diff --git a/src/tk/wurst_client/files/FileManager.java b/src/tk/wurst_client/files/FileManager.java index 33880c9..c374a80 100644 --- a/src/tk/wurst_client/files/FileManager.java +++ b/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 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(); diff --git a/src/tk/wurst_client/gui/UIRenderer.java b/src/tk/wurst_client/gui/UIRenderer.java index 69a801d..e800206 100644 --- a/src/tk/wurst_client/gui/UIRenderer.java +++ b/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 modList = new LinkedList(); 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()); diff --git a/src/tk/wurst_client/mods/AntiAfkMod.java b/src/tk/wurst_client/mods/AntiAfkMod.java index 33d570c..86d4c96 100644 --- a/src/tk/wurst_client/mods/AntiAfkMod.java +++ b/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) diff --git a/src/tk/wurst_client/mods/AntiBlindMod.java b/src/tk/wurst_client/mods/AntiBlindMod.java index 7a188f8..540033b 100644 --- a/src/tk/wurst_client/mods/AntiBlindMod.java +++ b/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", diff --git a/src/tk/wurst_client/mods/AntiCactusMod.java b/src/tk/wurst_client/mods/AntiCactusMod.java index d29f277..d300998 100644 --- a/src/tk/wurst_client/mods/AntiCactusMod.java +++ b/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", diff --git a/src/tk/wurst_client/mods/AntiFireMod.java b/src/tk/wurst_client/mods/AntiFireMod.java index cea9475..a2ae8fe 100644 --- a/src/tk/wurst_client/mods/AntiFireMod.java +++ b/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.", diff --git a/src/tk/wurst_client/mods/AntiKnockbackMod.java b/src/tk/wurst_client/mods/AntiKnockbackMod.java index 2fe13cf..9ff4648 100644 --- a/src/tk/wurst_client/mods/AntiKnockbackMod.java +++ b/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", diff --git a/src/tk/wurst_client/mods/AntiPotionMod.java b/src/tk/wurst_client/mods/AntiPotionMod.java index f19e1c0..9f9d5f0 100644 --- a/src/tk/wurst_client/mods/AntiPotionMod.java +++ b/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", diff --git a/src/tk/wurst_client/mods/AntiSpamMod.java b/src/tk/wurst_client/mods/AntiSpamMod.java index e68b6cd..4b660f4 100644 --- a/src/tk/wurst_client/mods/AntiSpamMod.java +++ b/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", diff --git a/src/tk/wurst_client/mods/ArenaBrawlMod.java b/src/tk/wurst_client/mods/ArenaBrawlMod.java index 0be6c12..22fb6a2 100644 --- a/src/tk/wurst_client/mods/ArenaBrawlMod.java +++ b/src/tk/wurst_client/mods/ArenaBrawlMod.java @@ -23,7 +23,6 @@ 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; @@ -31,7 +30,7 @@ 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" diff --git a/src/tk/wurst_client/mods/AutoArmorMod.java b/src/tk/wurst_client/mods/AutoArmorMod.java index 1d4c628..9f0cf51 100644 --- a/src/tk/wurst_client/mods/AutoArmorMod.java +++ b/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", diff --git a/src/tk/wurst_client/mods/AutoBuildMod.java b/src/tk/wurst_client/mods/AutoBuildMod.java index c94b34c..7ef5098 100644 --- a/src/tk/wurst_client/mods/AutoBuildMod.java +++ b/src/tk/wurst_client/mods/AutoBuildMod.java @@ -16,7 +16,6 @@ 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; @@ -24,7 +23,7 @@ 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.", diff --git a/src/tk/wurst_client/mods/AutoEatMod.java b/src/tk/wurst_client/mods/AutoEatMod.java index 3ac6811..ecb62ec 100644 --- a/src/tk/wurst_client/mods/AutoEatMod.java +++ b/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", diff --git a/src/tk/wurst_client/mods/AutoFishMod.java b/src/tk/wurst_client/mods/AutoFishMod.java index 9558634..90adb9c 100644 --- a/src/tk/wurst_client/mods/AutoFishMod.java +++ b/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", diff --git a/src/tk/wurst_client/mods/AutoLeaveMod.java b/src/tk/wurst_client/mods/AutoLeaveMod.java index 31ab478..25fe302 100644 --- a/src/tk/wurst_client/mods/AutoLeaveMod.java +++ b/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", diff --git a/src/tk/wurst_client/mods/AutoMineMod.java b/src/tk/wurst_client/mods/AutoMineMod.java index 5f687d9..ffe5bc6 100644 --- a/src/tk/wurst_client/mods/AutoMineMod.java +++ b/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", diff --git a/src/tk/wurst_client/mods/AutoRespawnMod.java b/src/tk/wurst_client/mods/AutoRespawnMod.java index 7bd557f..db494ae 100644 --- a/src/tk/wurst_client/mods/AutoRespawnMod.java +++ b/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", diff --git a/src/tk/wurst_client/mods/AutoSignMod.java b/src/tk/wurst_client/mods/AutoSignMod.java index c40affc..19b4486 100644 --- a/src/tk/wurst_client/mods/AutoSignMod.java +++ b/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.", diff --git a/src/tk/wurst_client/mods/AutoSoupMod.java b/src/tk/wurst_client/mods/AutoSoupMod.java index ee133d5..24995ab 100644 --- a/src/tk/wurst_client/mods/AutoSoupMod.java +++ b/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", diff --git a/src/tk/wurst_client/mods/AutoSplashPotMod.java b/src/tk/wurst_client/mods/AutoSplashPotMod.java index 3b91120..235f351 100644 --- a/src/tk/wurst_client/mods/AutoSplashPotMod.java +++ b/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", diff --git a/src/tk/wurst_client/mods/AutoSprintMod.java b/src/tk/wurst_client/mods/AutoSprintMod.java index 199810f..cd13a2e 100644 --- a/src/tk/wurst_client/mods/AutoSprintMod.java +++ b/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", diff --git a/src/tk/wurst_client/mods/AutoStealMod.java b/src/tk/wurst_client/mods/AutoStealMod.java index 648b463..e3ffc34 100644 --- a/src/tk/wurst_client/mods/AutoStealMod.java +++ b/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", diff --git a/src/tk/wurst_client/mods/AutoSwitchMod.java b/src/tk/wurst_client/mods/AutoSwitchMod.java index 2272bc1..e4d7ab3 100644 --- a/src/tk/wurst_client/mods/AutoSwitchMod.java +++ b/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.", diff --git a/src/tk/wurst_client/mods/AutoSwordMod.java b/src/tk/wurst_client/mods/AutoSwordMod.java index 78bc4d2..c4deee8 100644 --- a/src/tk/wurst_client/mods/AutoSwordMod.java +++ b/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", diff --git a/src/tk/wurst_client/mods/AutoToolMod.java b/src/tk/wurst_client/mods/AutoToolMod.java index cc2fda3..37133ad 100644 --- a/src/tk/wurst_client/mods/AutoToolMod.java +++ b/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", diff --git a/src/tk/wurst_client/mods/AutoWalkMod.java b/src/tk/wurst_client/mods/AutoWalkMod.java index 02a7e85..c4bdce0 100644 --- a/src/tk/wurst_client/mods/AutoWalkMod.java +++ b/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", diff --git a/src/tk/wurst_client/mods/BaseFinderMod.java b/src/tk/wurst_client/mods/BaseFinderMod.java index ff8d392..e49a4b0 100644 --- a/src/tk/wurst_client/mods/BaseFinderMod.java +++ b/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", diff --git a/src/tk/wurst_client/mods/BlinkMod.java b/src/tk/wurst_client/mods/BlinkMod.java index 4a84087..57b53fa 100644 --- a/src/tk/wurst_client/mods/BlinkMod.java +++ b/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", diff --git a/src/tk/wurst_client/mods/BlockHitMod.java b/src/tk/wurst_client/mods/BlockHitMod.java index c8cde40..cd6277a 100644 --- a/src/tk/wurst_client/mods/BlockHitMod.java +++ b/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.", diff --git a/src/tk/wurst_client/mods/BoatFlyMod.java b/src/tk/wurst_client/mods/BoatFlyMod.java index 84a7e7e..bd28bfa 100644 --- a/src/tk/wurst_client/mods/BoatFlyMod.java +++ b/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", diff --git a/src/tk/wurst_client/mods/BonemealAuraMod.java b/src/tk/wurst_client/mods/BonemealAuraMod.java index 8145991..c5d1b61 100644 --- a/src/tk/wurst_client/mods/BonemealAuraMod.java +++ b/src/tk/wurst_client/mods/BonemealAuraMod.java @@ -23,7 +23,6 @@ import net.minecraft.util.math.BlockPos; 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.CheckboxSetting; import tk.wurst_client.navigator.settings.SliderSetting; @@ -31,7 +30,7 @@ import tk.wurst_client.special.YesCheatSpf.BypassLevel; import tk.wurst_client.utils.BlockUtils; -@Info(category = Category.MISC, +@Info( description = "Automatically uses bone meal on specific types of plants.\n" + "Use the checkboxes to specify the types of plants.", name = "BonemealAura", diff --git a/src/tk/wurst_client/mods/BowAimbotMod.java b/src/tk/wurst_client/mods/BowAimbotMod.java index 087d6e1..cd64b99 100644 --- a/src/tk/wurst_client/mods/BowAimbotMod.java +++ b/src/tk/wurst_client/mods/BowAimbotMod.java @@ -19,13 +19,12 @@ import tk.wurst_client.events.listeners.RenderListener; import tk.wurst_client.events.listeners.UpdateListener; import tk.wurst_client.font.Fonts; -import tk.wurst_client.mods.Mod.Category; import tk.wurst_client.mods.Mod.Info; import tk.wurst_client.navigator.NavigatorItem; import tk.wurst_client.utils.EntityUtils; import tk.wurst_client.utils.RenderUtils; -@Info(category = Category.COMBAT, +@Info( description = "Automatically aims your bow at the closest entity.\n" + "Tip: This works with FastBow.", name = "BowAimbot", diff --git a/src/tk/wurst_client/mods/BuildRandomMod.java b/src/tk/wurst_client/mods/BuildRandomMod.java index 97bb451..1019059 100644 --- a/src/tk/wurst_client/mods/BuildRandomMod.java +++ b/src/tk/wurst_client/mods/BuildRandomMod.java @@ -14,12 +14,11 @@ import net.minecraft.util.math.RayTraceResult.Type; 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.utils.BlockUtils; -@Info(category = Category.BLOCKS, +@Info( description = "Places random blocks around you.", name = "BuildRandom", tags = "build random", diff --git a/src/tk/wurst_client/mods/BunnyHopMod.java b/src/tk/wurst_client/mods/BunnyHopMod.java index b82c4e5..f37c8cc 100644 --- a/src/tk/wurst_client/mods/BunnyHopMod.java +++ b/src/tk/wurst_client/mods/BunnyHopMod.java @@ -10,10 +10,9 @@ import net.minecraft.client.Minecraft; 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 jumps whenever you walk.\n" + "Tip: Jumping while sprinting is a faster way to move.", name = "BunnyHop", diff --git a/src/tk/wurst_client/mods/CaveFinderMod.java b/src/tk/wurst_client/mods/CaveFinderMod.java index e930022..c5b7d1c 100644 --- a/src/tk/wurst_client/mods/CaveFinderMod.java +++ b/src/tk/wurst_client/mods/CaveFinderMod.java @@ -9,7 +9,7 @@ import tk.wurst_client.mods.Mod.Bypasses; -@Mod.Info(category = Mod.Category.RENDER, +@Mod.Info( description = "Allows you to see caves through walls.", name = "CaveFinder", tags = "cave finder", diff --git a/src/tk/wurst_client/mods/ChestEspMod.java b/src/tk/wurst_client/mods/ChestEspMod.java index 16ba830..dee1578 100644 --- a/src/tk/wurst_client/mods/ChestEspMod.java +++ b/src/tk/wurst_client/mods/ChestEspMod.java @@ -20,12 +20,11 @@ import net.minecraft.util.math.BlockPos; import tk.wurst_client.events.listeners.RenderListener; 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.utils.RenderUtils; -@Info(category = Category.RENDER, +@Info( description = "Allows you to see chests through walls.", name = "ChestESP", tags = "ChestFinder, chest esp, chest finder", diff --git a/src/tk/wurst_client/mods/ClickAuraMod.java b/src/tk/wurst_client/mods/ClickAuraMod.java index a294713..70733e1 100644 --- a/src/tk/wurst_client/mods/ClickAuraMod.java +++ b/src/tk/wurst_client/mods/ClickAuraMod.java @@ -18,7 +18,7 @@ import tk.wurst_client.special.YesCheatSpf.BypassLevel; import tk.wurst_client.utils.EntityUtils; -@Mod.Info(category = Mod.Category.COMBAT, +@Mod.Info( description = "Automatically attacks the closest valid entity whenever you\n" + "click.\n" + "Warning: ClickAuras generally look more suspicious than Killauras\n" diff --git a/src/tk/wurst_client/mods/CmdBlockMod.java b/src/tk/wurst_client/mods/CmdBlockMod.java index 7a19a2d..e3a5181 100644 --- a/src/tk/wurst_client/mods/CmdBlockMod.java +++ b/src/tk/wurst_client/mods/CmdBlockMod.java @@ -15,7 +15,7 @@ import tk.wurst_client.gui.mods.GuiCmdBlock; import tk.wurst_client.mods.Mod.Bypasses; -@Mod.Info(category = Mod.Category.EXPLOITS, +@Mod.Info( description = "Allows you to make a Command Block without having OP.\n" + "Appears to be patched on Spigot.", name = "CMD-Block", diff --git a/src/tk/wurst_client/mods/CrashChestMod.java b/src/tk/wurst_client/mods/CrashChestMod.java index 7f9fb39..a250712 100644 --- a/src/tk/wurst_client/mods/CrashChestMod.java +++ b/src/tk/wurst_client/mods/CrashChestMod.java @@ -13,7 +13,7 @@ import net.minecraft.nbt.NBTTagList; import tk.wurst_client.mods.Mod.Bypasses; -@Mod.Info(category = Mod.Category.EXPLOITS, +@Mod.Info( description = "Generates a CrashChest. Give a lot of these to another\n" + "player to make them crash. They will not be able to join the server\n" + "ever again!", diff --git a/src/tk/wurst_client/mods/CrashItemMod.java b/src/tk/wurst_client/mods/CrashItemMod.java index 01a94c0..af77180 100644 --- a/src/tk/wurst_client/mods/CrashItemMod.java +++ b/src/tk/wurst_client/mods/CrashItemMod.java @@ -11,7 +11,7 @@ import net.minecraft.item.ItemNameTag; import tk.wurst_client.mods.Mod.Bypasses; -@Mod.Info(category = Mod.Category.EXPLOITS, +@Mod.Info( description = "Generates a CrashItem.\n" + "Right click a mob with it to kick nearby players from the server.", name = "CrashItem", diff --git a/src/tk/wurst_client/mods/CriticalsMod.java b/src/tk/wurst_client/mods/CriticalsMod.java index 2eb3a96..cd6ab03 100644 --- a/src/tk/wurst_client/mods/CriticalsMod.java +++ b/src/tk/wurst_client/mods/CriticalsMod.java @@ -13,12 +13,11 @@ import net.minecraft.network.play.client.CPacketPlayer; 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; import tk.wurst_client.navigator.NavigatorItem; import tk.wurst_client.navigator.settings.ModeSetting; -@Info(category = Category.COMBAT, +@Info( description = "Changes all your hits to critical hits.", name = "Criticals", tags = "Crits", diff --git a/src/tk/wurst_client/mods/DerpMod.java b/src/tk/wurst_client/mods/DerpMod.java index a31fedd..72749f6 100644 --- a/src/tk/wurst_client/mods/DerpMod.java +++ b/src/tk/wurst_client/mods/DerpMod.java @@ -10,10 +10,9 @@ import net.minecraft.network.play.client.CPacketPlayer; 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.FUN, +@Info( description = "While this is active, other people will think you are\n" + "derping around.", name = "Derp", diff --git a/src/tk/wurst_client/mods/DolphinMod.java b/src/tk/wurst_client/mods/DolphinMod.java index 2c794e7..55fb78e 100644 --- a/src/tk/wurst_client/mods/DolphinMod.java +++ b/src/tk/wurst_client/mods/DolphinMod.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 swims like a dolphin.", name = "Dolphin", tags = "AutoSwim, auto swim", diff --git a/src/tk/wurst_client/mods/ExtraElytraMod.java b/src/tk/wurst_client/mods/ExtraElytraMod.java index eac39e6..a4ccfaa 100644 --- a/src/tk/wurst_client/mods/ExtraElytraMod.java +++ b/src/tk/wurst_client/mods/ExtraElytraMod.java @@ -15,12 +15,11 @@ import net.minecraft.util.math.MathHelper; 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.CheckboxSetting; import tk.wurst_client.special.YesCheatSpf.BypassLevel; -@Info(category = Category.MOVEMENT, +@Info( description = "Eases the use of the Elytra.", name = "ExtraElytra", tags = "EasyElytra, extra elytra, easy elytra", diff --git a/src/tk/wurst_client/mods/FancyChatMod.java b/src/tk/wurst_client/mods/FancyChatMod.java index a327aaa..e30730a 100644 --- a/src/tk/wurst_client/mods/FancyChatMod.java +++ b/src/tk/wurst_client/mods/FancyChatMod.java @@ -10,10 +10,9 @@ import tk.wurst_client.events.ChatOutputEvent; import tk.wurst_client.events.listeners.ChatOutputListener; 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, +@Info( description = "Replaces ASCII characters in sent chat messages with fancier unicode characters. Can be\n" + "used to bypass curse word filters on some servers. Does not work on servers that block\n" + "unicode characters.", diff --git a/src/tk/wurst_client/mods/FastBowMod.java b/src/tk/wurst_client/mods/FastBowMod.java index dcea77c..5103fba 100644 --- a/src/tk/wurst_client/mods/FastBowMod.java +++ b/src/tk/wurst_client/mods/FastBowMod.java @@ -17,11 +17,10 @@ import net.minecraft.util.math.BlockPos; 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.COMBAT, +@Info( description = "Turns your bow into a machine gun.\n" + "Tip: This works with BowAimbot.", name = "FastBow", diff --git a/src/tk/wurst_client/mods/FastBreakMod.java b/src/tk/wurst_client/mods/FastBreakMod.java index df846c5..1a0154c 100644 --- a/src/tk/wurst_client/mods/FastBreakMod.java +++ b/src/tk/wurst_client/mods/FastBreakMod.java @@ -8,14 +8,13 @@ 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; import tk.wurst_client.navigator.NavigatorItem; import tk.wurst_client.navigator.settings.ModeSetting; import tk.wurst_client.navigator.settings.SliderSetting; import tk.wurst_client.navigator.settings.SliderSetting.ValueDisplay; -@Info(category = Category.BLOCKS, +@Info( description = "Allows you to break blocks faster.\n" + "Tip: This works with Nuker.", name = "FastBreak", diff --git a/src/tk/wurst_client/mods/FastEatMod.java b/src/tk/wurst_client/mods/FastEatMod.java index 5ddb9a2..78cf27b 100644 --- a/src/tk/wurst_client/mods/FastEatMod.java +++ b/src/tk/wurst_client/mods/FastEatMod.java @@ -11,10 +11,9 @@ import net.minecraft.network.play.client.CPacketPlayer; 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 = "Allows you to eat food much faster.\n" + "OM! NOM! NOM!", name = "FastEat", noCheatCompatible = false, diff --git a/src/tk/wurst_client/mods/FastLadderMod.java b/src/tk/wurst_client/mods/FastLadderMod.java index 0f17f62..3b534d2 100644 --- a/src/tk/wurst_client/mods/FastLadderMod.java +++ b/src/tk/wurst_client/mods/FastLadderMod.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 = "Allows you to climb up ladders twice as fast.", name = "FastLadder", tags = "FastClimb, fast ladder, fast climb", diff --git a/src/tk/wurst_client/mods/FastPlaceMod.java b/src/tk/wurst_client/mods/FastPlaceMod.java index 09d4789..9292740 100644 --- a/src/tk/wurst_client/mods/FastPlaceMod.java +++ b/src/tk/wurst_client/mods/FastPlaceMod.java @@ -9,11 +9,10 @@ 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 = "Allows you to place blocks 5 times faster.\n" + "Tip: This can speed up AutoBuild.", name = "FastPlace", diff --git a/src/tk/wurst_client/mods/FightBotMod.java b/src/tk/wurst_client/mods/FightBotMod.java index 367c747..2fb0594 100644 --- a/src/tk/wurst_client/mods/FightBotMod.java +++ b/src/tk/wurst_client/mods/FightBotMod.java @@ -11,7 +11,6 @@ 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.CheckboxSetting; @@ -20,7 +19,7 @@ import tk.wurst_client.special.YesCheatSpf.BypassLevel; import tk.wurst_client.utils.EntityUtils; -@Info(category = Category.COMBAT, +@Info( description = "A bot that automatically fights for you.\n" + "It walks around and kills everything.\n" + "Good for MobArena.", name = "FightBot", diff --git a/src/tk/wurst_client/mods/FlightMod.java b/src/tk/wurst_client/mods/FlightMod.java index a212ac0..6aaa352 100644 --- a/src/tk/wurst_client/mods/FlightMod.java +++ b/src/tk/wurst_client/mods/FlightMod.java @@ -10,14 +10,13 @@ import net.minecraft.network.play.client.CPacketPlayer; 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; import tk.wurst_client.special.YesCheatSpf.BypassLevel; -@Info(category = Category.MOVEMENT, +@Info( description = "Allows you to you fly.\n" + "Bypasses NoCheat+ if YesCheat+ is enabled.\n" + "Bypasses MAC if AntiMAC is enabled.", diff --git a/src/tk/wurst_client/mods/FollowMod.java b/src/tk/wurst_client/mods/FollowMod.java index de2ec0e..220f881 100644 --- a/src/tk/wurst_client/mods/FollowMod.java +++ b/src/tk/wurst_client/mods/FollowMod.java @@ -10,11 +10,10 @@ import net.minecraft.entity.EntityLivingBase; 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.EntityUtils; -@Info(category = Category.COMBAT, +@Info( description = "A bot that follows the closest entity.\n" + "Very annoying.", name = "Follow", help = "Mods/Follow") diff --git a/src/tk/wurst_client/mods/ForceOpMod.java b/src/tk/wurst_client/mods/ForceOpMod.java index e5f4557..fd37015 100644 --- a/src/tk/wurst_client/mods/ForceOpMod.java +++ b/src/tk/wurst_client/mods/ForceOpMod.java @@ -31,11 +31,10 @@ 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; import tk.wurst_client.navigator.NavigatorItem; -@Info(category = Category.CHAT, +@Info( description = "Cracks AuthMe passwords. Can be used to get OP.\n" + "If you want to know how to use this, press the\n" + "\"How to use\" button. That will open an online\n" diff --git a/src/tk/wurst_client/mods/ForcePushMod.java b/src/tk/wurst_client/mods/ForcePushMod.java index 6df28d4..70ce2ab 100644 --- a/src/tk/wurst_client/mods/ForcePushMod.java +++ b/src/tk/wurst_client/mods/ForcePushMod.java @@ -13,7 +13,7 @@ import tk.wurst_client.mods.Mod.Bypasses; import tk.wurst_client.utils.EntityUtils; -@Mod.Info(category = Mod.Category.FUN, +@Mod.Info( description = "Pushes mobs like crazy.\n" + "They'll literally fly away!\n" + "Can sometimes get you kicked for \"Flying is not enabled\".", name = "ForcePush", diff --git a/src/tk/wurst_client/mods/FreecamMod.java b/src/tk/wurst_client/mods/FreecamMod.java index a3ec617..a21df1d 100644 --- a/src/tk/wurst_client/mods/FreecamMod.java +++ b/src/tk/wurst_client/mods/FreecamMod.java @@ -10,10 +10,9 @@ import net.minecraft.client.entity.EntityOtherPlayerMP; 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.RENDER, +@Info( description = "Allows you to fly out of your body.\n" + "Looks similar to spectator mode.", name = "Freecam", diff --git a/src/tk/wurst_client/mods/FullbrightMod.java b/src/tk/wurst_client/mods/FullbrightMod.java index 6006ac6..e344e0f 100644 --- a/src/tk/wurst_client/mods/FullbrightMod.java +++ b/src/tk/wurst_client/mods/FullbrightMod.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.RENDER, +@Info( description = "Allows you to see in the dark.", name = "Fullbright", tags = "NightVision, full bright, brightness, night vision", diff --git a/src/tk/wurst_client/mods/GhostHandMod.java b/src/tk/wurst_client/mods/GhostHandMod.java index 6f1acd1..f41cef1 100644 --- a/src/tk/wurst_client/mods/GhostHandMod.java +++ b/src/tk/wurst_client/mods/GhostHandMod.java @@ -9,7 +9,7 @@ import tk.wurst_client.mods.Mod.Bypasses; -@Mod.Info(category = Mod.Category.BLOCKS, +@Mod.Info( description = "Allows you to reach specific blocks through walls.\n" + "Use .ghosthand id or .ghosthand name \n" + "to specify it.", diff --git a/src/tk/wurst_client/mods/GlideMod.java b/src/tk/wurst_client/mods/GlideMod.java index 8eb8fa3..05b25e3 100644 --- a/src/tk/wurst_client/mods/GlideMod.java +++ b/src/tk/wurst_client/mods/GlideMod.java @@ -10,10 +10,9 @@ import net.minecraft.block.material.Material; 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 fall like if you had a hang glider.", name = "Glide", help = "Mods/Glide") diff --git a/src/tk/wurst_client/mods/GoToCmdMod.java b/src/tk/wurst_client/mods/GoToCmdMod.java index 3f1a876..889eb5e 100644 --- a/src/tk/wurst_client/mods/GoToCmdMod.java +++ b/src/tk/wurst_client/mods/GoToCmdMod.java @@ -13,11 +13,10 @@ import tk.wurst_client.ai.PathUtils; 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.BlockUtils; -@Info(category = Category.HIDDEN, description = "", name = "GoTo") +@Info(description = "", name = "GoTo") @Bypasses public class GoToCmdMod extends Mod implements UpdateListener { diff --git a/src/tk/wurst_client/mods/HeadRollMod.java b/src/tk/wurst_client/mods/HeadRollMod.java index 149ab92..2748d4c 100644 --- a/src/tk/wurst_client/mods/HeadRollMod.java +++ b/src/tk/wurst_client/mods/HeadRollMod.java @@ -11,10 +11,9 @@ import net.minecraft.network.play.client.CPacketPlayer; 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.FUN, +@Info( description = "While this is active, other people will think you are\n" + "rolling your head around!\n" + "Looks a bit like nodding.", name = "HeadRoll", diff --git a/src/tk/wurst_client/mods/HeadlessMod.java b/src/tk/wurst_client/mods/HeadlessMod.java index d476b3b..adfcaa5 100644 --- a/src/tk/wurst_client/mods/HeadlessMod.java +++ b/src/tk/wurst_client/mods/HeadlessMod.java @@ -11,10 +11,9 @@ import net.minecraft.network.play.client.CPacketPlayer; 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.FUN, +@Info( description = "While this is active, other people will think you are\n" + "headless. Looks hilarious!", name = "Headless", diff --git a/src/tk/wurst_client/mods/HealthTagsMod.java b/src/tk/wurst_client/mods/HealthTagsMod.java index f126a1b..99151a2 100644 --- a/src/tk/wurst_client/mods/HealthTagsMod.java +++ b/src/tk/wurst_client/mods/HealthTagsMod.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.RENDER, +@Info( description = "Adds the health of players to their nametags.", name = "HealthTags", tags = "health tags", diff --git a/src/tk/wurst_client/mods/HighJumpMod.java b/src/tk/wurst_client/mods/HighJumpMod.java index 05ccebd..44b337d 100644 --- a/src/tk/wurst_client/mods/HighJumpMod.java +++ b/src/tk/wurst_client/mods/HighJumpMod.java @@ -8,12 +8,11 @@ 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; import tk.wurst_client.navigator.settings.SliderSetting; import tk.wurst_client.navigator.settings.SliderSetting.ValueDisplay; -@Info(category = Category.MOVEMENT, +@Info( description = "Makes you jump much higher.", name = "HighJump", noCheatCompatible = false, diff --git a/src/tk/wurst_client/mods/HomeMod.java b/src/tk/wurst_client/mods/HomeMod.java index 80bab72..d978d7e 100644 --- a/src/tk/wurst_client/mods/HomeMod.java +++ b/src/tk/wurst_client/mods/HomeMod.java @@ -11,10 +11,9 @@ import tk.wurst_client.events.listeners.ChatInputListener; 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.CHAT, +@Info( description = "Types \"/home\" instantly.", name = "/home", help = "Mods/home") diff --git a/src/tk/wurst_client/mods/InstantBunkerMod.java b/src/tk/wurst_client/mods/InstantBunkerMod.java index f1dff9b..bc5da5d 100644 --- a/src/tk/wurst_client/mods/InstantBunkerMod.java +++ b/src/tk/wurst_client/mods/InstantBunkerMod.java @@ -13,13 +13,12 @@ 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.special.YesCheatSpf.BypassLevel; import tk.wurst_client.utils.BuildUtils; import tk.wurst_client.utils.RenderUtils; -@Info(category = Category.BLOCKS, +@Info( description = "Instantly builds a small bunker around you.", name = "InstantBunker", tags = "instant bunker", diff --git a/src/tk/wurst_client/mods/InvisibilityMod.java b/src/tk/wurst_client/mods/InvisibilityMod.java index 56b461e..43ff235 100644 --- a/src/tk/wurst_client/mods/InvisibilityMod.java +++ b/src/tk/wurst_client/mods/InvisibilityMod.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.EXPLOITS, +@Info( description = "Makes you invisible and invincible.\n" + "If you die and respawn near a certain player while\n" + "this mod is enabled, that player will be unable to see\n" diff --git a/src/tk/wurst_client/mods/ItemEspMod.java b/src/tk/wurst_client/mods/ItemEspMod.java index 55576d6..d592e72 100644 --- a/src/tk/wurst_client/mods/ItemEspMod.java +++ b/src/tk/wurst_client/mods/ItemEspMod.java @@ -11,12 +11,11 @@ import net.minecraft.entity.item.EntityItem; import tk.wurst_client.events.listeners.RenderListener; 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.utils.RenderUtils; -@Info(category = Category.RENDER, +@Info( description = "Allows you to see items through walls.", name = "ItemESP", tags = "item esp", diff --git a/src/tk/wurst_client/mods/JesusMod.java b/src/tk/wurst_client/mods/JesusMod.java index e81a1e2..db64303 100644 --- a/src/tk/wurst_client/mods/JesusMod.java +++ b/src/tk/wurst_client/mods/JesusMod.java @@ -16,7 +16,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 walk on water.\n" + "The real Jesus used this hack ~2000 years ago.\n" + "Bypasses NoCheat+ if YesCheat+ is enabled.", diff --git a/src/tk/wurst_client/mods/JetpackMod.java b/src/tk/wurst_client/mods/JetpackMod.java index c7372eb..1a1bec6 100644 --- a/src/tk/wurst_client/mods/JetpackMod.java +++ b/src/tk/wurst_client/mods/JetpackMod.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 = "Allows you to jump in mid-air.\n" + "Looks as if you had a jetpack.", name = "Jetpack", diff --git a/src/tk/wurst_client/mods/KaboomMod.java b/src/tk/wurst_client/mods/KaboomMod.java index 6f31a63..5236908 100644 --- a/src/tk/wurst_client/mods/KaboomMod.java +++ b/src/tk/wurst_client/mods/KaboomMod.java @@ -18,13 +18,12 @@ import net.minecraft.world.Explosion; 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; -@Info(category = Category.BLOCKS, +@Info( description = "Breaks blocks around you like an explosion.\n" + "This can be a lot faster than Nuker if the server\n" + "doesn't have NoCheat+. It works best with fast tools\n" diff --git a/src/tk/wurst_client/mods/KillauraLegitMod.java b/src/tk/wurst_client/mods/KillauraLegitMod.java index af933e5..f5947ca 100644 --- a/src/tk/wurst_client/mods/KillauraLegitMod.java +++ b/src/tk/wurst_client/mods/KillauraLegitMod.java @@ -11,7 +11,6 @@ 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.CheckboxSetting; @@ -19,7 +18,7 @@ import tk.wurst_client.navigator.settings.SliderSetting.ValueDisplay; import tk.wurst_client.utils.EntityUtils; -@Info(category = Category.COMBAT, +@Info( description = "Slower Killaura that bypasses any cheat prevention\n" + "PlugIn. Not required on most NoCheat+ servers!", name = "KillauraLegit", diff --git a/src/tk/wurst_client/mods/KillauraMod.java b/src/tk/wurst_client/mods/KillauraMod.java index 455d314..cfd18e3 100644 --- a/src/tk/wurst_client/mods/KillauraMod.java +++ b/src/tk/wurst_client/mods/KillauraMod.java @@ -11,7 +11,6 @@ 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.CheckboxSetting; @@ -20,7 +19,7 @@ import tk.wurst_client.special.YesCheatSpf.BypassLevel; import tk.wurst_client.utils.EntityUtils; -@Info(category = Category.COMBAT, +@Info( description = "Automatically attacks everything in your range.", name = "Killaura", tags = "kill aura", diff --git a/src/tk/wurst_client/mods/KillerPotionMod.java b/src/tk/wurst_client/mods/KillerPotionMod.java index 24833b6..691347f 100644 --- a/src/tk/wurst_client/mods/KillerPotionMod.java +++ b/src/tk/wurst_client/mods/KillerPotionMod.java @@ -14,7 +14,7 @@ import net.minecraft.network.play.client.CPacketCreativeInventoryAction; import tk.wurst_client.mods.Mod.Bypasses; -@Mod.Info(category = Mod.Category.EXPLOITS, +@Mod.Info( description = "Generates a potion that can kill players in Creative mode.\n" + "Requires Creative mode.", name = "KillerPotion", diff --git a/src/tk/wurst_client/mods/LiquidsMod.java b/src/tk/wurst_client/mods/LiquidsMod.java index 1d69a3c..55e9f1e 100644 --- a/src/tk/wurst_client/mods/LiquidsMod.java +++ b/src/tk/wurst_client/mods/LiquidsMod.java @@ -9,7 +9,7 @@ import tk.wurst_client.mods.Mod.Bypasses; -@Mod.Info(category = Mod.Category.BLOCKS, +@Mod.Info( description = "Allows you to interact with liquid blocks.", name = "Liquids", help = "Mods/Liquids") diff --git a/src/tk/wurst_client/mods/LogSpammerMod.java b/src/tk/wurst_client/mods/LogSpammerMod.java index d535016..1d95bde 100644 --- a/src/tk/wurst_client/mods/LogSpammerMod.java +++ b/src/tk/wurst_client/mods/LogSpammerMod.java @@ -7,18 +7,16 @@ */ package tk.wurst_client.mods; -import io.netty.buffer.Unpooled; - import java.util.Random; +import io.netty.buffer.Unpooled; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.client.CPacketCustomPayload; 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.EXPLOITS, +@Info( description = "Fills the server console with errors so that admins can't see what you are doing.\n" + "Patched on Spigot.", name = "LogSpammer", diff --git a/src/tk/wurst_client/mods/LsdMod.java b/src/tk/wurst_client/mods/LsdMod.java index 14a57ed..64cf21e 100644 --- a/src/tk/wurst_client/mods/LsdMod.java +++ b/src/tk/wurst_client/mods/LsdMod.java @@ -14,10 +14,9 @@ import net.minecraft.potion.PotionEffect; 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.FUN, +@Info( description = "Thousands of colors!", name = "LSD", help = "Mods/LSD") diff --git a/src/tk/wurst_client/mods/MassTpaMod.java b/src/tk/wurst_client/mods/MassTpaMod.java index b2631ee..7764c95 100644 --- a/src/tk/wurst_client/mods/MassTpaMod.java +++ b/src/tk/wurst_client/mods/MassTpaMod.java @@ -18,10 +18,9 @@ import tk.wurst_client.events.listeners.ChatInputListener; 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.CHAT, +@Info( description = "Sends a TPA request to all players.\n" + "Stops if someone accepts.", name = "MassTPA", diff --git a/src/tk/wurst_client/mods/MenuWalkMod.java b/src/tk/wurst_client/mods/MenuWalkMod.java index ce85dbf..63a3ea5 100644 --- a/src/tk/wurst_client/mods/MenuWalkMod.java +++ b/src/tk/wurst_client/mods/MenuWalkMod.java @@ -7,16 +7,15 @@ */ package tk.wurst_client.mods; +import org.lwjgl.input.Keyboard; + import net.minecraft.client.gui.GuiChat; import net.minecraft.client.gui.GuiGameOver; import net.minecraft.client.gui.GuiIngameMenu; - -import org.lwjgl.input.Keyboard; - import tk.wurst_client.mods.Mod.Bypasses; import tk.wurst_client.navigator.gui.NavigatorScreen; -@Mod.Info(category = Mod.Category.MOVEMENT, +@Mod.Info( description = "Allows you to walk while viewing a menu (e.g. the inventory\n" + "menu).", name = "MenuWalk", diff --git a/src/tk/wurst_client/mods/MileyCyrusMod.java b/src/tk/wurst_client/mods/MileyCyrusMod.java index c57c4b8..1b76475 100644 --- a/src/tk/wurst_client/mods/MileyCyrusMod.java +++ b/src/tk/wurst_client/mods/MileyCyrusMod.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.FUN, +@Info( description = "Makes you twerk like Miley Cyrus!", name = "MileyCyrus", tags = "miley cyrus, twerk", diff --git a/src/tk/wurst_client/mods/MobEspMod.java b/src/tk/wurst_client/mods/MobEspMod.java index 928e768..f7d7def 100644 --- a/src/tk/wurst_client/mods/MobEspMod.java +++ b/src/tk/wurst_client/mods/MobEspMod.java @@ -11,12 +11,11 @@ import net.minecraft.entity.EntityLiving; import tk.wurst_client.events.listeners.RenderListener; 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.utils.RenderUtils; -@Info(category = Category.RENDER, +@Info( description = "Allows you to see mobs through walls.", name = "MobESP", tags = "mob esp", diff --git a/src/tk/wurst_client/mods/Mod.java b/src/tk/wurst_client/mods/Mod.java index ae4fa9a..6025bad 100644 --- a/src/tk/wurst_client/mods/Mod.java +++ b/src/tk/wurst_client/mods/Mod.java @@ -28,8 +28,6 @@ public class Mod implements NavigatorItem private final String name = getClass().getAnnotation(Info.class).name(); private final String description = getClass().getAnnotation(Info.class) .description(); - private final Category category = getClass().getAnnotation(Info.class) - .category(); private final String tags = getClass().getAnnotation(Info.class).tags(); private final String help = getClass().getAnnotation(Info.class).help(); private final Bypasses bypasses = getClass().getAnnotation(Bypasses.class); @@ -43,20 +41,6 @@ public class Mod implements NavigatorItem protected static final WurstClient wurst = WurstClient.INSTANCE; protected static final Minecraft mc = Minecraft.getMinecraft(); - public enum Category - { - AUTOBUILD, - BLOCKS, - CHAT, - COMBAT, - EXPLOITS, - FUN, - HIDDEN, - RENDER, - MISC, - MOVEMENT; - } - @Retention(RetentionPolicy.RUNTIME) public @interface Info { @@ -64,8 +48,6 @@ public enum Category String description(); - Category category(); - boolean noCheatCompatible() default true; String tags() default ""; @@ -168,11 +150,6 @@ public NavigatorItem[] getSeeAlso() return new NavigatorItem[0]; } - public final Category getCategory() - { - return category; - } - @Override public final boolean isEnabled() { diff --git a/src/tk/wurst_client/mods/MultiAuraMod.java b/src/tk/wurst_client/mods/MultiAuraMod.java index 4b46aff..88e1694 100644 --- a/src/tk/wurst_client/mods/MultiAuraMod.java +++ b/src/tk/wurst_client/mods/MultiAuraMod.java @@ -13,7 +13,6 @@ 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.CheckboxSetting; @@ -21,7 +20,7 @@ import tk.wurst_client.navigator.settings.SliderSetting.ValueDisplay; import tk.wurst_client.utils.EntityUtils; -@Info(category = Category.COMBAT, +@Info( description = "Faster Killaura that attacks multiple entities at once.", name = "MultiAura", noCheatCompatible = false, diff --git a/src/tk/wurst_client/mods/NameProtectMod.java b/src/tk/wurst_client/mods/NameProtectMod.java index ddd626b..87b492b 100644 --- a/src/tk/wurst_client/mods/NameProtectMod.java +++ b/src/tk/wurst_client/mods/NameProtectMod.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.RENDER, +@Info( description = "Hides all player names.\n" + "Some YouTubers like to censor out all names in their\n" + "videos.", name = "NameProtect", diff --git a/src/tk/wurst_client/mods/NameTagsMod.java b/src/tk/wurst_client/mods/NameTagsMod.java index d362790..e1be95d 100644 --- a/src/tk/wurst_client/mods/NameTagsMod.java +++ b/src/tk/wurst_client/mods/NameTagsMod.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.RENDER, +@Info( description = "Changes the scale of the nametags so you can always read them.\n" + "Also allows you to see the nametags of sneaking players.", name = "NameTags", diff --git a/src/tk/wurst_client/mods/NavigatorMod.java b/src/tk/wurst_client/mods/NavigatorMod.java index f0c2644..83c5226 100644 --- a/src/tk/wurst_client/mods/NavigatorMod.java +++ b/src/tk/wurst_client/mods/NavigatorMod.java @@ -8,12 +8,10 @@ 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; import tk.wurst_client.navigator.gui.NavigatorMainScreen; -@Info(category = Category.HIDDEN, - description = "", +@Info(description = "", name = "Navigator", tags = "ClickGUI", help = "Mods/Navigator") diff --git a/src/tk/wurst_client/mods/NoClipMod.java b/src/tk/wurst_client/mods/NoClipMod.java index 7f375d3..5924638 100644 --- a/src/tk/wurst_client/mods/NoClipMod.java +++ b/src/tk/wurst_client/mods/NoClipMod.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 = "Allows you to freely move through blocks.\n" + "A block (e.g. sand) must fall on your head to activate it.\n" + "Warning: You will take damage while moving through blocks!", diff --git a/src/tk/wurst_client/mods/NoFallMod.java b/src/tk/wurst_client/mods/NoFallMod.java index ae1a99a..f3cf30b 100644 --- a/src/tk/wurst_client/mods/NoFallMod.java +++ b/src/tk/wurst_client/mods/NoFallMod.java @@ -10,10 +10,9 @@ import net.minecraft.network.play.client.CPacketPlayer; 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 = "Protects you from fall damage.\n" + "Bypasses AntiCheat.", name = "NoFall", tags = "no fall", diff --git a/src/tk/wurst_client/mods/NoHurtcamMod.java b/src/tk/wurst_client/mods/NoHurtcamMod.java index bf93891..e7fe417 100644 --- a/src/tk/wurst_client/mods/NoHurtcamMod.java +++ b/src/tk/wurst_client/mods/NoHurtcamMod.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.RENDER, +@Info( description = "Disables the annoying effect when you get hurt.", name = "NoHurtcam", tags = "no hurtcam, no hurt cam", diff --git a/src/tk/wurst_client/mods/NoOverlayMod.java b/src/tk/wurst_client/mods/NoOverlayMod.java index a5b291b..c89c8ac 100644 --- a/src/tk/wurst_client/mods/NoOverlayMod.java +++ b/src/tk/wurst_client/mods/NoOverlayMod.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 the overlays of pumpkins, water, fire, and lava.", name = "NoOverlay", tags = "AntiPumkin, no overlay") diff --git a/src/tk/wurst_client/mods/NoSlowdownMod.java b/src/tk/wurst_client/mods/NoSlowdownMod.java index 0c72458..3b5c612 100644 --- a/src/tk/wurst_client/mods/NoSlowdownMod.java +++ b/src/tk/wurst_client/mods/NoSlowdownMod.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 = "Cancels slowness effects caused by water, soul sand and\n" + "using items.", name = "NoSlowdown", diff --git a/src/tk/wurst_client/mods/NoWallsMod.java b/src/tk/wurst_client/mods/NoWallsMod.java index 3191ef0..426905d 100644 --- a/src/tk/wurst_client/mods/NoWallsMod.java +++ b/src/tk/wurst_client/mods/NoWallsMod.java @@ -12,10 +12,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 = "Allows you walk through walls.\n" + "Not all servers support this.", name = "NoWalls", diff --git a/src/tk/wurst_client/mods/NoWeatherMod.java b/src/tk/wurst_client/mods/NoWeatherMod.java index ec05c2a..e8dc49a 100644 --- a/src/tk/wurst_client/mods/NoWeatherMod.java +++ b/src/tk/wurst_client/mods/NoWeatherMod.java @@ -1,13 +1,12 @@ 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; import tk.wurst_client.navigator.settings.CheckboxSetting; import tk.wurst_client.navigator.settings.SliderSetting; import tk.wurst_client.navigator.settings.SliderSetting.ValueDisplay; -@Info(category = Category.RENDER, +@Info( description = "Allows you to alter the client-side weather, time and moon phase.", name = "NoWeather") @Bypasses diff --git a/src/tk/wurst_client/mods/NoWebMod.java b/src/tk/wurst_client/mods/NoWebMod.java index 0a0bb7e..8e9d86b 100644 --- a/src/tk/wurst_client/mods/NoWebMod.java +++ b/src/tk/wurst_client/mods/NoWebMod.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 = "Prevents you from getting slowed down in webs.\n" + "Note: This has nothing to do with websites.", name = "NoWeb", diff --git a/src/tk/wurst_client/mods/NukerLegitMod.java b/src/tk/wurst_client/mods/NukerLegitMod.java index ec0c27b..bce45a4 100644 --- a/src/tk/wurst_client/mods/NukerLegitMod.java +++ b/src/tk/wurst_client/mods/NukerLegitMod.java @@ -22,7 +22,6 @@ 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.CheckboxSetting; @@ -32,7 +31,7 @@ import tk.wurst_client.utils.BlockUtils; import tk.wurst_client.utils.RenderUtils; -@Info(category = Category.BLOCKS, +@Info( description = "Slower Nuker that bypasses any cheat prevention\n" + "PlugIn. Not required on most NoCheat+ servers!", name = "NukerLegit", diff --git a/src/tk/wurst_client/mods/NukerMod.java b/src/tk/wurst_client/mods/NukerMod.java index e4c45bf..39767a2 100644 --- a/src/tk/wurst_client/mods/NukerMod.java +++ b/src/tk/wurst_client/mods/NukerMod.java @@ -22,7 +22,6 @@ 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; @@ -32,7 +31,7 @@ import tk.wurst_client.utils.BlockUtils; import tk.wurst_client.utils.RenderUtils; -@Info(category = Category.BLOCKS, +@Info( description = "Destroys blocks around you.\n" + "Use .nuker mode to change the mode.", name = "Nuker", diff --git a/src/tk/wurst_client/mods/OverlayMod.java b/src/tk/wurst_client/mods/OverlayMod.java index 66583fe..13aec7d 100644 --- a/src/tk/wurst_client/mods/OverlayMod.java +++ b/src/tk/wurst_client/mods/OverlayMod.java @@ -13,12 +13,11 @@ import net.minecraft.util.math.RayTraceResult.Type; import tk.wurst_client.events.listeners.RenderListener; 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.utils.RenderUtils; -@Info(category = Category.RENDER, +@Info( description = "Renders the Nuker animation when you mine a block.", name = "Overlay", help = "Mods/Overlay") diff --git a/src/tk/wurst_client/mods/PanicMod.java b/src/tk/wurst_client/mods/PanicMod.java index d0ee2b5..ad1878c 100644 --- a/src/tk/wurst_client/mods/PanicMod.java +++ b/src/tk/wurst_client/mods/PanicMod.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.MISC, +@Info( description = "Instantly turns off all enabled mods.\n" + "Be careful with this!", name = "Panic", @@ -31,7 +30,7 @@ public void onEnable() public void onUpdate() { for(Mod mod : wurst.mods.getAllMods()) - if(mod.getCategory() != Category.HIDDEN && mod.isEnabled()) + if(mod.isEnabled()) mod.setEnabled(false); } diff --git a/src/tk/wurst_client/mods/ParkourMod.java b/src/tk/wurst_client/mods/ParkourMod.java index 37d7712..55d6035 100644 --- a/src/tk/wurst_client/mods/ParkourMod.java +++ b/src/tk/wurst_client/mods/ParkourMod.java @@ -11,7 +11,7 @@ import tk.wurst_client.events.listeners.UpdateListener; import tk.wurst_client.mods.Mod.Bypasses; -@Mod.Info(category = Mod.Category.MOVEMENT, +@Mod.Info( description = "Makes you jump automatically when reaching the edge of a block.\n" + "Useful for parkours, Jump'n'Runs, etc.", name = "Parkour") diff --git a/src/tk/wurst_client/mods/PhaseMod.java b/src/tk/wurst_client/mods/PhaseMod.java index bf3d2ca..7f5f30c 100644 --- a/src/tk/wurst_client/mods/PhaseMod.java +++ b/src/tk/wurst_client/mods/PhaseMod.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.EXPLOITS, +@Info( description = "Exploits a bug in NoCheat+ that allows you to glitch\n" + "through blocks.", name = "Phase", diff --git a/src/tk/wurst_client/mods/PlayerEspMod.java b/src/tk/wurst_client/mods/PlayerEspMod.java index 1a119c2..9e6b50f 100644 --- a/src/tk/wurst_client/mods/PlayerEspMod.java +++ b/src/tk/wurst_client/mods/PlayerEspMod.java @@ -11,12 +11,11 @@ import net.minecraft.entity.player.EntityPlayer; import tk.wurst_client.events.listeners.RenderListener; 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.utils.RenderUtils; -@Info(category = Category.RENDER, +@Info( description = "Allows you to see players through walls.", name = "PlayerESP", tags = "player esp", diff --git a/src/tk/wurst_client/mods/PlayerFinderMod.java b/src/tk/wurst_client/mods/PlayerFinderMod.java index 20663a8..0f720bc 100644 --- a/src/tk/wurst_client/mods/PlayerFinderMod.java +++ b/src/tk/wurst_client/mods/PlayerFinderMod.java @@ -18,13 +18,12 @@ import tk.wurst_client.events.listeners.PacketInputListener; import tk.wurst_client.events.listeners.RenderListener; 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.utils.BlockUtils; import tk.wurst_client.utils.RenderUtils; -@Info(category = Category.RENDER, +@Info( description = "Finds far players during thunderstorms.", name = "PlayerFinder", tags = "player finder", diff --git a/src/tk/wurst_client/mods/PotionSaverMod.java b/src/tk/wurst_client/mods/PotionSaverMod.java index ff62fc5..f645f3f 100644 --- a/src/tk/wurst_client/mods/PotionSaverMod.java +++ b/src/tk/wurst_client/mods/PotionSaverMod.java @@ -9,7 +9,7 @@ import tk.wurst_client.mods.Mod.Bypasses; -@Mod.Info(category = Mod.Category.COMBAT, +@Mod.Info( description = "Freezes all potion effects while you are standing still.", name = "PotionSaver", tags = "potion saver", diff --git a/src/tk/wurst_client/mods/ProphuntEspMod.java b/src/tk/wurst_client/mods/ProphuntEspMod.java index 6c264e9..43478d4 100644 --- a/src/tk/wurst_client/mods/ProphuntEspMod.java +++ b/src/tk/wurst_client/mods/ProphuntEspMod.java @@ -13,12 +13,11 @@ import net.minecraft.util.math.MathHelper; import tk.wurst_client.events.listeners.RenderListener; 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.utils.RenderUtils; -@Info(category = Category.RENDER, +@Info( description = "Allows you to see fake blocks in Prophunt.", name = "ProphuntESP", tags = "prophunt esp", diff --git a/src/tk/wurst_client/mods/ProtectMod.java b/src/tk/wurst_client/mods/ProtectMod.java index bfeae7a..a1f7509 100644 --- a/src/tk/wurst_client/mods/ProtectMod.java +++ b/src/tk/wurst_client/mods/ProtectMod.java @@ -11,11 +11,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.utils.EntityUtils; -@Info(category = Category.COMBAT, +@Info( description = "A bot that follows the closest entity and protects it.", name = "Protect", help = "Mods/Protect") diff --git a/src/tk/wurst_client/mods/RegenMod.java b/src/tk/wurst_client/mods/RegenMod.java index 776495d..81a4cc3 100644 --- a/src/tk/wurst_client/mods/RegenMod.java +++ b/src/tk/wurst_client/mods/RegenMod.java @@ -10,10 +10,9 @@ import net.minecraft.network.play.client.CPacketPlayer; 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 = "Regenerates your health 1000 times faster.\n" + "Can cause unwanted \"Flying is not enabled!\" kicks.", name = "Regen", diff --git a/src/tk/wurst_client/mods/RemoteViewMod.java b/src/tk/wurst_client/mods/RemoteViewMod.java index d02c680..b620e3d 100644 --- a/src/tk/wurst_client/mods/RemoteViewMod.java +++ b/src/tk/wurst_client/mods/RemoteViewMod.java @@ -14,11 +14,10 @@ import net.minecraft.entity.EntityLivingBase; 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.EntityUtils; -@Info(category = Category.RENDER, +@Info( description = "Allows you to see the world as someone else.\n" + "Use the .rv command to make it target a specific entity.", name = "RemoteView", diff --git a/src/tk/wurst_client/mods/SafeWalkMod.java b/src/tk/wurst_client/mods/SafeWalkMod.java index 9e7bd65..44b18d6 100644 --- a/src/tk/wurst_client/mods/SafeWalkMod.java +++ b/src/tk/wurst_client/mods/SafeWalkMod.java @@ -9,7 +9,7 @@ import tk.wurst_client.mods.Mod.Bypasses; -@Mod.Info(category = Mod.Category.MOVEMENT, +@Mod.Info( description = "Protects you from falling down as if you were sneaking.", name = "SafeWalk", tags = "safe walk", diff --git a/src/tk/wurst_client/mods/SearchMod.java b/src/tk/wurst_client/mods/SearchMod.java index 0c2d453..411f414 100644 --- a/src/tk/wurst_client/mods/SearchMod.java +++ b/src/tk/wurst_client/mods/SearchMod.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 = "Helps you to find specific blocks.\n" + "Use .search id or .search name \n" + "to specify it.", diff --git a/src/tk/wurst_client/mods/SkinBlinkerMod.java b/src/tk/wurst_client/mods/SkinBlinkerMod.java index b8c4d63..168ef1b 100644 --- a/src/tk/wurst_client/mods/SkinBlinkerMod.java +++ b/src/tk/wurst_client/mods/SkinBlinkerMod.java @@ -13,7 +13,7 @@ import tk.wurst_client.events.listeners.UpdateListener; import tk.wurst_client.mods.Mod.Bypasses; -@Mod.Info(category = Mod.Category.FUN, +@Mod.Info( description = "Makes your skin blink.\n" + "Requires a skin with a jacket, a hat or something similar.", name = "SkinBlinker", diff --git a/src/tk/wurst_client/mods/SneakMod.java b/src/tk/wurst_client/mods/SneakMod.java index 0174e30..0d4f678 100644 --- a/src/tk/wurst_client/mods/SneakMod.java +++ b/src/tk/wurst_client/mods/SneakMod.java @@ -13,11 +13,10 @@ import net.minecraft.network.play.client.CPacketEntityAction.Action; 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.special.YesCheatSpf.BypassLevel; -@Info(category = Category.MOVEMENT, +@Info( description = "Automatically sneaks all the time.", name = "Sneak", tags = "AutoSneaking", diff --git a/src/tk/wurst_client/mods/SpammerMod.java b/src/tk/wurst_client/mods/SpammerMod.java index 312d62b..72de48d 100644 --- a/src/tk/wurst_client/mods/SpammerMod.java +++ b/src/tk/wurst_client/mods/SpammerMod.java @@ -30,14 +30,13 @@ import tk.wurst_client.hooks.FrameHook; 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.spam.SpamProcessor; import tk.wurst_client.spam.exceptions.UnreadableTagException; import tk.wurst_client.spam.tag.Tag; import tk.wurst_client.utils.MiscUtils; -@Info(category = Category.CHAT, +@Info( description = "It's called Spammer, but it's a lot more.\n" + "Special features:\n" + ">ASCII art\n" + ">Run any Wurst command\n" + ">Variables\n" + ">HTML-like tags & comments\n" diff --git a/src/tk/wurst_client/mods/SpeedHackMod.java b/src/tk/wurst_client/mods/SpeedHackMod.java index 5e9f848..2585380 100644 --- a/src/tk/wurst_client/mods/SpeedHackMod.java +++ b/src/tk/wurst_client/mods/SpeedHackMod.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 run roughly 2.5x faster than you would by\n" + "sprinting and jumping.\n" + "Notice: This mod was patched in NoCheat+ version 3.13.2. It will\n" diff --git a/src/tk/wurst_client/mods/SpeedNukerMod.java b/src/tk/wurst_client/mods/SpeedNukerMod.java index 549e063..ffdf23c 100644 --- a/src/tk/wurst_client/mods/SpeedNukerMod.java +++ b/src/tk/wurst_client/mods/SpeedNukerMod.java @@ -16,7 +16,6 @@ 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; import tk.wurst_client.navigator.settings.CheckboxSetting; @@ -25,7 +24,7 @@ import tk.wurst_client.navigator.settings.SliderSetting.ValueDisplay; import tk.wurst_client.utils.BlockUtils; -@Info(category = Category.BLOCKS, +@Info( description = "Faster Nuker that cannot bypass NoCheat+.", name = "SpeedNuker", tags = "FastNuker, speed nuker, fast nuker", diff --git a/src/tk/wurst_client/mods/SpiderMod.java b/src/tk/wurst_client/mods/SpiderMod.java index 4d75d5f..f9ed7d6 100644 --- a/src/tk/wurst_client/mods/SpiderMod.java +++ b/src/tk/wurst_client/mods/SpiderMod.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 = "Allows you to climb up walls like a spider.", name = "Spider", help = "Mods/Spider") diff --git a/src/tk/wurst_client/mods/StepMod.java b/src/tk/wurst_client/mods/StepMod.java index e00a2c4..d0210b0 100644 --- a/src/tk/wurst_client/mods/StepMod.java +++ b/src/tk/wurst_client/mods/StepMod.java @@ -15,13 +15,12 @@ import net.minecraft.util.math.BlockPos; 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.special.YesCheatSpf.BypassLevel; -@Info(category = Category.MOVEMENT, +@Info( description = "Allows you to step up full blocks.", name = "Step", help = "Mods/Step") diff --git a/src/tk/wurst_client/mods/ThrowMod.java b/src/tk/wurst_client/mods/ThrowMod.java index 859e23f..f399d5e 100644 --- a/src/tk/wurst_client/mods/ThrowMod.java +++ b/src/tk/wurst_client/mods/ThrowMod.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.MISC, +@Info( description = "Uses an item multiple times.\n" + "This can cause a lot of lag and even crash a server.\n" + "Works best with snowballs or eggs.\n" diff --git a/src/tk/wurst_client/mods/TimerMod.java b/src/tk/wurst_client/mods/TimerMod.java index eab6aff..7824758 100644 --- a/src/tk/wurst_client/mods/TimerMod.java +++ b/src/tk/wurst_client/mods/TimerMod.java @@ -8,12 +8,11 @@ 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; import tk.wurst_client.navigator.settings.SliderSetting; import tk.wurst_client.navigator.settings.SliderSetting.ValueDisplay; -@Info(category = Category.MOVEMENT, +@Info( description = "Changes the speed of almost everything.\n" + "Tip: Slow speeds make aiming easier and work well with\n" + "NoCheat+.", diff --git a/src/tk/wurst_client/mods/TiredMod.java b/src/tk/wurst_client/mods/TiredMod.java index 00170b1..1ec9a3b 100644 --- a/src/tk/wurst_client/mods/TiredMod.java +++ b/src/tk/wurst_client/mods/TiredMod.java @@ -11,10 +11,9 @@ import net.minecraft.network.play.client.CPacketPlayer; 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.FUN, +@Info( description = "While this is active, other people will think you are\n" + "extremely tired and about to fall asleep!", name = "Tired", diff --git a/src/tk/wurst_client/mods/TpAuraMod.java b/src/tk/wurst_client/mods/TpAuraMod.java index 2f7fe05..c40c043 100644 --- a/src/tk/wurst_client/mods/TpAuraMod.java +++ b/src/tk/wurst_client/mods/TpAuraMod.java @@ -19,7 +19,7 @@ import tk.wurst_client.navigator.settings.SliderSetting.ValueDisplay; import tk.wurst_client.utils.EntityUtils; -@Mod.Info(category = Mod.Category.COMBAT, +@Mod.Info( description = "Automatically attacks the closest valid entity while teleporting around it.", name = "TP-Aura", tags = "TpAura, EnderAura, tp aura, ender aura", diff --git a/src/tk/wurst_client/mods/TracersMod.java b/src/tk/wurst_client/mods/TracersMod.java index 6123888..430168d 100644 --- a/src/tk/wurst_client/mods/TracersMod.java +++ b/src/tk/wurst_client/mods/TracersMod.java @@ -11,12 +11,11 @@ import net.minecraft.entity.player.EntityPlayer; import tk.wurst_client.events.listeners.RenderListener; 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.utils.RenderUtils; -@Info(category = Category.RENDER, +@Info( description = "Draws lines to players around you.", name = "Tracers", help = "Mods/Tracers") diff --git a/src/tk/wurst_client/mods/TrajectoriesMod.java b/src/tk/wurst_client/mods/TrajectoriesMod.java index 45062f9..001d5ca 100644 --- a/src/tk/wurst_client/mods/TrajectoriesMod.java +++ b/src/tk/wurst_client/mods/TrajectoriesMod.java @@ -7,6 +7,9 @@ */ package tk.wurst_client.mods; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL13; + import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.renderer.entity.RenderManager; @@ -14,10 +17,6 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL13; - import tk.wurst_client.events.listeners.RenderListener; import tk.wurst_client.mods.Mod.Bypasses; import tk.wurst_client.navigator.NavigatorItem; @@ -25,7 +24,7 @@ @Mod.Info(name = "Trajectories", description = "Predicts the flight path of arrows and throwable items.", - category = Mod.Category.RENDER, + tags = "AimAssist, ArrowPrediction, aim assist, arrow prediction", help = "Mods/Trajectories") @Bypasses diff --git a/src/tk/wurst_client/mods/TriggerBotMod.java b/src/tk/wurst_client/mods/TriggerBotMod.java index aeddfcc..ce74bf5 100644 --- a/src/tk/wurst_client/mods/TriggerBotMod.java +++ b/src/tk/wurst_client/mods/TriggerBotMod.java @@ -12,7 +12,6 @@ import net.minecraft.util.math.RayTraceResult.Type; 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.CheckboxSetting; @@ -21,7 +20,7 @@ import tk.wurst_client.special.YesCheatSpf.BypassLevel; import tk.wurst_client.utils.EntityUtils; -@Info(category = Category.COMBAT, +@Info( description = "Automatically attacks the entity you're looking at.", name = "TriggerBot", tags = "trigger bot", diff --git a/src/tk/wurst_client/mods/TrollPotionMod.java b/src/tk/wurst_client/mods/TrollPotionMod.java index 12e3d77..687b980 100644 --- a/src/tk/wurst_client/mods/TrollPotionMod.java +++ b/src/tk/wurst_client/mods/TrollPotionMod.java @@ -14,7 +14,7 @@ import net.minecraft.network.play.client.CPacketCreativeInventoryAction; import tk.wurst_client.mods.Mod.Bypasses; -@Mod.Info(category = Mod.Category.FUN, +@Mod.Info( description = "Generates an incredibly annoying potion.\n" + "Tip: AntiBlind makes you partially immune to it.", name = "TrollPotion", diff --git a/src/tk/wurst_client/mods/TrueSightMod.java b/src/tk/wurst_client/mods/TrueSightMod.java index c08065c..9e09592 100644 --- a/src/tk/wurst_client/mods/TrueSightMod.java +++ b/src/tk/wurst_client/mods/TrueSightMod.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.RENDER, +@Info( description = "Allows you to see invisible entities.", name = "TrueSight", tags = "true sight", diff --git a/src/tk/wurst_client/mods/TunnellerMod.java b/src/tk/wurst_client/mods/TunnellerMod.java index 610938a..2a909eb 100644 --- a/src/tk/wurst_client/mods/TunnellerMod.java +++ b/src/tk/wurst_client/mods/TunnellerMod.java @@ -22,7 +22,7 @@ import tk.wurst_client.utils.BlockUtils; import tk.wurst_client.utils.RenderUtils; -@Mod.Info(category = Mod.Category.BLOCKS, +@Mod.Info( description = "Digs a 3x3 tunnel around you.", name = "Tunneller", help = "Mods/Tunneller") diff --git a/src/tk/wurst_client/mods/XRayMod.java b/src/tk/wurst_client/mods/XRayMod.java index 10230c8..9aa5f84 100644 --- a/src/tk/wurst_client/mods/XRayMod.java +++ b/src/tk/wurst_client/mods/XRayMod.java @@ -11,10 +11,9 @@ import net.minecraft.block.Block; import tk.wurst_client.mods.Mod.Bypasses; -import tk.wurst_client.mods.Mod.Category; import tk.wurst_client.mods.Mod.Info; -@Info(category = Category.RENDER, +@Info( description = "Allows you to see ores through walls.", name = "X-Ray", tags = "xray, x ray",