Merge branch 'beta' into https

# Conflicts:
#	src/main/java/SkyHanniInstallerFrame.java

1 files changed, 23 insertions, 4 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt b/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt
index 4f3110789..29a344b18 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt
@@ -9,6 +9,8 @@ import at.hannibal2.skyhanni.test.SkyHanniDebugsAndTests
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.isRancherSign
 import at.hannibal2.skyhanni.utils.NEUItems
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import io.github.moulberry.notenoughupdates.profileviewer.GuiProfileViewer
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.inventory.GuiChest
 import net.minecraft.client.gui.inventory.GuiEditSign
@@ -17,8 +19,13 @@ import net.minecraft.client.renderer.GlStateManager
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.util.UUID
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.minutes
 
 class GuiEditManager {
+
+    private var lastHotkeyPressed = SimpleTimeMark.farPast()
+
     @SubscribeEvent
     fun onKeyClick(event: LorenzKeyPressEvent) {
         if (!LorenzUtils.inSkyBlock) return
@@ -26,13 +33,15 @@ class GuiEditManager {
         if (isInGui()) return
 
         Minecraft.getMinecraft().currentScreen?.let {
-            if (it !is GuiInventory && it !is GuiChest && it !is GuiEditSign) return
+            if (it !is GuiInventory && it !is GuiChest && it !is GuiEditSign && it !is GuiProfileViewer) return
             if (it is GuiEditSign && !it.isRancherSign()) return
         }
 
+        if (lastHotkeyPressed.passedSince() < 500.milliseconds) return
         if (NEUItems.neuHasFocus()) return
+        lastHotkeyPressed = SimpleTimeMark.now()
 
-        openGuiPositionEditor()
+        openGuiPositionEditor(hotkeyReminder = false)
     }
 
     @SubscribeEvent(priority = EventPriority.LOWEST)
@@ -59,9 +68,19 @@ class GuiEditManager {
             }
         }
 
+        private var lastHotkeyReminded = SimpleTimeMark.farPast()
+
         @JvmStatic
-        fun openGuiPositionEditor() {
+        fun openGuiPositionEditor(hotkeyReminder: Boolean) {
             SkyHanniMod.screenToOpen = GuiPositionEditor(latestPositions.values.toList(), 2)
+            if (hotkeyReminder && lastHotkeyReminded.passedSince() > 30.minutes) {
+                lastHotkeyReminded = SimpleTimeMark.now()
+                LorenzUtils.chat(
+                    "§eTo edit hidden GUI elements:\n" +
+                            " §7- §e1. Set a key in /sh edit.\n" +
+                            " §7- §e2. Click that key while the GUI element is visible."
+                )
+            }
         }
 
         @JvmStatic
@@ -95,4 +114,4 @@ class GuiEditManager {
     }
 }
 
-class Vector2i(val x: Int, val y: Int)
\ No newline at end of file
+class Vector2i(val x: Int, val y: Int)