diff --git a/build.gradle b/build.gradle index ebc08b8..29ebca8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,46 +1,47 @@ +/* +// For those who want the bleeding edge buildscript { repositories { - mavenCentral() + jcenter() maven { name = "forge" url = "http://files.minecraftforge.net/maven" } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" - } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.0-SNAPSHOT' } } +apply plugin: 'net.minecraftforge.gradle.forge' +*/ + +// for people who want stable +plugins { + id "net.minecraftforge.gradle.forge" version "2.0.2" +} apply plugin: 'java' -apply plugin: 'forge' // Java level 1.7 sourceCompatibility = '1.7' targetCompatibility = '1.7' -version = "MC1.8.0-b0.9.6-R1a" -group= "net.einsteinsci.betterbeginnings" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +version = "MC1.8.0-b0.9.6-R1" +group = "net.einsteinsci.betterbeginnings" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "betterbeginnings" minecraft { - version = "1.8-11.14.3.1450" - if(file('../run').exists()) - {runDir = "../run"} - else - {runDir = "eclipse"} + version = "1.8-11.14.4.1577" + 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_nodoc_20150404" - // mappings = "snapshot_20141130" + // mappings = "snapshot_20141130" + // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. } dependencies { @@ -53,6 +54,14 @@ dependencies { //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 + // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. + //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' + + // the deobf configurations: 'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided, + // except that these dependencies get remapped to your current MCP mappings + //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev' + //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev' + // for more info... // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html // http://www.gradle.org/docs/current/userguide/dependency_management.html diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b761216..30d399d 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 678d9d8..9397848 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jul 02 15:54:47 CDT 2014 +#Mon Sep 14 12:28:28 PDT 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip diff --git a/src/main/java/net/einsteinsci/betterbeginnings/ModMain.java b/src/main/java/net/einsteinsci/betterbeginnings/ModMain.java index d1c1a55..392825a 100644 --- a/src/main/java/net/einsteinsci/betterbeginnings/ModMain.java +++ b/src/main/java/net/einsteinsci/betterbeginnings/ModMain.java @@ -23,15 +23,14 @@ import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.logging.log4j.Level; @Mod(modid = ModMain.MODID, version = ModMain.VERSION, name = ModMain.NAME, guiFactory = "net.einsteinsci.betterbeginnings.config.BBConfigGuiFactory") public class ModMain { public static final String MODID = "betterbeginnings"; - public static final String VERSION = "0.9.6-R1a"; - public static final String NAME = "Better Beginnings"; + public static final String VERSION = "0.9.6-R1"; + public static final String NAME = "BetterBeginnings"; public static final CreativeTabs tabBetterBeginnings = new CreativeTabs("tabBetterBeginnings") { @Override diff --git a/src/main/java/net/einsteinsci/betterbeginnings/event/BBEventHandler.java b/src/main/java/net/einsteinsci/betterbeginnings/event/BBEventHandler.java index 36ee562..93b9726 100644 --- a/src/main/java/net/einsteinsci/betterbeginnings/event/BBEventHandler.java +++ b/src/main/java/net/einsteinsci/betterbeginnings/event/BBEventHandler.java @@ -37,7 +37,7 @@ public class BBEventHandler { if (BBConfig.greetUser) { - ChatUtil.sendModChatToPlayer(e.player, ChatUtil.LIME + "Better Beginnings " + ModMain.VERSION + + ChatUtil.sendModChatToPlayer(e.player, ChatUtil.LIME + "BetterBeginnings " + ModMain.VERSION + " loaded successfully."); } } diff --git a/src/main/java/net/einsteinsci/betterbeginnings/network/ServerProxy.java b/src/main/java/net/einsteinsci/betterbeginnings/network/ServerProxy.java index 376c479..7b85f3a 100644 --- a/src/main/java/net/einsteinsci/betterbeginnings/network/ServerProxy.java +++ b/src/main/java/net/einsteinsci/betterbeginnings/network/ServerProxy.java @@ -11,14 +11,10 @@ import org.apache.logging.log4j.Level; public class ServerProxy { public void registerRenderThings() - { - - } + { } public void registerTileEntitySpecialRenderer() - { - - } + { } public void registerNetworkStuff() { diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 5c2d7c4..106c2f3 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "betterbeginnings", "name": "Better Beginnings", "description": "Rebalances early stages of Minecraft, and creates alternatives to the typical vanilla grind.", - "version": "b0.9.6 R1a", + "version": "b0.9.6 R1", "mcversion": "1.8", "url": "http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/2192122-betterbeginnings-mod-9000-downloads", "updateUrl": "",