Move server utils to server package

AlexProgrammerDE · Dec 17, 2023 · 179ab3e · 179ab3e
1 parent bf9aa67
commit 179ab3e
Show file tree

Hide file tree

Showing 54 changed files with 87 additions and 64 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -24,16 +24,16 @@ application {
 
 tasks {
     distTar {
-        enabled = false
+        onlyIf { false }
     }
     distZip {
-        enabled = false
+        onlyIf { false }
     }
     shadowDistTar {
-        archiveBaseName.set("ServerWrecker")
+        onlyIf { false }
     }
     shadowDistZip {
-        archiveBaseName.set("ServerWrecker")
+        onlyIf { false }
     }
     withType<ShadowJar> {
         archiveBaseName.set("ServerWrecker")

diff --git a/src/main/java/net/pistonmaster/serverwrecker/ServerWreckerBootstrap.java b/src/main/java/net/pistonmaster/serverwrecker/ServerWreckerBootstrap.java
@@ -27,7 +27,7 @@
 import net.pistonmaster.serverwrecker.server.api.MixinExtension;
 import net.pistonmaster.serverwrecker.server.settings.DevSettings;
 import net.pistonmaster.serverwrecker.server.settings.lib.SettingsHolder;
-import net.pistonmaster.serverwrecker.util.CustomClassProvider;
+import net.pistonmaster.serverwrecker.server.util.CustomClassProvider;
 import net.pistonmaster.serverwrecker.util.SWPathConstants;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.config.Configurator;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/ServerWreckerLauncher.java b/src/main/java/net/pistonmaster/serverwrecker/ServerWreckerLauncher.java
@@ -19,7 +19,7 @@
  */
 package net.pistonmaster.serverwrecker;
 
-import net.pistonmaster.serverwrecker.util.SWContextClassLoader;
+import net.pistonmaster.serverwrecker.server.util.SWContextClassLoader;
 
 import java.util.List;
 

diff --git a/src/main/java/net/pistonmaster/serverwrecker/account/service/SWTheAlteningAuthService.java b/src/main/java/net/pistonmaster/serverwrecker/account/service/SWTheAlteningAuthService.java
@@ -26,7 +26,7 @@
 import net.pistonmaster.serverwrecker.account.HttpHelper;
 import net.pistonmaster.serverwrecker.account.MinecraftAccount;
 import net.pistonmaster.serverwrecker.proxy.SWProxy;
-import net.pistonmaster.serverwrecker.util.UUIDHelper;
+import net.pistonmaster.serverwrecker.server.util.UUIDHelper;
 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/server/AttackManager.java b/src/main/java/net/pistonmaster/serverwrecker/server/AttackManager.java
@@ -46,8 +46,8 @@
 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.util.RandomUtil;
-import net.pistonmaster.serverwrecker.util.TimeUtil;
+import net.pistonmaster.serverwrecker.server.util.RandomUtil;
+import net.pistonmaster.serverwrecker.server.util.TimeUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/ServerWreckerServer.java b/src/main/java/net/pistonmaster/serverwrecker/server/ServerWreckerServer.java
@@ -62,7 +62,7 @@
 import net.pistonmaster.serverwrecker.server.viaversion.SWViaLoader;
 import net.pistonmaster.serverwrecker.server.viaversion.platform.*;
 import net.pistonmaster.serverwrecker.util.SWPathConstants;
-import net.pistonmaster.serverwrecker.util.VersionComparator;
+import net.pistonmaster.serverwrecker.server.util.VersionComparator;
 import org.apache.logging.log4j.LogManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/api/ExecutorHelper.java b/src/main/java/net/pistonmaster/serverwrecker/server/api/ExecutorHelper.java
@@ -19,7 +19,7 @@
  */
 package net.pistonmaster.serverwrecker.server.api;
 
-import net.pistonmaster.serverwrecker.util.RandomUtil;
+import net.pistonmaster.serverwrecker.server.util.RandomUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/data/OffsetData.java b/src/main/java/net/pistonmaster/serverwrecker/server/data/OffsetData.java
@@ -19,7 +19,7 @@
  */
 package net.pistonmaster.serverwrecker.server.data;
 
-import net.pistonmaster.serverwrecker.util.MathHelper;
+import net.pistonmaster.serverwrecker.server.util.MathHelper;
 import org.cloudburstmc.math.GenericMath;
 import org.cloudburstmc.math.vector.Vector3d;
 import org.cloudburstmc.math.vector.Vector3i;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/pathfinding/BotEntityState.java b/src/main/java/net/pistonmaster/serverwrecker/server/pathfinding/BotEntityState.java
@@ -21,7 +21,7 @@
 
 import net.pistonmaster.serverwrecker.server.pathfinding.graph.ProjectedInventory;
 import net.pistonmaster.serverwrecker.server.pathfinding.graph.ProjectedLevelState;
-import net.pistonmaster.serverwrecker.util.VectorHelper;
+import net.pistonmaster.serverwrecker.server.util.VectorHelper;
 import org.cloudburstmc.math.vector.Vector3d;
 
 /**

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/pathfinding/Costs.java b/src/main/java/net/pistonmaster/serverwrecker/server/pathfinding/Costs.java
@@ -28,7 +28,7 @@
 import net.pistonmaster.serverwrecker.server.protocol.bot.container.SWItemStack;
 import net.pistonmaster.serverwrecker.server.protocol.bot.state.EntityEffectState;
 import net.pistonmaster.serverwrecker.server.protocol.bot.state.tag.TagsState;
-import net.pistonmaster.serverwrecker.util.MathHelper;
+import net.pistonmaster.serverwrecker.server.util.MathHelper;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.OptionalInt;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/pathfinding/RouteFinder.java b/src/main/java/net/pistonmaster/serverwrecker/server/pathfinding/RouteFinder.java
@@ -32,7 +32,7 @@
 import net.pistonmaster.serverwrecker.server.pathfinding.graph.GraphInstructions;
 import net.pistonmaster.serverwrecker.server.pathfinding.graph.MinecraftGraph;
 import net.pistonmaster.serverwrecker.server.pathfinding.graph.OutOfLevelException;
-import net.pistonmaster.serverwrecker.util.VectorHelper;
+import net.pistonmaster.serverwrecker.server.util.VectorHelper;
 
 import java.util.Collections;
 import java.util.List;

diff --git a/...in/java/net/pistonmaster/serverwrecker/server/pathfinding/execution/BlockBreakAction.java b/...in/java/net/pistonmaster/serverwrecker/server/pathfinding/execution/BlockBreakAction.java
@@ -28,8 +28,8 @@
 import net.pistonmaster.serverwrecker.server.pathfinding.SWVec3i;
 import net.pistonmaster.serverwrecker.server.protocol.BotConnection;
 import net.pistonmaster.serverwrecker.server.protocol.bot.container.SWItemStack;
-import net.pistonmaster.serverwrecker.util.TimeUtil;
-import net.pistonmaster.serverwrecker.util.VectorHelper;
+import net.pistonmaster.serverwrecker.server.util.TimeUtil;
+import net.pistonmaster.serverwrecker.server.util.VectorHelper;
 
 import java.util.concurrent.TimeUnit;
 

diff --git a/...in/java/net/pistonmaster/serverwrecker/server/pathfinding/execution/BlockPlaceAction.java b/...in/java/net/pistonmaster/serverwrecker/server/pathfinding/execution/BlockPlaceAction.java
@@ -27,9 +27,9 @@
 import net.pistonmaster.serverwrecker.server.protocol.BotConnection;
 import net.pistonmaster.serverwrecker.server.protocol.bot.BotActionManager;
 import net.pistonmaster.serverwrecker.server.protocol.bot.container.SWItemStack;
-import net.pistonmaster.serverwrecker.util.BlockTypeHelper;
-import net.pistonmaster.serverwrecker.util.ItemTypeHelper;
-import net.pistonmaster.serverwrecker.util.TimeUtil;
+import net.pistonmaster.serverwrecker.server.util.BlockTypeHelper;
+import net.pistonmaster.serverwrecker.server.util.ItemTypeHelper;
+import net.pistonmaster.serverwrecker.server.util.TimeUtil;
 
 import java.util.concurrent.TimeUnit;
 

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/pathfinding/execution/GapJumpAction.java b/src/main/java/net/pistonmaster/serverwrecker/server/pathfinding/execution/GapJumpAction.java
@@ -23,7 +23,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
 import net.pistonmaster.serverwrecker.server.protocol.BotConnection;
-import net.pistonmaster.serverwrecker.util.BlockTypeHelper;
+import net.pistonmaster.serverwrecker.server.util.BlockTypeHelper;
 import org.cloudburstmc.math.vector.Vector3d;
 
 @ToString

diff --git a/.../net/pistonmaster/serverwrecker/server/pathfinding/execution/JumpAndPlaceBelowAction.java b/.../net/pistonmaster/serverwrecker/server/pathfinding/execution/JumpAndPlaceBelowAction.java
@@ -27,9 +27,9 @@
 import net.pistonmaster.serverwrecker.server.protocol.BotConnection;
 import net.pistonmaster.serverwrecker.server.protocol.bot.BotActionManager;
 import net.pistonmaster.serverwrecker.server.protocol.bot.container.SWItemStack;
-import net.pistonmaster.serverwrecker.util.BlockTypeHelper;
-import net.pistonmaster.serverwrecker.util.ItemTypeHelper;
-import net.pistonmaster.serverwrecker.util.TimeUtil;
+import net.pistonmaster.serverwrecker.server.util.BlockTypeHelper;
+import net.pistonmaster.serverwrecker.server.util.ItemTypeHelper;
+import net.pistonmaster.serverwrecker.server.util.TimeUtil;
 
 import java.util.concurrent.TimeUnit;
 

diff --git a/...main/java/net/pistonmaster/serverwrecker/server/pathfinding/execution/MovementAction.java b/...main/java/net/pistonmaster/serverwrecker/server/pathfinding/execution/MovementAction.java
@@ -23,7 +23,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
 import net.pistonmaster.serverwrecker.server.protocol.BotConnection;
-import net.pistonmaster.serverwrecker.util.BlockTypeHelper;
+import net.pistonmaster.serverwrecker.server.util.BlockTypeHelper;
 import org.cloudburstmc.math.vector.Vector3d;
 
 @ToString

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/pathfinding/execution/PathExecutor.java b/src/main/java/net/pistonmaster/serverwrecker/server/pathfinding/execution/PathExecutor.java
@@ -23,7 +23,7 @@
 import net.pistonmaster.serverwrecker.server.api.event.EventUtil;
 import net.pistonmaster.serverwrecker.server.api.event.bot.BotPreTickEvent;
 import net.pistonmaster.serverwrecker.server.protocol.BotConnection;
-import net.pistonmaster.serverwrecker.util.TimeUtil;
+import net.pistonmaster.serverwrecker.server.util.TimeUtil;
 
 import java.util.List;
 import java.util.Queue;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/pathfinding/goals/BreakBlockPosGoal.java b/src/main/java/net/pistonmaster/serverwrecker/server/pathfinding/goals/BreakBlockPosGoal.java
@@ -23,7 +23,7 @@
 import net.pistonmaster.serverwrecker.server.pathfinding.BotEntityState;
 import net.pistonmaster.serverwrecker.server.pathfinding.SWVec3i;
 import net.pistonmaster.serverwrecker.server.pathfinding.graph.MinecraftGraph;
-import net.pistonmaster.serverwrecker.util.BlockTypeHelper;
+import net.pistonmaster.serverwrecker.server.util.BlockTypeHelper;
 
 public record BreakBlockPosGoal(SWVec3i goal) implements GoalScorer {
     @Override

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

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

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
@@ -30,7 +30,7 @@
 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;
-import net.pistonmaster.serverwrecker.util.BlockTypeHelper;
+import net.pistonmaster.serverwrecker.server.util.BlockTypeHelper;
 
 @Slf4j
 public record MinecraftGraph(TagsState tagsState) {

diff --git a/...main/java/net/pistonmaster/serverwrecker/server/pathfinding/graph/ProjectedInventory.java b/...main/java/net/pistonmaster/serverwrecker/server/pathfinding/graph/ProjectedInventory.java
@@ -27,7 +27,7 @@
 import net.pistonmaster.serverwrecker.server.protocol.bot.container.PlayerInventoryContainer;
 import net.pistonmaster.serverwrecker.server.protocol.bot.container.SWItemStack;
 import net.pistonmaster.serverwrecker.server.protocol.bot.state.tag.TagsState;
-import net.pistonmaster.serverwrecker.util.ItemTypeHelper;
+import net.pistonmaster.serverwrecker.server.util.ItemTypeHelper;
 
 import java.util.HashSet;
 import java.util.Map;

diff --git a/...ain/java/net/pistonmaster/serverwrecker/server/pathfinding/graph/ProjectedLevelState.java b/...ain/java/net/pistonmaster/serverwrecker/server/pathfinding/graph/ProjectedLevelState.java
@@ -28,7 +28,7 @@
 import net.pistonmaster.serverwrecker.server.protocol.bot.block.BlockStateMeta;
 import net.pistonmaster.serverwrecker.server.protocol.bot.state.ChunkHolder;
 import net.pistonmaster.serverwrecker.server.protocol.bot.state.LevelState;
-import net.pistonmaster.serverwrecker.util.VectorHelper;
+import net.pistonmaster.serverwrecker.server.util.VectorHelper;
 
 /**
  * An immutable representation of the world state.

diff --git a/...in/java/net/pistonmaster/serverwrecker/server/pathfinding/graph/actions/DownMovement.java b/...in/java/net/pistonmaster/serverwrecker/server/pathfinding/graph/actions/DownMovement.java
@@ -28,7 +28,7 @@
 import net.pistonmaster.serverwrecker.server.pathfinding.execution.BlockBreakAction;
 import net.pistonmaster.serverwrecker.server.pathfinding.graph.GraphInstructions;
 import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.movement.MovementMiningCost;
-import net.pistonmaster.serverwrecker.util.VectorHelper;
+import net.pistonmaster.serverwrecker.server.util.VectorHelper;
 
 import java.util.List;
 

diff --git a/...java/net/pistonmaster/serverwrecker/server/pathfinding/graph/actions/ParkourMovement.java b/...java/net/pistonmaster/serverwrecker/server/pathfinding/graph/actions/ParkourMovement.java
@@ -28,7 +28,7 @@
 import net.pistonmaster.serverwrecker.server.pathfinding.execution.GapJumpAction;
 import net.pistonmaster.serverwrecker.server.pathfinding.graph.GraphInstructions;
 import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.movement.ParkourDirection;
-import net.pistonmaster.serverwrecker.util.VectorHelper;
+import net.pistonmaster.serverwrecker.server.util.VectorHelper;
 
 import java.util.List;
 

diff --git a/.../java/net/pistonmaster/serverwrecker/server/pathfinding/graph/actions/PlayerMovement.java b/.../java/net/pistonmaster/serverwrecker/server/pathfinding/graph/actions/PlayerMovement.java
@@ -34,7 +34,7 @@
 import net.pistonmaster.serverwrecker.server.pathfinding.graph.GraphInstructions;
 import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.movement.*;
 import net.pistonmaster.serverwrecker.server.protocol.bot.BotActionManager;
-import net.pistonmaster.serverwrecker.util.VectorHelper;
+import net.pistonmaster.serverwrecker.server.util.VectorHelper;
 
 import java.util.List;
 

diff --git a/...main/java/net/pistonmaster/serverwrecker/server/pathfinding/graph/actions/UpMovement.java b/...main/java/net/pistonmaster/serverwrecker/server/pathfinding/graph/actions/UpMovement.java
@@ -35,7 +35,7 @@
 import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.movement.BlockSafetyData;
 import net.pistonmaster.serverwrecker.server.pathfinding.graph.actions.movement.MovementMiningCost;
 import net.pistonmaster.serverwrecker.server.protocol.bot.BotActionManager;
-import net.pistonmaster.serverwrecker.util.VectorHelper;
+import net.pistonmaster.serverwrecker.server.util.VectorHelper;
 
 import java.util.List;
 

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/plugins/AutoArmor.java b/src/main/java/net/pistonmaster/serverwrecker/server/plugins/AutoArmor.java
@@ -35,7 +35,7 @@
 import net.pistonmaster.serverwrecker.server.settings.lib.property.BooleanProperty;
 import net.pistonmaster.serverwrecker.server.settings.lib.property.MinMaxPropertyLink;
 import net.pistonmaster.serverwrecker.server.settings.lib.property.Property;
-import net.pistonmaster.serverwrecker.util.TimeUtil;
+import net.pistonmaster.serverwrecker.server.util.TimeUtil;
 
 import java.util.Arrays;
 import java.util.Map;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/plugins/AutoEat.java b/src/main/java/net/pistonmaster/serverwrecker/server/plugins/AutoEat.java
@@ -34,7 +34,7 @@
 import net.pistonmaster.serverwrecker.server.settings.lib.property.BooleanProperty;
 import net.pistonmaster.serverwrecker.server.settings.lib.property.MinMaxPropertyLink;
 import net.pistonmaster.serverwrecker.server.settings.lib.property.Property;
-import net.pistonmaster.serverwrecker.util.TimeUtil;
+import net.pistonmaster.serverwrecker.server.util.TimeUtil;
 
 import java.util.concurrent.TimeUnit;
 

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/plugins/AutoReconnect.java b/src/main/java/net/pistonmaster/serverwrecker/server/plugins/AutoReconnect.java
@@ -30,7 +30,7 @@
 import net.pistonmaster.serverwrecker.server.settings.lib.property.BooleanProperty;
 import net.pistonmaster.serverwrecker.server.settings.lib.property.MinMaxPropertyLink;
 import net.pistonmaster.serverwrecker.server.settings.lib.property.Property;
-import net.pistonmaster.serverwrecker.util.RandomUtil;
+import net.pistonmaster.serverwrecker.server.util.RandomUtil;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/plugins/AutoRespawn.java b/src/main/java/net/pistonmaster/serverwrecker/server/plugins/AutoRespawn.java
@@ -34,7 +34,7 @@
 import net.pistonmaster.serverwrecker.server.settings.lib.property.BooleanProperty;
 import net.pistonmaster.serverwrecker.server.settings.lib.property.MinMaxPropertyLink;
 import net.pistonmaster.serverwrecker.server.settings.lib.property.Property;
-import net.pistonmaster.serverwrecker.util.RandomUtil;
+import net.pistonmaster.serverwrecker.server.util.RandomUtil;
 
 import java.util.concurrent.TimeUnit;
 

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/plugins/AutoTotem.java b/src/main/java/net/pistonmaster/serverwrecker/server/plugins/AutoTotem.java
@@ -32,7 +32,7 @@
 import net.pistonmaster.serverwrecker.server.settings.lib.property.BooleanProperty;
 import net.pistonmaster.serverwrecker.server.settings.lib.property.MinMaxPropertyLink;
 import net.pistonmaster.serverwrecker.server.settings.lib.property.Property;
-import net.pistonmaster.serverwrecker.util.TimeUtil;
+import net.pistonmaster.serverwrecker.server.util.TimeUtil;
 
 import java.util.concurrent.TimeUnit;
 

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/plugins/BotTicker.java b/src/main/java/net/pistonmaster/serverwrecker/server/plugins/BotTicker.java
@@ -22,7 +22,7 @@
 import net.pistonmaster.serverwrecker.server.api.PluginHelper;
 import net.pistonmaster.serverwrecker.server.api.event.attack.BotConnectionInitEvent;
 import net.pistonmaster.serverwrecker.server.protocol.BotConnection;
-import net.pistonmaster.serverwrecker.util.TickTimer;
+import net.pistonmaster.serverwrecker.server.util.TickTimer;
 
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/plugins/ForwardingBypass.java b/src/main/java/net/pistonmaster/serverwrecker/server/plugins/ForwardingBypass.java
@@ -42,8 +42,8 @@
 import net.pistonmaster.serverwrecker.server.settings.lib.property.ComboProperty;
 import net.pistonmaster.serverwrecker.server.settings.lib.property.Property;
 import net.pistonmaster.serverwrecker.server.settings.lib.property.StringProperty;
-import net.pistonmaster.serverwrecker.util.UUIDHelper;
-import net.pistonmaster.serverwrecker.util.VelocityConstants;
+import net.pistonmaster.serverwrecker.server.util.UUIDHelper;
+import net.pistonmaster.serverwrecker.server.util.VelocityConstants;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/plugins/ServerListBypass.java b/src/main/java/net/pistonmaster/serverwrecker/server/plugins/ServerListBypass.java
@@ -31,8 +31,8 @@
 import net.pistonmaster.serverwrecker.server.settings.lib.property.BooleanProperty;
 import net.pistonmaster.serverwrecker.server.settings.lib.property.MinMaxPropertyLink;
 import net.pistonmaster.serverwrecker.server.settings.lib.property.Property;
-import net.pistonmaster.serverwrecker.util.RandomUtil;
-import net.pistonmaster.serverwrecker.util.TimeUtil;
+import net.pistonmaster.serverwrecker.server.util.RandomUtil;
+import net.pistonmaster.serverwrecker.server.util.TimeUtil;
 
 import java.util.concurrent.TimeUnit;
 

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/protocol/BotConnection.java b/src/main/java/net/pistonmaster/serverwrecker/server/protocol/BotConnection.java
@@ -29,7 +29,7 @@
 import net.pistonmaster.serverwrecker.server.protocol.bot.SessionDataManager;
 import net.pistonmaster.serverwrecker.server.protocol.netty.ViaClientSession;
 import net.pistonmaster.serverwrecker.server.settings.lib.SettingsHolder;
-import net.pistonmaster.serverwrecker.util.TimeUtil;
+import net.pistonmaster.serverwrecker.server.util.TimeUtil;
 import org.slf4j.Logger;
 
 import java.util.UUID;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/protocol/SWSessionService.java b/src/main/java/net/pistonmaster/serverwrecker/server/protocol/SWSessionService.java
@@ -24,7 +24,7 @@
 import net.pistonmaster.serverwrecker.account.AuthType;
 import net.pistonmaster.serverwrecker.account.HttpHelper;
 import net.pistonmaster.serverwrecker.proxy.SWProxy;
-import net.pistonmaster.serverwrecker.util.UUIDHelper;
+import net.pistonmaster.serverwrecker.server.util.UUIDHelper;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;

diff --git a/.../java/net/pistonmaster/serverwrecker/server/protocol/bot/movement/BotMovementManager.java b/.../java/net/pistonmaster/serverwrecker/server/protocol/bot/movement/BotMovementManager.java
@@ -36,7 +36,7 @@
 import net.pistonmaster.serverwrecker.server.protocol.bot.block.BlockStateMeta;
 import net.pistonmaster.serverwrecker.server.protocol.bot.state.EntityAttributesState;
 import net.pistonmaster.serverwrecker.server.protocol.bot.state.LevelState;
-import net.pistonmaster.serverwrecker.util.MathHelper;
+import net.pistonmaster.serverwrecker.server.util.MathHelper;
 import org.cloudburstmc.math.GenericMath;
 import org.cloudburstmc.math.vector.Vector3d;
 import org.cloudburstmc.math.vector.Vector3i;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/protocol/bot/state/ChunkHolder.java b/src/main/java/net/pistonmaster/serverwrecker/server/protocol/bot/state/ChunkHolder.java
@@ -26,7 +26,7 @@
 import net.pistonmaster.serverwrecker.server.protocol.bot.block.BlockStateMeta;
 import net.pistonmaster.serverwrecker.server.protocol.bot.model.ChunkKey;
 import net.pistonmaster.serverwrecker.server.protocol.bot.utils.SectionUtils;
-import net.pistonmaster.serverwrecker.util.NoopLock;
+import net.pistonmaster.serverwrecker.server.util.NoopLock;
 import org.cloudburstmc.math.vector.Vector3i;
 
 import java.util.concurrent.locks.Lock;

diff --git a/src/main/java/net/pistonmaster/serverwrecker/server/protocol/bot/state/LevelState.java b/src/main/java/net/pistonmaster/serverwrecker/server/protocol/bot/state/LevelState.java
@@ -30,7 +30,7 @@
 import net.pistonmaster.serverwrecker.server.protocol.bot.nbt.MCUniformInt;
 import net.pistonmaster.serverwrecker.server.protocol.bot.nbt.UniformOrInt;
 import net.pistonmaster.serverwrecker.server.protocol.bot.utils.SectionUtils;
-import net.pistonmaster.serverwrecker.util.MathHelper;
+import net.pistonmaster.serverwrecker.server.util.MathHelper;
 import org.cloudburstmc.math.vector.Vector3i;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/...r/serverwrecker/util/BlockTypeHelper.java → ...rwrecker/server/util/BlockTypeHelper.java b/...r/serverwrecker/util/BlockTypeHelper.java → ...rwrecker/server/util/BlockTypeHelper.java
@@ -17,7 +17,7 @@
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
  */
-package net.pistonmaster.serverwrecker.util;
+package net.pistonmaster.serverwrecker.server.util;
 
 import net.pistonmaster.serverwrecker.server.data.BlockType;
 import net.pistonmaster.serverwrecker.server.protocol.bot.block.BlockStateMeta;