Remove mod categories

src/tk/wurst_client/files/FileManager.java

@@ -33,7 +33,6 @@
 import tk.wurst_client.alts.Encryption;
 import tk.wurst_client.gui.alts.GuiAltList;
 import tk.wurst_client.mods.*;
-import tk.wurst_client.mods.Mod.Category;
 import tk.wurst_client.navigator.Navigator;
 import tk.wurst_client.navigator.NavigatorItem;
 import tk.wurst_client.navigator.settings.NavigatorSetting;
@@ -144,8 +143,9 @@ public void saveMods()
 			ArenaBrawlMod.class.getName(), AutoBuildMod.class.getName(),
 			AutoSignMod.class.getName(), FightBotMod.class.getName(),
 			FollowMod.class.getName(), ForceOpMod.class.getName(),
-			FreecamMod.class.getName(), InvisibilityMod.class.getName(),
-			LsdMod.class.getName(), MassTpaMod.class.getName(),
+			FreecamMod.class.getName(), GoToCmdMod.class.getName(),
+			InvisibilityMod.class.getName(), LsdMod.class.getName(),
+			MassTpaMod.class.getName(), NavigatorMod.class.getName(),
 			ProtectMod.class.getName(), RemoteViewMod.class.getName(),
 			SpammerMod.class.getName());
 
@@ -168,7 +168,7 @@ public void loadMods()
 				Entry<String, JsonElement> entry = itr.next();
 				Mod mod =
 					WurstClient.INSTANCE.mods.getModByName(entry.getKey());
-				if(mod != null && mod.getCategory() != Category.HIDDEN
+				if(mod != null
 					&& !modBlacklist.contains(mod.getClass().getName()))
 				{
 					JsonObject jsonModule = (JsonObject)entry.getValue();

src/tk/wurst_client/gui/UIRenderer.java

@@ -23,6 +23,7 @@
 import tk.wurst_client.events.GUIRenderEvent;
 import tk.wurst_client.font.Fonts;
 import tk.wurst_client.mods.Mod;
+import tk.wurst_client.mods.NavigatorMod;
 import tk.wurst_client.utils.RenderUtils;
 
 public class UIRenderer
@@ -49,7 +50,7 @@ private static void renderModList()
 		LinkedList<String> modList = new LinkedList<String>();
 		for(Mod mod : WurstClient.INSTANCE.mods.getAllMods())
 		{
-			if(mod.getCategory() == Mod.Category.HIDDEN)
+			if(mod instanceof NavigatorMod)
 				continue;
 			if(mod.isActive())
 				modList.add(mod.getRenderName());

src/tk/wurst_client/mods/AntiAfkMod.java

@@ -11,13 +11,11 @@
 
 import net.minecraft.util.math.BlockPos;
 import tk.wurst_client.events.listeners.UpdateListener;
-import tk.wurst_client.mods.Mod.Category;
 import tk.wurst_client.utils.BlockUtils;
 
 @Mod.Info(name = "AntiAFK",
 	description = "Walks around randomly to hide you from AFK detectors.\n"
 		+ "Needs 3x3 blocks of free space.",
-	category = Category.MISC,
 	tags = "AFKBot,anti afk,afk bot",
 	help = "Mods/AntiAFK")
 @Mod.Bypasses(ghostMode = false)

src/tk/wurst_client/mods/AntiBlindMod.java

@@ -7,9 +7,7 @@
  */
 package tk.wurst_client.mods;
 
-import tk.wurst_client.mods.Mod.Category;
-
-@Mod.Info(category = Category.RENDER,
+@Mod.Info(
 	description = "Blocks blindness and nausea.",
 	name = "AntiBlind",
 	tags = "AntiBlindness, anti blindness",

src/tk/wurst_client/mods/AntiCactusMod.java

@@ -7,7 +7,7 @@
  */
 package tk.wurst_client.mods;
 
-@Mod.Info(category = Mod.Category.BLOCKS,
+@Mod.Info(
 	description = "Protects you from cactus damage.",
 	name = "AntiCactus",
 	tags = "anti cactus",

src/tk/wurst_client/mods/AntiFireMod.java

@@ -9,9 +9,8 @@
 
 import net.minecraft.network.play.client.CPacketPlayer;
 import tk.wurst_client.events.listeners.UpdateListener;
-import tk.wurst_client.mods.Mod.Category;
 
-@Mod.Info(category = Category.MISC,
+@Mod.Info(
 	description = "Blocks damage from catching on fire.\n"
 		+ "Does NOT block damage from standing inside of fire.\n"
 		+ "Requires a full hunger bar.",

src/tk/wurst_client/mods/AntiKnockbackMod.java

@@ -10,7 +10,7 @@
 import tk.wurst_client.navigator.settings.SliderSetting;
 import tk.wurst_client.navigator.settings.SliderSetting.ValueDisplay;
 
-@Mod.Info(category = Mod.Category.COMBAT,
+@Mod.Info(
 	description = "Protects you from getting pushed by players, mobs and\n"
 		+ "fluids.",
 	name = "AntiKnockback",

src/tk/wurst_client/mods/AntiPotionMod.java

@@ -11,10 +11,9 @@
 import net.minecraft.init.MobEffects;
 import net.minecraft.network.play.client.CPacketPlayer;
 import tk.wurst_client.events.listeners.UpdateListener;
-import tk.wurst_client.mods.Mod.Category;
 import tk.wurst_client.mods.Mod.Info;
 
-@Info(category = Category.MISC,
+@Info(
 	description = "Blocks bad potion effects.",
 	name = "AntiPotion",
 	tags = "NoPotion, Zoot, anti potions, no potions",

src/tk/wurst_client/mods/AntiSpamMod.java

@@ -13,10 +13,9 @@
 import tk.wurst_client.events.ChatInputEvent;
 import tk.wurst_client.events.listeners.ChatInputListener;
 import tk.wurst_client.mods.Mod.Bypasses;
-import tk.wurst_client.mods.Mod.Category;
 import tk.wurst_client.mods.Mod.Info;
 
-@Info(category = Category.CHAT, description = "Blocks chat spam.\n"
+@Info( description = "Blocks chat spam.\n"
 	+ "Example:\n" + "Spam!\n" + "Spam!\n" + "Spam!\n"
 	+ "Will be changed to:\n" + "Spam! [x3]", name = "AntiSpam",
 	tags = "NoSpam, ChatFilter, anti spam, no spam, chat filter",

src/tk/wurst_client/mods/ArenaBrawlMod.java

@@ -23,15 +23,14 @@
 import tk.wurst_client.events.listeners.RenderListener;
 import tk.wurst_client.events.listeners.UpdateListener;
 import tk.wurst_client.mods.Mod.Bypasses;
-import tk.wurst_client.mods.Mod.Category;
 import tk.wurst_client.mods.Mod.Info;
 import tk.wurst_client.navigator.settings.SliderSetting;
 import tk.wurst_client.navigator.settings.SliderSetting.ValueDisplay;
 import tk.wurst_client.utils.BlockUtils;
 import tk.wurst_client.utils.EntityUtils;
 import tk.wurst_client.utils.RenderUtils;
 
-@Info(category = Category.MISC,
+@Info(
 	description = "Makes ArenaBrawl on mc.hypixel.net a lot easier.\n"
 		+ "This is a collection of mods that have been optimized\n"
 		+ "for ArenaBrawl. It will bypass everything that Hypixel\n"

src/tk/wurst_client/mods/AutoArmorMod.java

@@ -15,10 +15,9 @@
 import net.minecraft.item.ItemStack;
 import tk.wurst_client.events.listeners.UpdateListener;
 import tk.wurst_client.mods.Mod.Bypasses;
-import tk.wurst_client.mods.Mod.Category;
 import tk.wurst_client.mods.Mod.Info;
 
-@Info(category = Category.COMBAT,
+@Info(
 	description = "Manages your armor automatically.",
 	name = "AutoArmor",
 	tags = "auto armor",

src/tk/wurst_client/mods/AutoBuildMod.java

@@ -16,15 +16,14 @@
 import tk.wurst_client.events.listeners.RenderListener;
 import tk.wurst_client.events.listeners.UpdateListener;
 import tk.wurst_client.mods.Mod.Bypasses;
-import tk.wurst_client.mods.Mod.Category;
 import tk.wurst_client.mods.Mod.Info;
 import tk.wurst_client.navigator.NavigatorItem;
 import tk.wurst_client.navigator.settings.ModeSetting;
 import tk.wurst_client.special.YesCheatSpf.BypassLevel;
 import tk.wurst_client.utils.BuildUtils;
 import tk.wurst_client.utils.RenderUtils;
 
-@Info(category = Category.AUTOBUILD,
+@Info(
 	description = "Automatically builds the selected template whenever\n"
 		+ "you place a block.\n"
 		+ "This mod can bypass NoCheat+ while YesCheat+ is\n" + "enabled.",

src/tk/wurst_client/mods/AutoEatMod.java

@@ -12,11 +12,10 @@
 import net.minecraft.util.EnumHand;
 import tk.wurst_client.events.listeners.UpdateListener;
 import tk.wurst_client.mods.Mod.Bypasses;
-import tk.wurst_client.mods.Mod.Category;
 import tk.wurst_client.mods.Mod.Info;
 import tk.wurst_client.navigator.NavigatorItem;
 
-@Info(category = Category.MISC,
+@Info(
 	description = "Automatically eats food when necessary.",
 	name = "AutoEat",
 	tags = "AutoSoup,auto eat,auto soup",

src/tk/wurst_client/mods/AutoFishMod.java

@@ -10,10 +10,9 @@
 import net.minecraft.entity.projectile.EntityFishHook;
 import tk.wurst_client.events.listeners.UpdateListener;
 import tk.wurst_client.mods.Mod.Bypasses;
-import tk.wurst_client.mods.Mod.Category;
 import tk.wurst_client.mods.Mod.Info;
 
-@Info(category = Category.MISC,
+@Info(
 	description = "Automatically catches fish.",
 	name = "AutoFish",
 	tags = "FishBot, auto fish, fish bot, fishing",

src/tk/wurst_client/mods/AutoLeaveMod.java

@@ -14,12 +14,11 @@
 import net.minecraft.util.EnumHand;
 import tk.wurst_client.events.listeners.UpdateListener;
 import tk.wurst_client.mods.Mod.Bypasses;
-import tk.wurst_client.mods.Mod.Category;
 import tk.wurst_client.mods.Mod.Info;
 import tk.wurst_client.navigator.NavigatorItem;
 import tk.wurst_client.navigator.settings.ModeSetting;
 
-@Info(category = Category.COMBAT,
+@Info(
 	description = "Automatically leaves the server when your health is low.\n"
 		+ "The Chars, TP and SelfHurt modes can bypass CombatLog and similar plugins.",
 	name = "AutoLeave",

src/tk/wurst_client/mods/AutoMineMod.java

@@ -10,10 +10,9 @@
 import net.minecraft.block.Block;
 import tk.wurst_client.events.listeners.UpdateListener;
 import tk.wurst_client.mods.Mod.Bypasses;
-import tk.wurst_client.mods.Mod.Category;
 import tk.wurst_client.mods.Mod.Info;
 
-@Info(category = Category.BLOCKS,
+@Info(
 	description = "Automatically mines a block as soon as you look at it.",
 	name = "AutoMine",
 	tags = "AutoBreak, auto mine, auto break",

src/tk/wurst_client/mods/AutoRespawnMod.java

@@ -10,10 +10,9 @@
 import net.minecraft.client.gui.GuiScreen;
 import tk.wurst_client.events.listeners.DeathListener;
 import tk.wurst_client.mods.Mod.Bypasses;
-import tk.wurst_client.mods.Mod.Category;
 import tk.wurst_client.mods.Mod.Info;
 
-@Info(category = Category.COMBAT,
+@Info(
 	description = "Automatically respawns you whenever you die.",
 	name = "AutoRespawn",
 	tags = "auto respawn",

src/tk/wurst_client/mods/AutoSignMod.java

@@ -9,10 +9,9 @@
 
 import net.minecraft.util.text.ITextComponent;
 import tk.wurst_client.mods.Mod.Bypasses;
-import tk.wurst_client.mods.Mod.Category;
 import tk.wurst_client.mods.Mod.Info;
 
-@Info(category = Category.BLOCKS,
+@Info(
 	description = "Instantly writes whatever text you want on every sign\n"
 		+ "you place. Once activated, you can write normally on\n"
 		+ "one sign to specify the text for all other signs.",

src/tk/wurst_client/mods/AutoSoupMod.java

@@ -21,13 +21,12 @@
 import net.minecraft.util.EnumHand;
 import tk.wurst_client.events.listeners.UpdateListener;
 import tk.wurst_client.mods.Mod.Bypasses;
-import tk.wurst_client.mods.Mod.Category;
 import tk.wurst_client.mods.Mod.Info;
 import tk.wurst_client.navigator.NavigatorItem;
 import tk.wurst_client.navigator.settings.SliderSetting;
 import tk.wurst_client.navigator.settings.SliderSetting.ValueDisplay;
 
-@Info(category = Category.COMBAT,
+@Info(
 	description = "Automatically eats soup if your health is below the set value.",
 	name = "AutoSoup",
 	tags = "auto soup",

src/tk/wurst_client/mods/AutoSplashPotMod.java

@@ -22,12 +22,11 @@
 import net.minecraft.util.EnumHand;
 import tk.wurst_client.events.listeners.UpdateListener;
 import tk.wurst_client.mods.Mod.Bypasses;
-import tk.wurst_client.mods.Mod.Category;
 import tk.wurst_client.mods.Mod.Info;
 import tk.wurst_client.navigator.settings.SliderSetting;
 import tk.wurst_client.navigator.settings.SliderSetting.ValueDisplay;
 
-@Info(category = Category.COMBAT,
+@Info(
 	description = "Automatically throws splash healing potions if your health is below the set value.",
 	name = "AutoSplashPot",
 	tags = "AutoPotion,auto potion,auto splash potion",

src/tk/wurst_client/mods/AutoSprintMod.java

@@ -9,10 +9,9 @@
 
 import tk.wurst_client.events.listeners.UpdateListener;
 import tk.wurst_client.mods.Mod.Bypasses;
-import tk.wurst_client.mods.Mod.Category;
 import tk.wurst_client.mods.Mod.Info;
 
-@Info(category = Category.MOVEMENT,
+@Info(
 	description = "Makes you sprint whenever you walk.",
 	name = "AutoSprint",
 	tags = "auto sprint",

src/tk/wurst_client/mods/AutoStealMod.java

@@ -8,10 +8,9 @@
 package tk.wurst_client.mods;
 
 import tk.wurst_client.mods.Mod.Bypasses;
-import tk.wurst_client.mods.Mod.Category;
 import tk.wurst_client.mods.Mod.Info;
 
-@Info(category = Category.MISC,
+@Info(
 	description = "Automatically steals everything from all chests you\n"
 		+ "open.",
 	name = "AutoSteal",

src/tk/wurst_client/mods/AutoSwitchMod.java

@@ -10,7 +10,7 @@
 import tk.wurst_client.events.listeners.UpdateListener;
 import tk.wurst_client.navigator.NavigatorItem;
 
-@Mod.Info(category = Mod.Category.MISC,
+@Mod.Info(
 	description = "Switches the item in your hand all the time.\n"
 		+ "Tip: Use this in combination with BuildRandom while\n"
 		+ "having a lot of different colored wool blocks in your\n" + "hotbar.",

src/tk/wurst_client/mods/AutoSwordMod.java

@@ -13,11 +13,10 @@
 import net.minecraft.item.ItemTool;
 import tk.wurst_client.events.listeners.LeftClickListener;
 import tk.wurst_client.events.listeners.UpdateListener;
-import tk.wurst_client.mods.Mod.Category;
 import tk.wurst_client.mods.Mod.Info;
 import tk.wurst_client.navigator.NavigatorItem;
 
-@Info(category = Category.COMBAT,
+@Info(
 	description = "Automatically uses the best weapon in your hotbar to attack\n"
 		+ "entities. Tip: This works with Killaura.",
 	name = "AutoSword",

src/tk/wurst_client/mods/AutoToolMod.java

@@ -14,11 +14,10 @@
 import tk.wurst_client.events.listeners.LeftClickListener;
 import tk.wurst_client.events.listeners.UpdateListener;
 import tk.wurst_client.mods.Mod.Bypasses;
-import tk.wurst_client.mods.Mod.Category;
 import tk.wurst_client.mods.Mod.Info;
 import tk.wurst_client.navigator.NavigatorItem;
 
-@Info(category = Category.BLOCKS,
+@Info(
 	description = "Automatically uses the best tool in your hotbar to\n"
 		+ "mine blocks. Tip: This works with Nuker.",
 	name = "AutoTool",

src/tk/wurst_client/mods/AutoWalkMod.java

@@ -9,10 +9,9 @@
 
 import tk.wurst_client.events.listeners.UpdateListener;
 import tk.wurst_client.mods.Mod.Bypasses;
-import tk.wurst_client.mods.Mod.Category;
 import tk.wurst_client.mods.Mod.Info;
 
-@Info(category = Category.MOVEMENT,
+@Info(
 	description = "Automatically walks all the time.",
 	name = "AutoWalk",
 	tags = "auto walk",

src/tk/wurst_client/mods/BaseFinderMod.java

@@ -14,11 +14,10 @@
 import tk.wurst_client.events.listeners.RenderListener;
 import tk.wurst_client.events.listeners.UpdateListener;
 import tk.wurst_client.mods.Mod.Bypasses;
-import tk.wurst_client.mods.Mod.Category;
 import tk.wurst_client.mods.Mod.Info;
 import tk.wurst_client.utils.RenderUtils;
 
-@Info(category = Category.RENDER,
+@Info(
 	description = "Finds player bases by searching for man-made blocks.\n"
 		+ "Good for finding faction bases.",
 	name = "BaseFinder",

src/tk/wurst_client/mods/BlinkMod.java

@@ -16,10 +16,9 @@
 import tk.wurst_client.events.PacketOutputEvent;
 import tk.wurst_client.events.listeners.PacketOutputListener;
 import tk.wurst_client.mods.Mod.Bypasses;
-import tk.wurst_client.mods.Mod.Category;
 import tk.wurst_client.mods.Mod.Info;
 
-@Info(category = Category.MOVEMENT,
+@Info(
 	description = "Suspends all motion updates while enabled.\n"
 		+ "Can be used for teleportation, instant picking up of items and more.",
 	name = "Blink",

src/tk/wurst_client/mods/BlockHitMod.java

@@ -12,10 +12,9 @@
 import net.minecraft.item.ItemSword;
 import tk.wurst_client.events.listeners.LeftClickListener;
 import tk.wurst_client.mods.Mod.Bypasses;
-import tk.wurst_client.mods.Mod.Category;
 import tk.wurst_client.mods.Mod.Info;
 
-@Info(category = Category.COMBAT,
+@Info(
 	description = "Automatically blocks whenever you hit something with a\n"
 		+ "sword. Some say that you will receive less damage in PVP when doing\n"
 		+ "this.",

src/tk/wurst_client/mods/BoatFlyMod.java

@@ -10,7 +10,7 @@
 import tk.wurst_client.events.listeners.UpdateListener;
 import tk.wurst_client.mods.Mod.Bypasses;
 
-@Mod.Info(category = Mod.Category.MOVEMENT,
+@Mod.Info(
 	description = "Allows you to fly with boats and rideable entities.\n"
 		+ "Bypasses NoCheat+, at least for now.",
 	name = "BoatFly",