diff --git a/build.properties b/build.properties index a6bf90550..7bc60da02 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ -minecraft_version=1.12.1 +minecraft_version=1.12.2 mappings_version=snapshot_20170625 forge_version=14.22.0.2446 mcmp_version=2.2.2 jei_version=4.7.0.67 -mod_version=9.4.1 +mod_version=9.4.2 tesla_version=1.0.59 invtweak_version=1.63+beta.107 opencomputers_version=1.7.0.24 diff --git a/src/main/java/mekanism/api/gas/GasRegistry.java b/src/main/java/mekanism/api/gas/GasRegistry.java index f39c3e08c..3026d0504 100644 --- a/src/main/java/mekanism/api/gas/GasRegistry.java +++ b/src/main/java/mekanism/api/gas/GasRegistry.java @@ -115,7 +115,8 @@ public class GasRegistry return registeredGasses.indexOf(gas); } - private static void checkPhase(){ - Preconditions.checkState(Loader.instance().getLoaderState().ordinal() > LoaderState.INITIALIZATION.ordinal(), "Gasses must be registered before postInit."); + private static void checkPhase() + { + Preconditions.checkState(Loader.instance().getLoaderState().ordinal() < LoaderState.INITIALIZATION.ordinal(), "Gasses must be registered before postInit."); } } diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 77fb69da6..28d45f393 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -150,7 +150,7 @@ import com.mojang.authlib.GameProfile; * @author AidanBrady * */ -@Mod(modid = "mekanism", name = "Mekanism", version = "9.4.1", guiFactory = "mekanism.client.gui.ConfigGuiFactory", +@Mod(modid = "mekanism", name = "Mekanism", version = "9.4.2", guiFactory = "mekanism.client.gui.ConfigGuiFactory", acceptedMinecraftVersions = "[1.12,1.13)", dependencies = "required-after:forge@[14.21.0.2373,);" + "after:redstoneflux;" + @@ -187,7 +187,7 @@ public class Mekanism public static Configuration configuration; /** Mekanism version number */ - public static Version versionNumber = new Version(9, 4, 1); + public static Version versionNumber = new Version(9, 4, 2); /** MultiblockManagers for various structrures */ public static MultiblockManager tankManager = new MultiblockManager<>("dynamicTank"); diff --git a/src/main/java/mekanism/common/integration/TOPProvider.java b/src/main/java/mekanism/common/integration/TOPProvider.java index 774a79b0a..41b44eb8b 100644 --- a/src/main/java/mekanism/common/integration/TOPProvider.java +++ b/src/main/java/mekanism/common/integration/TOPProvider.java @@ -36,21 +36,30 @@ public class TOPProvider implements Function, IProbeInfoProv @Override public void addProbeInfo(ProbeMode mode, IProbeInfo probeInfo, EntityPlayer player, World world, IBlockState blockState, IProbeHitData data) { - if (mode != ProbeMode.EXTENDED){ + if(mode != ProbeMode.EXTENDED) + { return; } final TileEntity tile = world.getTileEntity( data.getPos() ); - if (tile != null){ - if (tile.hasCapability(Capabilities.GAS_HANDLER_CAPABILITY, null)){ + if(tile != null) + { + if(tile.hasCapability(Capabilities.GAS_HANDLER_CAPABILITY, null)) + { IGasHandler handler = tile.getCapability(Capabilities.GAS_HANDLER_CAPABILITY, null); - if (handler != null){ + + if(handler != null) + { GasTankInfo[] tanks = handler.getTankInfo(); - for (GasTankInfo tank : tanks){ - if (tank.getGas() != null){ + + for(GasTankInfo tank : tanks) + { + if(tank.getGas() != null) + { probeInfo.text(TextStyleClass.NAME + "Gas: " + tank.getGas().getGas().getLocalizedName()); } + IProgressStyle style = probeInfo.defaultProgressStyle().suffix("mB"); probeInfo.progress(tank.getStored(), tank.getMaxGas(), style); } diff --git a/src/main/java/mekanism/common/integration/wrenches/IC2Proxy.java b/src/main/java/mekanism/common/integration/wrenches/IC2Proxy.java index 882960b76..1a1f45b6d 100644 --- a/src/main/java/mekanism/common/integration/wrenches/IC2Proxy.java +++ b/src/main/java/mekanism/common/integration/wrenches/IC2Proxy.java @@ -14,28 +14,26 @@ public class IC2Proxy implements MekWrenchProxy, IMekWrench private final Class wrenchClass; - public IC2Proxy(){ + public IC2Proxy() + { Class w = null; - try - { + + try { w = Class.forName(IC2_WRENCH_CLASS); - } - catch(ClassNotFoundException e) - { - //no-op - } - this.wrenchClass = w; + } catch(ClassNotFoundException e) {} + + wrenchClass = w; } @Override public boolean canUseWrench(ItemStack stack, EntityPlayer player, BlockPos pos) { - return this.wrenchClass != null && this.wrenchClass.isInstance(stack.getItem()); + return wrenchClass != null && wrenchClass.isInstance(stack.getItem()); } @Override public IMekWrench get(ItemStack stack) { - return this.wrenchClass != null && this.wrenchClass.isInstance(stack.getItem()) ? this : null; + return wrenchClass != null && wrenchClass.isInstance(stack.getItem()) ? this : null; } } diff --git a/src/main/java/mekanism/common/integration/wrenches/Wrenches.java b/src/main/java/mekanism/common/integration/wrenches/Wrenches.java index c44f72356..9b3ac5e50 100644 --- a/src/main/java/mekanism/common/integration/wrenches/Wrenches.java +++ b/src/main/java/mekanism/common/integration/wrenches/Wrenches.java @@ -16,8 +16,7 @@ public enum Wrenches MEKANISM_PASSTHROUGH(IMekWrench.class.getName(), MekPassthrough::new), BUILDCRAFT(BuildCraftProxy.BUILDCRAFT_WRENCH_CLASS, BuildCraftProxy::new), COFH(CofhProxy.COFH_HAMMER_CLASS, CofhProxy::new), - IC2(IC2Proxy.IC2_WRENCH_CLASS, IC2Proxy::new), - ; + IC2(IC2Proxy.IC2_WRENCH_CLASS, IC2Proxy::new); private final String classname; private Class itemClass; @@ -40,29 +39,25 @@ public enum Wrenches { for(Wrenches w : values()) { - try - { + try { w.itemClass = Class.forName(w.classname); - } catch(ClassNotFoundException e) - { + } catch(ClassNotFoundException e) { w.enabled = false; w.provider = null; w.itemClass = null; continue; } - try - { + + try { w.provider = w.mekProxy.get(); - } catch(Exception e) - { + } catch(Exception e) { w.enabled = false; w.provider = null; } } } - public static @Nullable - IMekWrench getHandler(ItemStack it) + public static @Nullable IMekWrench getHandler(ItemStack it) { for(Wrenches w : values()) { @@ -71,6 +66,7 @@ public enum Wrenches return w.provider.get(it); } } + return null; } } diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index f80632095..7a84df39e 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -41,7 +41,7 @@ import net.minecraftforge.oredict.OreDictionary; import buildcraft.api.fuels.BuildcraftFuelRegistry; import buildcraft.api.fuels.IFuel; -@Mod(modid = "mekanismgenerators", name = "MekanismGenerators", version = "9.4.1", dependencies = "required-after:mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory", acceptedMinecraftVersions = "[1.12,1.13)") +@Mod(modid = "mekanismgenerators", name = "MekanismGenerators", version = "9.4.2", dependencies = "required-after:mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory", acceptedMinecraftVersions = "[1.12,1.13)") @Mod.EventBusSubscriber() public class MekanismGenerators implements IModule { @@ -52,7 +52,7 @@ public class MekanismGenerators implements IModule public static MekanismGenerators instance; /** MekanismGenerators version number */ - public static Version versionNumber = new Version(9, 4, 1); + public static Version versionNumber = new Version(9, 4, 2); public static MultiblockManager turbineManager = new MultiblockManager<>("industrialTurbine"); diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index 119f849ac..565b1f70b 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -34,7 +34,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; -@Mod(modid = "mekanismtools", name = "MekanismTools", version = "9.4.1", dependencies = "required-after:mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory", acceptedMinecraftVersions = "[1.12,1.13)") +@Mod(modid = "mekanismtools", name = "MekanismTools", version = "9.4.2", dependencies = "required-after:mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory", acceptedMinecraftVersions = "[1.12,1.13)") @Mod.EventBusSubscriber() public class MekanismTools implements IModule { @@ -45,7 +45,7 @@ public class MekanismTools implements IModule public static MekanismTools instance; /** MekanismTools version number */ - public static Version versionNumber = new Version(9, 4, 1); + public static Version versionNumber = new Version(9, 4, 2); //Enums: Tools public static ToolMaterial toolOBSIDIAN;