aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/combat/QuiverDisplayConfig.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ReputationHelperConfig.java9
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/dev/DevConfig.java3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/event/bingo/BingoCardConfig.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/event/bingo/BingoConfig.java3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/garden/pests/StereoHarmonyConfig.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/inventory/ChestValueConfig.java3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/inventory/SackDisplayConfig.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/skillprogress/SkillProgressConfig.java5
13 files changed, 43 insertions, 10 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
index adc56c596..7f9b47d6c 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
@@ -214,7 +214,15 @@ class ConfigManager {
findPositionLinks(field.get(obj), slog)
continue
}
- val configLink = field.getAnnotation(ConfigLink::class.java) ?: continue
+ val configLink = field.getAnnotation(ConfigLink::class.java)
+ if (configLink == null) {
+ if (LorenzUtils.isInDevEnvironment()) {
+ var name = "${field.declaringClass.name}.${field.name}"
+ name = name.replace("at.hannibal2.skyhanni.config.", "")
+ println("WEE WOO WEE WOO HIER FEHLT EIN @CONFIGLINK: $name")
+ }
+ continue
+ }
val position = field.get(obj) as Position
position.setLink(configLink)
}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/QuiverDisplayConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/QuiverDisplayConfig.java
index 626c73f99..4e79bcb36 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/QuiverDisplayConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/QuiverDisplayConfig.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.ConfigEditorDropdown;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
import io.github.notenoughupdates.moulconfig.observer.Property;
@@ -16,6 +17,7 @@ public class QuiverDisplayConfig {
public boolean enabled = true;
@Expose
+ @ConfigLink(owner = QuiverDisplayConfig.class, field = "enabled")
public Position quiverDisplayPos = new Position(260, 80);
@Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ReputationHelperConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ReputationHelperConfig.java
index 08e693828..fa87eb4eb 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ReputationHelperConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ReputationHelperConfig.java
@@ -21,21 +21,20 @@ public class ReputationHelperConfig {
public boolean enabled = true;
@Expose
- @ConfigOption(name = "Use Hotkey", desc = "Only show the Reputation Helper while pressing the hotkey.")
+ @ConfigOption(name = "Hide Completed", desc = "Hides tasks after they've been completed.")
@ConfigEditorBoolean
- public boolean useHotkey = false;
+ public Property<Boolean> hideComplete = Property.of(true);
@Expose
- @ConfigOption(name = "Hide Completed", desc = "Hides tasks after they've been completed.")
+ @ConfigOption(name = "Use Hotkey", desc = "Only show the Reputation Helper while pressing the hotkey.")
@ConfigEditorBoolean
- public Property<Boolean> hideComplete = Property.of(true);
+ public boolean useHotkey = false;
@Expose
@ConfigOption(name = "Hotkey", desc = "Press this hotkey to show the Reputation Helper.")
@ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE)
public int hotkey = Keyboard.KEY_NONE;
-
@Expose
@ConfigLink(owner = ReputationHelperConfig.class, field = "enabled")
public Position position = new Position(10, 10, false, true);
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java
index ee78fbf34..bbacd341a 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java
@@ -136,6 +136,7 @@ public class DebugConfig {
@ConfigEditorBoolean
public boolean neverFunnyTime = false;
+ // Does not have a config element!
@Expose
public Position trackSoundPosition = new Position(0, 0);
}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DevConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DevConfig.java
index 14b16c136..728d75782 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DevConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DevConfig.java
@@ -55,12 +55,15 @@ public class DevConfig {
@Expose
public WaypointsConfig waypoint = new WaypointsConfig();
+ // Does not have a config element!
@Expose
public Position debugPos = new Position(10, 10, false, true);
+ // Does not have a config element!
@Expose
public Position debugLocationPos = new Position(1, 160, false, true);
+ // Does not have a config element!
@Expose
public Position debugItemPos = new Position(90, 70);
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/bingo/BingoCardConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/bingo/BingoCardConfig.java
index 9ef5fb331..f4ff789ff 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/bingo/BingoCardConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/bingo/BingoCardConfig.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;
import io.github.notenoughupdates.moulconfig.observer.Property;
@@ -42,6 +43,7 @@ public class BingoCardConfig {
public boolean bingoSplashGuide = true;
@Expose
+ @ConfigLink(owner = BingoCardConfig.class, field = "enabled")
public Position bingoCardPos = new Position(10, 10, false, true);
@Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/bingo/BingoConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/bingo/BingoConfig.java
index ca2af7aca..40ce0ecbe 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/bingo/BingoConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/bingo/BingoConfig.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 BingoConfig {
@@ -19,6 +20,7 @@ public class BingoConfig {
@Accordion
public CompactChatConfig compactChat = new CompactChatConfig();
+ // TODO move into own category
@Expose
@ConfigOption(name = "Minion Craft Helper", desc = "Show how many more items you need to upgrade the minion in your inventory. Especially useful for Bingo.")
@ConfigEditorBoolean
@@ -32,5 +34,6 @@ public class BingoConfig {
public boolean minionCraftHelperProgressFirst = false;
@Expose
+ @ConfigLink(owner = BingoConfig.class, field = "minionCraftHelperEnabled")
public Position minionCraftHelperPos = new Position(10, 10, false, true);
}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java
index 7f1cdf79d..f2bdf85d5 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java
@@ -217,6 +217,7 @@ public class GardenConfig {
@FeatureToggle
public boolean jacobContestSummary = true;
+ // Does not have a config element!
@Expose
public Position cropSpeedMeterPos = new Position(278, -236, false, true);
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/pests/StereoHarmonyConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/pests/StereoHarmonyConfig.java
index 3ff82a246..fd32b44fd 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/pests/StereoHarmonyConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/pests/StereoHarmonyConfig.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;
import io.github.notenoughupdates.moulconfig.observer.Property;
@@ -49,5 +50,6 @@ public class StereoHarmonyConfig {
public boolean hideWhenNone = false;
@Expose
+ @ConfigLink(owner = StereoHarmonyConfig.class, field = "displayEnabled")
public Position position = new Position(205, 55, 1f);
}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ChestValueConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ChestValueConfig.java
index a92c65b84..5f4300865 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ChestValueConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ChestValueConfig.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;
public class ChestValueConfig {
@@ -133,7 +134,7 @@ public class ChestValueConfig {
)
public int hideBelow = 100_000;
-
@Expose
+ @ConfigLink(owner = ChestValueConfig.class, field = "enabled")
public Position position = new Position(107, 141, false, true);
}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/SackDisplayConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/SackDisplayConfig.java
index 5fc8268dd..5dca75b93 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/SackDisplayConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/SackDisplayConfig.java
@@ -8,6 +8,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;
public class SackDisplayConfig {
@@ -202,5 +203,6 @@ public class SackDisplayConfig {
}
@Expose
+ @ConfigLink(owner = SackDisplayConfig.class, field = "enabled")
public Position position = new Position(144, 139, false, true);
}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
index 915430ea7..8ee2cc926 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java
@@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.config.FeatureToggle;
import at.hannibal2.skyhanni.config.core.config.Position;
import at.hannibal2.skyhanni.config.enums.OutsideSbFeature;
import at.hannibal2.skyhanni.config.features.commands.CommandsConfig;
+import at.hannibal2.skyhanni.config.features.garden.NextJacobContestConfig;
import at.hannibal2.skyhanni.config.features.minion.MinionsConfig;
import at.hannibal2.skyhanni.config.features.misc.pets.PetConfig;
import at.hannibal2.skyhanni.config.features.stranded.StrandedConfig;
@@ -220,6 +221,10 @@ public class MiscConfig {
public boolean showTimeInLimbo = true;
@Expose
+ @ConfigLink(owner = MiscConfig.class, field = "showTimeInLimbo")
+ public Position showTimeInLimboPosition = new Position(400, 200, 1.3f);
+
+ @Expose
@ConfigOption(
name = "Lesser Orb of Healing Hider",
desc = "Hides the Lesser Orb of Healing.")
@@ -234,13 +239,12 @@ public class MiscConfig {
@ConfigEditorBoolean
public boolean lockMouseLookChatMessage = true;
- @Expose
- public Position showTimeInLimboPosition = new Position(400, 200, 1.3f);
-
+ // Does not have a config element!
@Expose
public Position lockedMouseDisplay = new Position(400, 200, 0.8f);
@Expose
+ @ConfigLink(owner = NextJacobContestConfig.class, field = "display")
public Position inventoryLoadPos = new Position(394, 124, false, true);
@Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/skillprogress/SkillProgressConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/skillprogress/SkillProgressConfig.java
index 19f80c958..572cf4671 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/skillprogress/SkillProgressConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/skillprogress/SkillProgressConfig.java
@@ -7,6 +7,7 @@ import com.google.gson.annotations.Expose;
import io.github.notenoughupdates.moulconfig.annotations.Category;
import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
import io.github.notenoughupdates.moulconfig.observer.Property;
@@ -104,14 +105,18 @@ public class SkillProgressConfig {
public SkillETADisplayConfig skillETADisplayConfig = new SkillETADisplayConfig();
@Expose
+ @ConfigLink(owner = SkillProgressConfig.class, field = "enabled")
public Position displayPosition = new Position(384, -105, false, true);
@Expose
+ @ConfigLink(owner = SkillProgressBarConfig.class, field = "enabled")
public Position barPosition = new Position(384, -87, false, true);
@Expose
+ @ConfigLink(owner = AllSkillDisplayConfig.class, field = "enabled")
public Position allSkillPosition = new Position(5, 209, false, true);
@Expose
+ @ConfigLink(owner = SkillETADisplayConfig.class, field = "enabled")
public Position etaPosition = new Position(5, 155, false, true);
}