From e45249031752a304484134b66647d73cc01374f5 Mon Sep 17 00:00:00 2001
From: Ryan Fox <flewkey@2a03.party>
Date: Mon, 17 Aug 2020 01:22:31 +0000
Subject: [PATCH] Rename "server" package to "util"

---
 src/main/java/party/_2a03/mc/MinecraftTweaks2a03.java       | 2 +-
 src/main/java/party/_2a03/mc/command/ConfigCommand.java     | 2 +-
 src/main/java/party/_2a03/mc/command/HomeCommand.java       | 6 +++---
 src/main/java/party/_2a03/mc/command/SpawnCommand.java      | 4 ++--
 .../java/party/_2a03/mc/mixin/MixinRespawnAnchorBlock.java  | 2 +-
 .../java/party/_2a03/mc/mixin/MixinServerPlayerEntity.java  | 4 ++--
 src/main/java/party/_2a03/mc/mixin/MixinTntBlock.java       | 2 +-
 src/main/java/party/_2a03/mc/mixin/MixinTntEntity.java      | 2 +-
 src/main/java/party/_2a03/mc/{server => util}/Config.java   | 6 +++---
 .../java/party/_2a03/mc/{server => util}/PlayerData.java    | 6 +++---
 .../party/_2a03/mc/{server => util}/PlayerPosition.java     | 4 ++--
 11 files changed, 20 insertions(+), 20 deletions(-)
 rename src/main/java/party/_2a03/mc/{server => util}/Config.java (96%)
 rename src/main/java/party/_2a03/mc/{server => util}/PlayerData.java (88%)
 rename src/main/java/party/_2a03/mc/{server => util}/PlayerPosition.java (95%)

diff --git a/src/main/java/party/_2a03/mc/MinecraftTweaks2a03.java b/src/main/java/party/_2a03/mc/MinecraftTweaks2a03.java
index 6ade938..e35a681 100644
--- a/src/main/java/party/_2a03/mc/MinecraftTweaks2a03.java
+++ b/src/main/java/party/_2a03/mc/MinecraftTweaks2a03.java
@@ -14,7 +14,7 @@ import party._2a03.mc.command.HatCommand;
 import party._2a03.mc.command.HeadCommand;
 import party._2a03.mc.command.HomeCommand;
 import party._2a03.mc.command.SpawnCommand;
-import party._2a03.mc.server.Config;
+import party._2a03.mc.util.Config;
 
 public class MinecraftTweaks2a03 implements ModInitializer {
 	private static final Logger LOGGER = LogManager.getLogger();
diff --git a/src/main/java/party/_2a03/mc/command/ConfigCommand.java b/src/main/java/party/_2a03/mc/command/ConfigCommand.java
index d55c685..1f7545c 100644
--- a/src/main/java/party/_2a03/mc/command/ConfigCommand.java
+++ b/src/main/java/party/_2a03/mc/command/ConfigCommand.java
@@ -5,7 +5,7 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.LiteralText;
-import party._2a03.mc.server.Config;
+import party._2a03.mc.util.Config;
 
 public class ConfigCommand {
 	public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
diff --git a/src/main/java/party/_2a03/mc/command/HomeCommand.java b/src/main/java/party/_2a03/mc/command/HomeCommand.java
index 1e79c8b..224998e 100644
--- a/src/main/java/party/_2a03/mc/command/HomeCommand.java
+++ b/src/main/java/party/_2a03/mc/command/HomeCommand.java
@@ -8,9 +8,9 @@ import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.LiteralText;
 import net.minecraft.util.registry.RegistryKey;
-import party._2a03.mc.server.Config;
-import party._2a03.mc.server.PlayerData;
-import party._2a03.mc.server.PlayerPosition;
+import party._2a03.mc.util.Config;
+import party._2a03.mc.util.PlayerData;
+import party._2a03.mc.util.PlayerPosition;
 
 public class HomeCommand {
 	public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
diff --git a/src/main/java/party/_2a03/mc/command/SpawnCommand.java b/src/main/java/party/_2a03/mc/command/SpawnCommand.java
index 4f9e937..0b1884f 100644
--- a/src/main/java/party/_2a03/mc/command/SpawnCommand.java
+++ b/src/main/java/party/_2a03/mc/command/SpawnCommand.java
@@ -7,8 +7,8 @@ import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.LiteralText;
 import net.minecraft.util.registry.RegistryKey;
-import party._2a03.mc.server.Config;
-import party._2a03.mc.server.PlayerPosition;
+import party._2a03.mc.util.Config;
+import party._2a03.mc.util.PlayerPosition;
 
 public class SpawnCommand {
 	public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
diff --git a/src/main/java/party/_2a03/mc/mixin/MixinRespawnAnchorBlock.java b/src/main/java/party/_2a03/mc/mixin/MixinRespawnAnchorBlock.java
index 874535b..0617bc4 100644
--- a/src/main/java/party/_2a03/mc/mixin/MixinRespawnAnchorBlock.java
+++ b/src/main/java/party/_2a03/mc/mixin/MixinRespawnAnchorBlock.java
@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import party._2a03.mc.server.Config;
+import party._2a03.mc.util.Config;
 
 @Mixin(RespawnAnchorBlock.class)
 public abstract class MixinRespawnAnchorBlock extends Block {
diff --git a/src/main/java/party/_2a03/mc/mixin/MixinServerPlayerEntity.java b/src/main/java/party/_2a03/mc/mixin/MixinServerPlayerEntity.java
index c992a45..c275587 100644
--- a/src/main/java/party/_2a03/mc/mixin/MixinServerPlayerEntity.java
+++ b/src/main/java/party/_2a03/mc/mixin/MixinServerPlayerEntity.java
@@ -9,8 +9,8 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import party._2a03.mc.server.Config;
-import party._2a03.mc.server.PlayerPosition;
+import party._2a03.mc.util.Config;
+import party._2a03.mc.util.PlayerPosition;
 
 @Mixin(ServerPlayerEntity.class)
 public abstract class MixinServerPlayerEntity extends PlayerEntity {
diff --git a/src/main/java/party/_2a03/mc/mixin/MixinTntBlock.java b/src/main/java/party/_2a03/mc/mixin/MixinTntBlock.java
index 59dace7..5db2b21 100644
--- a/src/main/java/party/_2a03/mc/mixin/MixinTntBlock.java
+++ b/src/main/java/party/_2a03/mc/mixin/MixinTntBlock.java
@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import party._2a03.mc.server.Config;
+import party._2a03.mc.util.Config;
 
 @Mixin(TntBlock.class)
 public abstract class MixinTntBlock extends Block {
diff --git a/src/main/java/party/_2a03/mc/mixin/MixinTntEntity.java b/src/main/java/party/_2a03/mc/mixin/MixinTntEntity.java
index 809d5f5..9723018 100644
--- a/src/main/java/party/_2a03/mc/mixin/MixinTntEntity.java
+++ b/src/main/java/party/_2a03/mc/mixin/MixinTntEntity.java
@@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import party._2a03.mc.server.Config;
+import party._2a03.mc.util.Config;
 
 @Mixin(TntEntity.class)
 public abstract class MixinTntEntity extends Entity {
diff --git a/src/main/java/party/_2a03/mc/server/Config.java b/src/main/java/party/_2a03/mc/util/Config.java
similarity index 96%
rename from src/main/java/party/_2a03/mc/server/Config.java
rename to src/main/java/party/_2a03/mc/util/Config.java
index 2d3fcdb..71cfd7e 100644
--- a/src/main/java/party/_2a03/mc/server/Config.java
+++ b/src/main/java/party/_2a03/mc/util/Config.java
@@ -1,4 +1,4 @@
-package party._2a03.mc.server;
+package party._2a03.mc.util;
 
 import com.google.common.collect.Maps;
 import java.io.File;
@@ -13,8 +13,8 @@ import org.apache.commons.io.IOUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import party._2a03.mc.MinecraftTweaks2a03;
-import party._2a03.mc.server.PlayerData;
-import party._2a03.mc.server.PlayerPosition;
+import party._2a03.mc.util.PlayerData;
+import party._2a03.mc.util.PlayerPosition;
 
 public class Config {
 	private static final Logger LOGGER = LogManager.getLogger();
diff --git a/src/main/java/party/_2a03/mc/server/PlayerData.java b/src/main/java/party/_2a03/mc/util/PlayerData.java
similarity index 88%
rename from src/main/java/party/_2a03/mc/server/PlayerData.java
rename to src/main/java/party/_2a03/mc/util/PlayerData.java
index 08e45c4..e411160 100644
--- a/src/main/java/party/_2a03/mc/server/PlayerData.java
+++ b/src/main/java/party/_2a03/mc/util/PlayerData.java
@@ -1,8 +1,8 @@
-package party._2a03.mc.server;
+package party._2a03.mc.util;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
-import party._2a03.mc.server.PlayerPosition;
+import party._2a03.mc.util.PlayerPosition;
 
 public class PlayerData {
 	private String uuid;
@@ -31,4 +31,4 @@ public class PlayerData {
 		json.put("home", home.getJSON());
 		return json;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/party/_2a03/mc/server/PlayerPosition.java b/src/main/java/party/_2a03/mc/util/PlayerPosition.java
similarity index 95%
rename from src/main/java/party/_2a03/mc/server/PlayerPosition.java
rename to src/main/java/party/_2a03/mc/util/PlayerPosition.java
index dd5dc0b..b297c26 100644
--- a/src/main/java/party/_2a03/mc/server/PlayerPosition.java
+++ b/src/main/java/party/_2a03/mc/util/PlayerPosition.java
@@ -1,10 +1,10 @@
-package party._2a03.mc.server;
+package party._2a03.mc.util;
 
 import org.json.JSONArray;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.util.registry.RegistryKey;
-import party._2a03.mc.server.Config;
+import party._2a03.mc.util.Config;
 
 public class PlayerPosition {
 	public double x;