From 6943a44075d1e5abb2ceb74a7836840aa311fa66 Mon Sep 17 00:00:00 2001 From: Bella Date: Fri, 7 Feb 2020 11:59:18 -0500 Subject: [PATCH] close #418 --- src/main/java/me/zeroeightsix/kami/KamiMod.java | 4 +--- .../me/zeroeightsix/kami/gui/kami/KamiGUI.java | 12 +++++++++--- .../kami/module/modules/gui/InventoryViewer.java | 16 ++++++++++++---- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/main/java/me/zeroeightsix/kami/KamiMod.java b/src/main/java/me/zeroeightsix/kami/KamiMod.java index 3b9fb4254..942736e88 100644 --- a/src/main/java/me/zeroeightsix/kami/KamiMod.java +++ b/src/main/java/me/zeroeightsix/kami/KamiMod.java @@ -192,6 +192,7 @@ public class KamiMod { try { // load modules that are on by default // auto enable ModuleManager.getModuleByName("InfoOverlay").setEnabled(true); + ModuleManager.getModuleByName("InventoryViewer").setEnabled(true); if (((DiscordSettings) ModuleManager.getModuleByName("DiscordRPC")).startupGlobal.getValue()) { ModuleManager.getModuleByName("DiscordRPC").setEnabled(true); @@ -205,9 +206,6 @@ public class KamiMod { if (((CustomChat) ModuleManager.getModuleByName("CustomChat")).startupGlobal.getValue()) { ModuleManager.getModuleByName("CustomChat").setEnabled(true); } - if (((InventoryViewer) ModuleManager.getModuleByName("InventoryViewer")).startupGlobal.getValue()) { - ModuleManager.getModuleByName("InventoryViewer").setEnabled(true); - } if (((CleanGUI) ModuleManager.getModuleByName("CleanGUI")).startupGlobal.getValue()) { ModuleManager.getModuleByName("CleanGUI").setEnabled(true); } diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java index 82261e53d..78fa747ba 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java @@ -249,14 +249,20 @@ public class KamiGUI extends GUI { /* * Inventory Viewer * This method appears empty but it's used by - * me/zeroeightsix/kami/module/modules/bewwawho/gui/InventoryViewer.java + * me/zeroeightsix/kami/module/modules/gui/InventoryViewer.java */ frame = new Frame(getTheme(), new Stretcherlayout(1), "Inventory Viewer"); frame.setCloseable(false); frame.setMinimizeable(false); - frame.setPinnable(false); + frame.setPinnable(true); + frame.setPinned(true); Label inventory = new Label(""); - inventory.setShadow(true); + inventory.addTickListener(() -> { // 1 == 2 px in game + inventory.setWidth(152); + inventory.setHeight(40); + inventory.setOpacity(0.1f); // why does this not do anything + }); + inventory.setShadow(false); frame.addChild(inventory); inventory.setFontRenderer(fontRenderer); frames.add(frame); diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/gui/InventoryViewer.java b/src/main/java/me/zeroeightsix/kami/module/modules/gui/InventoryViewer.java index 35f782f49..65d787a99 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/gui/InventoryViewer.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/gui/InventoryViewer.java @@ -22,7 +22,6 @@ import java.util.List; */ @Module.Info(name = "InventoryViewer", category = Module.Category.GUI, description = "View your inventory on screen", showOnArray = Module.ShowOnArray.OFF) public class InventoryViewer extends Module { - public Setting startupGlobal = register(Settings.b("Enable Automatically", true)); private Setting viewMode = register(Settings.e("Appearance", ViewMode.ICONLARGE)); KamiGUI kamiGUI = KamiMod.getInstance().getGuiManager(); @@ -37,8 +36,12 @@ public class InventoryViewer extends Module { return frame.getX(); case 1: return frame.getY(); + case 3: + if (frame.isPinned()) return 1; + else return 0; default: return 0; + } } } @@ -118,9 +121,11 @@ public class InventoryViewer extends Module { @Override public void onRender() { - final NonNullList items = InventoryViewer.mc.player.inventory.mainInventory; - boxRender(invPos(0), invPos(1)); - itemRender(items, invPos(0), invPos(1)); + if (invPos(3) == 1) { + final NonNullList items = InventoryViewer.mc.player.inventory.mainInventory; + boxRender(invPos(0), invPos(1)); + itemRender(items, invPos(0), invPos(1)); + } } private void boxRender(final int x, final int y) { @@ -141,4 +146,7 @@ public class InventoryViewer extends Module { postItemRender(); } } + + @Override + public void onDisable() { this.enable(); } }