diff --git a/build.gradle b/build.gradle index 1bc3274..c54da9f 100644 --- a/build.gradle +++ b/build.gradle @@ -43,8 +43,8 @@ repositories { dependencies { compile files('libs/') - deobfCompile "mezz.jei:jei_1.12:4.7.0.67:api" - runtime "mezz.jei:jei_1.12:4.7.0.67" + deobfCompile "mezz.jei:jei_1.12:4.7.0.68:api" + runtime "mezz.jei:jei_1.12:4.7.0.68" deobfCompile "mcp.mobius.waila:Hwyla:1.8.18-B32_1.12:api" runtime "mcp.mobius.waila:Hwyla:1.8.18-B32_1.12" } diff --git a/gradle.properties b/gradle.properties index 788ce5b..556dbdc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,5 +2,5 @@ # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx4G mc_version=1.12 -forge_version=14.21.0.2359 -mod_version=2.0 +forge_version=14.21.1.2387 +mod_version=2.0.1 diff --git a/src/main/java/me/jacky1356400/exchangers/integration/EnderIOIntegration.java b/src/main/java/me/jacky1356400/exchangers/integration/EnderIOIntegration.java index e317769..48f33c4 100644 --- a/src/main/java/me/jacky1356400/exchangers/integration/EnderIOIntegration.java +++ b/src/main/java/me/jacky1356400/exchangers/integration/EnderIOIntegration.java @@ -11,7 +11,7 @@ import net.minecraftforge.fluids.UniversalBucket; public class EnderIOIntegration { - + /* public static ItemStack capacitorBankBasic; public static ItemStack capacitorBank; public static ItemStack capacitorBankVibrant; @@ -57,5 +57,5 @@ public static void init() { bucketVaporOfLevity = UniversalBucket.getFilledBucket(ForgeModContainer.getInstance().universalBucket, vaporOfLevity); } - + */ } diff --git a/src/main/java/me/jacky1356400/exchangers/integration/MekanismIntegration.java b/src/main/java/me/jacky1356400/exchangers/integration/MekanismIntegration.java index 9ceaa2d..43aec52 100644 --- a/src/main/java/me/jacky1356400/exchangers/integration/MekanismIntegration.java +++ b/src/main/java/me/jacky1356400/exchangers/integration/MekanismIntegration.java @@ -6,7 +6,7 @@ import net.minecraft.util.ResourceLocation; public class MekanismIntegration { - + /* public static ItemStack circuitBasic; public static ItemStack circuitAdvanced; public static ItemStack circuitElite; @@ -41,4 +41,5 @@ public static void init() { portableTeleporter = new ItemStack(portableTeleporterItem, 1, 0); } } + */ } diff --git a/src/main/java/me/jacky1356400/exchangers/integration/ThermalExpansionIntegration.java b/src/main/java/me/jacky1356400/exchangers/integration/ThermalExpansionIntegration.java index 3486bf5..057760c 100644 --- a/src/main/java/me/jacky1356400/exchangers/integration/ThermalExpansionIntegration.java +++ b/src/main/java/me/jacky1356400/exchangers/integration/ThermalExpansionIntegration.java @@ -10,7 +10,7 @@ import net.minecraftforge.fluids.UniversalBucket; public class ThermalExpansionIntegration { - + /* public static ItemStack fluxCapacitorBasic; public static ItemStack fluxCapacitorHardened; public static ItemStack fluxCapacitorReinforced; @@ -53,4 +53,5 @@ public static void init() { bucketGelidCryotheum = UniversalBucket.getFilledBucket(ForgeModContainer.getInstance().universalBucket, cryotheum); } + */ } diff --git a/src/main/java/me/jacky1356400/exchangers/proxy/CommonProxy.java b/src/main/java/me/jacky1356400/exchangers/proxy/CommonProxy.java index 6ceb3ea..07bab89 100644 --- a/src/main/java/me/jacky1356400/exchangers/proxy/CommonProxy.java +++ b/src/main/java/me/jacky1356400/exchangers/proxy/CommonProxy.java @@ -30,6 +30,7 @@ public void preInit(FMLPreInitializationEvent e) { config = new Configuration(new File(configDir.getPath(), "exchangers.cfg")); Config.readConfig(); MinecraftForge.EVENT_BUS.register(new ModRegistry()); + /* if ((Config.enderIOModule = true) && (Loader.isModLoaded(Data.EIO))) { EnderIOIntegration.init(); } @@ -39,6 +40,7 @@ public void preInit(FMLPreInitializationEvent e) { if ((Config.mekanismModule = true) && (Loader.isModLoaded(Data.MEK))) { MekanismIntegration.init(); } + */ PacketHandler.registerMessages(Data.MODID); } diff --git a/src/main/java/me/jacky1356400/exchangers/util/Data.java b/src/main/java/me/jacky1356400/exchangers/util/Data.java index 156c7a8..d152da7 100644 --- a/src/main/java/me/jacky1356400/exchangers/util/Data.java +++ b/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.0"; + public static final String VERSION = "1.12-2.0.1"; public static final String MODID = "exchangers"; public static final String MODNAME = "Exchangers"; public static final CreativeTabs TAB = new CreativeTabs(MODID) { diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 0278083..3b76b00 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "exchangers", "name": "Exchangers", "description": "Block Exchangers.", - "version": "1.12-2.0", + "version": "1.12-2.0.1", "mcversion": "1.12", "url": "https://github.com/Jacky1356400/Exchangers", "updateUrl": "",