Added the ability to add search tags to config options (#309)

25 files changed, 200 insertions, 126 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
index 710bdd6c..34d87c5b 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
@@ -34,9 +34,9 @@ import io.github.moulberry.notenoughupdates.recipes.CraftingOverlay;
 import io.github.moulberry.notenoughupdates.recipes.CraftingRecipe;
 import io.github.moulberry.notenoughupdates.recipes.Ingredient;
 import io.github.moulberry.notenoughupdates.recipes.NeuRecipe;
+import io.github.moulberry.notenoughupdates.util.ApiUtil;
 import io.github.moulberry.notenoughupdates.util.Constants;
 import io.github.moulberry.notenoughupdates.util.HotmInformation;
-import io.github.moulberry.notenoughupdates.util.ApiUtil;
 import io.github.moulberry.notenoughupdates.util.ItemResolutionQuery;
 import io.github.moulberry.notenoughupdates.util.ItemUtils;
 import io.github.moulberry.notenoughupdates.util.SBInfo;
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/misc/UpdateCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/misc/UpdateCommand.java
index 81cf7e8f..1aeebda5 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/commands/misc/UpdateCommand.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/misc/UpdateCommand.java
@@ -25,8 +25,6 @@ import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.util.ChatComponentText;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigOption.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigOption.java
index d51294e7..920cb326 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigOption.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigOption.java
@@ -30,6 +30,7 @@ public @interface ConfigOption {
 	String name();
 
 	String desc();
+	String[] searchTags() default "";
 
 	int subcategoryId() default -1;
 }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/struct/ConfigProcessor.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/struct/ConfigProcessor.java
index 75862069..efdeab01 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/struct/ConfigProcessor.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/struct/ConfigProcessor.java
@@ -69,17 +69,19 @@ public class ConfigProcessor {
 		public GuiOptionEditor editor;
 
 		public int accordionId = -1;
+		public final String[] searchTags;
 
 		private final Field field;
 		private final Object container;
 
-		public ProcessedOption(String name, String desc, int subcategoryId, Field field, Object container) {
+		public ProcessedOption(String name, String desc, int subcategoryId, Field field, Object container, String[] searchTags) {
 			this.name = name;
 			this.desc = desc;
 			this.subcategoryId = subcategoryId;
 
 			this.field = field;
 			this.container = container;
+			this.searchTags = searchTags;
 		}
 
 		public Object get() {
@@ -137,7 +139,8 @@ public class ConfigProcessor {
 							optionAnnotation.desc(),
 							optionAnnotation.subcategoryId(),
 							optionField,
-							categoryObj
+							categoryObj,
+							optionAnnotation.searchTags()
 						);
 						if (optionField.isAnnotationPresent(ConfigAccordionId.class)) {
 							ConfigAccordionId annotation = optionField.getAnnotation(ConfigAccordionId.class);
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DamageCommas.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DamageCommas.java
index 04d97747..d8f7becd 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DamageCommas.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DamageCommas.java
@@ -27,7 +27,6 @@ import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 
-import java.text.NumberFormat;
 import java.util.WeakHashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/InventoryStorageSelector.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/InventoryStorageSelector.java
index 0abf3f11..572b0fbf 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/InventoryStorageSelector.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/InventoryStorageSelector.java
@@ -83,24 +83,26 @@ public class InventoryStorageSelector {
 			return;
 		}
 
-		if (KeybindHelper.isKeyPressed(NotEnoughUpdates.INSTANCE.config.storageGUI.arrowLeftKey)) {
-			NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex--;
-
-			int max = StorageManager.getInstance().storageConfig.displayToStorageIdMap.size() - 1;
-			if (NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex > max)
-				NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = max;
-			if (NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex < 0)
-				NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = 0;
-		} else if (KeybindHelper.isKeyPressed(NotEnoughUpdates.INSTANCE.config.storageGUI.arrowRightKey)) {
-			NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex++;
-
-			int max = StorageManager.getInstance().storageConfig.displayToStorageIdMap.size() - 1;
-			if (NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex > max)
-				NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = max;
-			if (NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex < 0)
-				NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = 0;
-		} else if (KeybindHelper.isKeyPressed(NotEnoughUpdates.INSTANCE.config.storageGUI.arrowDownKey)) {
-			sendToPage(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex);
+		if (NotEnoughUpdates.INSTANCE.config.storageGUI.arrowKeyBackpacks) {
+			if (KeybindHelper.isKeyPressed(NotEnoughUpdates.INSTANCE.config.storageGUI.arrowLeftKey)) {
+				NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex--;
+
+				int max = StorageManager.getInstance().storageConfig.displayToStorageIdMap.size() - 1;
+				if (NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex > max)
+					NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = max;
+				if (NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex < 0)
+					NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = 0;
+			} else if (KeybindHelper.isKeyPressed(NotEnoughUpdates.INSTANCE.config.storageGUI.arrowRightKey)) {
+				NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex++;
+
+				int max = StorageManager.getInstance().storageConfig.displayToStorageIdMap.size() - 1;
+				if (NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex > max)
+					NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = max;
+				if (NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex < 0)
+					NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = 0;
+			} else if (KeybindHelper.isKeyPressed(NotEnoughUpdates.INSTANCE.config.storageGUI.arrowDownKey)) {
+				sendToPage(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex);
+			}
 		}
 
 		if (isSlotSelected()) {
@@ -145,27 +147,29 @@ public class InventoryStorageSelector {
 			return;
 		}
 
-		if (KeybindHelper.isKeyPressed(NotEnoughUpdates.INSTANCE.config.storageGUI.backpackHotkey)) {
-			Minecraft.getMinecraft().thePlayer.inventory.currentItem = 0;
-			isOverridingSlot = true;
-		} else if (KeybindHelper.isKeyPressed(NotEnoughUpdates.INSTANCE.config.storageGUI.arrowLeftKey)) {
-			NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex--;
-
-			int max = StorageManager.getInstance().storageConfig.displayToStorageIdMap.size() - 1;
-			if (NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex > max)
-				NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = max;
-			if (NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex < 0)
-				NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = 0;
-		} else if (KeybindHelper.isKeyPressed(NotEnoughUpdates.INSTANCE.config.storageGUI.arrowRightKey)) {
-			NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex++;
-
-			int max = StorageManager.getInstance().storageConfig.displayToStorageIdMap.size() - 1;
-			if (NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex > max)
-				NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = max;
-			if (NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex < 0)
-				NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = 0;
-		} else if (KeybindHelper.isKeyPressed(NotEnoughUpdates.INSTANCE.config.storageGUI.arrowDownKey)) {
-			sendToPage(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex);
+		if (NotEnoughUpdates.INSTANCE.config.storageGUI.arrowKeyBackpacks) {
+			if (KeybindHelper.isKeyPressed(NotEnoughUpdates.INSTANCE.config.storageGUI.backpackHotkey)) {
+				Minecraft.getMinecraft().thePlayer.inventory.currentItem = 0;
+				isOverridingSlot = true;
+			} else if (KeybindHelper.isKeyPressed(NotEnoughUpdates.INSTANCE.config.storageGUI.arrowLeftKey)) {
+				NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex--;
+
+				int max = StorageManager.getInstance().storageConfig.displayToStorageIdMap.size() - 1;
+				if (NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex > max)
+					NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = max;
+				if (NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex < 0)
+					NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = 0;
+			} else if (KeybindHelper.isKeyPressed(NotEnoughUpdates.INSTANCE.config.storageGUI.arrowRightKey)) {
+				NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex++;
+
+				int max = StorageManager.getInstance().storageConfig.displayToStorageIdMap.size() - 1;
+				if (NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex > max)
+					NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = max;
+				if (NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex < 0)
+					NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = 0;
+			} else if (KeybindHelper.isKeyPressed(NotEnoughUpdates.INSTANCE.config.storageGUI.arrowDownKey)) {
+				sendToPage(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex);
+			}
 		}
 
 		if (isSlotSelected()) {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfigEditor.java b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfigEditor.java
index 17bc57e9..cee994b7 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfigEditor.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfigEditor.java
@@ -46,6 +46,7 @@ import org.lwjgl.opengl.GL11;
 
 import java.awt.*;
 import java.net.URI;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -110,7 +111,8 @@ public class NEUConfigEditor extends GuiElement {
 			for (ConfigProcessor.ProcessedOption option : category.options.values()) {
 				categoryForOption.put(option, category);
 
-				String combined = category.name + " " + category.desc + " " + option.name + " " + option.desc;
+				String combined = category.name + " " + category.desc + " " + option.name + " " + option.desc + " " +
+					Arrays.toString(option.searchTags);
 				combined = combined.replaceAll("[^a-zA-Z_ ]", "").toLowerCase();
 				for (String word : combined.split("[ _]")) {
 					searchOptionMap.computeIfAbsent(word, k -> new HashSet<>()).add(option);
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AHGraph.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AHGraph.java
index ce931392..58c58e3c 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AHGraph.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AHGraph.java
@@ -32,7 +32,8 @@ public class AHGraph {
 	@Expose
 	@ConfigOption(
 		name = "Enable AH/BZ Price Graph",
-		desc = "Enable or disable the graph. Disabling this will also make it so that no price data is stored."
+		desc = "Enable or disable the graph. Disabling this will also make it so that no price data is stored.",
+		searchTags = {"auction", "bazaar"}
 	)
 	@ConfigEditorBoolean
 	public boolean graphEnabled = true;
@@ -58,7 +59,8 @@ public class AHGraph {
 	@Expose
 	@ConfigOption(
 		name = "Graph Colour",
-		desc = "Set a custom colour for the graph."
+		desc = "Set a custom colour for the graph.",
+		searchTags = "color"
 	)
 	@ConfigEditorColour
 	public String graphColor = "0:255:0:255:0";
@@ -66,7 +68,8 @@ public class AHGraph {
 	@Expose
 	@ConfigOption(
 		name = "Secondary Graph Colour",
-		desc = "Set a custom colour for the second graph line."
+		desc = "Set a custom colour for the second graph line.",
+		searchTags = "color"
 	)
 	@ConfigEditorColour
 	public String graphColor2 = "0:255:255:255:0";
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ApiData.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ApiData.java
index e52b7d34..9802af89 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ApiData.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ApiData.java
@@ -31,7 +31,8 @@ public class ApiData {
 	@Expose
 	@ConfigOption(
 		name = "Api Key",
-		desc = "Hypixel API key\nYou can run §a/api new§r to autofill this value."
+		desc = "Hypixel API key\nYou can run §a/api new§r to autofill this value.",
+		searchTags = "apikey"
 	)
 	@ConfigEditorText
 	public String apiKey = "";
@@ -41,57 +42,87 @@ public class ApiData {
 	public boolean repository = false;
 
 	@Expose
-	@ConfigOption(name = "Automatically Update Repository", desc = "Update the repository on every startup")
+	@ConfigOption(
+		name = "Automatically Update Repository",
+		desc = "Update the repository on every startup"
+	)
 	@ConfigEditorBoolean()
 	@ConfigAccordionId(id = 0)
 	public boolean autoupdate = true;
 
 	@ConfigAccordionId(id = 0)
-	@ConfigOption(name = "Update Repository now", desc = "Refresh your repository")
+	@ConfigOption(
+		name = "Update Repository now",
+		desc = "Refresh your repository"
+	)
 	@ConfigEditorButton(runnableId = 22, buttonText = "Update")
 	public int updateRepositoryButton = 0;
 
 	@ConfigEditorAccordion(id = 1)
 	@ConfigAccordionId(id = 0)
-	@ConfigOption(name = "Repository Location", desc = "")
+	@ConfigOption(
+		name = "Repository Location",
+		desc = ""
+	)
 	public boolean repositoryLocation = false;
 
 	@ConfigAccordionId(id = 1)
-	@ConfigOption(name = "Use default repository", desc = "The latest, most up to date item list for the official NEU releases.")
+	@ConfigOption(
+		name = "Use default repository",
+		desc = "The latest, most up to date item list for the official NEU releases."
+	)
 	@ConfigEditorButton(runnableId = 23, buttonText = "Reset")
 	public int setRepositoryToDefaultButton = 0;
 
 	@ConfigAccordionId(id = 1)
-	@ConfigOption(name = "Use pre-release repository", desc = "The latest, most up to date item list for the NEU pre-releases.\n§4Use §lonly§r§4 with the pre-releases.")
+	@ConfigOption(
+		name = "Use pre-release repository",
+		desc = "The latest, most up to date item list for the NEU pre-releases.\n§4Use §lonly§r§4 with the pre-releases."
+	)
 	@ConfigEditorButton(runnableId = 24, buttonText = "Use")
 	public int setRepositoryToDangerousButton = 0;
 
 	@Expose
 	@ConfigAccordionId(id = 1)
-	@ConfigOption(name = "Repository User", desc = "Repository User")
+	@ConfigOption(
+		name = "Repository User",
+		desc = "Repository User"
+	)
 	@ConfigEditorText
 	public String repoUser = "NotEnoughUpdates";
 
 	@Expose
 	@ConfigAccordionId(id = 1)
-	@ConfigOption(name = "Repository Name", desc = "Repository Name")
+	@ConfigOption(
+		name = "Repository Name",
+		desc = "Repository Name"
+	)
 	@ConfigEditorText
 	public String repoName = "NotEnoughUpdates-REPO";
 
 	@Expose
 	@ConfigAccordionId(id = 1)
-	@ConfigOption(name = "Repository Branch", desc = "Repository Branch")
+	@ConfigOption(
+		name = "Repository Branch",
+		desc = "Repository Branch"
+	)
 	@ConfigEditorText
 	public String repoBranch = "master";
 
 	@Expose
 	@ConfigAccordionId(id = 0)
-	@ConfigOption(name = "Edit Mode", desc = "Enables you to edit items in the item list.\n§4Recommended for repository maintainers only.\n§4§lRemember: §rTurn off auto update as well")
+	@ConfigOption(
+		name = "Edit Mode",
+		desc = "Enables you to edit items in the item list.\n§4Recommended for repository maintainers only.\n§4§lRemember: §rTurn off auto update as well"
+	)
 	@ConfigEditorBoolean
 	public boolean repositoryEditing = false;
 
 	@Expose
-	@ConfigOption(name = "Lowestbin API", desc = "§4Do §lNOT §r§4change this, unless you know exactly what you are doing\n§fDefault: §amoulberry.codes")
+	@ConfigOption(
+		name = "Lowestbin API",
+		desc = "§4Do §lNOT §r§4change this, unless you know exactly what you are doing\n§fDefault: §amoulberry.codes"
+	)
 	@ConfigEditorText
 	public String moulberryCodesApi = "moulberry.codes";
 
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Calendar.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Calendar.java
index f1debe28..8aef92d8 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Calendar.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Calendar.java
@@ -28,7 +28,8 @@ public class Calendar {
 	@Expose
 	@ConfigOption(
 		name = "Event Notifications",
-		desc = "Display notifications for SkyBlock calendar events"
+		desc = "Display notifications for SkyBlock calendar events",
+		searchTags = {"jacob", "dark", "farming"}
 	)
 	@ConfigEditorBoolean
 	public boolean eventNotifications = true;
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/CustomArmour.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/CustomArmour.java
index 92b4b2ab..0d33172d 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/CustomArmour.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/CustomArmour.java
@@ -30,7 +30,8 @@ public class CustomArmour {
 	@ConfigOption(
 		name = "Enable Equipment Hud",
 		desc = "Shows an overlay in your inventory showing your 4 extra armour slots\n" +
-			"\u00A7cRequires Hide Potion Effects to be enabled"
+			"\u00A7cRequires Hide Potion Effects to be enabled",
+		searchTags = "armor"
 	)
 	@ConfigEditorBoolean
 	public boolean enableArmourHud = true;
@@ -46,7 +47,8 @@ public class CustomArmour {
 	@Expose
 	@ConfigOption(
 		name = "GUI Style",
-		desc = "Change the colour of the GUI"
+		desc = "Change the colour of the GUI",
+		searchTags = "color"
 	)
 	@ConfigEditorDropdown(
 		values = {"Minecraft", "Grey", "PacksHQ Dark", "Transparent", "FSR"}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/DungeonMapConfig.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/DungeonMapConfig.java
index 8e211bd6..eb7bdca1 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/DungeonMapConfig.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/DungeonMapConfig.java
@@ -127,14 +127,16 @@ public class DungeonMapConfig {
 	@Expose
 	@ConfigOption(
 		name = "Background Colour",
-		desc = "Colour of the map background. Supports opacity & chroma"
+		desc = "Colour of the map background. Supports opacity & chroma",
+		searchTags = "color"
 	)
 	public String dmBackgroundColour = "00:170:75:75:75";
 
 	@Expose
 	@ConfigOption(
 		name = "Border Colour",
-		desc = "Colour of the map border. Supports opacity & chroma. Turn off custom borders to see"
+		desc = "Colour of the map border. Supports opacity & chroma. Turn off custom borders to see",
+		searchTags = "color"
 	)
 	public String dmBorderColour = "00:0:0:0:0";
 
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Dungeons.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Dungeons.java
index 3d84cebe..cf5635ec 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Dungeons.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Dungeons.java
@@ -183,7 +183,8 @@ public class Dungeons {
 	@Expose
 	@ConfigOption(
 		name = "Enable Block Overlay",
-		desc = "Change the colour of certain blocks / entities while inside dungeons, but keeps the normal texture outside of dungeons"
+		desc = "Change the colour of certain blocks / entities while inside dungeons, but keeps the normal texture outside of dungeons",
+		searchTags = "color"
 	)
 	@ConfigEditorBoolean
 	@ConfigAccordionId(id = 2)
@@ -203,7 +204,8 @@ public class Dungeons {
 		name = "Slow Update",
 		desc = "Updates the colour every second instead of every tick.\n" +
 			"\u00A7cWARNING: This will cause all texture animations (eg. flowing water) to update slowly.\n" +
-			"This should only be used on low-end machines"
+			"This should only be used on low-end machines",
+		searchTags = "color"
 	)
 	@ConfigEditorBoolean
 	@ConfigAccordionId(id = 2)
@@ -212,7 +214,8 @@ public class Dungeons {
 	@Expose
 	@ConfigOption(
 		name = "Cracked Bricks",
-		desc = "Change the colour of: Cracked Bricks"
+		desc = "Change the colour of: Cracked Bricks",
+		searchTags = "color"
 	)
 	@ConfigEditorColour
 	@ConfigAccordionId(id = 2)
@@ -221,7 +224,8 @@ public class Dungeons {
 	@Expose
 	@ConfigOption(
 		name = "Dispensers",
-		desc = "Change the colour of: Dispensers"
+		desc = "Change the colour of: Dispensers",
+		searchTags = "color"
 	)
 	@ConfigEditorColour
 	@ConfigAccordionId(id = 2)
@@ -230,7 +234,8 @@ public class Dungeons {
 	@Expose
 	@ConfigOption(
 		name = "Levers",
-		desc = "Change the colour of: Levers"
+		desc = "Change the colour of: Levers",
+		searchTags = "color"
 	)
 	@ConfigEditorColour
 	@ConfigAccordionId(id = 2)
@@ -239,7 +244,8 @@ public class Dungeons {
 	@Expose
 	@ConfigOption(
 		name = "Tripwire String",
-		desc = "Change the colour of: Tripwire String"
+		desc = "Change the colour of: Tripwire String",
+		searchTags = "color"
 	)
 	@ConfigEditorColour
 	@ConfigAccordionId(id = 2)
@@ -248,7 +254,8 @@ public class Dungeons {
 	@Expose
 	@ConfigOption(
 		name = "Normal Chests",
-		desc = "Change the colour of: Normal Chests"
+		desc = "Change the colour of: Normal Chests",
+		searchTags = "color"
 	)
 	@ConfigEditorColour
 	@ConfigAccordionId(id = 2)
@@ -257,7 +264,8 @@ public class Dungeons {
 	@Expose
 	@ConfigOption(
 		name = "Trapped Chests",
-		desc = "Change the colour of: Trapped Chests"
+		desc = "Change the colour of: Trapped Chests",
+		searchTags = "color"
 	)
 	@ConfigEditorColour
 	@ConfigAccordionId(id = 2)
@@ -266,7 +274,8 @@ public class Dungeons {
 	@Expose
 	@ConfigOption(
 		name = "Bats",
-		desc = "Change the colour of: Bats"
+		desc = "Change the colour of: Bats",
+		searchTags = "color"
 	)
 	@ConfigEditorColour
 	@ConfigAccordionId(id = 2)
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Enchanting.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Enchanting.java
index b596d180..c2ac4bb4 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Enchanting.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Enchanting.java
@@ -29,7 +29,8 @@ import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigOption
 public class Enchanting {
 	@ConfigOption(
 		name = "Enchant Table / Hex GUI",
-		desc = ""
+		desc = "",
+		searchTags = "et"
 	)
 	@ConfigEditorAccordion(id = 1)
 	public boolean tableGUIAccordion = false;
@@ -159,7 +160,8 @@ public class Enchanting {
 	@Expose
 	@ConfigOption(
 		name = "Ultrasequencer Next",
-		desc = "Set the colour of the glass pan