udpate gradle, prepare for final 1.12 release

build.gradle

@@ -10,6 +10,14 @@ buildscript {
 apply plugin: 'net.minecraftforge.gradle.forge'
 //Only edit below this line, the above code adds and enables the nessasary things for Forge to be setup.
 
+def mc_version
+if(mc_version_patch > 0)
+    mc_version = "${mc_version_major}.${mc_version_minor}.${mc_version_patch}"
+else
+    mc_version = "${mc_version_major}.${mc_version_minor}"
+
+def mc_version_short = "${mc_version_major}.${mc_version_minor}"
+
 version = version_major + '.' + version_minor + '.' + version_patch + '.' + getBuildNumber()
 group= "net.xalcon.energyconverters" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "energyconverters_" + mc_version
@@ -28,23 +36,31 @@ minecraft {
 }
 
 repositories {
+
     maven { url = "http://maven.covers1624.net" } // COFH Mods
     maven { url = "http://maven.ic2.player.to/" }
-    maven { url 'http://maven.epoxide.xyz' } // Tesla
+    maven { url = "http://chickenbones.net/maven/" }
+    maven { url = 'http://maven.mcmoddev.com' } // Tesla
 	maven { url = "http://dvs1.progwml6.com/files/maven" } // JEI
+    maven { url = "https://minecraft.curseforge.com/api/maven/" }
     ivy { artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision].[ext]" }
 }
 
 dependencies {
     deobfCompile "net.industrial-craft:industrialcraft-2:${ic2_version}"
-    deobfCompile "net.darkhax.tesla:Tesla-1.12:${tesla_version}"
-	deobfCompile "mezz.jei:jei_1.12:${jei_version}:api"
-    deobfCompile "cofh:RedstoneFlux:1.12-2.0.0.1:universal"
-
-    //compile name: "buildcraft", version: "7.99.4"
+    deobfCompile "net.darkhax.tesla:Tesla-${mc_version_short}:${tesla_version}"
+    deobfCompile "cofh:RedstoneFlux:${mc_version_short}-${redstone_flux_version}:universal"
+    compile name: "buildcraft-all", version: "${buildcraft_version}"
 
 	runtime "net.industrial-craft:industrialcraft-2:${ic2_version}:universal"
-	runtime "mezz.jei:jei_1.12:${jei_version}"
+	runtime "mezz.jei:jei_${mc_version}:${jei_version}"
+    runtime "solar-village:SolarVillage:${mc_version}:${solar_village_version}"
+    runtime "codechicken:CodeChickenLib:${mc_version}-${ccl_version}:universal"
+    runtime "cofh:CoFHCore:${mc_version}-${cofh_core_version}:universal"
+    runtime "cofh:CoFHWorld:${mc_version}-${cofh_world_version}:universal"
+    runtime "cofh:ThermalFoundation:${mc_version}-${thermal_foundation_version}:universal"
+    runtime "cofh:ThermalDynamics:${mc_version}-${thermal_dynamics_version}:universal"
+    runtime "cofh:ThermalExpansion:${mc_version}-${thermal_expansion_version}:universal"
 }
 
 processResources
@@ -67,6 +83,6 @@ processResources
     }
 }
 
-def getBuildNumber() {
+static def getBuildNumber() {
     return "$System.env.BUILD_NUMBER" != "null" ? "$System.env.BUILD_NUMBER" : "0"
 }

gradle.properties

@@ -2,15 +2,27 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
 
-mc_version=1.12.1
-forge_version=14.22.0.2456
-mcp_mappings=snapshot_20170630
+mc_version_major=1
+mc_version_minor=12
+mc_version_patch=2
 
+forge_version=14.23.5.2796
+mcp_mappings=stable_39
+
+buildcraft_version=7.99.20
 ic2_version=2.8.+
 tesla_version=1.+
+redstone_flux_version=2.1.+
+
+# Runtime mods, not used during compilation
+solar_village_version=1.3.32
 jei_version=4.+
-reborncore_version=+
-techreborn_version=+
+ccl_version=3.2.+
+cofh_core_version=4.6.+
+cofh_world_version=1.3.+
+thermal_foundation_version=2.6.+
+thermal_dynamics_version=2.5.+
+thermal_expansion_version=5.5.+
 
 version_major=1
 version_minor=0

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Jun 11 12:00:35 CEST 2017
+#Wed Dec 19 18:20:09 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

src/main/java/net/xalcon/energyconverters/common/CreativeTabEnergyConverters.java

@@ -9,13 +9,13 @@ public class CreativeTabEnergyConverters extends CreativeTabs
 {
     public final static CreativeTabEnergyConverters Instance = new CreativeTabEnergyConverters();
 
-    public CreativeTabEnergyConverters()
+    private CreativeTabEnergyConverters()
     {
         super("energy_converters");
     }
 
     @Override
-    public ItemStack getTabIconItem()
+    public ItemStack createIcon()
     {
         return new ItemStack(Item.getItemFromBlock(ModBlocks.getEnergyBridge()));
     }

src/main/java/net/xalcon/energyconverters/common/blocks/BlockBase.java

@@ -16,7 +16,7 @@ public BlockBase(Material material, String name)
     {
         super(material);
         this.internalName = name;
-        this.setUnlocalizedName(this.internalName);
+        this.setTranslationKey(this.internalName);
         this.setRegistryName(this.internalName);
         this.setHardness(2);
         this.setResistance(5);

src/main/java/net/xalcon/energyconverters/common/blocks/BlockEnergyBridge.java

@@ -24,7 +24,8 @@ public BlockEnergyBridge()
     }
 
     @Override
-    public BlockRenderLayer getBlockLayer() {
+    public BlockRenderLayer getRenderLayer()
+    {
         return BlockRenderLayer.TRANSLUCENT;
     }
 

src/main/java/net/xalcon/energyconverters/common/blocks/ItemBlockEnumMeta.java

@@ -23,9 +23,8 @@ public int getMetadata(int meta)
 	}
 
 	@Override
-	public String getUnlocalizedName(ItemStack stack) {
-		return super.getUnlocalizedName(stack) + "." + this.values[stack.getMetadata()].getName();
+	public String getTranslationKey(ItemStack stack)
+	{
+		return super.getTranslationKey(stack) + "." + this.values[stack.getMetadata()].getName();
 	}
-
-
 }