diff --git a/src/main/java/tconstruct/armor/ArmorAbilitiesClient.java b/src/main/java/tconstruct/armor/ArmorAbilitiesClient.java index 2d2b8d82..874314ca 100644 --- a/src/main/java/tconstruct/armor/ArmorAbilitiesClient.java +++ b/src/main/java/tconstruct/armor/ArmorAbilitiesClient.java @@ -13,8 +13,8 @@ import tconstruct.library.modifier.IModifyable; public class ArmorAbilitiesClient { - Minecraft mc; - ArmorControls controlInstance; + private final Minecraft mc; + private final ArmorControls controlInstance; ItemStack prevFeet; double prevMotionY; diff --git a/src/main/java/tconstruct/armor/ArmorProxyClient.java b/src/main/java/tconstruct/armor/ArmorProxyClient.java index c9288d71..8e8ac926 100644 --- a/src/main/java/tconstruct/armor/ArmorProxyClient.java +++ b/src/main/java/tconstruct/armor/ArmorProxyClient.java @@ -47,6 +47,13 @@ public class ArmorProxyClient extends ArmorProxyCommon public static KnapsackInventory knapsack = new KnapsackInventory(); public static ArmorExtended armorExtended = new ArmorExtended(); + @Override + public void preInit() { + controlInstance = new ArmorControls(); + FMLCommonHandler.instance().bus().register(controlInstance); + MinecraftForge.EVENT_BUS.register(new TabRegistry()); + } + @Override public void initialize () { @@ -148,7 +155,6 @@ public class ArmorProxyClient extends ArmorProxyCommon @Override public void registerKeys () { - controlInstance = new ArmorControls(); uploadKeyBindingsToGame(Minecraft.getMinecraft().gameSettings, controlInstance); TabRegistry.registerTab(new InventoryTabVanilla()); diff --git a/src/main/java/tconstruct/armor/ArmorProxyCommon.java b/src/main/java/tconstruct/armor/ArmorProxyCommon.java index 502ae839..d7df1d28 100644 --- a/src/main/java/tconstruct/armor/ArmorProxyCommon.java +++ b/src/main/java/tconstruct/armor/ArmorProxyCommon.java @@ -13,6 +13,8 @@ public class ArmorProxyCommon implements IGuiHandler public static final int armorGuiID = 101; public static final int knapsackGuiID = 102; + public void preInit() {} + public void initialize () { registerGuiHandler(); diff --git a/src/main/java/tconstruct/armor/TinkerArmor.java b/src/main/java/tconstruct/armor/TinkerArmor.java index 747ef6a5..4ecb52c0 100644 --- a/src/main/java/tconstruct/armor/TinkerArmor.java +++ b/src/main/java/tconstruct/armor/TinkerArmor.java @@ -76,15 +76,11 @@ public class TinkerArmor @Handler public void preInit (FMLPreInitializationEvent event) { + proxy.preInit(); + MinecraftForge.EVENT_BUS.register(new TinkerArmorEvents()); FMLCommonHandler.instance().bus().register(new ArmorAbilities()); - if (event.getSide() == Side.CLIENT) - { - FMLCommonHandler.instance().bus().register(new ArmorControls()); - MinecraftForge.EVENT_BUS.register(new TabRegistry()); - } - TinkerArmor.dryingRack = new DryingRack().setBlockName("Armor.DryingRack"); GameRegistry.registerBlock(TinkerArmor.dryingRack, "Armor.DryingRack"); GameRegistry.registerTileEntity(DryingRackLogic.class, "Armor.DryingRack");