SkyHanni's own /wiki command logic now works better in SkyBlock Level guide and allows to change weather to use official Hypixel Wiki or the older Fandom Wiki. #831

3 files changed, 46 insertions, 29 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/commands/BetterWikiCommandConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/commands/BetterWikiCommandConfig.java
new file mode 100644
index 000000000..68356dd9e
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/commands/BetterWikiCommandConfig.java
@@ -0,0 +1,44 @@
+package at.hannibal2.skyhanni.config.features.commands;
+
+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.ConfigEditorKeybind;
+import io.github.moulberry.moulconfig.annotations.ConfigOption;
+import org.lwjgl.input.Keyboard;
+
+public class BetterWikiCommandConfig {
+
+    @Expose
+    @ConfigOption(name = "Enabled", desc = "Improve the functionality of the /wiki command.\nThis is required for all of the below features.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = false;
+
+    @Expose
+    @ConfigOption(name = "SkyBlock Guide", desc = "Use SkyHanni's method in the SkyBlock Guide.") // TODO Make this method not suck
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean sbGuide = false;
+
+    @Expose
+    @ConfigOption(name = "Use Fandom Wiki", desc = "Use Fandom Wiki (§ehypixel-skyblock.fandom.com§7) instead of the Hypixel wiki (§ewiki.hypixel.net§7) in most wiki-related chat messages.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean useFandom = false;
+
+    @Expose
+    @ConfigOption(name = "Auto Open", desc = "Directly opens the Wiki when running the command instead of having to click a message in chat.")
+    @ConfigEditorBoolean
+    public boolean autoOpenWiki = false;
+
+    @Expose
+    @ConfigOption(name = "Open from Menus", desc = "Directly opens the Wiki from menus instead of having to click a message in chat.")
+    @ConfigEditorBoolean
+    public boolean menuOpenWiki = false;
+
+    @Expose
+    @ConfigOption(name = "Fandom Wiki Key", desc = "Search for an item on Wiki with this keybind.\n§4For optimal experiences, do §lNOT§r §4bind this to a mouse button.")
+    @ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE)
+    public int wikiKeybind = Keyboard.KEY_NONE;
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java
index 4003cfb99..01f831246 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java
@@ -13,10 +13,10 @@ public class CommandsConfig {
     @Expose
     public TabCompleteConfig tabComplete = new TabCompleteConfig();
 
-    @ConfigOption(name = "Fandom Wiki for §e/wiki", desc = "")
+    @ConfigOption(name = "Better §e/wiki", desc = "")
     @Accordion
     @Expose
-    public FandomWikiCommandConfig fandomWiki = new FandomWikiCommandConfig();
+    public BetterWikiCommandConfig betterWiki = new BetterWikiCommandConfig();
 
     @ConfigOption(name = "Party Commands", desc = "Shortens party commands and allows tab-completing for them. " +
         "\n§eCommands: /pt /pp /pko /pk /pd §7SkyBlock command §e/pt §7to check the play time still works.")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/commands/FandomWikiCommandConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/commands/FandomWikiCommandConfig.java
deleted file mode 100644
index c8a25a204..000000000
--- a/src/main/java/at/hannibal2/skyhanni/config/features/commands/FandomWikiCommandConfig.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package at.hannibal2.skyhanni.config.features.commands;
-
-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.ConfigEditorKeybind;
-import io.github.moulberry.moulconfig.annotations.ConfigOption;
-import org.lwjgl.input.Keyboard;
-
-public class FandomWikiCommandConfig {
-
-    @Expose
-    @ConfigOption(name = "Enabled", desc = "Use Fandom Wiki (§ehypixel-skyblock.fandom.com§7) instead of the Hypixel wiki (§ewiki.hypixel.net§7) in most wiki-related chat messages.")
-    @ConfigEditorBoolean
-    @FeatureToggle
-    public boolean enabled = false;
-
-    @Expose
-    @ConfigOption(name = "Skip Chat", desc = "Directly opens the Fandom Wiki instead of sending the §e\"Click to search for this thing on the Fandom Wiki\"§7 message beforehand.")
-    @ConfigEditorBoolean
-    public boolean skipWikiChat = false;
-
-    @Expose
-    @ConfigOption(name = "Fandom Wiki Key", desc = "Search for an item on Fandom Wiki with this keybind.\n§4For optimal experiences, do §lNOT§r §4bind this to a mouse button.")
-    @ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE)
-    public int fandomWikiKeybind = Keyboard.KEY_NONE;
-}