Cleanup imports

AlexProgrammerDE · Oct 2, 2023 · 7513be8 · 7513be8
1 parent 1844758
commit 7513be8
Show file tree

Hide file tree

Showing 21 changed files with 15 additions and 62 deletions.
diff --git a/src/main/java/net/pistonmaster/serverwrecker/ServerWrecker.java b/src/main/java/net/pistonmaster/serverwrecker/ServerWrecker.java
@@ -238,6 +238,17 @@ public ServerWrecker(OperationMode operationMode, String host, int port) {
         LOGGER.info("Finished loading!");
     }
 
+    public static void setupLogging(DevSettings devSettings) {
+        var level = devSettings.coreDebug() ? Level.DEBUG : Level.INFO;
+        var nettyLevel = devSettings.nettyDebug() ? Level.DEBUG : Level.INFO;
+        var grpcLevel = devSettings.grpcDebug() ? Level.DEBUG : Level.INFO;
+        Configurator.setRootLevel(level);
+        Configurator.setLevel(LOGGER.getName(), level);
+        Configurator.setLevel("org.pf4j", level);
+        Configurator.setLevel("io.netty", nettyLevel);
+        Configurator.setLevel("io.grpc", grpcLevel);
+    }
+
     private boolean checkForUpdates() {
         try {
             var url = URI.create("https://api.github.com/repos/AlexProgrammerDE/ServerWrecker/releases/latest").toURL();
@@ -297,17 +308,6 @@ public void setupLoggingAndVia(DevSettings devSettings) {
         setupLogging(devSettings);
     }
 
-    public static void setupLogging(DevSettings devSettings) {
-        var level = devSettings.coreDebug() ? Level.DEBUG : Level.INFO;
-        var nettyLevel = devSettings.nettyDebug() ? Level.DEBUG : Level.INFO;
-        var grpcLevel = devSettings.grpcDebug() ? Level.DEBUG : Level.INFO;
-        Configurator.setRootLevel(level);
-        Configurator.setLevel(LOGGER.getName(), level);
-        Configurator.setLevel("org.pf4j", level);
-        Configurator.setLevel("io.netty", nettyLevel);
-        Configurator.setLevel("io.grpc", grpcLevel);
-    }
-
     /**
      * Shuts down the proxy, kicking players with the specified reason.
      *

diff --git a/src/main/java/net/pistonmaster/serverwrecker/grpc/AttackServiceImpl.java b/src/main/java/net/pistonmaster/serverwrecker/grpc/AttackServiceImpl.java
@@ -23,7 +23,6 @@
 import lombok.RequiredArgsConstructor;
 import net.pistonmaster.serverwrecker.ServerWrecker;
 import net.pistonmaster.serverwrecker.grpc.generated.*;
-import net.pistonmaster.serverwrecker.settings.lib.SettingsHolder;
 
 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
@@ -25,7 +25,6 @@
 import net.pistonmaster.serverwrecker.logging.CommandManager;
 
 import javax.inject.Inject;
-import java.util.List;
 
 @RequiredArgsConstructor(onConstructor_ = @Inject)
 public class CommandServiceImpl extends CommandServiceGrpc.CommandServiceImplBase {

diff --git a/src/main/java/net/pistonmaster/serverwrecker/gui/libs/JFXFileHelper.java b/src/main/java/net/pistonmaster/serverwrecker/gui/libs/JFXFileHelper.java
@@ -22,7 +22,6 @@
 import javafx.application.Platform;
 import javafx.stage.FileChooser;
 
-import java.io.File;
 import java.nio.file.Path;
 import java.util.concurrent.CompletableFuture;
 

diff --git a/src/main/java/net/pistonmaster/serverwrecker/gui/libs/PastesDevService.java b/src/main/java/net/pistonmaster/serverwrecker/gui/libs/PastesDevService.java
@@ -24,7 +24,6 @@
 import net.pistonmaster.serverwrecker.builddata.BuildData;
 import org.apache.http.Header;
 import org.apache.http.HttpHeaders;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/gui/libs/SmartScroller.java b/src/main/java/net/pistonmaster/serverwrecker/gui/libs/SmartScroller.java
@@ -22,7 +22,6 @@
 import javax.swing.*;
 import javax.swing.text.DefaultCaret;
 import javax.swing.text.JTextComponent;
-import java.awt.*;
 import java.awt.event.AdjustmentEvent;
 import java.awt.event.AdjustmentListener;
 

diff --git a/src/main/java/net/pistonmaster/serverwrecker/gui/navigation/DeveloperPanel.java b/src/main/java/net/pistonmaster/serverwrecker/gui/navigation/DeveloperPanel.java
@@ -30,10 +30,8 @@
 import javax.inject.Inject;
 import javax.swing.*;
 import java.awt.*;
-import java.io.BufferedWriter;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Path;
 
 public class DeveloperPanel extends NavigationItem implements SettingsDuplex<DevSettings> {
     private final JCheckBox viaDebug = new JCheckBox();

diff --git a/src/main/java/net/pistonmaster/serverwrecker/gui/navigation/ProxyPanel.java b/src/main/java/net/pistonmaster/serverwrecker/gui/navigation/ProxyPanel.java
@@ -25,7 +25,6 @@
 import net.pistonmaster.serverwrecker.gui.libs.JEnumComboBox;
 import net.pistonmaster.serverwrecker.gui.libs.JFXFileHelper;
 import net.pistonmaster.serverwrecker.gui.libs.SwingTextUtils;
-import net.pistonmaster.serverwrecker.proxy.ProxyRegistry;
 import net.pistonmaster.serverwrecker.proxy.ProxySettings;
 import net.pistonmaster.serverwrecker.proxy.ProxyType;
 import net.pistonmaster.serverwrecker.proxy.SWProxy;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/gui/navigation/SettingsPanel.java b/src/main/java/net/pistonmaster/serverwrecker/gui/navigation/SettingsPanel.java
@@ -33,7 +33,6 @@
 import java.awt.*;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
 
 public class SettingsPanel extends NavigationItem implements SettingsDuplex<BotSettings> {
     private final JTextField hostInput = new JTextField(BotSettings.DEFAULT_HOST);

diff --git a/src/main/java/net/pistonmaster/serverwrecker/logging/CommandManager.java b/src/main/java/net/pistonmaster/serverwrecker/logging/CommandManager.java
@@ -25,10 +25,8 @@
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.suggestion.Suggestion;
-import io.netty.handler.traffic.GlobalTrafficShapingHandler;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import net.pistonmaster.serverwrecker.AttackManager;
 import net.pistonmaster.serverwrecker.ServerWrecker;
 import net.pistonmaster.serverwrecker.api.ConsoleSubject;
 import net.pistonmaster.serverwrecker.api.ServerWreckerAPI;
@@ -45,9 +43,6 @@
 import net.pistonmaster.serverwrecker.pathfinding.graph.MinecraftGraph;
 import net.pistonmaster.serverwrecker.pathfinding.graph.ProjectedInventory;
 import net.pistonmaster.serverwrecker.pathfinding.graph.ProjectedLevelState;
-import net.pistonmaster.serverwrecker.protocol.BotConnection;
-import net.pistonmaster.serverwrecker.protocol.bot.BotMovementManager;
-import net.pistonmaster.serverwrecker.protocol.bot.SessionDataManager;
 import org.apache.commons.io.FileUtils;
 import org.cloudburstmc.math.vector.Vector3d;
 import org.slf4j.Logger;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/pathfinding/execution/BlockBreakAction.java b/src/main/java/net/pistonmaster/serverwrecker/pathfinding/execution/BlockBreakAction.java
@@ -24,12 +24,6 @@
 import lombok.ToString;
 import net.pistonmaster.serverwrecker.data.ItemType;
 import net.pistonmaster.serverwrecker.protocol.BotConnection;
-import net.pistonmaster.serverwrecker.protocol.bot.BotMovementManager;
-import net.pistonmaster.serverwrecker.protocol.bot.container.ContainerSlot;
-import net.pistonmaster.serverwrecker.protocol.bot.container.InventoryManager;
-import net.pistonmaster.serverwrecker.protocol.bot.container.PlayerInventoryContainer;
-import net.pistonmaster.serverwrecker.protocol.bot.container.SWItemStack;
-import net.pistonmaster.serverwrecker.protocol.bot.state.LevelState;
 import net.pistonmaster.serverwrecker.util.TimeUtil;
 import net.pistonmaster.serverwrecker.util.VectorHelper;
 import org.cloudburstmc.math.vector.Vector3i;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/pathfinding/execution/BlockPlaceAction.java b/src/main/java/net/pistonmaster/serverwrecker/pathfinding/execution/BlockPlaceAction.java
@@ -23,12 +23,6 @@
 import lombok.ToString;
 import net.pistonmaster.serverwrecker.data.ItemType;
 import net.pistonmaster.serverwrecker.protocol.BotConnection;
-import net.pistonmaster.serverwrecker.protocol.bot.BotMovementManager;
-import net.pistonmaster.serverwrecker.protocol.bot.container.ContainerSlot;
-import net.pistonmaster.serverwrecker.protocol.bot.container.InventoryManager;
-import net.pistonmaster.serverwrecker.protocol.bot.container.PlayerInventoryContainer;
-import net.pistonmaster.serverwrecker.protocol.bot.container.SWItemStack;
-import net.pistonmaster.serverwrecker.protocol.bot.state.LevelState;
 import net.pistonmaster.serverwrecker.util.TimeUtil;
 import org.cloudburstmc.math.vector.Vector3i;
 

diff --git a/src/main/java/net/pistonmaster/serverwrecker/pathfinding/execution/MovementAction.java b/src/main/java/net/pistonmaster/serverwrecker/pathfinding/execution/MovementAction.java
@@ -23,14 +23,9 @@
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
 import net.pistonmaster.serverwrecker.protocol.BotConnection;
-import net.pistonmaster.serverwrecker.protocol.bot.BotMovementManager;
-import net.pistonmaster.serverwrecker.protocol.bot.block.BlockStateMeta;
-import net.pistonmaster.serverwrecker.protocol.bot.state.LevelState;
 import net.pistonmaster.serverwrecker.util.BlockTypeHelper;
 import org.cloudburstmc.math.vector.Vector3d;
 
-import java.util.Optional;
-
 @ToString
 @RequiredArgsConstructor
 public class MovementAction implements WorldAction {

diff --git a/src/main/java/net/pistonmaster/serverwrecker/pathfinding/goals/XZGoal.java b/src/main/java/net/pistonmaster/serverwrecker/pathfinding/goals/XZGoal.java
@@ -22,7 +22,6 @@
 import net.pistonmaster.serverwrecker.pathfinding.BotEntityState;
 import net.pistonmaster.serverwrecker.util.VectorHelper;
 import org.cloudburstmc.math.vector.Vector2d;
-import org.cloudburstmc.math.vector.Vector3d;
 
 public record XZGoal(Vector2d goal) implements GoalScorer {
     public XZGoal {

diff --git a/src/main/java/net/pistonmaster/serverwrecker/pathfinding/graph/PlayerMovement.java b/src/main/java/net/pistonmaster/serverwrecker/pathfinding/graph/PlayerMovement.java
@@ -20,7 +20,6 @@
 package net.pistonmaster.serverwrecker.pathfinding.graph;
 
 import com.google.common.util.concurrent.AtomicDouble;
-import net.pistonmaster.serverwrecker.data.BlockShapeType;
 import net.pistonmaster.serverwrecker.pathfinding.BotEntityState;
 import net.pistonmaster.serverwrecker.pathfinding.Costs;
 import net.pistonmaster.serverwrecker.pathfinding.execution.BlockBreakAction;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/protocol/bot/BotActionManager.java b/src/main/java/net/pistonmaster/serverwrecker/protocol/bot/BotActionManager.java
@@ -29,10 +29,7 @@
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
-import net.pistonmaster.serverwrecker.data.BlockShape;
 import net.pistonmaster.serverwrecker.data.BlockShapeType;
-import net.pistonmaster.serverwrecker.protocol.bot.block.BlockStateMeta;
-import net.pistonmaster.serverwrecker.protocol.bot.state.LevelState;
 import net.pistonmaster.serverwrecker.util.BoundingBox;
 import org.cloudburstmc.math.vector.Vector3d;
 import org.cloudburstmc.math.vector.Vector3f;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/protocol/bot/BotControlAPI.java b/src/main/java/net/pistonmaster/serverwrecker/protocol/bot/BotControlAPI.java
@@ -27,7 +27,6 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
-import net.pistonmaster.serverwrecker.protocol.bot.model.AbilitiesData;
 
 import java.security.SecureRandom;
 import java.time.Instant;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/protocol/bot/BotMovementManager.java b/src/main/java/net/pistonmaster/serverwrecker/protocol/bot/BotMovementManager.java
@@ -38,7 +38,6 @@
 
 import java.util.Comparator;
 import java.util.List;
-import java.util.Optional;
 
 /**
  * Huge credit to <a href="https://github.com/LabyStudio/java-minecraft/blob/master/src/main/java/de/labystudio/game/player/Player.java">LabyStudio/java-minecraft</a>

diff --git a/src/main/java/net/pistonmaster/serverwrecker/protocol/bot/SessionDataManager.java b/src/main/java/net/pistonmaster/serverwrecker/protocol/bot/SessionDataManager.java
@@ -23,18 +23,13 @@
 import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
 import com.github.steveice10.mc.protocol.data.UnexpectedEncryptionException;
 import com.github.steveice10.mc.protocol.data.game.ClientCommand;
-import com.github.steveice10.mc.protocol.data.game.PlayerListEntry;
-import com.github.steveice10.mc.protocol.data.game.PlayerListEntryAction;
 import com.github.steveice10.mc.protocol.data.game.ResourcePackStatus;
-import com.github.steveice10.mc.protocol.data.game.chunk.ChunkBiomeData;
 import com.github.steveice10.mc.protocol.data.game.chunk.ChunkSection;
-import com.github.steveice10.mc.protocol.data.game.chunk.DataPalette;
 import com.github.steveice10.mc.protocol.data.game.chunk.palette.PaletteType;
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.GlobalPos;
 import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode;
 import com.github.steveice10.mc.protocol.data.game.entity.player.PlayerSpawnInfo;
 import com.github.steveice10.mc.protocol.data.game.entity.player.PositionElement;
-import com.github.steveice10.mc.protocol.data.game.level.block.BlockChangeEntry;
 import com.github.steveice10.mc.protocol.data.game.level.notify.RainStrengthValue;
 import com.github.steveice10.mc.protocol.data.game.level.notify.RespawnScreenValue;
 import com.github.steveice10.mc.protocol.data.game.level.notify.ThunderStrengthValue;
@@ -55,7 +50,10 @@
 import com.github.steveice10.mc.protocol.packet.ingame.serverbound.level.ServerboundAcceptTeleportationPacket;
 import com.github.steveice10.mc.protocol.packet.login.clientbound.ClientboundGameProfilePacket;
 import com.github.steveice10.mc.protocol.packet.login.clientbound.ClientboundLoginDisconnectPacket;
-import com.github.steveice10.opennbt.tag.builtin.*;
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.opennbt.tag.builtin.IntTag;
+import com.github.steveice10.opennbt.tag.builtin.ListTag;
+import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import com.github.steveice10.packetlib.event.session.DisconnectedEvent;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -71,27 +69,23 @@
 import net.pistonmaster.serverwrecker.api.event.bot.ChatMessageReceiveEvent;
 import net.pistonmaster.serverwrecker.data.ResourceData;
 import net.pistonmaster.serverwrecker.protocol.BotConnection;
-import net.pistonmaster.serverwrecker.protocol.bot.container.Container;
 import net.pistonmaster.serverwrecker.protocol.bot.container.InventoryManager;
 import net.pistonmaster.serverwrecker.protocol.bot.container.SWItemStack;
 import net.pistonmaster.serverwrecker.protocol.bot.container.WindowContainer;
 import net.pistonmaster.serverwrecker.protocol.bot.model.*;
 import net.pistonmaster.serverwrecker.protocol.bot.state.*;
-import net.pistonmaster.serverwrecker.protocol.bot.state.entity.EntityLikeState;
 import net.pistonmaster.serverwrecker.protocol.bot.state.entity.EntityState;
 import net.pistonmaster.serverwrecker.protocol.bot.state.entity.ExperienceOrbState;
 import net.pistonmaster.serverwrecker.protocol.bot.state.tag.TagsState;
 import net.pistonmaster.serverwrecker.protocol.netty.ViaClientSession;
 import net.pistonmaster.serverwrecker.settings.lib.SettingsHolder;
 import net.pistonmaster.serverwrecker.util.BusHandler;
 import org.cloudburstmc.math.vector.Vector3d;
-import org.cloudburstmc.math.vector.Vector3i;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 
 import java.io.IOException;
 import java.util.Map;
-import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 

diff --git a/src/main/java/net/pistonmaster/serverwrecker/protocol/bot/state/LevelState.java b/src/main/java/net/pistonmaster/serverwrecker/protocol/bot/state/LevelState.java
@@ -23,8 +23,6 @@
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import lombok.Getter;
 import lombok.Setter;
-import net.pistonmaster.serverwrecker.data.BlockShape;
-import net.pistonmaster.serverwrecker.data.BlockShapeType;
 import net.pistonmaster.serverwrecker.data.BlockType;
 import net.pistonmaster.serverwrecker.data.ResourceData;
 import net.pistonmaster.serverwrecker.protocol.bot.SessionDataManager;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/protocol/netty/SWNettyHelper.java b/src/main/java/net/pistonmaster/serverwrecker/protocol/netty/SWNettyHelper.java
@@ -41,7 +41,6 @@
 import io.netty.incubator.channel.uring.IOUringSocketChannel;
 import net.pistonmaster.serverwrecker.proxy.SWProxy;
 
-import java.net.InetSocketAddress;
 import java.util.concurrent.ThreadFactory;
 
 public class SWNettyHelper {