Move TabRegistry initialization to TinkerArmor

This commit is contained in:
Qowyn committed 2014-09-23 16:33:22 +02:00
1 parent c006610fea
commit 8d77ab5916
2 files changed
+5 -7

No files matched your search

@@ -5,7 +5,9 @@ import cpw.mods.fml.common.event.*;
import cpw.mods.fml.common.registry.*;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
import cpw.mods.fml.relauncher.Side;
import java.util.EnumSet;
import mantle.pulsar.pulse.*;
import net.minecraft.block.Block;
import net.minecraft.init.*;
@@ -19,6 +21,7 @@ import tconstruct.armor.blocks.DryingRack;
import tconstruct.armor.items.*;
import tconstruct.blocks.logic.DryingRackLogic;
import tconstruct.client.ArmorControls;
import tconstruct.client.tabs.TabRegistry;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.accessory.AccessoryCore;
import tconstruct.library.armor.ArmorPart;
@@ -75,6 +78,7 @@ public class TinkerArmor
if (event.getSide() == Side.CLIENT)
{
FMLCommonHandler.instance().bus().register(new ArmorControls());
MinecraftForge.EVENT_BUS.register(new TabRegistry());
}
TinkerArmor.dryingRack = new DryingRack().setBlockName("Armor.DryingRack");
@@ -3,16 +3,13 @@ package tconstruct.client;
import cpw.mods.fml.common.gameevent.TickEvent.Type;
import mantle.common.network.AbstractPacket;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.inventory.GuiInventory;
import net.minecraft.client.settings.KeyBinding;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.Potion;
import net.minecraftforge.common.MinecraftForge;
import tconstruct.TConstruct;
import tconstruct.armor.*;
import tconstruct.armor.items.TravelGear;
import tconstruct.client.tabs.TabRegistry;
import tconstruct.util.network.*;
public class ArmorControls extends TKeyHandler
@@ -64,10 +61,7 @@ public class ArmorControls extends TKeyHandler
{
openArmorGui();// mc.thePlayer.username);
}
if (kb == invKey && mc.currentScreen != null && mc.currentScreen.getClass() == GuiInventory.class)// &&// !mc.playerController.isInCreativeMode())
{
MinecraftForge.EVENT_BUS.register(new TabRegistry());
}
if (kb == jumpKey) // Double jump
{
if (mc.thePlayer.capabilities.isCreativeMode)