From 0a1ff4f797d2cc075cd29e3e2fe4fc45eb3e94d5 Mon Sep 17 00:00:00 2001 From: ShinkoNet Date: Thu, 25 Aug 2016 22:14:20 +1000 Subject: [PATCH 1/3] Minecraft 1.10 Support --- build.gradle | 2 +- src/main/resources/mcmod.info | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 70c8a1c..a03f4fe 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ runServer { }*/ minecraft { - version = "1.9.4-12.17.0.1960" + version = "1.10-12.18.0.1986-1.10.0" runDir = "run" // the mappings can be changed at any time, and must be in the following format. diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 40568d4..0eebd19 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -2,7 +2,7 @@ { "modid": "notebetter", "name": "NoteBetter", - "description": "Better Note Blocks.", + "description": "Better Note Blocks. 1.10 Fork by ShinkoNet.", "version": "${version}", "mcversion": "${mcversion}", "url": "", From ee0dae7be158b54eb4f14eacb1cc1016738366ef Mon Sep 17 00:00:00 2001 From: ShinkoNet Date: Sun, 2 Oct 2016 13:37:27 +1100 Subject: [PATCH 2/3] 1.10.2 support --- .../java/com/github/soniex2/notebetter/api/package-info.java | 2 +- src/main/resources/mcmod.info | 2 +- src/main/scala/com/github/soniex2/notebetter/NoteBetter.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/github/soniex2/notebetter/api/package-info.java b/src/main/java/com/github/soniex2/notebetter/api/package-info.java index df07837..4bd9b13 100644 --- a/src/main/java/com/github/soniex2/notebetter/api/package-info.java +++ b/src/main/java/com/github/soniex2/notebetter/api/package-info.java @@ -1,7 +1,7 @@ /** * @author soniex2 */ -@API(owner = "notebetter", provides = "notebetter|api", apiVersion = "2.0.0") +@API(owner = "notebetter", provides = "notebetter|api", apiVersion = "2.0.1") @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault package com.github.soniex2.notebetter.api; diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 0eebd19..eb31e85 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -2,7 +2,7 @@ { "modid": "notebetter", "name": "NoteBetter", - "description": "Better Note Blocks. 1.10 Fork by ShinkoNet.", + "description": "Better Note Blocks. 1.10.2 Fork by ShinkoNet.", "version": "${version}", "mcversion": "${mcversion}", "url": "", diff --git a/src/main/scala/com/github/soniex2/notebetter/NoteBetter.java b/src/main/scala/com/github/soniex2/notebetter/NoteBetter.java index c172902..9404ac1 100644 --- a/src/main/scala/com/github/soniex2/notebetter/NoteBetter.java +++ b/src/main/scala/com/github/soniex2/notebetter/NoteBetter.java @@ -26,7 +26,7 @@ @ParametersAreNonnullByDefault public class NoteBetter implements NoteBetterAPIInstance { public static final String MODID = "notebetter"; - public static final String VERSION = "2.0.0"; + public static final String VERSION = "2.0.1"; @Mod.Instance public static NoteBetter instance; From 85bd774e247ad547305454054b9ff51b6e082ba0 Mon Sep 17 00:00:00 2001 From: ShinkoNet Date: Sun, 2 Oct 2016 13:38:00 +1100 Subject: [PATCH 3/3] 1.10.2 support --- build.gradle | 66 +++++++++++++--------------------------------------- 1 file changed, 16 insertions(+), 50 deletions(-) diff --git a/build.gradle b/build.gradle index a03f4fe..6ad72cc 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,4 @@ + // For those who want the bleeding edge buildscript { repositories { @@ -11,62 +12,29 @@ buildscript { classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' } } - -apply plugin: 'scala' apply plugin: 'net.minecraftforge.gradle.forge' /* -// for people who want stable +// for people who want stable - not yet functional for MC 1.8.8 - we require the forgegradle 2.1 snapshot plugins { - id "net.minecraftforge.gradle.forge" version "2.0.1" + id "net.minecraftforge.gradle.forge" version "2.0.2" } */ - -version = "2.0.0" -group = "com.github.soniex2.notebetter" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = "notebetter" - -/*runClient { - jvmArgs '-Dfml.coreMods.load=com.github.soniex2.notebetter.asm.NoteBetterCore' -} -runServer { - jvmArgs '-Dfml.coreMods.load=com.github.soniex2.notebetter.asm.NoteBetterCore' -}*/ +version = "1.0" +group= "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = "modid" minecraft { - version = "1.10-12.18.0.1986-1.10.0" + version = "1.10.2-12.18.1.2011" runDir = "run" - + // the mappings can be changed at any time, and must be in the following format. // snapshot_YYYYMMDD snapshot are built nightly. // stable_# stables are built at the discretion of the MCP team. // Use non-default mappings at your own risk. they may not allways work. // simply re-run your setup task after changing the mappings to update your workspace. - mappings = "snapshot_20160612" - makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. - useDepAts = true - coreMod = "com.github.soniex2.notebetter.asm.NoteBetterCore" -} - -def commonManifest = { - attributes 'FMLCorePlugin': 'com.github.soniex2.notebetter.asm.NoteBetterCore' - attributes 'FMLCorePluginContainsFMLMod': 'true' -} - -jar { - manifest commonManifest -} - -task deobfJar(type: Jar) { - from(sourceSets.main.output) { - classifier = "deobf" - } - manifest commonManifest -} - -repositories { - maven { url = "http://maven.cil.li/" } - maven { url "http://dvs1.progwml6.com/files/maven" } + mappings = "snapshot_20160518" + // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. } dependencies { @@ -74,7 +42,7 @@ dependencies { // or you may define them like so.. //compile "some.group:artifact:version:classifier" //compile "some.group:artifact:version" - + // real examples //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env @@ -87,16 +55,14 @@ dependencies { //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev' //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev' - //compile "li.cil.oc:OpenComputers:MC1.8.9-1.5.+" - deobfCompile "mezz.jei:jei_1.9.4:3.6.3.212" - // for more info... // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html // http://www.gradle.org/docs/current/userguide/dependency_management.html } -processResources { +processResources +{ // this will ensure that this task is redone when the versions change. inputs.property "version", project.version inputs.property "mcversion", project.minecraft.version @@ -104,11 +70,11 @@ processResources { // replace stuff in mcmod.info, nothing else from(sourceSets.main.resources.srcDirs) { include 'mcmod.info' - + // replace version and mcversion - expand 'version': project.version, 'mcversion': project.minecraft.version + expand 'version':project.version, 'mcversion':project.minecraft.version } - + // copy everything else, thats not the mcmod.info from(sourceSets.main.resources.srcDirs) { exclude 'mcmod.info'