Merge branch 'refs/heads/main' into fork/ItsEmpa/cleanup/funny-intellij

# Conflicts: # src/main/java/me/partlysanestudios/partlysaneskies/features/skills/SkillUpgradeRecommendation.java # src/main/kotlin/me/partlysanestudios/partlysaneskies/utils/StringUtils.kt
PartlySaneStudios · Jul 24, 2024 · 071f464 · 071f464
2 parents b26f983 + 63bbbe7
commit 071f464
Show file tree

Hide file tree

Showing 6 changed files with 147 additions and 239 deletions.
diff --git a/...java/me/partlysanestudios/partlysaneskies/features/skills/SkillUpgradeRecommendation.java b/...java/me/partlysanestudios/partlysaneskies/features/skills/SkillUpgradeRecommendation.java
diff --git a/src/main/kotlin/me/partlysanestudios/partlysaneskies/PartlySaneSkies.kt b/src/main/kotlin/me/partlysanestudios/partlysaneskies/PartlySaneSkies.kt
@@ -340,8 +340,6 @@ class PartlySaneSkies {
 
         DebugKey.init()
 
-        // Initializes skill upgrade recommendation
-        SkillUpgradeRecommendation.populateSkillMap()
         try {
             SkyblockDataManager.updateAll()
         } catch (e: IOException) {

diff --git a/src/main/kotlin/me/partlysanestudios/partlysaneskies/config/Keybinds.kt b/src/main/kotlin/me/partlysanestudios/partlysaneskies/config/Keybinds.kt
@@ -38,6 +38,7 @@ object Keybinds {
         if (OneConfigScreen.favouritePetKeybind.isActive()) {
             PetAlert.favouritePet()
         }
+        if (!Keyboard.isCreated()) return
         if (Keyboard.isKeyDown(Keyboard.KEY_LEFT)) {
             if (PartlySaneSkies.minecraft.currentScreen is AuctionHouseGui ||
                 PartlySaneSkies.minecraft.currentScreen is GuiChest &&

diff --git a/src/main/kotlin/me/partlysanestudios/partlysaneskies/features/gui/RefreshKeybinds.kt b/src/main/kotlin/me/partlysanestudios/partlysaneskies/features/gui/RefreshKeybinds.kt
@@ -29,7 +29,7 @@ object RefreshKeybinds {
 
     @SubscribeEvent
     fun onGuiKeyboardInput(event: GuiScreenEvent.KeyboardInputEvent.Pre) {
-        if (!PartlySaneSkies.config.refreshKeybind) return
+        if (!PartlySaneSkies.config.refreshKeybind || !Keyboard.isCreated()) return
         checkKeybinds(event)
     }