From 8d03bbe8535488cf1b6ea71c63e765aa7f588c9e Mon Sep 17 00:00:00 2001
From: Lorenz <ESs95s3P5z8Pheb>
Date: Fri, 8 Jul 2022 13:18:07 +0200
Subject: code cleanup

---
 src/main/java/at/lorenz/mod/GuiContainerHook.kt    | 61 ----------------------
 .../at/lorenz/mod/ItemDisplayOverlayFeatures.kt    |  1 +
 src/main/java/at/lorenz/mod/LorenzDebug.kt         | 19 -------
 .../at/lorenz/mod/mixinhooks/GuiContainerHook.kt   | 61 ++++++++++++++++++++++
 .../at/lorenz/mod/mixins/MixinGuiContainer.java    |  2 +-
 src/main/java/at/lorenz/mod/utils/LorenzDebug.kt   | 16 ++++++
 6 files changed, 79 insertions(+), 81 deletions(-)
 delete mode 100644 src/main/java/at/lorenz/mod/GuiContainerHook.kt
 delete mode 100644 src/main/java/at/lorenz/mod/LorenzDebug.kt
 create mode 100644 src/main/java/at/lorenz/mod/mixinhooks/GuiContainerHook.kt
 create mode 100644 src/main/java/at/lorenz/mod/utils/LorenzDebug.kt

(limited to 'src/main/java/at/lorenz')

diff --git a/src/main/java/at/lorenz/mod/GuiContainerHook.kt b/src/main/java/at/lorenz/mod/GuiContainerHook.kt
deleted file mode 100644
index 55b30e964..000000000
--- a/src/main/java/at/lorenz/mod/GuiContainerHook.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package at.lorenz.mod
-
-import at.lorenz.mod.events.GuiContainerEvent
-import at.lorenz.mod.events.GuiContainerEvent.CloseWindowEvent
-import at.lorenz.mod.events.GuiContainerEvent.SlotClickEvent
-import net.minecraft.client.gui.inventory.GuiContainer
-import net.minecraft.inventory.Slot
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo
-
-class GuiContainerHook(guiAny: Any) {
-
-    val gui: GuiContainer
-
-    init {
-        gui = guiAny as GuiContainer
-    }
-
-    fun closeWindowPressed(ci: CallbackInfo) {
-        if (CloseWindowEvent(gui, gui.inventorySlots).postAndCatch()) ci.cancel()
-    }
-
-    fun backgroundDrawn(mouseX: Int, mouseY: Int, partialTicks: Float, ci: CallbackInfo) {
-        GuiContainerEvent.BackgroundDrawnEvent(
-            gui,
-            gui.inventorySlots,
-            mouseX,
-            mouseY,
-            partialTicks
-        ).postAndCatch()
-    }
-
-    fun foregroundDrawn(mouseX: Int, mouseY: Int, partialTicks: Float, ci: CallbackInfo) {
-        GuiContainerEvent.ForegroundDrawnEvent(gui, gui.inventorySlots, mouseX, mouseY, partialTicks).postAndCatch()
-    }
-
-    fun onDrawSlot(slot: Slot, ci: CallbackInfo) {
-        if (GuiContainerEvent.DrawSlotEvent.Pre(
-                gui,
-                gui.inventorySlots,
-                slot
-            ).postAndCatch()
-        ) ci.cancel()
-    }
-
-    fun onDrawSlotPost(slot: Slot, ci: CallbackInfo) {
-        GuiContainerEvent.DrawSlotEvent.Post(gui, gui.inventorySlots, slot).postAndCatch()
-    }
-
-    fun onMouseClick(slot: Slot?, slotId: Int, clickedButton: Int, clickType: Int, ci: CallbackInfo) {
-        if (
-            SlotClickEvent(
-                gui,
-                gui.inventorySlots,
-                slot,
-                slotId,
-                clickedButton,
-                clickType
-            ).postAndCatch()
-        ) ci.cancel()
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/at/lorenz/mod/ItemDisplayOverlayFeatures.kt b/src/main/java/at/lorenz/mod/ItemDisplayOverlayFeatures.kt
index 86d4a8e45..58ebaa34a 100644
--- a/src/main/java/at/lorenz/mod/ItemDisplayOverlayFeatures.kt
+++ b/src/main/java/at/lorenz/mod/ItemDisplayOverlayFeatures.kt
@@ -3,6 +3,7 @@ package at.lorenz.mod
 import at.lorenz.mod.events.GuiRenderItemEvent
 import at.lorenz.mod.utils.ItemUtils
 import at.lorenz.mod.utils.ItemUtils.cleanName
+import at.lorenz.mod.utils.LorenzDebug
 import at.lorenz.mod.utils.LorenzUtils
 import at.lorenz.mod.utils.LorenzUtils.between
 import at.lorenz.mod.utils.LorenzUtils.matchRegex
diff --git a/src/main/java/at/lorenz/mod/LorenzDebug.kt b/src/main/java/at/lorenz/mod/LorenzDebug.kt
deleted file mode 100644
index 61eb09065..000000000
--- a/src/main/java/at/lorenz/mod/LorenzDebug.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package at.lorenz.mod
-
-import at.lorenz.mod.utils.LorenzLogger
-import at.lorenz.mod.utils.LorenzUtils
-
-object LorenzDebug {
-
-    private val logger = LorenzLogger("debug")
-
-    fun log(text: String) {
-        logger.log(text)
-        println("debug logger: $text")
-    }
-
-    fun writeAndLog(text: String) {
-        LorenzUtils.debug(text)
-        log(text)
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/at/lorenz/mod/mixinhooks/GuiContainerHook.kt b/src/main/java/at/lorenz/mod/mixinhooks/GuiContainerHook.kt
new file mode 100644
index 000000000..101bb56a1
--- /dev/null
+++ b/src/main/java/at/lorenz/mod/mixinhooks/GuiContainerHook.kt
@@ -0,0 +1,61 @@
+package at.lorenz.mod.mixinhooks
+
+import at.lorenz.mod.events.GuiContainerEvent
+import at.lorenz.mod.events.GuiContainerEvent.CloseWindowEvent
+import at.lorenz.mod.events.GuiContainerEvent.SlotClickEvent
+import net.minecraft.client.gui.inventory.GuiContainer
+import net.minecraft.inventory.Slot
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo
+
+class GuiContainerHook(guiAny: Any) {
+
+    val gui: GuiContainer
+
+    init {
+        gui = guiAny as GuiContainer
+    }
+
+    fun closeWindowPressed(ci: CallbackInfo) {
+        if (CloseWindowEvent(gui, gui.inventorySlots).postAndCatch()) ci.cancel()
+    }
+
+    fun backgroundDrawn(mouseX: Int, mouseY: Int, partialTicks: Float, ci: CallbackInfo) {
+        GuiContainerEvent.BackgroundDrawnEvent(
+            gui,
+            gui.inventorySlots,
+            mouseX,
+            mouseY,
+            partialTicks
+        ).postAndCatch()
+    }
+
+    fun foregroundDrawn(mouseX: Int, mouseY: Int, partialTicks: Float, ci: CallbackInfo) {
+        GuiContainerEvent.ForegroundDrawnEvent(gui, gui.inventorySlots, mouseX, mouseY, partialTicks).postAndCatch()
+    }
+
+    fun onDrawSlot(slot: Slot, ci: CallbackInfo) {
+        if (GuiContainerEvent.DrawSlotEvent.Pre(
+                gui,
+                gui.inventorySlots,
+                slot
+            ).postAndCatch()
+        ) ci.cancel()
+    }
+
+    fun onDrawSlotPost(slot: Slot, ci: CallbackInfo) {
+        GuiContainerEvent.DrawSlotEvent.Post(gui, gui.inventorySlots, slot).postAndCatch()
+    }
+
+    fun onMouseClick(slot: Slot?, slotId: Int, clickedButton: Int, clickType: Int, ci: CallbackInfo) {
+        if (
+            SlotClickEvent(
+                gui,
+                gui.inventorySlots,
+                slot,
+                slotId,
+                clickedButton,
+                clickType
+            ).postAndCatch()
+        ) ci.cancel()
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/at/lorenz/mod/mixins/MixinGuiContainer.java b/src/main/java/at/lorenz/mod/mixins/MixinGuiContainer.java
index a0cf8fdbe..4bd09cda0 100644
--- a/src/main/java/at/lorenz/mod/mixins/MixinGuiContainer.java
+++ b/src/main/java/at/lorenz/mod/mixins/MixinGuiContainer.java
@@ -1,6 +1,6 @@
 package at.lorenz.mod.mixins;
 
-import at.lorenz.mod.GuiContainerHook;
+import at.lorenz.mod.mixinhooks.GuiContainerHook;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.inventory.Slot;
diff --git a/src/main/java/at/lorenz/mod/utils/LorenzDebug.kt b/src/main/java/at/lorenz/mod/utils/LorenzDebug.kt
new file mode 100644
index 000000000..32e4ac6f0
--- /dev/null
+++ b/src/main/java/at/lorenz/mod/utils/LorenzDebug.kt
@@ -0,0 +1,16 @@
+package at.lorenz.mod.utils
+
+object LorenzDebug {
+
+    private val logger = LorenzLogger("debug")
+
+    fun log(text: String) {
+        logger.log(text)
+        println("debug logger: $text")
+    }
+
+    fun writeAndLog(text: String) {
+        LorenzUtils.debug(text)
+        log(text)
+    }
+}
\ No newline at end of file
-- 
cgit