From 2cbc61d8f25284dffe3bcd7b909342d572ed8ab0 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Mon, 8 Apr 2024 22:04:30 +0200
Subject: Improvement: Add @ConfigLink to many garden guis (#1395)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/config/features/garden/ArmorDropTrackerConfig.java       | 2 ++
 .../skyhanni/config/features/garden/EliteFarmingWeightConfig.java     | 2 ++
 .../skyhanni/config/features/garden/FarmingFortuneConfig.java         | 2 ++
 .../hannibal2/skyhanni/config/features/garden/GardenLevelConfig.java  | 2 ++
 .../hannibal2/skyhanni/config/features/garden/MoneyPerHourConfig.java | 2 ++
 .../skyhanni/config/features/garden/NextJacobContestConfig.java       | 2 ++
 .../config/features/garden/cropmilestones/CropMilestonesConfig.java   | 2 ++
 .../skyhanni/config/features/garden/cropmilestones/NextConfig.java    | 2 ++
 .../config/features/garden/optimalspeed/OptimalSpeedConfig.java       | 2 ++
 .../skyhanni/config/features/garden/pests/PestTimerConfig.java        | 2 ++
 .../skyhanni/config/features/garden/visitor/TimerConfig.java          | 2 ++
 .../java/at/hannibal2/skyhanni/config/features/gui/GUIConfig.java     | 2 ++
 .../config/features/gui/customscoreboard/CustomScoreboardConfig.java  | 3 ++-
 .../at/hannibal2/skyhanni/config/features/misc/pets/PetConfig.java    | 2 ++
 .../at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt   | 4 ++--
 .../at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt | 2 +-
 16 files changed, 31 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/ArmorDropTrackerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/ArmorDropTrackerConfig.java
index 4dae6798b..2be798a77 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/ArmorDropTrackerConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/ArmorDropTrackerConfig.java
@@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.config.FeatureToggle;
 import at.hannibal2.skyhanni.config.core.config.Position;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 public class ArmorDropTrackerConfig {
@@ -20,5 +21,6 @@ public class ArmorDropTrackerConfig {
     public boolean hideChat = false;
 
     @Expose
+    @ConfigLink(owner = ArmorDropTrackerConfig.class, field = "enabled")
     public Position pos = new Position(16, -232, false, true);
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/EliteFarmingWeightConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/EliteFarmingWeightConfig.java
index 77d2ee4ba..682236efb 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/EliteFarmingWeightConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/EliteFarmingWeightConfig.java
@@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.config.core.config.Position;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorText;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 public class EliteFarmingWeightConfig {
@@ -17,6 +18,7 @@ public class EliteFarmingWeightConfig {
     public boolean display = true;
 
     @Expose
+    @ConfigLink(owner = EliteFarmingWeightConfig.class, field = "display")
     public Position pos = new Position(180, 10, false, true);
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/FarmingFortuneConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/FarmingFortuneConfig.java
index 747f0118e..bd06f3afe 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/FarmingFortuneConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/FarmingFortuneConfig.java
@@ -6,6 +6,7 @@ import at.hannibal2.skyhanni.config.core.config.Position;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorButton;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 public class FarmingFortuneConfig {
@@ -23,5 +24,6 @@ public class FarmingFortuneConfig {
     public Runnable open = Commands::openFortuneGuide;
 
     @Expose
+    @ConfigLink(owner = FarmingFortuneConfig.class, field = "display")
     public Position pos = new Position(5, -180, false, true);
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenLevelConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenLevelConfig.java
index c027ecb26..e117a1858 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenLevelConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenLevelConfig.java
@@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.config.FeatureToggle;
 import at.hannibal2.skyhanni.config.core.config.Position;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 public class GardenLevelConfig {
@@ -14,5 +15,6 @@ public class GardenLevelConfig {
     public boolean display = false;
 
     @Expose
+    @ConfigLink(owner = GardenLevelConfig.class, field = "display")
     public Position pos = new Position(390, 40, false, true);
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/MoneyPerHourConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/MoneyPerHourConfig.java
index eab650a77..32819e8d3 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/MoneyPerHourConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/MoneyPerHourConfig.java
@@ -7,6 +7,7 @@ import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 import java.util.ArrayList;
@@ -156,5 +157,6 @@ public class MoneyPerHourConfig {
     public boolean hideTitle = false;
 
     @Expose
+    @ConfigLink(owner = MoneyPerHourConfig.class, field = "display")
     public Position pos = new Position(-330, 170, false, true);
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/NextJacobContestConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/NextJacobContestConfig.java
index 98f56e0bb..a9b1c43bd 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/NextJacobContestConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/NextJacobContestConfig.java
@@ -9,6 +9,7 @@ import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 import java.util.ArrayList;
@@ -99,5 +100,6 @@ public class NextJacobContestConfig {
     public List<CropType> warnFor = new ArrayList<>(CropType.getEntries());
 
     @Expose
+    @ConfigLink(owner = NextJacobContestConfig.class, field = "display")
     public Position pos = new Position(-200, 10, false, true);
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/CropMilestonesConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/CropMilestonesConfig.java
index 1cf9ed97a..ee47709a8 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/CropMilestonesConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/CropMilestonesConfig.java
@@ -9,6 +9,7 @@ import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 import io.github.notenoughupdates.moulconfig.observer.Property;
 
@@ -158,6 +159,7 @@ public class CropMilestonesConfig {
     public int blocksBrokenResetTime = 5;
 
     @Expose
+    @ConfigLink(owner = CropMilestonesConfig.class, field = "progress")
     public Position progressDisplayPos = new Position(-400, -200, false, true);
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/NextConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/NextConfig.java
index 7649db5e0..e7e45f536 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/NextConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/NextConfig.java
@@ -7,6 +7,7 @@ import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 // TODO moulconfig runnable support
@@ -91,5 +92,6 @@ public class NextConfig {
     public boolean bestHideTitle = false;
 
     @Expose
+    @ConfigLink(owner = NextConfig.class, field = "bestDisplay")
     public Position displayPos = new Position(-200, -200, false, true);
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalspeed/OptimalSpeedConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalspeed/OptimalSpeedConfig.java
index a7cc93c17..57532f5d6 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalspeed/OptimalSpeedConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalspeed/OptimalSpeedConfig.java
@@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.config.core.config.Position;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.Accordion;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 public class OptimalSpeedConfig {
@@ -35,5 +36,6 @@ public class OptimalSpeedConfig {
     public CustomSpeedConfig customSpeed = new CustomSpeedConfig();
 
     @Expose
+    @ConfigLink(owner = OptimalSpeedConfig.class, field = "showOnHUD")
     public Position pos = new Position(5, -200, false, true);
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/pests/PestTimerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/pests/PestTimerConfig.java
index 7606154e3..692dbddb3 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/pests/PestTimerConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/pests/PestTimerConfig.java
@@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.config.FeatureToggle;
 import at.hannibal2.skyhanni.config.core.config.Position;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 public class PestTimerConfig {
@@ -26,5 +27,6 @@ public class PestTimerConfig {
     public boolean onlyWithVacuum = true;
 
     @Expose
+    @ConfigLink(owner = PestTimerConfig.class, field = "enabled")
     public Position position = new Position(390, 65, false, true);
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/TimerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/TimerConfig.java
index 26b948e5e..3cabfb15d 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/TimerConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/TimerConfig.java
@@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.config.FeatureToggle;
 import at.hannibal2.skyhanni.config.core.config.Position;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 public class TimerConfig {
@@ -33,5 +34,6 @@ public class TimerConfig {
     public boolean newVisitorPing = false;
 
     @Expose
+    @ConfigLink(owner = TimerConfig.class, field = "enabled")
     public Position pos = new Position(390, 65, false, true);
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/gui/GUIConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/gui/GUIConfig.java
index 05b471978..fb21e3daf 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/gui/GUIConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/gui/GUIConfig.java
@@ -16,6 +16,7 @@ import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorButton;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorKeybind;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 import org.lwjgl.input.Keyboard;
 
@@ -99,6 +100,7 @@ public class GUIConfig {
     public boolean tpsDisplay = false;
 
     @Expose
+    @ConfigLink(owner = GUIConfig.class, field = "tpsDisplay")
     public Position tpsDisplayPosition = new Position(10, 10, false, true);
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/CustomScoreboardConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/CustomScoreboardConfig.java
index e5804aafa..4dc1c647d 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/CustomScoreboardConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/CustomScoreboardConfig.java
@@ -7,6 +7,7 @@ import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.Accordion;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 import java.util.ArrayList;
@@ -45,7 +46,7 @@ public class CustomScoreboardConfig {
     @Accordion
     public InformationFilteringConfig informationFiltering = new InformationFilteringConfig();
 
-
     @Expose
+    @ConfigLink(owner = CustomScoreboardConfig.class, field = "enabled")
     public Position position = new Position(10, 80, false, true);
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/pets/PetConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/pets/PetConfig.java
index 0ff6816dc..ac925113b 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/pets/PetConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/pets/PetConfig.java
@@ -7,6 +7,7 @@ import io.github.notenoughupdates.moulconfig.annotations.Accordion;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 
 import java.util.ArrayList;
@@ -21,6 +22,7 @@ public class PetConfig {
     public boolean display = false;
 
     @Expose
+    @ConfigLink(owner = PetConfig.class, field = "display")
     public Position displayPos = new Position(-330, -15, false, true);
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
index 8377c5777..43142be27 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
@@ -492,9 +492,9 @@ object GardenNextJacobContest {
         if (!isEnabled()) return
 
         if (display.isEmpty()) {
-            config.pos.renderStrings(simpleDisplay, posLabel = "Garden Next Jacob Contest")
+            config.pos.renderStrings(simpleDisplay, posLabel = "Next Jacob Contest")
         } else {
-            config.pos.renderSingleLineWithItems(display, 1.0, posLabel = "Garden Next Jacob Contest")
+            config.pos.renderSingleLineWithItems(display, 1.0, posLabel = "Next Jacob Contest")
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt
index 31db0b811..3b5ee8dab 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt
@@ -70,7 +70,7 @@ object CropMoneyDisplay {
         if (!isEnabled()) return
 
         if (!GardenAPI.hideExtraGuis()) {
-            config.pos.renderStringsAndItems(display, posLabel = "Garden Crop Money Per Hour")
+            config.pos.renderStringsAndItems(display, posLabel = "Garden Money Per Hour")
         }
     }
 
-- 
cgit