Merge branch 'beta' into cumcum

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
#	src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java

6 files changed, 74 insertions, 23 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt
index fbdb21257..c1aa5a313 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt
@@ -263,7 +263,8 @@ object SkyHanniConfigSearchResetCommand {
         if (this is Position) {
             val x = javaClass.getDeclaredField("x").makeAccessible().get(this)
             val y = javaClass.getDeclaredField("y").makeAccessible().get(this)
-            return "($x, $y)"
+            val scale = javaClass.getDeclaredField("scale").makeAccessible().get(this)
+            return "($x, $y, $scale)"
         }
 
         if (this is String) {
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniTestCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index 63bc5f471..b0da49b33 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniTestCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -11,19 +11,24 @@ import at.hannibal2.skyhanni.features.garden.visitor.GardenVisitorColorNames
 import at.hannibal2.skyhanni.utils.*
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
+import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.NEUItems.getNpcPriceOrNull
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.RenderUtils.renderString
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
+import net.minecraft.client.Minecraft
+import net.minecraft.client.gui.inventory.GuiContainer
 import net.minecraft.nbt.NBTTagCompound
+import net.minecraftforge.client.event.GuiScreenEvent
 import net.minecraftforge.common.MinecraftForge
 import net.minecraftforge.event.entity.player.ItemTooltipEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.io.File
 
-class SkyHanniTestCommand {
+class SkyHanniDebugsAndTests {
 
     companion object {
+        private val config get() = SkyHanniMod.feature.dev
         var displayLine = ""
         var displayList = emptyList<List<Any>>()
 
@@ -48,10 +53,10 @@ class SkyHanniTestCommand {
         fun testCommand(args: Array<String>) {
             SoundUtils.playBeepSound()
 
-            val a = Thread { OSUtils.copyToClipboard("123") }
-            val b = Thread { OSUtils.copyToClipboard("456") }
-            a.start()
-            b.start()
+//            val a = Thread { OSUtils.copyToClipboard("123") }
+//            val b = Thread { OSUtils.copyToClipboard("456") }
+//            a.start()
+//            b.start()
 
 
 //            for ((i, s) in ScoreboardData.siedebarLinesFormatted().withIndex()) {
@@ -198,7 +203,7 @@ class SkyHanniTestCommand {
             builder.append("\n")
             builder.append("player name: '${LorenzUtils.getPlayerName()}'\n")
             builder.append("player uuid: '${LorenzUtils.getPlayerUuid()}'\n")
-            builder.append("repoAutoUpdate: ${SkyHanniMod.feature.dev.repoAutoUpdate}\n")
+            builder.append("repoAutoUpdate: ${config.repoAutoUpdate}\n")
             builder.append("\n")
 
             builder.append("onHypixel: ${LorenzUtils.onHypixel}\n")
@@ -228,20 +233,50 @@ class SkyHanniTestCommand {
             OSUtils.copyToClipboard(builder.toString())
             LorenzUtils.chat("§eCopied SkyHanni debug data to clipboard.")
         }
+
+        fun copyItemInternalName() {
+            val hand = InventoryUtils.getItemInHand()
+            if (hand == null) {
+                LorenzUtils.chat("§cNo item in hand!")
+                return
+            }
+
+            val internalName = hand.getInternalNameOrNull()
+            if (internalName == null) {
+                LorenzUtils.chat("§cInternal name is null for item ${hand.name}")
+                return
+            }
+
+            val rawInternalName = internalName.asString()
+            OSUtils.copyToClipboard(rawInternalName)
+            LorenzUtils.chat("§eCopied internal name §7$rawInternalName §eto the clipboard!")
+        }
+    }
+
+    @SubscribeEvent
+    fun onKeybind(event: GuiScreenEvent.KeyboardInputEvent.Post) {
+        if (!OSUtils.isKeyHeld(SkyHanniMod.feature.dev.copyInternalName)) return
+        val gui = event.gui as? GuiContainer ?: return
+        val focussedSlot = gui.slotUnderMouse ?: return
+        val stack = focussedSlot.stack ?: return
+        val internalName = stack.getInternalNameOrNull() ?: return
+        val rawInternalName = internalName.asString()
+        OSUtils.copyToClipboard(rawInternalName)
+        LorenzUtils.chat("§eCopied internal name §7$rawInternalName §eto the clipboard!")
     }
 
     @SubscribeEvent
     fun onShowInternalName(event: ItemTooltipEvent) {
-        if (!SkyHanniMod.feature.dev.showInternalName) return
+        if (!config.showInternalName) return
         val itemStack = event.itemStack ?: return
         val internalName = itemStack.getInternalName()
-        if ((internalName == NEUInternalName.NONE) && !SkyHanniMod.feature.dev.showEmptyNames) return
+        if ((internalName == NEUInternalName.NONE) && !config.showEmptyNames) return
         event.toolTip.add("Internal Name: '${internalName.asString()}'")
     }
 
     @SubscribeEvent
     fun onSHowNpcPrice(event: ItemTooltipEvent) {
-        if (!SkyHanniMod.feature.dev.showNpcPrice) return
+        if (!config.showNpcPrice) return
         val itemStack = event.itemStack ?: return
         val internalName = itemStack.getInternalNameOrNull() ?: return
 
@@ -250,6 +285,16 @@ class SkyHanniTestCommand {
     }
 
     @SubscribeEvent
+    fun onRenderLocation(event: GuiRenderEvent.GameOverlayRenderEvent) {
+        if (LorenzUtils.inSkyBlock && Minecraft.getMinecraft().gameSettings.showDebugInfo) {
+            config.debugLocationPos.renderString(
+                "Current Area: ${HypixelData.skyBlockArea}",
+                posLabel = "SkyBlock Area (Debug)"
+            )
+        }
+    }
+
+    @SubscribeEvent
     fun onChatMessage(event: LorenzChatEvent) {
 
     }
@@ -257,12 +302,12 @@ class SkyHanniTestCommand {
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) {
         if (!LorenzUtils.inSkyBlock) return
-        if (!SkyHanniMod.feature.dev.debugEnabled) return
+        if (!config.debugEnabled) return
 
         if (displayLine.isNotEmpty()) {
-            SkyHanniMod.feature.dev.debugPos.renderString("test: $displayLine", posLabel = "Test")
+            config.debugPos.renderString("test: $displayLine", posLabel = "Test")
         }
-        SkyHanniMod.feature.dev.debugPos.renderStringsAndItems(displayList, posLabel = "Test Display")
+        config.debugPos.renderStringsAndItems(displayList, posLabel = "Test Display")
     }
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt b/src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt
index 870752a25..fdb4a58c3 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt
@@ -44,7 +44,7 @@ object TestCopyBestiaryValues {
     @SubscribeEvent(priority = EventPriority.LOW)
     fun onLateInventoryOpen(event: InventoryUpdatedEvent) {
         if (!SkyHanniMod.feature.dev.copyBestiaryData) return
-        SkyHanniTestCommand.displayLine = ""
+        SkyHanniDebugsAndTests.displayLine = ""
 
         val backItem = event.inventoryItems[3 + 9 * 5 + 3]
         if (backItem == null) {
@@ -112,6 +112,6 @@ object TestCopyBestiaryValues {
         val text = gson.toJson(obj)
         OSUtils.copyToClipboard(text)
 
-        SkyHanniTestCommand.displayLine = "Bestiary for $titleName"
+        SkyHanniDebugsAndTests.displayLine = "Bestiary for $titleName"
     }
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/test/TestCopyRngMeterValues.kt b/src/main/java/at/hannibal2/skyhanni/test/TestCopyRngMeterValues.kt
index b243c9991..a556a7254 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/TestCopyRngMeterValues.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/TestCopyRngMeterValues.kt
@@ -3,9 +3,10 @@ package at.hannibal2.skyhanni.test
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigManager
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
-import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_old
+import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.formatNumber
 import at.hannibal2.skyhanni.utils.OSUtils
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
@@ -17,16 +18,16 @@ object TestCopyRngMeterValues {
     fun onInventoryOpen(event: InventoryFullyOpenedEvent) {
         if (!SkyHanniMod.feature.dev.copyRngMeter) return
 
-        val map = mutableMapOf<String, Long>()
+        val map = mutableMapOf<NEUInternalName, Long>()
         val slayerPattern = "§7Slayer XP: §d.*§5/§d(?<xp>.*)".toPattern()
         val dungeonPattern = "§7Dungeon Score: §d.*§5/§d(?<xp>.*)".toPattern()
         for (item in event.inventoryItems.values) {
             for (line in item.getLore()) {
                 slayerPattern.matchMatcher(line) {
-                    map[item.getInternalName_old()] = group("xp").formatNumber()
+                    map[item.getInternalName()] = group("xp").formatNumber()
                 }
                 dungeonPattern.matchMatcher(line) {
-                    map[item.getInternalName_old()] = group("xp").formatNumber()
+                    map[item.getInternalName()] = group("xp").formatNumber()
                 }
             }
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/CopyErrorCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/command/CopyErrorCommand.kt
index 946255996..dd830571f 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/command/CopyErrorCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/command/CopyErrorCommand.kt
@@ -42,6 +42,10 @@ object CopyErrorCommand {
         } ?: "§c[SkyHanni] Error id not found!")
     }
 
+    fun logErrorState(userMessage: String, internalMessage: String) {
+        logError(IllegalStateException(internalMessage), userMessage)
+    }
+
     fun logError(throwable: Throwable, message: String) {
         val error = Error(message, throwable)
         Minecraft.getMinecraft().thePlayer ?: throw error
diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/CopyItemCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/command/CopyItemCommand.kt
index 2b33c8e82..4fc82bbc3 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/command/CopyItemCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/command/CopyItemCommand.kt
@@ -1,18 +1,18 @@
 package at.hannibal2.skyhanni.test.command
 
-import at.hannibal2.skyhanni.test.SkyHanniTestCommand
+import at.hannibal2.skyhanni.test.SkyHanniDebugsAndTests
+import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_old
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.OSUtils
-import net.minecraft.client.Minecraft
 
 object CopyItemCommand {
 
     fun command(args: Array<String>) {
         try {
             val resultList = mutableListOf<String>()
-            val itemStack = Minecraft.getMinecraft().thePlayer.inventory.getCurrentItem()!!
+            val itemStack = InventoryUtils.getItemInHand() ?: return
             resultList.add("ITEM LORE")
             resultList.add("display name: '" + itemStack.displayName.toString() + "'")
             val itemID = itemStack.getInternalName_old()
@@ -32,7 +32,7 @@ object CopyItemCommand {
                     resultList.add("")
                     resultList.add("ExtraAttributes")
                     val extraAttributes = tagCompound.getCompoundTag("ExtraAttributes")
-                    SkyHanniTestCommand.runn(extraAttributes, "  .  ")
+                    SkyHanniDebugsAndTests.runn(extraAttributes, "  .  ")
                 }
             }