Merge remote-tracking branch 'origin/main'

AlexProgrammerDE · Dec 19, 2023 · ac6da1a · ac6da1a
2 parents 33adc9c + 3ee3404
commit ac6da1a
Show file tree

Hide file tree

Showing 31 changed files with 67 additions and 323 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -36,8 +36,8 @@ via-aprilfools = "net.raphimc:ViaAprilFools:2.0.10"
 via-loader = "net.raphimc:ViaLoader:2.2.12"
 via-bedrock = "net.raphimc:ViaBedrock:0.0.3-SNAPSHOT"
 snakeyaml = "org.yaml:snakeyaml:2.2"
-kyori-plain = "net.kyori:adventure-text-serializer-plain:4.14.0"
-kyori-gson = "net.kyori:adventure-text-serializer-gson:4.14.0"
+kyori-plain = "net.kyori:adventure-text-serializer-plain:4.15.0"
+kyori-gson = "net.kyori:adventure-text-serializer-gson:4.15.0"
 commons-validator = "commons-validator:commons-validator:1.8.0"
 commons-io = "commons-io:commons-io:2.15.1"
 guava = "com.google.guava:guava:32.1.3-jre"
@@ -48,7 +48,7 @@ caffeine = "com.github.ben-manes.caffeine:caffeine:3.1.8"
 classtransform-mixinstranslator = "net.lenni0451.classtransform:mixinstranslator:1.12.1"
 classtransform-mixinsdummy = "net.lenni0451.classtransform:mixinsdummy:1.12.1"
 classtransform-additionalclassprovider = "net.lenni0451.classtransform:additionalclassprovider:1.12.1"
-reflect = "net.lenni0451:Reflect:1.3.1"
+reflect = "net.lenni0451:Reflect:1.3.2"
 lambdaevents = "net.lenni0451:LambdaEvents:2.4.0"
 appdirs = "net.harawata:appdirs:1.2.2"
 minecraftauth = "net.raphimc:MinecraftAuth:3.0.0"

diff --git a/src/main/java/net/pistonmaster/serverwrecker/account/AuthType.java b/src/main/java/net/pistonmaster/serverwrecker/account/AuthType.java
@@ -21,16 +21,7 @@
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-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;
+import net.pistonmaster.serverwrecker.account.service.*;
 
 @Getter
 @RequiredArgsConstructor

diff --git a/src/main/java/net/pistonmaster/serverwrecker/account/MinecraftAccount.java b/src/main/java/net/pistonmaster/serverwrecker/account/MinecraftAccount.java
@@ -26,7 +26,8 @@
 
 import java.util.UUID;
 
-public record MinecraftAccount(@NonNull AuthType authType, @NonNull String username, @NonNull AccountData accountData, boolean enabled) {
+public record MinecraftAccount(@NonNull AuthType authType, @NonNull String username, @NonNull AccountData accountData,
+                               boolean enabled) {
     @Override
     public String toString() {
         return String.format("MinecraftAccount(authType=%s, username=%s, enabled=%s)", authType, username, enabled);

diff --git a/src/main/java/net/pistonmaster/serverwrecker/account/service/SWOfflineAuthService.java b/src/main/java/net/pistonmaster/serverwrecker/account/service/SWOfflineAuthService.java
@@ -26,15 +26,15 @@
 import java.io.IOException;
 
 public final class SWOfflineAuthService implements MCAuthService<SWOfflineAuthService.OfflineAuthData> {
+    public static MinecraftAccount createAccount(String username) {
+        return new MinecraftAccount(AuthType.OFFLINE, username, new OfflineJavaData(username), true);
+    }
+
     @Override
     public MinecraftAccount login(OfflineAuthData data, SWProxy proxyData) throws IOException {
         return createAccount(data.username());
     }
 
-    public static MinecraftAccount createAccount(String username) {
-        return new MinecraftAccount(AuthType.OFFLINE, username, new OfflineJavaData(username), true);
-    }
-
     @Override
     public OfflineAuthData createData(String data) {
         return new OfflineAuthData(data);

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,12 +23,7 @@
 import com.formdev.flatlaf.FlatDarkLaf;
 import com.formdev.flatlaf.FlatIntelliJLaf;
 import com.formdev.flatlaf.FlatLightLaf;
-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.*;
 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,13 +23,7 @@
 import lombok.extern.slf4j.Slf4j;
 
 import javax.swing.*;
-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 javax.swing.text.*;
 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,12 +21,7 @@
 
 import io.grpc.stub.StreamObserver;
 import net.pistonmaster.serverwrecker.client.gui.GUIManager;
-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.grpc.generated.*;
 
 import javax.inject.Inject;
 import javax.swing.*;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/client/settings/ProxyRegistry.java b/src/main/java/net/pistonmaster/serverwrecker/client/settings/ProxyRegistry.java
@@ -35,6 +35,14 @@ public class ProxyRegistry {
     private final List<SWProxy> proxies = new ArrayList<>();
     private final List<Runnable> loadHooks = new ArrayList<>();
 
+    private static <T> T getIndexOrNull(T[] array, int index) {
+        if (index < array.length) {
+            return array[index];
+        } else {
+            return null;
+        }
+    }
+
     public void loadFromString(String data, ProxyType proxyType) {
         var newProxies = data.lines()
                 .filter(line -> !line.isBlank())
@@ -66,14 +74,6 @@ private SWProxy fromStringSingle(String data, ProxyType proxyType) {
         return new SWProxy(proxyType, host, port, username, password, true);
     }
 
-    private static <T> T getIndexOrNull(T[] array, int index) {
-        if (index < array.length) {
-            return array[index];
-        } else {
-            return null;
-        }
-    }
-
     public List<SWProxy> getProxies() {
         return Collections.unmodifiableList(proxies);
     }

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,16 +21,7 @@
 
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
-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 com.google.gson.*;
 import it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap;
 import it.unimi.dsi.fastutil.objects.Object2IntArrayMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
@@ -57,11 +48,7 @@
 import java.security.interfaces.ECPublicKey;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 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,11 +62,7 @@
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.function.ToIntFunction;
 
 import static com.mojang.brigadier.CommandDispatcher.ARGUMENT_SEPARATOR;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/grpc/AttackServiceImpl.java b/src/main/java/net/pistonmaster/serverwrecker/grpc/AttackServiceImpl.java
@@ -22,13 +22,7 @@
 import io.grpc.stub.StreamObserver;
 import lombok.RequiredArgsConstructor;
 import net.pistonmaster.serverwrecker.client.settings.SettingsManager;
-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.grpc.generated.*;
 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,13 +22,7 @@
 import io.grpc.stub.StreamObserver;
 import lombok.RequiredArgsConstructor;
 import net.pistonmaster.serverwrecker.command.ServerCommandManager;
-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 net.pistonmaster.serverwrecker.grpc.generated.*;
 
 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,18 +19,8 @@
  */
 package net.pistonmaster.serverwrecker.grpc;
 
-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 io.grpc.*;
+import io.jsonwebtoken.*;
 
 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,13 +20,7 @@
 package net.pistonmaster.serverwrecker.grpc;
 
 import ch.jalu.injector.Injector;
-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.*;
 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
@@ -52,19 +52,8 @@
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
-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.*;
+import java.util.concurrent.*;
 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,31 +53,15 @@
 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.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.plugins.*;
 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.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.server.viaversion.platform.*;
 import net.pistonmaster.serverwrecker.util.SWPathConstants;
 import org.apache.logging.log4j.LogManager;
 import org.slf4j.Logger;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/pathfinding/graph/MinecraftGraph.java b/src/main/java/net/pistonmaster/serverwrecker/server/pathfinding/graph/MinecraftGraph.java
@@ -19,27 +19,14 @@
  */
 package net.pistonmaster.serverwrecker.server.pathfinding.graph;
 
-import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
-import it.unimi.dsi.fastutil.objects.Object2ObjectFunction;
-import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
-import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import it.unimi.dsi.fastutil.objects.ObjectList;
+import it.unimi.dsi.fastutil.objects.*;
 import lombok.extern.slf4j.Slf4j;
 import net.pistonmaster.serverwrecker.server.data.BlockItems;
 import net.pistonmaster.serverwrecker.server.data.BlockType;
 import net.pistonmaster.serverwrecker.server.pathfinding.BotEntityState;
 import net.pistonmaster.serverwrecker.server.pathfinding.SWVec3i;
-import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.DownMovement;
-import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.GraphAction;
-import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.ParkourMovement;
-import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.PlayerMovement;
-import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.UpMovement;
-import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.movement.BlockSafetyData;
-import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.movement.MovementDirection;
-import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.movement.MovementMiningCost;
-import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.movement.MovementModifier;
-import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.movement.MovementSide;
-import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.movement.ParkourDirection;
+import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.*;
+import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.movement.*;
 import net.pistonmaster.serverwrecker.server.protocol.bot.BotActionManager;
 import net.pistonmaster.serverwrecker.server.protocol.bot.block.BlockStateMeta;
 import net.pistonmaster.serverwrecker.server.protocol.bot.state.tag.TagsState;

diff --git a/.../java/net/pistonmaster/serverwrecker/server/pathfinding/graph/actions/PlayerMovement.java b/.../java/net/pistonmaster/serverwrecker/server/pathfinding/graph/actions/PlayerMovement.java
@@ -32,13 +32,7 @@
 import net.pistonmaster.serverwrecker.server.pathfinding.execution.MovementAction;
 import net.pistonmaster.serverwrecker.server.pathfinding.execution.WorldAction;
 import net.pistonmaster.serverwrecker.server.pathfinding.graph.GraphInstructions;
-import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.movement.BlockDirection;
-import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.movement.BlockSafetyData;
-import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.movement.BodyPart;
-import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.movement.MovementDirection;
-import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.movement.MovementMiningCost;
-import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.movement.MovementModifier;
-import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.movement.MovementSide;
+import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.movement.*;
 import net.pistonmaster.serverwrecker.server.protocol.bot.BotActionManager;
 import net.pistonmaster.serverwrecker.server.util.VectorHelper;
 

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/plugins/ClientSettings.java b/src/main/java/net/pistonmaster/serverwrecker/server/plugins/ClientSettings.java
@@ -33,11 +33,7 @@
 import net.pistonmaster.serverwrecker.server.api.event.bot.SWPacketSentEvent;
 import net.pistonmaster.serverwrecker.server.api.event.lifecycle.SettingsRegistryInitEvent;
 import net.pistonmaster.serverwrecker.server.settings.lib.SettingsObject;
-import net.pistonmaster.serverwrecker.server.settings.lib.property.BooleanProperty;
-import net.pistonmaster.serverwrecker.server.settings.lib.property.ComboProperty;
-import net.pistonmaster.serverwrecker.server.settings.lib.property.IntProperty;
-import net.pistonmaster.serverwrecker.server.settings.lib.property.Property;
-import net.pistonmaster.serverwrecker.server.settings.lib.property.StringProperty;
+import net.pistonmaster.serverwrecker.server.settings.lib.property.*;
 
 import javax.inject.Inject;
 import java.util.ArrayList;