code cleanup, and used SkyHanni framework at more spots

3 files changed, 28 insertions, 27 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/GiftingOpportunities.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/GiftingOpportunities.java
deleted file mode 100644
index 751017942..000000000
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/GiftingOpportunities.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package at.hannibal2.skyhanni.config.features.event.winter;
-
-import at.hannibal2.skyhanni.config.FeatureToggle;
-import com.google.gson.annotations.Expose;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
-import io.github.moulberry.moulconfig.annotations.ConfigOption;
-
-public class GiftingOpportunities {
-    @Expose
-    @ConfigOption(name = "Highlight unique gift opportunities", desc = "Highlight players who you haven't given gifts to yet")
-    @ConfigEditorBoolean
-    @FeatureToggle
-    public boolean highlightSpecialNeedsPlayers = true;
-
-    @Expose
-    @ConfigOption(name = "Display only while holding a gift", desc = "Only highlight ungifted players while holding a gift.")
-    @ConfigEditorBoolean
-    public boolean highlighWithGiftOnly = true;
-
-
-    @Expose
-    @ConfigOption(name = "Use armor stands", desc = "Make use of armor stands to stop highlighting players. A bit inaccurate, but can help with people you gifted before this feature was used.")
-    @ConfigEditorBoolean
-    public boolean useArmorStandDetection = false;
-
-}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/GiftingOpportunitiesConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/GiftingOpportunitiesConfig.java
new file mode 100644
index 000000000..f303099b4
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/GiftingOpportunitiesConfig.java
@@ -0,0 +1,27 @@
+package at.hannibal2.skyhanni.config.features.event.winter;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import com.google.gson.annotations.Expose;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.moulberry.moulconfig.annotations.ConfigOption;
+
+public class GiftingOpportunitiesConfig {
+    @Expose
+    @ConfigOption(name = "Enabled", desc = "Highlight players who you haven't given gifts to yet.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = true;
+
+    @Expose
+    @ConfigOption(name = "Only While Holding Gift", desc = "Only highlight ungifted players while holding a gift.")
+    @ConfigEditorBoolean
+    public boolean highlighWithGiftOnly = true;
+
+
+    @Expose
+    @ConfigOption(name = "Use Armor Stands", desc = "Make use of armor stands to stop highlighting players. " +
+        "This is a bit inaccurate, but it can help with people you gifted before this feature was used.")
+    @ConfigEditorBoolean
+    public boolean useArmorStandDetection = false;
+
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/WinterConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/WinterConfig.java
index 2548558dc..4cb15cb19 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/WinterConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/WinterConfig.java
@@ -23,7 +23,7 @@ public class WinterConfig {
     @Accordion
     @Expose
     @ConfigOption(name = "Unique Gifting Opportunities", desc = "Highlight players who you haven't given gifts to yet")
-    public GiftingOpportunities giftingOpportunities = new GiftingOpportunities();
+    public GiftingOpportunitiesConfig giftingOpportunities = new GiftingOpportunitiesConfig();
 
     @Expose
     public Position islandCloseTimePosition = new Position(10, 10, false, true);