From 2a7e0a624f482a28af1c770dbcf2a20f52f94f78 Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Sun, 19 Apr 2015 03:30:08 +0100 Subject: Added Midas Touch --- .../jewelrycraft/client/InventoryTabVanilla.java | 4 +- .../darkknight/jewelrycraft/client/TabJewelry.java | 3 +- .../jewelrycraft/client/TabRegistry.java | 52 +++++++++------------- .../jewelrycraft/client/gui/GuiJewelry.java | 1 - 4 files changed, 25 insertions(+), 35 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/client') diff --git a/src/main/java/darkknight/jewelrycraft/client/InventoryTabVanilla.java b/src/main/java/darkknight/jewelrycraft/client/InventoryTabVanilla.java index c8d598c..4f5ae88 100644 --- a/src/main/java/darkknight/jewelrycraft/client/InventoryTabVanilla.java +++ b/src/main/java/darkknight/jewelrycraft/client/InventoryTabVanilla.java @@ -11,13 +11,13 @@ public class InventoryTabVanilla extends AbstractTab } @Override - public void onTabClicked () + public void onTabClicked() { TabRegistry.openInventoryGui(); } @Override - public boolean shouldAddToList () + public boolean shouldAddToList() { return true; } diff --git a/src/main/java/darkknight/jewelrycraft/client/TabJewelry.java b/src/main/java/darkknight/jewelrycraft/client/TabJewelry.java index 4598962..65d4a3b 100644 --- a/src/main/java/darkknight/jewelrycraft/client/TabJewelry.java +++ b/src/main/java/darkknight/jewelrycraft/client/TabJewelry.java @@ -1,10 +1,9 @@ package darkknight.jewelrycraft.client; +import net.minecraft.item.ItemStack; import darkknight.jewelrycraft.JewelrycraftMod; import darkknight.jewelrycraft.item.ItemList; import darkknight.jewelrycraft.network.PacketKeyPressEvent; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class TabJewelry extends AbstractTab { diff --git a/src/main/java/darkknight/jewelrycraft/client/TabRegistry.java b/src/main/java/darkknight/jewelrycraft/client/TabRegistry.java index 2765b73..a264412 100644 --- a/src/main/java/darkknight/jewelrycraft/client/TabRegistry.java +++ b/src/main/java/darkknight/jewelrycraft/client/TabRegistry.java @@ -7,6 +7,7 @@ import net.minecraft.client.gui.inventory.GuiInventory; import net.minecraft.network.play.client.C0DPacketCloseWindow; import net.minecraftforge.client.event.GuiScreenEvent; import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -18,52 +19,47 @@ import darkknight.jewelrycraft.client.*; public class TabRegistry { private static ArrayList tabList = new ArrayList(); - - public static void registerTab (AbstractTab tab) + + public static void registerTab(AbstractTab tab) { tabList.add(tab); } - - public static ArrayList getTabList () + + public static ArrayList getTabList() { return tabList; } - - @SideOnly(Side.CLIENT) + + @SideOnly (Side.CLIENT) @SubscribeEvent - public void guiPostInit (GuiScreenEvent.InitGuiEvent.Post event) + public void guiPostInit(GuiScreenEvent.InitGuiEvent.Post event) { - if ((event.gui instanceof GuiInventory)) - { + if ((event.gui instanceof GuiInventory)){ int xSize = 176; int ySize = 166; int guiLeft = (event.gui.width - xSize) / 2; int guiTop = (event.gui.height - ySize) / 2; - if(!mc.thePlayer.getActivePotionEffects().isEmpty()) guiLeft += 60; - + if (!mc.thePlayer.getActivePotionEffects().isEmpty()) guiLeft += 60; updateTabValues(guiLeft, guiTop, InventoryTabVanilla.class); addTabsToList(event.buttonList); } } - + private static Minecraft mc = FMLClientHandler.instance().getClient(); - - public static void openInventoryGui () + + public static void openInventoryGui() { mc.thePlayer.sendQueue.addToSendQueue(new C0DPacketCloseWindow(mc.thePlayer.openContainer.windowId)); GuiInventory inventory = new GuiInventory(mc.thePlayer); mc.displayGuiScreen(inventory); } - - public static void updateTabValues (int cornerX, int cornerY, Class selectedButton) + + public static void updateTabValues(int cornerX, int cornerY, Class selectedButton) { - int count = 2; - for (int i = 0; i < tabList.size(); i++) - { + int count = 2 + (Loader.isModLoaded("TConstruct") ? 1 : 0); + for(int i = 0; i < tabList.size(); i++){ AbstractTab t = tabList.get(i); - - if (t.shouldAddToList()) - { + if (t.shouldAddToList()){ t.id = count; t.xPosition = cornerX + (count - 2) * 28; t.yPosition = cornerY - 28; @@ -72,15 +68,11 @@ public class TabRegistry } } } - - public static void addTabsToList (List buttonList) + + public static void addTabsToList(List buttonList) { - for (AbstractTab tab : tabList) - { - if (tab.shouldAddToList()) - { - buttonList.add(tab); - } + for(AbstractTab tab: tabList){ + if (tab.shouldAddToList()) if (!(Loader.isModLoaded("TConstruct") && tab instanceof InventoryTabVanilla) || !tabList.get(1).enabled) buttonList.add(tab); } } } \ No newline at end of file diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelry.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelry.java index 44d312b..981fbfd 100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelry.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelry.java @@ -4,7 +4,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import darkknight.jewelrycraft.client.JewelryInventory; import darkknight.jewelrycraft.client.TabJewelry; import darkknight.jewelrycraft.client.TabRegistry; import darkknight.jewelrycraft.client.gui.container.ContainerJewelryTab; -- cgit v1.2.3