From 4f7ad220df0438b6f3382110577b53f29da46453 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 24 May 2018 15:50:07 -0400 Subject: Update of all changes --- .../jewelrycraft/client/TabRegistry.java | 54 ++++++++++++++-------- 1 file changed, 35 insertions(+), 19 deletions(-) mode change 100644 => 100755 src/main/java/darkknight/jewelrycraft/client/TabRegistry.java (limited to 'src/main/java/darkknight/jewelrycraft/client/TabRegistry.java') diff --git a/src/main/java/darkknight/jewelrycraft/client/TabRegistry.java b/src/main/java/darkknight/jewelrycraft/client/TabRegistry.java old mode 100644 new mode 100755 index fdc579f..21d8b9c --- a/src/main/java/darkknight/jewelrycraft/client/TabRegistry.java +++ b/src/main/java/darkknight/jewelrycraft/client/TabRegistry.java @@ -2,6 +2,7 @@ package darkknight.jewelrycraft.client; import java.util.ArrayList; import java.util.List; + import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -16,7 +17,7 @@ import net.minecraftforge.client.event.GuiScreenEvent; * @author TinkersConstruct */ public class TabRegistry { - private static ArrayList tabList = new ArrayList(); + private static ArrayList tabList = new ArrayList<>(); public static void registerTab(AbstractTab tab) { tabList.add(tab); @@ -26,6 +27,7 @@ public class TabRegistry { return tabList; } + @SuppressWarnings("unchecked") @SideOnly(Side.CLIENT) @SubscribeEvent public void guiPostInit(GuiScreenEvent.InitGuiEvent.Post event) { @@ -34,38 +36,50 @@ public class TabRegistry { int ySize = 166; int guiLeft = (event.gui.width - xSize) / 2; int guiTop = (event.gui.height - ySize) / 2; - if (!mc.thePlayer.getActivePotionEffects().isEmpty()) if (Loader.isModLoaded("NotEnoughItems")) { - try { - // Check whether NEI is hidden and enabled - Class c = Class.forName("codechicken.nei.NEIClientConfig"); - Object hidden = c.getMethod("isHidden").invoke(null); - Object enabled = c.getMethod("isEnabled").invoke(null); - if (hidden != null && hidden instanceof Boolean && enabled != null && enabled instanceof Boolean) if ((Boolean) hidden || !((Boolean) enabled)) guiLeft += 60; - } catch (Exception e) { - } - } else guiLeft += 60; + if (!mc.thePlayer.getActivePotionEffects().isEmpty()) + if (Loader.isModLoaded("NotEnoughItems")) { + try { + // Check whether NEI is hidden and enabled + Class c = Class.forName( + "codechicken.nei.NEIClientConfig"); + Object hidden = + c.getMethod("isHidden").invoke(null); + Object enabled = + c.getMethod("isEnabled").invoke(null); + if (hidden != null && hidden instanceof Boolean + && enabled != null + && enabled instanceof Boolean) + if ((Boolean) hidden || !((Boolean) enabled)) + guiLeft += 60; + } catch (Exception e) { + // Do nothing + } + } else + guiLeft += 60; updateTabValues(guiLeft, guiTop, InventoryTabVanilla.class); addTabsToList(event.buttonList); } } - private static Minecraft mc = FMLClientHandler.instance().getClient(); + private static Minecraft mc = FMLClientHandler.instance().getClient(); public static void openInventoryGui() { - mc.thePlayer.sendQueue.addToSendQueue(new C0DPacketCloseWindow(mc.thePlayer.openContainer.windowId)); + 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 = 0; for (int i = 0; i < tabList.size(); i++) { AbstractTab t = tabList.get(i); if (t.shouldAddToList()) { if (selectedButton.equals(TabCurses.class)) { t.xPosition = cornerX + 195; - t.yPosition = cornerY + count*20; - }else if (selectedButton.equals(TabJewelry.class)) { + t.yPosition = cornerY + count * 20; + } else if (selectedButton.equals(TabJewelry.class)) { t.xPosition = cornerX + 140 + count * 20; t.yPosition = cornerY + 64; } else { @@ -73,13 +87,15 @@ public class TabRegistry { t.yPosition = cornerY + 64; } t.enabled = !t.getClass().equals(selectedButton); - if (t.enabled) count++; + if (t.enabled) + count++; } } } - public static void addTabsToList(List buttonList) { + public static void addTabsToList(List buttonList) { for (AbstractTab tab : tabList) - if (tab.shouldAddToList() && tab.enabled) buttonList.add(tab); + if (tab.shouldAddToList() && tab.enabled) + buttonList.add(tab); } } \ No newline at end of file -- cgit v1.2.3