Fix armorcontrols having two separate instances. Fixes doublejump issue #1108

This commit is contained in:
Bernhard Bonigl committed 2014-10-22 22:51:08 +02:00
1 parent ffcd7f26b4
commit e37b32234f
4 files changed
+13 -9

No files matched your search

@@ -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;
@@ -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());
@@ -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();
@@ -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");