Migrate client entity to its own entity

AlexProgrammerDE · Dec 19, 2023 · 33adc9c · 33adc9c
1 parent 179ab3e
commit 33adc9c
Show file tree

Hide file tree

Showing 45 changed files with 698 additions and 405 deletions.
diff --git a/src/main/java/net/pistonmaster/serverwrecker/account/AuthType.java b/src/main/java/net/pistonmaster/serverwrecker/account/AuthType.java
@@ -21,7 +21,16 @@
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import net.pistonmaster.serverwrecker.account.service.*;
+import net.pistonmaster.serverwrecker.account.service.AccountData;
+import net.pistonmaster.serverwrecker.account.service.BedrockData;
+import net.pistonmaster.serverwrecker.account.service.MCAuthService;
+import net.pistonmaster.serverwrecker.account.service.OfflineJavaData;
+import net.pistonmaster.serverwrecker.account.service.OnlineJavaData;
+import net.pistonmaster.serverwrecker.account.service.SWBedrockMicrosoftAuthService;
+import net.pistonmaster.serverwrecker.account.service.SWEasyMCAuthService;
+import net.pistonmaster.serverwrecker.account.service.SWJavaMicrosoftAuthService;
+import net.pistonmaster.serverwrecker.account.service.SWOfflineAuthService;
+import net.pistonmaster.serverwrecker.account.service.SWTheAlteningAuthService;
 
 @Getter
 @RequiredArgsConstructor

diff --git a/src/main/java/net/pistonmaster/serverwrecker/client/gui/SWMenuBar.java b/src/main/java/net/pistonmaster/serverwrecker/client/gui/SWMenuBar.java
@@ -23,7 +23,12 @@
 import com.formdev.flatlaf.FlatDarkLaf;
 import com.formdev.flatlaf.FlatIntelliJLaf;
 import com.formdev.flatlaf.FlatLightLaf;
-import com.formdev.flatlaf.intellijthemes.*;
+import com.formdev.flatlaf.intellijthemes.FlatArcDarkOrangeIJTheme;
+import com.formdev.flatlaf.intellijthemes.FlatArcOrangeIJTheme;
+import com.formdev.flatlaf.intellijthemes.FlatCarbonIJTheme;
+import com.formdev.flatlaf.intellijthemes.FlatCyanLightIJTheme;
+import com.formdev.flatlaf.intellijthemes.FlatDarkPurpleIJTheme;
+import com.formdev.flatlaf.intellijthemes.FlatOneDarkIJTheme;
 import com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMaterialDarkerIJTheme;
 import com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMaterialOceanicIJTheme;
 import com.formdev.flatlaf.themes.FlatMacDarkLaf;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/client/gui/libs/MessageLogPanel.java b/src/main/java/net/pistonmaster/serverwrecker/client/gui/libs/MessageLogPanel.java
@@ -23,7 +23,13 @@
 import lombok.extern.slf4j.Slf4j;
 
 import javax.swing.*;
-import javax.swing.text.*;
+import javax.swing.text.AbstractDocument;
+import javax.swing.text.AttributeSet;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.DefaultCaret;
+import javax.swing.text.Document;
+import javax.swing.text.DocumentFilter;
+import javax.swing.text.SimpleAttributeSet;
 import java.awt.*;
 
 /**

diff --git a/src/main/java/net/pistonmaster/serverwrecker/client/gui/navigation/ControlPanel.java b/src/main/java/net/pistonmaster/serverwrecker/client/gui/navigation/ControlPanel.java
@@ -21,7 +21,12 @@
 
 import io.grpc.stub.StreamObserver;
 import net.pistonmaster.serverwrecker.client.gui.GUIManager;
-import net.pistonmaster.serverwrecker.grpc.generated.*;
+import net.pistonmaster.serverwrecker.grpc.generated.AttackStartRequest;
+import net.pistonmaster.serverwrecker.grpc.generated.AttackStartResponse;
+import net.pistonmaster.serverwrecker.grpc.generated.AttackStateToggleRequest;
+import net.pistonmaster.serverwrecker.grpc.generated.AttackStateToggleResponse;
+import net.pistonmaster.serverwrecker.grpc.generated.AttackStopRequest;
+import net.pistonmaster.serverwrecker.grpc.generated.AttackStopResponse;
 
 import javax.inject.Inject;
 import javax.swing.*;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/client/settings/SettingsManager.java b/src/main/java/net/pistonmaster/serverwrecker/client/settings/SettingsManager.java
@@ -21,7 +21,16 @@
 
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
-import com.google.gson.*;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap;
 import it.unimi.dsi.fastutil.objects.Object2IntArrayMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
@@ -48,7 +57,11 @@
 import java.security.interfaces.ECPublicKey;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Consumer;
 
 public class SettingsManager {

diff --git a/src/main/java/net/pistonmaster/serverwrecker/command/ServerCommandManager.java b/src/main/java/net/pistonmaster/serverwrecker/command/ServerCommandManager.java
@@ -62,7 +62,11 @@
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 import java.time.Instant;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.function.ToIntFunction;
 
 import static com.mojang.brigadier.CommandDispatcher.ARGUMENT_SEPARATOR;
@@ -151,7 +155,7 @@ public void postConstruct() {
                 .executes(help("Makes all connected bots stop pathfinding", c -> forEveryBot(bot -> {
                     bot.eventBus().unregisterAll(BotPreTickEvent.class, PathExecutor.class::isAssignableFrom);
 
-                    bot.sessionDataManager().botMovementManager().controlState().resetAll();
+                    bot.sessionDataManager().controlState().resetAll();
                     return Command.SINGLE_SUCCESS;
                 }))));
 
@@ -167,46 +171,42 @@ public void postConstruct() {
 
                                             return forEveryBot(bot -> {
                                                 var sessionDataManager = bot.sessionDataManager();
-                                                var botMovementManager = sessionDataManager.botMovementManager();
+                                                var clientEntity = sessionDataManager.clientEntity();
 
-                                                botMovementManager.lookAt(RotationOrigin.FEET, Vector3d.from(x, y, z));
+                                                clientEntity.lookAt(RotationOrigin.FEET, Vector3d.from(x, y, z));
                                                 return Command.SINGLE_SUCCESS;
                                             });
                                         }))))));
         dispatcher.register(literal("forward")
                 .executes(help("Makes all connected bots start walking forward", c -> forEveryBot(bot -> {
-                    bot.sessionDataManager().botMovementManager().controlState().forward(true);
+                    bot.sessionDataManager().controlState().forward(true);
                     return Command.SINGLE_SUCCESS;
                 }))));
         dispatcher.register(literal("backward")
                 .executes(help("Makes all connected bots start walking backwards", c -> forEveryBot(bot -> {
-                    bot.sessionDataManager().botMovementManager().controlState().backward(true);
+                    bot.sessionDataManager().controlState().backward(true);
                     return Command.SINGLE_SUCCESS;
                 }))));
         dispatcher.register(literal("left")
                 .executes(help("Makes all connected bots start walking left", c -> forEveryBot(bot -> {
-                    bot.sessionDataManager().botMovementManager().controlState().left(true);
+                    bot.sessionDataManager().controlState().left(true);
                     return Command.SINGLE_SUCCESS;
                 }))));
         dispatcher.register(literal("right")
                 .executes(help("Makes all connected bots start walking right", c -> forEveryBot(bot -> {
-                    bot.sessionDataManager().botMovementManager().controlState().right(true);
+                    bot.sessionDataManager().controlState().right(true);
                     return Command.SINGLE_SUCCESS;
                 }))));
         dispatcher.register(literal("jump")
                 .executes(help("Makes all connected bots jump up repeatedly", c -> forEveryBot(bot -> {
                     var sessionDataManager = bot.sessionDataManager();
-                    var botMovementManager = sessionDataManager.botMovementManager();
 
-                    botMovementManager.controlState().jumping(true);
+                    sessionDataManager.controlState().jumping(true);
                     return Command.SINGLE_SUCCESS;
                 }))));
         dispatcher.register(literal("reset")
                 .executes(help("Resets the movement of all connected bots", c -> forEveryBot(bot -> {
-                    var sessionDataManager = bot.sessionDataManager();
-                    var botMovementManager = sessionDataManager.botMovementManager();
-
-                    botMovementManager.controlState().resetAll();
+                    bot.sessionDataManager().controlState().resetAll();
                     return Command.SINGLE_SUCCESS;
                 }))));
 
@@ -336,12 +336,12 @@ private int executePathfinding(GoalScorer goalScorer) {
             var executorService = bot.executorManager().newExecutorService(bot, "Pathfinding");
             executorService.execute(() -> {
                 var sessionDataManager = bot.sessionDataManager();
-                var botMovementManager = sessionDataManager.botMovementManager();
+                var clientEntity = sessionDataManager.clientEntity();
                 var routeFinder = new RouteFinder(new MinecraftGraph(sessionDataManager.tagsState()), goalScorer);
 
                 Boolean2ObjectFunction<List<WorldAction>> findPath = requiresRepositioning -> {
                     var start = BotEntityState.initialState(
-                            botMovementManager.getPlayerPos(),
+                            clientEntity.pos(),
                             new ProjectedLevelState(
                                     Objects.requireNonNull(sessionDataManager.getCurrentLevel(), "Level is null!")
                             ),

diff --git a/src/main/java/net/pistonmaster/serverwrecker/grpc/AttackServiceImpl.java b/src/main/java/net/pistonmaster/serverwrecker/grpc/AttackServiceImpl.java
@@ -22,7 +22,13 @@
 import io.grpc.stub.StreamObserver;
 import lombok.RequiredArgsConstructor;
 import net.pistonmaster.serverwrecker.client.settings.SettingsManager;
-import net.pistonmaster.serverwrecker.grpc.generated.*;
+import net.pistonmaster.serverwrecker.grpc.generated.AttackServiceGrpc;
+import net.pistonmaster.serverwrecker.grpc.generated.AttackStartRequest;
+import net.pistonmaster.serverwrecker.grpc.generated.AttackStartResponse;
+import net.pistonmaster.serverwrecker.grpc.generated.AttackStateToggleRequest;
+import net.pistonmaster.serverwrecker.grpc.generated.AttackStateToggleResponse;
+import net.pistonmaster.serverwrecker.grpc.generated.AttackStopRequest;
+import net.pistonmaster.serverwrecker.grpc.generated.AttackStopResponse;
 import net.pistonmaster.serverwrecker.server.ServerWreckerServer;
 
 import javax.inject.Inject;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/grpc/CommandServiceImpl.java b/src/main/java/net/pistonmaster/serverwrecker/grpc/CommandServiceImpl.java
@@ -22,7 +22,13 @@
 import io.grpc.stub.StreamObserver;
 import lombok.RequiredArgsConstructor;
 import net.pistonmaster.serverwrecker.command.ServerCommandManager;
-import net.pistonmaster.serverwrecker.grpc.generated.*;
+import net.pistonmaster.serverwrecker.grpc.generated.CommandCompletionRequest;
+import net.pistonmaster.serverwrecker.grpc.generated.CommandCompletionResponse;
+import net.pistonmaster.serverwrecker.grpc.generated.CommandHistoryRequest;
+import net.pistonmaster.serverwrecker.grpc.generated.CommandHistoryResponse;
+import net.pistonmaster.serverwrecker.grpc.generated.CommandRequest;
+import net.pistonmaster.serverwrecker.grpc.generated.CommandResponse;
+import net.pistonmaster.serverwrecker.grpc.generated.CommandServiceGrpc;
 
 import javax.inject.Inject;
 

diff --git a/src/main/java/net/pistonmaster/serverwrecker/grpc/JwtServerInterceptor.java b/src/main/java/net/pistonmaster/serverwrecker/grpc/JwtServerInterceptor.java
@@ -19,8 +19,18 @@
  */
 package net.pistonmaster.serverwrecker.grpc;
 
-import io.grpc.*;
-import io.jsonwebtoken.*;
+import io.grpc.Context;
+import io.grpc.Contexts;
+import io.grpc.Metadata;
+import io.grpc.ServerCall;
+import io.grpc.ServerCallHandler;
+import io.grpc.ServerInterceptor;
+import io.grpc.Status;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jws;
+import io.jsonwebtoken.JwtException;
+import io.jsonwebtoken.JwtParser;
+import io.jsonwebtoken.Jwts;
 
 import javax.crypto.SecretKey;
 

diff --git a/src/main/java/net/pistonmaster/serverwrecker/grpc/RPCServer.java b/src/main/java/net/pistonmaster/serverwrecker/grpc/RPCServer.java
@@ -20,7 +20,13 @@
 package net.pistonmaster.serverwrecker.grpc;
 
 import ch.jalu.injector.Injector;
-import io.grpc.*;
+import io.grpc.InsecureServerCredentials;
+import io.grpc.Metadata;
+import io.grpc.Server;
+import io.grpc.ServerBuilder;
+import io.grpc.ServerCall;
+import io.grpc.ServerCallHandler;
+import io.grpc.ServerInterceptor;
 import io.grpc.netty.NettyServerBuilder;
 import lombok.Getter;
 import org.slf4j.Logger;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/AttackManager.java b/src/main/java/net/pistonmaster/serverwrecker/server/AttackManager.java
@@ -45,15 +45,26 @@
 import net.pistonmaster.serverwrecker.server.protocol.netty.SWNettyHelper;
 import net.pistonmaster.serverwrecker.server.settings.BotSettings;
 import net.pistonmaster.serverwrecker.server.settings.lib.SettingsHolder;
-import net.pistonmaster.serverwrecker.server.viaversion.SWVersionConstants;
 import net.pistonmaster.serverwrecker.server.util.RandomUtil;
 import net.pistonmaster.serverwrecker.server.util.TimeUtil;
+import net.pistonmaster.serverwrecker.server.viaversion.SWVersionConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/ServerWreckerServer.java b/src/main/java/net/pistonmaster/serverwrecker/server/ServerWreckerServer.java
@@ -53,16 +53,32 @@
 import net.pistonmaster.serverwrecker.server.api.event.lifecycle.SettingsRegistryInitEvent;
 import net.pistonmaster.serverwrecker.server.data.ResourceData;
 import net.pistonmaster.serverwrecker.server.data.TranslationMapper;
-import net.pistonmaster.serverwrecker.server.plugins.*;
+import net.pistonmaster.serverwrecker.server.plugins.AutoArmor;
+import net.pistonmaster.serverwrecker.server.plugins.AutoEat;
+import net.pistonmaster.serverwrecker.server.plugins.AutoJump;
+import net.pistonmaster.serverwrecker.server.plugins.AutoReconnect;
+import net.pistonmaster.serverwrecker.server.plugins.AutoRegister;
+import net.pistonmaster.serverwrecker.server.plugins.AutoRespawn;
+import net.pistonmaster.serverwrecker.server.plugins.AutoTotem;
+import net.pistonmaster.serverwrecker.server.plugins.BotTicker;
+import net.pistonmaster.serverwrecker.server.plugins.ChatMessageLogger;
+import net.pistonmaster.serverwrecker.server.plugins.ClientBrand;
+import net.pistonmaster.serverwrecker.server.plugins.ClientSettings;
+import net.pistonmaster.serverwrecker.server.plugins.ServerListBypass;
 import net.pistonmaster.serverwrecker.server.protocol.packet.SWClientboundStatusResponsePacket;
 import net.pistonmaster.serverwrecker.server.settings.BotSettings;
 import net.pistonmaster.serverwrecker.server.settings.DevSettings;
 import net.pistonmaster.serverwrecker.server.settings.lib.ServerSettingsRegistry;
 import net.pistonmaster.serverwrecker.server.settings.lib.SettingsHolder;
+import net.pistonmaster.serverwrecker.server.util.VersionComparator;
 import net.pistonmaster.serverwrecker.server.viaversion.SWViaLoader;
-import net.pistonmaster.serverwrecker.server.viaversion.platform.*;
+import net.pistonmaster.serverwrecker.server.viaversion.platform.SWViaAprilFools;
+import net.pistonmaster.serverwrecker.server.viaversion.platform.SWViaBackwards;
+import net.pistonmaster.serverwrecker.server.viaversion.platform.SWViaBedrock;
+import net.pistonmaster.serverwrecker.server.viaversion.platform.SWViaLegacy;
+import net.pistonmaster.serverwrecker.server.viaversion.platform.SWViaPlatform;
+import net.pistonmaster.serverwrecker.server.viaversion.platform.SWViaRewind;
 import net.pistonmaster.serverwrecker.util.SWPathConstants;
-import net.pistonmaster.serverwrecker.server.util.VersionComparator;
 import org.apache.logging.log4j.LogManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...in/java/net/pistonmaster/serverwrecker/server/pathfinding/execution/BlockBreakAction.java b/...in/java/net/pistonmaster/serverwrecker/server/pathfinding/execution/BlockBreakAction.java
@@ -59,8 +59,9 @@ public boolean isCompleted(BotConnection connection) {
     @Override
     public void tick(BotConnection connection) {
         var sessionDataManager = connection.sessionDataManager();
+        var clientEntity = sessionDataManager.clientEntity();
         var movementManager = sessionDataManager.botMovementManager();
-        movementManager.controlState().resetAll();
+        sessionDataManager.controlState().resetAll();
 
         var levelState = sessionDataManager.getCurrentLevel();
         var inventoryManager = sessionDataManager.inventoryManager();
@@ -72,10 +73,10 @@ public void tick(BotConnection connection) {
 
         if (!didLook) {
             didLook = true;
-            var previousYaw = movementManager.getYaw();
-            var previousPitch = movementManager.getPitch();
-            movementManager.lookAt(RotationOrigin.EYES, VectorHelper.middleOfBlockNormalize(blockPosition.toVector3d()));
-            if (previousPitch != movementManager.getPitch() || previousYaw != movementManager.getYaw()) {
+            var previousYaw = clientEntity.yaw();
+            var previousPitch = clientEntity.pitch();
+            clientEntity.lookAt(RotationOrigin.EYES, VectorHelper.middleOfBlockNormalize(blockPosition.toVector3d()));
+            if (previousPitch != clientEntity.pitch() || previousYaw != clientEntity.yaw()) {
                 movementManager.sendRot();
             }
         }
@@ -102,8 +103,8 @@ public void tick(BotConnection connection) {
 
                 var cost = Costs.getRequiredMiningTicks(
                         sessionDataManager.tagsState(),
-                        sessionDataManager.selfEffectState(),
-                        sessionDataManager.botMovementManager().entity().onGround(),
+                        sessionDataManager.clientEntity().effectState(),
+                        sessionDataManager.botMovementManager().movementState().onGround(),
                         item,
                         optionalBlockType
                 ).ticks();
@@ -192,8 +193,8 @@ public void tick(BotConnection connection) {
 
             remainingTicks = Costs.getRequiredMiningTicks(
                     sessionDataManager.tagsState(),
-                    sessionDataManager.selfEffectState(),
-                    sessionDataManager.botMovementManager().entity().onGround(),
+                    sessionDataManager.clientEntity().effectState(),
+                    sessionDataManager.botMovementManager().movementState().onGround(),
                     sessionDataManager.inventoryManager().getPlayerInventory()
                             .hotbarSlot(sessionDataManager.inventoryManager().heldItemSlot())
                             .item(),

diff --git a/...in/java/net/pistonmaster/serverwrecker/server/pathfinding/execution/BlockPlaceAction.java b/...in/java/net/pistonmaster/serverwrecker/server/pathfinding/execution/BlockPlaceAction.java
@@ -54,8 +54,7 @@ public boolean isCompleted(BotConnection connection) {
     @Override
     public void tick(BotConnection connection) {
         var sessionDataManager = connection.sessionDataManager();
-        var movementManager = sessionDataManager.botMovementManager();
-        movementManager.controlState().resetAll();
+        sessionDataManager.controlState().resetAll();
 
         if (!putOnHotbar) {
             var inventoryManager = sessionDataManager.inventoryManager();