fix a bug where items were placed onto armor slots

AverageGithub · Jan 8, 2022 · d13acce · d13acce
1 parent 73d38dc
commit d13acce
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/src/main/java/skytils/skytilsmod/mixins/transformers/gui/MixinGuiContainer.java b/src/main/java/skytils/skytilsmod/mixins/transformers/gui/MixinGuiContainer.java
@@ -34,7 +34,7 @@ public abstract class MixinGuiContainer extends GuiScreen {
     @Unique
     private final GuiContainerHook hook = new GuiContainerHook(this);
 
-    @Inject(method = "keyTyped", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/entity/EntityPlayerSP;closeScreen()V", shift = At.Shift.BEFORE))
+    @Inject(method = "keyTyped", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/entity/EntityPlayerSP;closeScreen()V", shift = At.Shift.BEFORE), cancellable = true)
     private void closeWindowPressed(CallbackInfo ci) {
         hook.closeWindowPressed(ci);
     }

diff --git a/src/main/kotlin/skytils/skytilsmod/Skytils.kt b/src/main/kotlin/skytils/skytilsmod/Skytils.kt
@@ -310,6 +310,11 @@ class Skytils {
                 Utils.inDungeons = Utils.inSkyblock && ScoreboardUtil.sidebarLines.any {
                     (it.contains("The Catacombs") && !it.contains("Queue")) || it.contains("Dungeon Cleared:")
                 }
+                if (deobfEnvironment) {
+                    if (DevTools.toggles.getOrDefault("forcehypixel", false)) Utils.isOnHypixel = true
+                    if (DevTools.toggles.getOrDefault("forceskyblock", false)) Utils.inSkyblock = true
+                    if (DevTools.toggles.getOrDefault("forcedungeons", false)) Utils.inDungeons = true
+                }
                 if (DevTools.getToggle("sprint"))
                     KeyBinding.setKeyBindState(mc.gameSettings.keyBindSprint.keyCode, true)
             }

diff --git a/src/main/kotlin/skytils/skytilsmod/events/impl/GuiContainerEvent.kt b/src/main/kotlin/skytils/skytilsmod/events/impl/GuiContainerEvent.kt
@@ -32,6 +32,7 @@ abstract class GuiContainerEvent(open val gui: GuiContainer, open val container:
         val partialTicks: Float
     ) : GuiContainerEvent(gui, container)
 
+    @Cancelable
     data class CloseWindowEvent(override val gui: GuiContainer, override val container: Container) :
         GuiContainerEvent(gui, container)
 

diff --git a/src/main/kotlin/skytils/skytilsmod/features/impl/protectitems/ProtectItems.kt b/src/main/kotlin/skytils/skytilsmod/features/impl/protectitems/ProtectItems.kt
@@ -40,12 +40,14 @@ class ProtectItems {
             val item = mc.thePlayer.inventory.itemStack
             val extraAttr = ItemUtil.getExtraAttributes(item)
             if (ItemProtectStrategy.isAnyWorth(item, extraAttr, ItemProtectStrategy.ProtectType.USERCLOSEWINDOW)) {
-                notifyStopped(null, "dropping")
                 for (slot in event.container.inventorySlots) {
-                    if (slot.inventory !== mc.thePlayer.inventory || slot.hasStack) continue
+                    if (slot.inventory !== mc.thePlayer.inventory || slot.hasStack || !slot.isItemValid(item)) continue
                     mc.playerController.windowClick(event.container.windowId, slot.slotNumber, 0, 0, mc.thePlayer)
-                    break
+                    notifyStopped(null, "dropping")
+                    return
                 }
+                notifyStopped(null, "closing the window on")
+                event.isCanceled = true
             }
         }
     }

diff --git a/src/main/kotlin/skytils/skytilsmod/mixins/hooks/gui/GuiContainerHook.kt b/src/main/kotlin/skytils/skytilsmod/mixins/hooks/gui/GuiContainerHook.kt
@@ -33,7 +33,7 @@ class GuiContainerHook(guiAny: Any) {
     }
 
     fun closeWindowPressed(ci: CallbackInfo) {
-        CloseWindowEvent(gui, gui.inventorySlots).postAndCatch()
+        if (CloseWindowEvent(gui, gui.inventorySlots).postAndCatch()) ci.cancel()
     }
 
     fun backgroundDrawn(mouseX: Int, mouseY: Int, partialTicks: Float, ci: CallbackInfo) {

diff --git a/src/main/kotlin/skytils/skytilsmod/utils/DevTools.kt b/src/main/kotlin/skytils/skytilsmod/utils/DevTools.kt
@@ -21,7 +21,7 @@ package skytils.skytilsmod.utils
 import gg.essential.universal.UChat
 
 object DevTools {
-    private val toggles = HashMap<String, Boolean>()
+    val toggles = HashMap<String, Boolean>()
     var allToggle = false
         private set