massive refactor

Client/src/main/java/de/com/baseband/client/BaseBand.java

@@ -7,8 +7,8 @@ import de.com.baseband.client.event.remote.RemoteEvent;
 import de.com.baseband.client.event.remote.RemoteEventManager;
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.Features;
-import de.com.baseband.client.feature.client.Client;
+import de.com.baseband.client.feature.modules.client.Client;
-import de.com.baseband.client.feature.render.HUD;
+import de.com.baseband.client.feature.modules.render.HUD;
 import de.com.baseband.client.registry.Configuration;
 import de.com.baseband.client.registry.Updater;
 import de.com.baseband.client.util.interact.Chat;

Client/src/main/java/de/com/baseband/client/Setup.java

@@ -1,13 +1,16 @@
 package de.com.baseband.client;
 
 import de.com.baseband.client.feature.Feature;
-import de.com.baseband.client.feature.chat.*;
-import de.com.baseband.client.feature.client.*;
-import de.com.baseband.client.feature.combat.AutoTotem;
 import de.com.baseband.client.feature.command.*;
-import de.com.baseband.client.feature.movement.*;
+import de.com.baseband.client.feature.modules.chat.*;
-import de.com.baseband.client.feature.render.*;
+import de.com.baseband.client.feature.modules.client.*;
-import de.com.baseband.client.feature.world.*;
+import de.com.baseband.client.feature.modules.combat.AutoTotem;
+import de.com.baseband.client.feature.modules.movement.ElytraBot;
+import de.com.baseband.client.feature.modules.movement.ElytraFly;
+import de.com.baseband.client.feature.modules.movement.NoSlowDown;
+import de.com.baseband.client.feature.modules.movement.Velocity;
+import de.com.baseband.client.feature.modules.render.*;
+import de.com.baseband.client.feature.modules.world.*;
 
 /**
  * @author TudbuT
@@ -51,7 +54,7 @@ public class Setup {
             new Freecam(),
             new Help(),
             new HUD(),
-            new HUD.ShowTPS(),
+            //new HUD.ShowTPS(),
             new ISeeYou(),
             new MidClick(),
             new Nametags(),

Client/src/main/java/de/com/baseband/client/event/FMLEventHandler.java

@@ -5,7 +5,7 @@ import de.com.baseband.client.Setup;
 import de.com.baseband.client.event.events.PlayerDestroyEvent;
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.Features;
-import de.com.baseband.client.feature.client.Client;
+import de.com.baseband.client.feature.modules.client.Client;
 import de.com.baseband.client.util.interact.Chat;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraftforge.client.event.ClientChatEvent;

Client/src/main/java/de/com/baseband/client/event/remote/RemoteEventManager.java

@@ -3,7 +3,7 @@ package de.com.baseband.client.event.remote;
 import de.com.baseband.client.BaseBand;
 import de.com.baseband.client.event.remote.events.RemoteInitEvent;
 import de.com.baseband.client.feature.Features;
-import de.com.baseband.client.feature.client.AltControl;
+import de.com.baseband.client.feature.modules.client.AltControl;
 import de.tudbut.io.TypedInputStream;
 import de.tudbut.io.TypedOutputStream;
 import de.tudbut.parsing.JSON;

Client/src/main/java/de/com/baseband/client/feature/command/Bind.java

@@ -3,7 +3,7 @@ package de.com.baseband.client.feature.command;
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.Features;
 import de.com.baseband.client.feature.category.Command;
-import de.com.baseband.client.feature.client.Client;
+import de.com.baseband.client.feature.modules.client.Client;
 import de.com.baseband.client.registry.SetCommand;
 import de.com.baseband.client.util.interact.Chat;
 import org.lwjgl.input.Keyboard;

Client/src/main/java/de/com/baseband/client/feature/command/Help.java

@@ -4,7 +4,7 @@ import de.com.baseband.client.feature.Category;
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.Features;
 import de.com.baseband.client.feature.category.Command;
-import de.com.baseband.client.feature.client.Client;
+import de.com.baseband.client.feature.modules.client.Client;
 import de.com.baseband.client.util.interact.Chat;
 import de.tudbut.obj.TLMap;
 import net.minecraft.util.text.Style;

Client/src/main/java/de/com/baseband/client/feature/command/Set.java

@@ -4,7 +4,7 @@ import de.com.baseband.client.BaseBand;
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.Features;
 import de.com.baseband.client.feature.category.Command;
-import de.com.baseband.client.feature.client.Client;
+import de.com.baseband.client.feature.modules.client.Client;
 import de.com.baseband.client.registry.ConfigHandle;
 import de.com.baseband.client.registry.SetCommand;
 import de.com.baseband.client.util.interact.Chat;

Client/src/main/java/de/com/baseband/client/feature/command/Toggle.java

@@ -3,7 +3,7 @@ package de.com.baseband.client.feature.command;
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.Features;
 import de.com.baseband.client.feature.category.Command;
-import de.com.baseband.client.feature.client.Client;
+import de.com.baseband.client.feature.modules.client.Client;
 import de.com.baseband.client.util.interact.Chat;
 
 @Command

Client/src/main/java/de/com/baseband/client/feature/command/Trigger.java

@@ -3,7 +3,7 @@ package de.com.baseband.client.feature.command;
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.Features;
 import de.com.baseband.client.feature.category.Command;
-import de.com.baseband.client.feature.client.Client;
+import de.com.baseband.client.feature.modules.client.Client;
 import de.com.baseband.client.gui.lib.component.Component;
 import de.com.baseband.client.registry.annotation.Description;
 import de.com.baseband.client.util.interact.Chat;

Client/src/main/java/de/com/baseband/client/feature/modules/chat/ChatAppend.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.chat;
+package de.com.baseband.client.feature.modules.chat;
 
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.registry.annotation.Config;

Client/src/main/java/de/com/baseband/client/feature/modules/chat/ChatCrypt.java

@@ -1,9 +1,9 @@
-package de.com.baseband.client.feature.chat;
+package de.com.baseband.client.feature.modules.chat;
 
 import de.com.baseband.client.BaseBand;
 import de.com.baseband.client.event.events.PacketEvent;
 import de.com.baseband.client.feature.Feature;
-import de.com.baseband.client.feature.render.HUD;
+import de.com.baseband.client.feature.modules.render.HUD;
 import de.com.baseband.client.mixin.mixins.ICPacketChat;
 import de.com.baseband.client.registry.annotation.*;
 import de.com.baseband.client.util.adapt.FieldFinder;

Client/src/main/java/de/com/baseband/client/feature/modules/chat/ChatExtras.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.chat;
+package de.com.baseband.client.feature.modules.chat;
 
 import de.com.baseband.client.BaseBand;
 import de.com.baseband.client.event.events.PacketEvent;

Client/src/main/java/de/com/baseband/client/feature/modules/chat/ChatFilter.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.chat;
+package de.com.baseband.client.feature.modules.chat;
 
 import de.com.baseband.client.BaseBand;
 import de.com.baseband.client.event.events.PacketEvent;

Client/src/main/java/de/com/baseband/client/feature/modules/chat/ISeeYou.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.chat;
+package de.com.baseband.client.feature.modules.chat;
 
 import de.com.baseband.client.feature.Feature;
 import net.minecraft.entity.Entity;

Client/src/main/java/de/com/baseband/client/feature/modules/chat/TPAccept.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.chat;
+package de.com.baseband.client.feature.modules.chat;
 
 import de.com.baseband.client.event.events.PlayerDestroyEvent;
 import de.com.baseband.client.feature.Feature;

Client/src/main/java/de/com/baseband/client/feature/modules/client/AltControl.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.client;
+package de.com.baseband.client.feature.modules.client;
 
 import de.com.baseband.client.BaseBand;
 import de.com.baseband.client.event.remote.events.RemoteConfigEvent;
@@ -6,7 +6,7 @@ import de.com.baseband.client.event.remote.events.RemoteSendMessageEvent;
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.Features;
 import de.com.baseband.client.feature.category.ClientCategory;
-import de.com.baseband.client.feature.render.ClickGUI;
+import de.com.baseband.client.feature.modules.render.ClickGUI;
 import de.com.baseband.client.registry.Configuration;
 import de.com.baseband.client.registry.annotation.Config;
 import de.com.baseband.client.registry.annotation.Description;

Client/src/main/java/de/com/baseband/client/feature/modules/client/AutoReconnect.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.client;
+package de.com.baseband.client.feature.modules.client;
 
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.category.ClientCategory;

Client/src/main/java/de/com/baseband/client/feature/modules/client/Baritone.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.client;
+package de.com.baseband.client.feature.modules.client;
 
 import baritone.api.process.IBaritoneProcess;
 import baritone.api.selection.ISelectionManager;

Client/src/main/java/de/com/baseband/client/feature/modules/client/Client.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.client;
+package de.com.baseband.client.feature.modules.client;
 
 import de.com.baseband.client.BaseBand;
 import de.com.baseband.client.event.events.PacketEvent;

Client/src/main/java/de/com/baseband/client/feature/modules/client/MidClick.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.client;
+package de.com.baseband.client.feature.modules.client;
 
 import de.com.baseband.client.BaseBand;
 import de.com.baseband.client.feature.Feature;
@@ -52,10 +52,10 @@ public class MidClick extends Feature {
     public enum BlockAction {
         None((b) -> {}),
         Select((b) -> {
-            de.com.baseband.client.feature.world.Select.begin = b;
+            de.com.baseband.client.feature.modules.world.Select.begin = b;
-            de.com.baseband.client.feature.world.Select.end = b;
+            de.com.baseband.client.feature.modules.world.Select.end = b;
         }),
-        Corner(de.com.baseband.client.feature.world.Select::select),
+        Corner(de.com.baseband.client.feature.modules.world.Select::select),
         ;
         public final Consumer<BlockPos> action;
         BlockAction(Consumer<BlockPos> action) {

Client/src/main/java/de/com/baseband/client/feature/modules/client/Spotify.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.client;
+package de.com.baseband.client.feature.modules.client;
 
 import de.com.baseband.client.BaseBand;
 import de.com.baseband.client.feature.Feature;

Client/src/main/java/de/com/baseband/client/feature/modules/client/Timer.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.client;
+package de.com.baseband.client.feature.modules.client;
 
 import de.com.baseband.client.event.events.PacketEvent;
 import de.com.baseband.client.event.events.PlayerDestroyEvent;

Client/src/main/java/de/com/baseband/client/feature/modules/client/Trust.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.client;
+package de.com.baseband.client.feature.modules.client;
 
 import de.com.baseband.client.BaseBand;
 import de.com.baseband.client.feature.Feature;

Client/src/main/java/de/com/baseband/client/feature/modules/combat/AutoKill.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.combat;
+package de.com.baseband.client.feature.modules.combat;
 
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.category.Combat;

Client/src/main/java/de/com/baseband/client/feature/modules/combat/AutoTotem.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.combat;
+package de.com.baseband.client.feature.modules.combat;
 
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.category.Combat;

Client/src/main/java/de/com/baseband/client/feature/modules/movement/ElytraBot.java

@@ -1,10 +1,10 @@
-package de.com.baseband.client.feature.movement;
+package de.com.baseband.client.feature.modules.movement;
 
 import de.com.baseband.client.BaseBand;
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.Features;
 import de.com.baseband.client.feature.category.Movement;
-import de.com.baseband.client.feature.client.Client;
+import de.com.baseband.client.feature.modules.client.Client;
 import de.com.baseband.client.registry.annotation.Config;
 import de.com.baseband.client.registry.annotation.Description;
 import de.com.baseband.client.registry.annotation.Gate;

Client/src/main/java/de/com/baseband/client/feature/modules/movement/ElytraFly.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.movement;
+package de.com.baseband.client.feature.modules.movement;
 
 import de.com.baseband.client.event.events.MoveEvent;
 import de.com.baseband.client.event.events.PacketEvent;

Client/src/main/java/de/com/baseband/client/feature/modules/movement/NoSlowDown.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.movement;
+package de.com.baseband.client.feature.modules.movement;
 
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.category.Movement;

Client/src/main/java/de/com/baseband/client/feature/modules/movement/Velocity.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.movement;
+package de.com.baseband.client.feature.modules.movement;
 
 import de.com.baseband.client.event.events.PacketEvent;
 import de.com.baseband.client.feature.Feature;

Client/src/main/java/de/com/baseband/client/feature/modules/render/Bright.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.render;
+package de.com.baseband.client.feature.modules.render;
 
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.category.Render;

Client/src/main/java/de/com/baseband/client/feature/modules/render/ClickGUI.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.render;
+package de.com.baseband.client.feature.modules.render;
 
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.Features;

Client/src/main/java/de/com/baseband/client/feature/modules/render/ESP.java

@@ -1,9 +1,9 @@
-package de.com.baseband.client.feature.render;
+package de.com.baseband.client.feature.modules.render;
 
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.Features;
 import de.com.baseband.client.feature.category.Render;
-import de.com.baseband.client.feature.client.Client;
+import de.com.baseband.client.feature.modules.client.Client;
 import de.com.baseband.client.registry.annotation.Config;
 import de.com.baseband.client.registry.annotation.Gate;
 import de.com.baseband.client.registry.annotation.Range;

Client/src/main/java/de/com/baseband/client/feature/modules/render/Freecam.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.render;
+package de.com.baseband.client.feature.modules.render;
 
 import de.com.baseband.client.event.events.PlayerDestroyEvent;
 import de.com.baseband.client.feature.Feature;

Client/src/main/java/de/com/baseband/client/feature/modules/render/HUD.java

@@ -1,12 +1,12 @@
-package de.com.baseband.client.feature.render;
+package de.com.baseband.client.feature.modules.render;
 
 import de.com.baseband.client.BaseBand;
 import de.com.baseband.client.feature.Category;
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.Features;
 import de.com.baseband.client.feature.category.Render;
-import de.com.baseband.client.feature.client.Client;
+import de.com.baseband.client.feature.modules.client.Client;
-import de.com.baseband.client.feature.client.Spotify;
+import de.com.baseband.client.feature.modules.client.Spotify;
 import de.com.baseband.client.gui.GuiTheme;
 import de.com.baseband.client.registry.annotation.*;
 import de.com.baseband.client.util.adapt.Marker;

Client/src/main/java/de/com/baseband/client/feature/modules/render/Nametags.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.render;
+package de.com.baseband.client.feature.modules.render;
 
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.category.Render;

Client/src/main/java/de/com/baseband/client/feature/modules/render/NoRender.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.render;
+package de.com.baseband.client.feature.modules.render;
 
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.category.Render;

Client/src/main/java/de/com/baseband/client/feature/modules/render/RenderFun.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.render;
+package de.com.baseband.client.feature.modules.render;
 
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.category.Render;

Client/src/main/java/de/com/baseband/client/feature/modules/render/SwingSpeed.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.render;
+package de.com.baseband.client.feature.modules.render;
 
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.category.Render;

Client/src/main/java/de/com/baseband/client/feature/modules/world/AutoEat.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.world;
+package de.com.baseband.client.feature.modules.world;
 
 import de.com.baseband.client.event.events.BaritoneEvent;
 import de.com.baseband.client.event.events.PacketEvent;

Client/src/main/java/de/com/baseband/client/feature/modules/world/AutoRespawn.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.world;
+package de.com.baseband.client.feature.modules.world;
 
 import de.com.baseband.client.BaseBand;
 import de.com.baseband.client.feature.Feature;

Client/src/main/java/de/com/baseband/client/feature/modules/world/AutoSignText.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.world;
+package de.com.baseband.client.feature.modules.world;
 
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.category.World;

Client/src/main/java/de/com/baseband/client/feature/modules/world/FastBreak.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.world;
+package de.com.baseband.client.feature.modules.world;
 
 import de.com.baseband.client.event.events.DamageBlockEvent;
 import de.com.baseband.client.feature.Feature;

Client/src/main/java/de/com/baseband/client/feature/modules/world/FastUse.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.world;
+package de.com.baseband.client.feature.modules.world;
 
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.Features;

Client/src/main/java/de/com/baseband/client/feature/modules/world/Ping.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.world;
+package de.com.baseband.client.feature.modules.world;
 
 import de.com.baseband.client.event.events.PacketEvent;
 import de.com.baseband.client.feature.Feature;

Client/src/main/java/de/com/baseband/client/feature/modules/world/SeedOverlay.java

@@ -1,10 +1,10 @@
-package de.com.baseband.client.feature.world;
+package de.com.baseband.client.feature.modules.world;
 
 import de.com.baseband.client.BaseBand;
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.Features;
 import de.com.baseband.client.feature.category.World;
-import de.com.baseband.client.feature.render.ClickGUI;
+import de.com.baseband.client.feature.modules.render.ClickGUI;
 import de.com.baseband.client.registry.annotation.*;
 import de.com.baseband.client.util.adapt.Marker;
 import de.com.baseband.client.util.adapt.SimpleWorldGenerator;

Client/src/main/java/de/com/baseband/client/feature/modules/world/Select.java

@@ -1,4 +1,4 @@
-package de.com.baseband.client.feature.world;
+package de.com.baseband.client.feature.modules.world;
 
 import de.com.baseband.client.BaseBand;
 import de.com.baseband.client.event.Priority;

Client/src/main/java/de/com/baseband/client/gui/GuiRewrite.java

@@ -3,7 +3,7 @@ package de.com.baseband.client.gui;
 import de.com.baseband.client.BaseBand;
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.Features;
-import de.com.baseband.client.feature.render.ClickGUI;
+import de.com.baseband.client.feature.modules.render.ClickGUI;
 import de.com.baseband.client.gui.lib.GUIManager;
 import de.com.baseband.client.gui.lib.component.Category;
 import de.com.baseband.client.gui.lib.component.Component;

Client/src/main/java/de/com/baseband/client/gui/lib/GUIManager.java

@@ -1,7 +1,7 @@
 package de.com.baseband.client.gui.lib;
 
 import de.com.baseband.client.feature.Features;
-import de.com.baseband.client.feature.client.Client;
+import de.com.baseband.client.feature.modules.client.Client;
 import de.com.baseband.client.gui.GuiTheme;
 import de.com.baseband.client.gui.lib.component.Component;
 import org.lwjgl.util.Rectangle;

Client/src/main/java/de/com/baseband/client/mixin/MixinProxy.java

@@ -6,12 +6,12 @@ import de.com.baseband.client.event.events.MotionUpdateEvent;
 import de.com.baseband.client.event.events.MoveEvent;
 import de.com.baseband.client.event.events.PacketEvent;
 import de.com.baseband.client.feature.Features;
-import de.com.baseband.client.feature.chat.ChatExtras;
+import de.com.baseband.client.feature.modules.chat.ChatExtras;
-import de.com.baseband.client.feature.client.Client;
+import de.com.baseband.client.feature.modules.client.Client;
-import de.com.baseband.client.feature.movement.Velocity;
+import de.com.baseband.client.feature.modules.movement.Velocity;
-import de.com.baseband.client.feature.render.NoRender;
+import de.com.baseband.client.feature.modules.render.NoRender;
-import de.com.baseband.client.feature.render.SwingSpeed;
+import de.com.baseband.client.feature.modules.render.SwingSpeed;
-import de.com.baseband.client.feature.world.AutoSignText;
+import de.com.baseband.client.feature.modules.world.AutoSignText;
 import de.com.baseband.client.util.adapt.FieldFinder;
 import de.com.baseband.client.util.net.ScreenshotHelper;
 import net.minecraft.client.gui.ChatLine;

Client/src/main/java/de/com/baseband/client/util/interact/FreecamPlayer.java

@@ -1,7 +1,7 @@
 package de.com.baseband.client.util.interact;
 
 import de.com.baseband.client.feature.Features;
-import de.com.baseband.client.feature.render.Freecam;
+import de.com.baseband.client.feature.modules.render.Freecam;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityOtherPlayerMP;
 import net.minecraft.client.entity.EntityPlayerSP;