merge world and player category into World & Interactions

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

@@ -10,11 +10,11 @@ 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.player.AntiLevitation;
-import de.com.baseband.client.feature.modules.player.AutoRespawn;
-import de.com.baseband.client.feature.modules.player.InteractionTweaks;
+import de.com.baseband.client.feature.modules.movement.AntiLevitation;
+import de.com.baseband.client.feature.modules.ingame.AutoRespawn;
+import de.com.baseband.client.feature.modules.ingame.InteractionTweaks;
 import de.com.baseband.client.feature.modules.render.*;
-import de.com.baseband.client.feature.modules.world.*;
+import de.com.baseband.client.feature.modules.ingame.*;
 
 /**
  * @author TudbuT

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

@@ -14,9 +14,8 @@ public enum Category {
     CHAT("Chat", Chat.class),
     COMBAT("Combat", Combat.class),
     MOVEMENT("Movement", Movement.class),
-    PLAYER("Player", Player.class),
     RENDER("Render", Render.class),
-    WORLD("World", World.class),
+    INGAME("World & Interactions", Ingame.class),
     CLIENT("Client", ClientCategory.class)
     ;
 

Client/src/main/java/de/com/baseband/client/feature/category/Ingame.java

@@ -7,5 +7,5 @@ import java.lang.annotation.Target;
 
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface World {
+public @interface Ingame {
 }

Client/src/main/java/de/com/baseband/client/feature/category/Player.java

@@ -1,11 +0,0 @@
-package de.com.baseband.client.feature.category;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Player {
-}

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

@@ -1,9 +1,9 @@
-package de.com.baseband.client.feature.modules.world;
+package de.com.baseband.client.feature.modules.ingame;
 
 import de.com.baseband.client.event.events.BaritoneEvent;
 import de.com.baseband.client.event.events.PacketEvent;
 import de.com.baseband.client.feature.Feature;
-import de.com.baseband.client.feature.category.World;
+import de.com.baseband.client.feature.category.Ingame;
 import de.com.baseband.client.mixin.mixins.IMinecraft;
 import de.com.baseband.client.registry.annotation.Config;
 import net.minecraft.client.gui.inventory.GuiContainer;
@@ -19,7 +19,7 @@ import net.minecraft.network.play.client.CPacketPlayerTryUseItemOnBlock;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.FoodStats;
 
-@World
+@Ingame
 public class AutoEat extends Feature {
 
     private int lastSlot = -1;

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

@@ -1,19 +1,19 @@
-package de.com.baseband.client.feature.modules.player;
+package de.com.baseband.client.feature.modules.ingame;
 
 import de.com.baseband.client.BaseBand;
 import de.com.baseband.client.feature.Feature;
-import de.com.baseband.client.feature.category.Player;
+import de.com.baseband.client.feature.category.Ingame;
 import de.tudbut.tools.Lock;
 import net.minecraft.client.gui.GuiGameOver;
 
-@Player
+@Ingame
 public class AutoRespawn extends Feature {
     @Override
     public String toString() {
         return "AutoRespawn";
     }
 
-    Lock lock = new Lock(false);
+    Lock lock = new Lock();
 
     public void onTick() {
         if (mc.currentScreen instanceof GuiGameOver && !lock.isLocked()) {

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

@@ -1,10 +1,10 @@
-package de.com.baseband.client.feature.modules.world;
+package de.com.baseband.client.feature.modules.ingame;
 
 import de.com.baseband.client.feature.Feature;
-import de.com.baseband.client.feature.category.World;
+import de.com.baseband.client.feature.category.Ingame;
 import de.com.baseband.client.registry.annotation.Config;
 
-@World
+@Ingame
 public class AutoSignText extends Feature {
     @Override
     public String toString() {

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

@@ -1,9 +1,9 @@
-package de.com.baseband.client.feature.modules.player;
+package de.com.baseband.client.feature.modules.ingame;
 
 import de.com.baseband.client.event.events.DamageBlockEvent;
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.Features;
-import de.com.baseband.client.feature.category.Player;
+import de.com.baseband.client.feature.category.Ingame;
 import de.com.baseband.client.mixin.mixins.IMinecraft;
 import de.com.baseband.client.mixin.mixins.IPlayerControllerMP;
 import de.com.baseband.client.registry.annotation.Config;
@@ -13,7 +13,7 @@ import net.minecraft.network.play.client.CPacketPlayerDigging;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 
-@Player
+@Ingame
 public class InteractionTweaks extends Feature {
     @Override
     public String toString() {
@@ -26,7 +26,7 @@ public class InteractionTweaks extends Feature {
         Features.ifFeaturePresent(FastBreak.class, subComponents::add);
     }
 
-    @Player
+    @Ingame
     public static class FastUse extends Feature {
         @Override
         public String toString() {
@@ -56,7 +56,7 @@ public class InteractionTweaks extends Feature {
         }
     }
 
-    @Player
+    @Ingame
     public static class FastBreak extends Feature {
 
         public enum Mode {

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

@@ -1,8 +1,9 @@
-package de.com.baseband.client.feature.modules.client;
+package de.com.baseband.client.feature.modules.ingame;
 
 import de.com.baseband.client.BaseBand;
 import de.com.baseband.client.feature.Feature;
 import de.com.baseband.client.feature.category.ClientCategory;
+import de.com.baseband.client.feature.modules.client.Client;
 import de.com.baseband.client.registry.PlayerDB;
 import de.com.baseband.client.registry.annotation.Config;
 import de.com.baseband.client.util.interact.Chat;
@@ -52,10 +53,10 @@ public class MidClick extends Feature {
     public enum BlockAction {
         None((b) -> {}),
         Select((b) -> {
-            de.com.baseband.client.feature.modules.world.Select.begin = b;
-            de.com.baseband.client.feature.modules.world.Select.end = b;
+            de.com.baseband.client.feature.modules.ingame.Select.begin = b;
+            de.com.baseband.client.feature.modules.ingame.Select.end = b;
         }),
-        Corner(de.com.baseband.client.feature.modules.world.Select::select),
+        Corner(de.com.baseband.client.feature.modules.ingame.Select::select),
         ;
         public final Consumer<BlockPos> action;
         BlockAction(Consumer<BlockPos> action) {

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

@@ -1,14 +1,14 @@
-package de.com.baseband.client.feature.modules.world;
+package de.com.baseband.client.feature.modules.ingame;
 
 import de.com.baseband.client.event.events.PacketEvent;
 import de.com.baseband.client.feature.Feature;
-import de.com.baseband.client.feature.category.World;
+import de.com.baseband.client.feature.category.Ingame;
 import de.com.baseband.client.registry.annotation.Config;
 import de.com.baseband.client.registry.annotation.Description;
 import de.com.baseband.client.registry.annotation.Range;
 import net.minecraft.network.play.client.CPacketKeepAlive;
 
-@World
+@Ingame
 public class Ping extends Feature {
 
     PacketHolder holder = null;

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

@@ -1,9 +1,9 @@
-package de.com.baseband.client.feature.modules.world;
+package de.com.baseband.client.feature.modules.ingame;
 
 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.category.Ingame;
 import de.com.baseband.client.feature.modules.render.ClickGUI;
 import de.com.baseband.client.registry.annotation.*;
 import de.com.baseband.client.util.adapt.Marker;
@@ -24,7 +24,7 @@ import org.lwjgl.opengl.GL11;
 import java.util.ArrayList;
 import java.util.Objects;
 
-@World
+@Ingame
 @Description("Shows changes done to the world compared to its original state\n" +
         "This module works similarly to the original in TTC, but is written form the ground up because the old code sucked.")
 public class SeedOverlay extends Feature {

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

@@ -1,14 +1,14 @@
-package de.com.baseband.client.feature.modules.world;
+package de.com.baseband.client.feature.modules.ingame;
 
 import de.com.baseband.client.BaseBand;
 import de.com.baseband.client.event.Priority;
 import de.com.baseband.client.event.events.SelectEvent;
 import de.com.baseband.client.feature.Feature;
-import de.com.baseband.client.feature.category.World;
+import de.com.baseband.client.feature.category.Ingame;
 import de.com.baseband.client.util.type.Selection;
 import net.minecraft.util.math.BlockPos;
 
-@World
+@Ingame
 public class Select extends Feature {
 
     public static BlockPos begin, end;

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

@@ -1,12 +1,12 @@
-package de.com.baseband.client.feature.modules.player;
+package de.com.baseband.client.feature.modules.movement;
 
 import de.com.baseband.client.event.events.MoveEvent;
 import de.com.baseband.client.feature.Feature;
-import de.com.baseband.client.feature.category.Player;
+import de.com.baseband.client.feature.category.Movement;
 import de.com.baseband.client.registry.annotation.Config;
 import net.minecraft.init.MobEffects;
 
-@Player
+@Movement
 public class AntiLevitation extends Feature {
     @Override
     public String toString() {
@@ -16,7 +16,7 @@ public class AntiLevitation extends Feature {
     @Config("Mode")
     public Mode mode = Mode.Motion;
 
-    enum Mode {
+    public enum Mode {
         Effect,
         Motion
     }

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

@@ -11,7 +11,7 @@ import de.com.baseband.client.feature.modules.client.Client;
 import de.com.baseband.client.feature.modules.movement.Velocity;
 import de.com.baseband.client.feature.modules.render.NoRender;
 import de.com.baseband.client.feature.modules.render.SwingSpeed;
-import de.com.baseband.client.feature.modules.world.AutoSignText;
+import de.com.baseband.client.feature.modules.ingame.AutoSignText;
 import de.com.baseband.client.util.adapt.FieldFinder;
 import de.com.baseband.client.util.net.ScreenshotHelper;
 import net.minecraft.client.gui.ChatLine;
@@ -136,10 +136,8 @@ public class MixinProxy {
     }
 
     public static int swingSpeed() {
-        SwingSpeed swingSpeed = Features.getFeature(SwingSpeed.class);
-
         if(Features.isFeatureEnabled(SwingSpeed.class)) {
-            return swingSpeed.swingSpeed;
+            return Features.getFeature(SwingSpeed.class).swingSpeed;
         } else {
             return -1;
         }

Client/src/main/java/de/com/baseband/client/mixin/mixins/MixinEntityLivingBase.java

@@ -11,8 +11,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 public class MixinEntityLivingBase {
     @Inject(method = {"getArmSwingAnimationEnd"}, at = {@At(value = "HEAD")}, cancellable = true)
     private void getArmSwingAnimationEnd(CallbackInfoReturnable<Integer> info) {
-        if (MixinProxy.swingSpeed() != -1) {
-            info.setReturnValue(MixinProxy.swingSpeed());
+        int swingSpeed = MixinProxy.swingSpeed();
+        if (swingSpeed != -1) {
+            info.setReturnValue(swingSpeed);
         }
     }
 }