aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/config/features
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-12-12 04:21:20 +0100
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-12-12 04:21:20 +0100
commit35e13552257e07ef13ef0aaf059156a175f55340 (patch)
tree9bd56c938d7a22d63be7524eac3f200d80c9fd57 /src/main/java/at/hannibal2/skyhanni/config/features
parent232c3cfc2074480976d39ca9d1f33cf7c7225a93 (diff)
downloadskyhanni-35e13552257e07ef13ef0aaf059156a175f55340.tar.gz
skyhanni-35e13552257e07ef13ef0aaf059156a175f55340.tar.bz2
skyhanni-35e13552257e07ef13ef0aaf059156a175f55340.zip
Not only Slayer, also Fishing and Diana items will now show in chat & title when over a custom defined price.
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/config/features')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/misc/TrackerConfig.java34
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/slayer/ItemProfitTrackerConfig.java23
2 files changed, 34 insertions, 23 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/TrackerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/TrackerConfig.java
index d3a257dc3..0451bfb00 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/TrackerConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/TrackerConfig.java
@@ -1,10 +1,13 @@
package at.hannibal2.skyhanni.config.features.misc;
+import at.hannibal2.skyhanni.config.FeatureToggle;
import at.hannibal2.skyhanni.config.HasLegacyId;
import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker;
import com.google.gson.annotations.Expose;
+import io.github.moulberry.moulconfig.annotations.Accordion;
import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorSlider;
import io.github.moulberry.moulconfig.annotations.ConfigOption;
import io.github.moulberry.moulconfig.observer.Property;
@@ -62,4 +65,35 @@ public class TrackerConfig {
@ConfigOption(name = "Exclude Hidden", desc = "Exclude hidden items in the total price calculation.")
@ConfigEditorBoolean
public boolean excludeHiddenItemsInPrice = false;
+
+ @Expose
+ @ConfigOption(name = "Item Warnings", desc = "Item Warnings")
+ @Accordion
+ public TrackerWarningConfig warnings = new TrackerWarningConfig();
+
+ public static class TrackerWarningConfig {
+
+ @Expose
+ @ConfigOption(name = "Price in Chat", desc = "Show an extra chat message when you pick up an expensive item. " +
+ "(This contains name, amount and price)")
+ @ConfigEditorBoolean
+ @FeatureToggle
+ public boolean chat = false;
+
+ @Expose
+ @ConfigOption(name = "Minimum Price", desc = "Items below this price will not show up in chat.")
+ @ConfigEditorSlider(minValue = 1, maxValue = 20_000_000, minStep = 1)
+ public int minimumChat = 5_000_000;
+
+ @Expose
+ @ConfigOption(name = "Title Warning", desc = "Show a title for expensive item pickups.")
+ @ConfigEditorBoolean
+ @FeatureToggle
+ public boolean title = true;
+
+ @Expose
+ @ConfigOption(name = "Title Price", desc = "Items above this price will show up as a title.")
+ @ConfigEditorSlider(minValue = 1, maxValue = 50_000_000, minStep = 1)
+ public int minimumTitle = 5_000_000;
+ }
}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/slayer/ItemProfitTrackerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/slayer/ItemProfitTrackerConfig.java
index 5fc67993b..424af991c 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/slayer/ItemProfitTrackerConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/slayer/ItemProfitTrackerConfig.java
@@ -4,7 +4,6 @@ import at.hannibal2.skyhanni.config.FeatureToggle;
import at.hannibal2.skyhanni.config.core.config.Position;
import com.google.gson.annotations.Expose;
import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorSlider;
import io.github.moulberry.moulconfig.annotations.ConfigOption;
public class ItemProfitTrackerConfig {
@@ -19,26 +18,4 @@ public class ItemProfitTrackerConfig {
@Expose
public Position pos = new Position(20, 20, false, true);
- @Expose
- @ConfigOption(name = "Price in Chat", desc = "Show an extra chat message when you pick up an item. " +
- "(This contains name, amount and price)")
- @ConfigEditorBoolean
- @FeatureToggle
- public boolean priceInChat = false;
-
- @Expose
- @ConfigOption(name = "Minimum Price", desc = "Items below this price will not show up in chat.")
- @ConfigEditorSlider(minValue = 1, maxValue = 5_000_000, minStep = 1)
- public int minimumPrice = 100_000;
-
- @Expose
- @ConfigOption(name = "Title Warning", desc = "Show a title for expensive item pickups.")
- @ConfigEditorBoolean
- @FeatureToggle
- public boolean titleWarning = false;
-
- @Expose
- @ConfigOption(name = "Title Price", desc = "Items above this price will show up as a title.")
- @ConfigEditorSlider(minValue = 1, maxValue = 20_000_000, minStep = 1)
- public int minimumPriceWarning = 500_000;
}