2.1.2 Update

- Fixed a few things for config file
- Moved TE buckets to TE integration class
- Minor code cleanups
- Updated mappings and Forge

Author: Jacky1356400

build.gradle

@@ -22,7 +22,7 @@ compileJava {
 minecraft {
     version = "${mc_version}-${forge_version}"
     runDir = "run"
-    mappings = "snapshot_20170705"
+    mappings = "${mappings_version}"
 }
 
 repositories {

gradle.properties

@@ -2,5 +2,6 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx4G
 mc_version=1.12
-forge_version=14.21.1.2396
-mod_version=2.1.1
+forge_version=14.21.1.2406
+mod_version=2.1.2
+mappings_version=snapshot_20170710

src/main/java/me/jacky1356400/exchangers/Config.java

@@ -103,13 +103,13 @@ private static void initConfig(Configuration cfg) {
 		cfg.addCustomCategoryComment(CATEGORY_RECIPES,
 				"Progressive recipes - requires the previous tier to craft the next tier exchanger, which means more expensive.");
 		vanillaProgressiveRecipes = cfg.getBoolean("Vanilla Progressive Recipes", CATEGORY_RECIPES, true,
-				"[Not implemented!] If true, enables progressive recipes for vanilla-based exchangers.");
+				"If true, enables progressive recipes for vanilla-based exchangers.");
 		enderIOProgressiveRecipes = cfg.getBoolean("Ender IO Progressive Recipes", CATEGORY_RECIPES, true,
 				"[Not implemented!] If true, enables progressive recipes for Ender IO-based exchangers.");
 		thermalExpansionProgressiveRecipes = cfg.getBoolean("Thermal Expansion Progressive Recipes", CATEGORY_RECIPES,
-				true, "[Not implemented!] If true, enables progressive recipes for Thermal Expansion-based exchangers.");
+				true, "If true, enables progressive recipes for Thermal Expansion-based exchangers.");
 		mekanismProgressiveRecipes = cfg.getBoolean("Mekanism Progressive Recipes", CATEGORY_RECIPES, true,
-				"If true, enables progressive recipes for Mekanism-based exchangers.");
+				"[Not implemented!] If true, enables progressive recipes for Mekanism-based exchangers.");
 
 		//Vanilla Tweaks
 		cfg.addCustomCategoryComment(CATEGORY_TWEAKS_VANILLA, "Vanilla Exchanger Tweaks");
@@ -156,7 +156,7 @@ private static void initConfig(Configuration cfg) {
 				10000, "Set the RF consumption per block for Vibrant Exchanger");
 
 		//Thermal Expansion Tweaks
-		cfg.addCustomCategoryComment(CATEGORY_TWEAKS_TE, "[Not implemented!] Thermal Expansion Exchanger Tweaks");
+		cfg.addCustomCategoryComment(CATEGORY_TWEAKS_TE, "Thermal Expansion Exchanger Tweaks");
 		leadstoneMaxEnergy = cfg.getInt("Leadstone Exchanger Capacity", CATEGORY_TWEAKS_TE, 80000, 1000, 100000000,
 				"Set the RF capacity for Leadstone Exchanger");
 		leadstonePerBlockUse = cfg.getInt("Leadstone Exchanger Power Consumption", CATEGORY_TWEAKS_TE, 10, 1,

src/main/java/me/jacky1356400/exchangers/init/ModRegistry.java

@@ -12,16 +12,13 @@
 import net.minecraft.block.Block;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraftforge.event.RegistryEvent;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.FluidUtil;
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
+import static me.jacky1356400.exchangers.integration.ThermalExpansionIntegration.*;
+
 public class ModRegistry {
 
 	public static final Item WOODEN = new ItemExchanger("exwooden", Tier.ONE, Config.woodMaxDmg);
@@ -45,10 +42,6 @@ public class ModRegistry {
     public static final Item TECORE_2 = new ItemBasic("teexcore_t2");
     public static final Item TECORE_3 = new ItemBasic("teexcore_t3");
 
-    public static ItemStack bucketResonantEnder;
-    public static ItemStack bucketEnergizedGlowstone;
-    public static ItemStack bucketGelidCryotheum;
-
 	@SuppressWarnings("deprecation")
 	private static void initRecipes() {
 		if (Config.vanillaModule = true) {
@@ -126,13 +119,6 @@ private static void initRecipes() {
                         'C', TECORE_3);
             }
 
-            Fluid ender = FluidRegistry.getFluid("ender");
-            bucketResonantEnder = FluidUtil.getFilledBucket(new FluidStack(ender, 1000));
-            Fluid glowstone = FluidRegistry.getFluid("glowstone");
-            bucketEnergizedGlowstone = FluidUtil.getFilledBucket(new FluidStack(glowstone, 1000));
-            Fluid cryotheum = FluidRegistry.getFluid("cryotheum");
-            bucketGelidCryotheum = FluidUtil.getFilledBucket(new FluidStack(cryotheum, 1000));
-
             RecipeHelper.addOldShaped(TECORE_1, "CLC", "LRL", "CLC", 'C', "gearCopper", 'L', "ingotLead",
                     'R', bucketResonantEnder);
             RecipeHelper.addOldShaped(TECORE_2, "BIB", "CGC", "BIB", 'B', "gearBronze", 'I', "gearInvar",'C',

src/main/java/me/jacky1356400/exchangers/integration/ThermalExpansionIntegration.java

@@ -4,6 +4,10 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidUtil;
 
 public class ThermalExpansionIntegration {
 
@@ -16,6 +20,9 @@ public class ThermalExpansionIntegration {
 	public static ItemStack redstoneReceptionCoil;
 	public static ItemStack redstoneTransmissionCoil;
 	public static ItemStack redstoneConductanceCoil;
+	public static ItemStack bucketResonantEnder;
+	public static ItemStack bucketEnergizedGlowstone;
+	public static ItemStack bucketGelidCryotheum;
 
 	public static void init() {
 		Exchangers.logger.info("Fetching items for Thermal Expansion integration...");
@@ -37,6 +44,13 @@ public static void init() {
 			redstoneConductanceCoil = new ItemStack(teMaterialsItem, 1, 515);
 		}
 
+		Fluid ender = FluidRegistry.getFluid("ender");
+		bucketResonantEnder = FluidUtil.getFilledBucket(new FluidStack(ender, 1000));
+		Fluid glowstone = FluidRegistry.getFluid("glowstone");
+		bucketEnergizedGlowstone = FluidUtil.getFilledBucket(new FluidStack(glowstone, 1000));
+		Fluid cryotheum = FluidRegistry.getFluid("cryotheum");
+		bucketGelidCryotheum = FluidUtil.getFilledBucket(new FluidStack(cryotheum, 1000));
+
 	}
 
 }

src/main/java/me/jacky1356400/exchangers/proxy/CommonProxy.java

@@ -7,12 +7,10 @@
 import me.jacky1356400.exchangers.handler.network.PacketHandler;
 import me.jacky1356400.exchangers.helper.DirectionHelper;
 import me.jacky1356400.exchangers.init.ModRegistry;
-import me.jacky1356400.exchangers.integration.ThermalExpansionIntegration;
 import me.jacky1356400.exchangers.item.ItemExchanger;
 import me.jacky1356400.exchangers.util.Data;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.config.Configuration;
-import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;

src/main/java/me/jacky1356400/exchangers/util/Data.java

@@ -18,7 +18,7 @@ public class Data {
 	public static final String EIO = "enderio";
 	public static final String MEK = "mekanism";
 	public static final String THERMAL = "thermalexpansion";
-	public static final String VERSION = "1.12-2.1.1";
+	public static final String VERSION = "1.12-2.1.2";
 	public static final String MODID = "exchangers";
 	public static final String MODNAME = "Exchangers";
 	public static final CreativeTabs TAB = new CreativeTabs(MODID) {

src/main/resources/mcmod.info

@@ -3,7 +3,7 @@
   "modid": "exchangers",
   "name": "Exchangers",
   "description": "Block Exchangers.",
-  "version": "1.12-2.1.1",
+  "version": "1.12-2.1.2",
   "mcversion": "1.12",
   "url": "https://github.com/Jacky1356400/Exchangers",
   "updateUrl": "",