Merge pull request #22

The non controversial config changes

5 files changed, 38 insertions, 27 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenCustomKeybinds.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenCustomKeybinds.kt
index 26b3c7abf..4e24cf988 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenCustomKeybinds.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenCustomKeybinds.kt
@@ -1,10 +1,10 @@
 package at.hannibal2.skyhanni.features.garden
 
 import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.config.core.config.KeybindHelper
 import at.hannibal2.skyhanni.config.features.Garden
 import at.hannibal2.skyhanni.events.GardenToolChangeEvent
 import at.hannibal2.skyhanni.mixins.transformers.AccessorKeyBinding
+import io.github.moulberry.moulconfig.internal.KeybindHelper
 import net.minecraft.client.Minecraft
 import net.minecraft.client.settings.KeyBinding
 import net.minecraftforge.event.world.WorldEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/ButtonOnPause.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/ButtonOnPause.kt
index d54cd7225..c28119857 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/ButtonOnPause.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ButtonOnPause.kt
@@ -1,8 +1,7 @@
 package at.hannibal2.skyhanni.features.misc
 
 import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.config.ConfigEditor
-import at.hannibal2.skyhanni.config.core.GuiScreenElementWrapper
+import at.hannibal2.skyhanni.config.ConfigGuiManager
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import net.minecraft.client.gui.GuiButton
 import net.minecraft.client.gui.GuiIngameMenu
@@ -17,11 +16,7 @@ class ButtonOnPause {
         if (!LorenzUtils.isHyPixel) return
 
         if (SkyHanniMod.feature.misc.configButtonOnPause && event.gui is GuiIngameMenu && event.button.id == buttonId) {
-            SkyHanniMod.screenToOpen = GuiScreenElementWrapper(
-                ConfigEditor(
-                    SkyHanniMod.feature
-                )
-            )
+            ConfigGuiManager.openConfigGui()
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/HideArmor.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/HideArmor.kt
index c3fe0d509..0e252b5ed 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/HideArmor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/HideArmor.kt
@@ -1,8 +1,10 @@
 package at.hannibal2.skyhanni.features.misc
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.PacketEvent
 import at.hannibal2.skyhanni.utils.LorenzUtils
+import io.github.moulberry.moulconfig.observer.Observer
 import net.minecraft.client.Minecraft
 import net.minecraft.client.entity.EntityOtherPlayerMP
 import net.minecraft.client.entity.EntityPlayerSP
@@ -27,7 +29,7 @@ class HideArmor {
 
         fixOtherArmor()
 
-        if (!SkyHanniMod.feature.misc.hideArmorEnabled) return
+        if (!SkyHanniMod.feature.misc.hideArmorEnabled.get()) return
 
         val currentScreen = Minecraft.getMinecraft().currentScreen
         if (currentScreen == null || currentScreen !is GuiInventory) {
@@ -45,6 +47,15 @@ class HideArmor {
         }
     }
 
+    @SubscribeEvent
+    fun onConfigLoaded(event: ConfigLoadEvent) {
+        val observer = Observer<Boolean> { a, b -> updateArmor() }
+        SkyHanniMod.feature.misc.hideArmorEnabled.whenChanged(observer)
+        SkyHanniMod.feature.misc.hideArmorOwn.whenChanged(observer)
+        SkyHanniMod.feature.misc.hideArmorOnlyHelmet.whenChanged(observer)
+    }
+
+
     // Since S04PacketEntityEquipment gets sent before the entity is fully loaded, I need to remove the armor later
     private fun fixOtherArmor() {
         for (entity in Minecraft.getMinecraft().theWorld.loadedEntityList) {
@@ -54,10 +65,10 @@ class HideArmor {
             if (entityId !in laterCheck) continue
 
             laterCheck.remove(entityId)
-            if (SkyHanniMod.feature.misc.hideArmorEnabled) {
+            if (SkyHanniMod.feature.misc.hideArmorEnabled.get()) {
                 val armorInventory = entity.inventory.armorInventory
                 for ((equipmentSlot, _) in armorInventory.withIndex()) {
-                    if (!SkyHanniMod.feature.misc.hideArmorOnlyHelmet || equipmentSlot == 3) {
+                    if (!SkyHanniMod.feature.misc.hideArmorOnlyHelmet.get() || equipmentSlot == 3) {
                         armorInventory[equipmentSlot] = null
                     }
                 }
@@ -86,9 +97,9 @@ class HideArmor {
 
                 val currentScreen = Minecraft.getMinecraft().currentScreen
                 if (currentScreen == null || currentScreen !is GuiInventory) {
-                    if (SkyHanniMod.feature.misc.hideArmorEnabled) {
-                        if (SkyHanniMod.feature.misc.hideArmorOwn) {
-                            if (!SkyHanniMod.feature.misc.hideArmorOnlyHelmet || armorSlot == 3) {
+                    if (SkyHanniMod.feature.misc.hideArmorEnabled.get()) {
+                        if (SkyHanniMod.feature.misc.hideArmorOwn.get()) {
+                            if (!SkyHanniMod.feature.misc.hideArmorOnlyHelmet.get() || armorSlot == 3) {
                                 packet.itemStacks[slot] = null
                             }
                         }
@@ -115,9 +126,9 @@ class HideArmor {
 
             val currentScreen = Minecraft.getMinecraft().currentScreen
             if (currentScreen == null || currentScreen !is GuiInventory) {
-                if (SkyHanniMod.feature.misc.hideArmorEnabled) {
-                    if (SkyHanniMod.feature.misc.hideArmorOwn) {
-                        if (!SkyHanniMod.feature.misc.hideArmorOnlyHelmet || armorSlot == 3) {
+                if (SkyHanniMod.feature.misc.hideArmorEnabled.get()) {
+                    if (SkyHanniMod.feature.misc.hideArmorOwn.get()) {
+                        if (!SkyHanniMod.feature.misc.hideArmorOnlyHelmet.get() || armorSlot == 3) {
                             event.isCanceled = true
                         }
                     }
@@ -146,8 +157,8 @@ class HideArmor {
             // set item in cache
             armor[equipmentSlot] = packet.itemStack
 
-            if (SkyHanniMod.feature.misc.hideArmorEnabled) {
-                if (!SkyHanniMod.feature.misc.hideArmorOnlyHelmet || equipmentSlot == 3) {
+            if (SkyHanniMod.feature.misc.hideArmorEnabled.get()) {
+                if (!SkyHanniMod.feature.misc.hideArmorOnlyHelmet.get() || equipmentSlot == 3) {
                     event.isCanceled = true
                 }
             }
@@ -177,7 +188,7 @@ class HideArmor {
                     changeArmor(entity, it)
                 }
 
-                if (SkyHanniMod.feature.misc.hideArmorEnabled) {
+                if (SkyHanniMod.feature.misc.hideArmorEnabled.get()) {
                     changeArmor(entity, null)
                 }
             }
@@ -195,13 +206,13 @@ class HideArmor {
                 return
             }
 
-            if (!SkyHanniMod.feature.misc.hideArmorOwn) {
+            if (!SkyHanniMod.feature.misc.hideArmorOwn.get()) {
                 if (entity is EntityPlayerSP) {
                     return
                 }
             }
 
-            if (!SkyHanniMod.feature.misc.hideArmorOnlyHelmet) {
+            if (!SkyHanniMod.feature.misc.hideArmorOnlyHelmet.get()) {
                 current[0] = null
                 current[1] = null
                 current[2] = null
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
index ec722eed4..8a3299561 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.misc
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.RenderMobColoredEvent
 import at.hannibal2.skyhanni.events.ResetEntityHurtEvent
 import at.hannibal2.skyhanni.events.withAlpha
@@ -59,10 +60,14 @@ class MarkedPlayerManager {
 
         fun isMarkedPlayer(player: String): Boolean = player.lowercase() in playerNamesToMark
 
-        fun toggleOwn() {
-            val ownName = SkyHanniMod.feature.markedPlayers.markOwnName
+    }
+
+
+    @SubscribeEvent
+    fun onConfigLoad(event: ConfigLoadEvent) {
+        SkyHanniMod.feature.markedPlayers.markOwnName.whenChanged { old, new ->
             val name = Minecraft.getMinecraft().thePlayer.name
-            if (ownName) {
+            if (new) {
                 if (!playerNamesToMark.contains(name)) {
                     playerNamesToMark.add(name)
                 }
@@ -110,7 +115,7 @@ class MarkedPlayerManager {
         if (Minecraft.getMinecraft().thePlayer == null) return
 
         markedPlayers.clear()
-        if (SkyHanniMod.feature.markedPlayers.markOwnName) {
+        if (SkyHanniMod.feature.markedPlayers.markOwnName.get()) {
             val name = Minecraft.getMinecraft().thePlayer.name
             if (!playerNamesToMark.contains(name)) {
                 playerNamesToMark.add(name)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt
index 18659e587..769b1a962 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt
@@ -1,7 +1,6 @@
 package at.hannibal2.skyhanni.features.slayer.blaze
 
 import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.config.core.util.render.TextRenderUtils
 import at.hannibal2.skyhanni.data.ClickType
 import at.hannibal2.skyhanni.events.BlockClickEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
@@ -14,6 +13,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NumberUtil.roundToPrecision
 import at.hannibal2.skyhanni.utils.StringUtils.matchRegex
 import at.hannibal2.skyhanni.utils.getLorenzVec
+import io.github.moulberry.moulconfig.internal.TextRenderUtils
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.ScaledResolution
 import net.minecraft.client.renderer.GlStateManager