diff --git a/gradle.properties b/gradle.properties
index 8cfc0d9..88d2485 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,16 +1,16 @@
 org.gradle.jvmargs=-Xmx2G
 
 # BTA
-bta_version=7.3
+bta_version=7.3_01
 bta_channel=release
 
 # Loader & Mod Menu
 loader_version=0.15.6-bta.7
 
 # ServerLibe
-serverlibe_version=beta.2.7-7.3
+serverlibe_version=beta.2.7-7.3_01
 
 # Mod
-mod_version=1.0.0-7.3
+mod_version=1.0.1-7.3_01
 mod_group=MelonModding
 mod_name=MelonUtilities
diff --git a/src/main/java/MelonUtilities/command/commandlogic/CommandLogicRollback.java b/src/main/java/MelonUtilities/command/commandlogic/CommandLogicRollback.java
index ee41e3f..f2540e0 100644
--- a/src/main/java/MelonUtilities/command/commandlogic/CommandLogicRollback.java
+++ b/src/main/java/MelonUtilities/command/commandlogic/CommandLogicRollback.java
@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.text.SimpleDateFormat;
+import java.time.ZoneId;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -56,7 +57,7 @@ public static int rollback(PlayerServer sender) {
 				{
 					ItemStack snapshotIcon = Items.PAPER.getDefaultStack();
 					SimpleDateFormat sdf = new SimpleDateFormat("MMM/dd/yyyy HH:mm:ss");
-					snapshotIcon.setCustomName("Snapshot: [" + sdf.format(capture.getKey()) + "]");
+					snapshotIcon.setCustomName("Snapshot: [" + sdf.format(capture.getKey()) + "]" + " (" + ZoneId.systemDefault() + ")");
 					snapshotIcon.setCustomColor((byte) TextFormatting.LIGHT_BLUE.id);
 					return new ServerSlotButton(snapshotIcon, inventory, finalI, () -> {
 						for(Entity entity : sender.world.loadedEntityList){
@@ -82,7 +83,7 @@ public static int rollback(PlayerServer sender) {
 				{
 					ItemStack backupIcon = Items.BOOK.getDefaultStack();
 					SimpleDateFormat sdf = new SimpleDateFormat("MMM/dd/yyyy HH:mm:ss");
-					backupIcon.setCustomName("Backup: [" + sdf.format(capture.getKey()) + "]");
+					backupIcon.setCustomName("Backup: [" + sdf.format(capture.getKey()) + "]" + " (" + ZoneId.systemDefault() + ")");
 					backupIcon.setCustomColor((byte) TextFormatting.CYAN.id);
 					return new ServerSlotButton(backupIcon, inventory, finalI, () -> {
 						for(Entity entity : sender.world.loadedEntityList){
diff --git a/src/main/java/MelonUtilities/command/commandlogic/CommandLogicTPA.java b/src/main/java/MelonUtilities/command/commandlogic/CommandLogicTPA.java
index 718d46b..0008368 100644
--- a/src/main/java/MelonUtilities/command/commandlogic/CommandLogicTPA.java
+++ b/src/main/java/MelonUtilities/command/commandlogic/CommandLogicTPA.java
@@ -4,13 +4,19 @@
 import MelonUtilities.utility.feedback.FeedbackType;
 import MelonUtilities.utility.managers.TpaManager;
 import com.mojang.brigadier.Command;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.entity.player.PlayerServer;
+import net.minecraft.server.world.WorldServer;
 
 public class CommandLogicTPA {
 	public static int tpa(PlayerServer sender, String targetUsername) {
 
-		assert sender.world != null;
-		PlayerServer target = (PlayerServer) sender.world.getPlayerEntityByName(targetUsername);
+		PlayerServer target = null;
+		for(WorldServer dimension : MinecraftServer.getInstance().dimensionWorlds.values()){
+			if(dimension.getPlayerEntityByName(targetUsername) != null){
+				target = (PlayerServer) dimension.getPlayerEntityByName(targetUsername);
+			}
+		}
 
 		if (target != null) {
 			TpaManager.addRequest(sender, target, false);
diff --git a/src/main/java/MelonUtilities/command/commandlogic/CommandLogicTPAHere.java b/src/main/java/MelonUtilities/command/commandlogic/CommandLogicTPAHere.java
index c3cc6a5..dcaa9b1 100644
--- a/src/main/java/MelonUtilities/command/commandlogic/CommandLogicTPAHere.java
+++ b/src/main/java/MelonUtilities/command/commandlogic/CommandLogicTPAHere.java
@@ -4,13 +4,19 @@
 import MelonUtilities.utility.feedback.FeedbackType;
 import MelonUtilities.utility.managers.TpaManager;
 import com.mojang.brigadier.Command;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.entity.player.PlayerServer;
+import net.minecraft.server.world.WorldServer;
 
 public class CommandLogicTPAHere {
 	public static int tpaHere(PlayerServer sender, String targetUsername){
 
-		assert sender.world != null;
-		PlayerServer target = (PlayerServer) sender.world.getPlayerEntityByName(targetUsername);
+		PlayerServer target = null;
+		for(WorldServer dimension : MinecraftServer.getInstance().dimensionWorlds.values()){
+			if(dimension.getPlayerEntityByName(targetUsername) != null){
+				target = (PlayerServer) dimension.getPlayerEntityByName(targetUsername);
+			}
+		}
 
 		if(target != null){
 			TpaManager.addRequest(sender, target, true);
diff --git a/src/main/java/MelonUtilities/command/commands/CommandElevator.java b/src/main/java/MelonUtilities/command/commands/CommandElevator.java
index 19433bc..bd3ff36 100644
--- a/src/main/java/MelonUtilities/command/commands/CommandElevator.java
+++ b/src/main/java/MelonUtilities/command/commands/CommandElevator.java
@@ -2,18 +2,18 @@
 
 import MelonUtilities.command.commandlogic.CommandLogicElevator;
 import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.IntegerArgumentType;
+import com.mojang.brigadier.arguments.ArgumentTypeInteger;
 import com.mojang.brigadier.builder.ArgumentBuilder;
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import com.mojang.brigadier.builder.RequiredArgumentBuilder;
+import com.mojang.brigadier.builder.ArgumentBuilderLiteral;
+import com.mojang.brigadier.builder.ArgumentBuilderRequired;
 import net.minecraft.core.net.command.CommandManager;
 import net.minecraft.core.net.command.CommandSource;
 import net.minecraft.server.entity.player.PlayerServer;
 
 public class CommandElevator implements CommandManager.CommandRegistry{
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> elevatorAllowObstructions(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("allowobstructions")
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> elevatorAllowObstructions(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("allowobstructions")
 			.executes(context ->
 				{
 					PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -24,9 +24,9 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> elevatorCooldown(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("cooldown")
-			.then(RequiredArgumentBuilder.<CommandSource, Integer>argument("cooldownvalue", IntegerArgumentType.integer(0, 256))
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> elevatorCooldown(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("cooldown")
+			.then(ArgumentBuilderRequired.<CommandSource, Integer>argument("cooldownvalue", ArgumentTypeInteger.integer(0, 256))
 				.executes(context ->
 					{
 						PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -41,7 +41,7 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 
 	@Override
 	public void register(CommandDispatcher<CommandSource> dispatcher) {
-		LiteralArgumentBuilder<CommandSource> builder = LiteralArgumentBuilder.<CommandSource>literal("elevator").requires(CommandSource::hasAdmin);
+		ArgumentBuilderLiteral<CommandSource> builder = ArgumentBuilderLiteral.<CommandSource>literal("elevator").requires(CommandSource::hasAdmin);
 
 		elevatorAllowObstructions(builder);
 		elevatorCooldown(builder);
diff --git a/src/main/java/MelonUtilities/command/commands/CommandHome.java b/src/main/java/MelonUtilities/command/commands/CommandHome.java
index da757ec..698a4be 100644
--- a/src/main/java/MelonUtilities/command/commands/CommandHome.java
+++ b/src/main/java/MelonUtilities/command/commands/CommandHome.java
@@ -5,18 +5,18 @@
 import MelonUtilities.config.Data;
 import MelonUtilities.config.datatypes.data.Home;
 import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.arguments.ArgumentTypeString;
 import com.mojang.brigadier.builder.ArgumentBuilder;
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import com.mojang.brigadier.builder.RequiredArgumentBuilder;
+import com.mojang.brigadier.builder.ArgumentBuilderLiteral;
+import com.mojang.brigadier.builder.ArgumentBuilderRequired;
 import net.minecraft.core.net.command.CommandManager;
 import net.minecraft.core.net.command.CommandSource;
 import net.minecraft.server.entity.player.PlayerServer;
 
 public class CommandHome implements CommandManager.CommandRegistry {
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> homeTP(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("tp")
-			.then(RequiredArgumentBuilder.<CommandSource, String>argument("home", ArgumentTypeHome.home())
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> homeTP(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("tp")
+			.then(ArgumentBuilderRequired.<CommandSource, String>argument("home", ArgumentTypeHome.home())
 				.executes(context ->
 					{
 						PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -34,9 +34,9 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> homeDelete(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("delete")
-			.then(RequiredArgumentBuilder.<CommandSource, String>argument("home", ArgumentTypeHome.home())
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> homeDelete(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("delete")
+			.then(ArgumentBuilderRequired.<CommandSource, String>argument("home", ArgumentTypeHome.home())
 				.executes(context ->
 					{
 						PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -54,9 +54,9 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> homeCreate(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("create")
-			.then(RequiredArgumentBuilder.<CommandSource, String>argument("name", StringArgumentType.string())
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> homeCreate(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("create")
+			.then(ArgumentBuilderRequired.<CommandSource, String>argument("name", ArgumentTypeString.string())
 				.executes(context ->
 					{
 						PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -69,10 +69,10 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> homeRename(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("rename")
-			.then(RequiredArgumentBuilder.<CommandSource, String>argument("home", ArgumentTypeHome.home())
-				.then(RequiredArgumentBuilder.<CommandSource, String>argument("name", StringArgumentType.string())
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> homeRename(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("rename")
+			.then(ArgumentBuilderRequired.<CommandSource, String>argument("home", ArgumentTypeHome.home())
+				.then(ArgumentBuilderRequired.<CommandSource, String>argument("name", ArgumentTypeString.string())
 					.executes(context ->
 						{
 							PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -92,8 +92,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> homeList(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("list")
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> homeList(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("list")
 			.executes(context ->
 				{
 					PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -106,7 +106,7 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 
 	@Override
 	public void register(CommandDispatcher<CommandSource> dispatcher) {
-		LiteralArgumentBuilder<CommandSource> builder = LiteralArgumentBuilder.<CommandSource>literal("home");
+		ArgumentBuilderLiteral<CommandSource> builder = ArgumentBuilderLiteral.<CommandSource>literal("home");
 
 		homeTP(builder);
 		homeDelete(builder);
diff --git a/src/main/java/MelonUtilities/command/commands/CommandLock.java b/src/main/java/MelonUtilities/command/commands/CommandLock.java
index 72ee6e5..b6c790d 100644
--- a/src/main/java/MelonUtilities/command/commands/CommandLock.java
+++ b/src/main/java/MelonUtilities/command/commands/CommandLock.java
@@ -4,16 +4,16 @@
 import MelonUtilities.command.commandlogic.CommandLogicLock;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.builder.ArgumentBuilder;
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import com.mojang.brigadier.builder.RequiredArgumentBuilder;
+import com.mojang.brigadier.builder.ArgumentBuilderLiteral;
+import com.mojang.brigadier.builder.ArgumentBuilderRequired;
 import net.minecraft.core.net.command.CommandManager;
 import net.minecraft.core.net.command.CommandSource;
 import net.minecraft.server.entity.player.PlayerServer;
 
 @SuppressWarnings("UnusedReturnValue")
 public class CommandLock implements CommandManager.CommandRegistry{
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> lockOnBlockPlaced(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("onblockplaced")
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> lockOnBlockPlaced(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("onblockplaced")
 			.executes(context ->
 				{
 					PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -24,8 +24,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> lockOnBlockPunched(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("onblockpunched")
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> lockOnBlockPunched(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("onblockpunched")
 			.executes(context ->
 				{
 					PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -36,9 +36,9 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> lockTrust(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("trust")
-			.then(RequiredArgumentBuilder.<CommandSource, String>argument("username", ArgumentTypeUsername.string())
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> lockTrust(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("trust")
+			.then(ArgumentBuilderRequired.<CommandSource, String>argument("username", ArgumentTypeUsername.string())
 				.executes(context ->
 					{
 						PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -51,9 +51,9 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> lockTrustAll(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("trustall")
-			.then(RequiredArgumentBuilder.<CommandSource, String>argument("username", ArgumentTypeUsername.string())
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> lockTrustAll(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("trustall")
+			.then(ArgumentBuilderRequired.<CommandSource, String>argument("username", ArgumentTypeUsername.string())
 				.executes(context ->
 					{
 						PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -66,8 +66,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> lockTrustCommunity(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("trustcommunity")
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> lockTrustCommunity(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("trustcommunity")
 			.executes(context ->
 				{
 					PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -78,9 +78,9 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> lockUntrust(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("untrust")
-			.then(RequiredArgumentBuilder.<CommandSource, String>argument("username", ArgumentTypeUsername.string())
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> lockUntrust(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("untrust")
+			.then(ArgumentBuilderRequired.<CommandSource, String>argument("username", ArgumentTypeUsername.string())
 				.executes(context ->
 					{
 						PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -93,9 +93,9 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> lockUntrustAll(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("untrustall")
-			.then(RequiredArgumentBuilder.<CommandSource, String>argument("username", ArgumentTypeUsername.string())
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> lockUntrustAll(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("untrustall")
+			.then(ArgumentBuilderRequired.<CommandSource, String>argument("username", ArgumentTypeUsername.string())
 				.executes(context ->
 					{
 						PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -108,8 +108,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> lockUntrustCommunity(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("untrustcommunity")
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> lockUntrustCommunity(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("untrustcommunity")
 			.executes(context ->
 				{
 					PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -120,8 +120,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> lockBypass(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("bypass").requires(CommandSource::hasAdmin)
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> lockBypass(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("bypass").requires(CommandSource::hasAdmin)
 			.executes(context ->
 				{
 					PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -132,8 +132,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> lockInfo(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("info")
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> lockInfo(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("info")
 			.executes(context ->
 				{
 					PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -144,7 +144,7 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> lock(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> lock(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
 		builder.executes(context ->
 			{
 				PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -157,7 +157,7 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 
 	@Override
 	public void register(CommandDispatcher<CommandSource> dispatcher) {
-		LiteralArgumentBuilder<CommandSource> builder = LiteralArgumentBuilder.<CommandSource>literal("lock");
+		ArgumentBuilderLiteral<CommandSource> builder = ArgumentBuilderLiteral.<CommandSource>literal("lock");
 
 		lock(builder);
 		lockOnBlockPlaced(builder);
diff --git a/src/main/java/MelonUtilities/command/commands/CommandMelonUtilities.java b/src/main/java/MelonUtilities/command/commands/CommandMelonUtilities.java
index bc13f86..d6af502 100644
--- a/src/main/java/MelonUtilities/command/commands/CommandMelonUtilities.java
+++ b/src/main/java/MelonUtilities/command/commands/CommandMelonUtilities.java
@@ -2,7 +2,7 @@
 
 import MelonUtilities.command.commandlogic.CommandLogicMelonUtilities;
 import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.builder.ArgumentBuilderLiteral;
 import net.minecraft.core.net.command.CommandManager;
 import net.minecraft.core.net.command.CommandSource;
 import net.minecraft.server.entity.player.PlayerServer;
@@ -10,8 +10,8 @@
 public class CommandMelonUtilities implements CommandManager.CommandRegistry{
 	@Override
 	public void register(CommandDispatcher<CommandSource> dispatcher) {
-		dispatcher.register((LiteralArgumentBuilder.<CommandSource>literal("melonutilities").requires(CommandSource::hasAdmin))
-			.then(LiteralArgumentBuilder.<CommandSource>literal("reload")
+		dispatcher.register((ArgumentBuilderLiteral.<CommandSource>literal("melonutilities").requires(CommandSource::hasAdmin))
+			.then(ArgumentBuilderLiteral.<CommandSource>literal("reload")
 				.executes(context ->
 					{
 						PlayerServer sender = (PlayerServer) context.getSource().getSender();
diff --git a/src/main/java/MelonUtilities/command/commands/CommandRole.java b/src/main/java/MelonUtilities/command/commands/CommandRole.java
index a239b39..94c1ab4 100644
--- a/src/main/java/MelonUtilities/command/commands/CommandRole.java
+++ b/src/main/java/MelonUtilities/command/commands/CommandRole.java
@@ -6,12 +6,12 @@
 import MelonUtilities.config.datatypes.data.Role;
 import MelonUtilities.utility.MUtil;
 import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.BoolArgumentType;
-import com.mojang.brigadier.arguments.IntegerArgumentType;
-import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.arguments.ArgumentTypeBool;
+import com.mojang.brigadier.arguments.ArgumentTypeInteger;
+import com.mojang.brigadier.arguments.ArgumentTypeString;
 import com.mojang.brigadier.builder.ArgumentBuilder;
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import com.mojang.brigadier.builder.RequiredArgumentBuilder;
+import com.mojang.brigadier.builder.ArgumentBuilderLiteral;
+import com.mojang.brigadier.builder.ArgumentBuilderRequired;
 import net.minecraft.core.entity.player.Player;
 import net.minecraft.core.net.command.CommandManager;
 import net.minecraft.core.net.command.CommandSource;
@@ -22,10 +22,10 @@
 @SuppressWarnings("UnusedReturnValue")
 public class CommandRole implements CommandManager.CommandRegistry{
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> roleCreate(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("create")
-			.then(RequiredArgumentBuilder.<CommandSource, String>argument("roleID", StringArgumentType.string())
-				.then(RequiredArgumentBuilder.<CommandSource, Integer>argument("priorityvalue", IntegerArgumentType.integer(0, 99))
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> roleCreate(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("create")
+			.then(ArgumentBuilderRequired.<CommandSource, String>argument("roleID", ArgumentTypeString.string())
+				.then(ArgumentBuilderRequired.<CommandSource, Integer>argument("priorityvalue", ArgumentTypeInteger.integer(0, 99))
 					.executes(context ->
 						{
 							PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -40,9 +40,9 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> roleDelete(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("delete")
-			.then(RequiredArgumentBuilder.<CommandSource, Role>argument("role", ArgumentTypeRole.role())
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> roleDelete(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("delete")
+			.then(ArgumentBuilderRequired.<CommandSource, Role>argument("role", ArgumentTypeRole.role())
 				.executes(context ->
 					{
 						PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -55,11 +55,11 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> roleEdit(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("edit")
-			.then(RequiredArgumentBuilder.<CommandSource, Role>argument("role", ArgumentTypeRole.role())
-				.then(LiteralArgumentBuilder.<CommandSource>literal("priority")
-					.then(RequiredArgumentBuilder.<CommandSource, Integer>argument("priorityvalue", IntegerArgumentType.integer(0, 99))
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> roleEdit(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("edit")
+			.then(ArgumentBuilderRequired.<CommandSource, Role>argument("role", ArgumentTypeRole.role())
+				.then(ArgumentBuilderLiteral.<CommandSource>literal("priority")
+					.then(ArgumentBuilderRequired.<CommandSource, Integer>argument("priorityvalue", ArgumentTypeInteger.integer(0, 99))
 						.executes(context ->
 							{
 								PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -70,9 +70,9 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 						)
 					)
 				)
-				.then(LiteralArgumentBuilder.<CommandSource>literal("display")
-					.then(LiteralArgumentBuilder.<CommandSource>literal("name")
-						.then(RequiredArgumentBuilder.<CommandSource, String>argument("displayname", StringArgumentType.greedyString())
+				.then(ArgumentBuilderLiteral.<CommandSource>literal("display")
+					.then(ArgumentBuilderLiteral.<CommandSource>literal("name")
+						.then(ArgumentBuilderRequired.<CommandSource, String>argument("displayname", ArgumentTypeString.greedyString())
 							.executes(context ->
 								{
 									PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -83,8 +83,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 							)
 						)
 					)
-					.then(LiteralArgumentBuilder.<CommandSource>literal("color")
-						.then(RequiredArgumentBuilder.<CommandSource, String>argument("color", ArgumentTypeColor.color())
+					.then(ArgumentBuilderLiteral.<CommandSource>literal("color")
+						.then(ArgumentBuilderRequired.<CommandSource, String>argument("color", ArgumentTypeColor.color())
 							.executes(context ->
 								{
 									PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -94,7 +94,7 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 								}
 							)
 						)
-						.then(RequiredArgumentBuilder.<CommandSource, String>argument("hex", StringArgumentType.string())
+						.then(ArgumentBuilderRequired.<CommandSource, String>argument("hex", ArgumentTypeString.string())
 							.executes(context ->
 								{
 									PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -105,8 +105,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 							)
 						)
 					)
-					.then(LiteralArgumentBuilder.<CommandSource>literal("underline")
-						.then(RequiredArgumentBuilder.<CommandSource, Boolean>argument("value", BoolArgumentType.bool())
+					.then(ArgumentBuilderLiteral.<CommandSource>literal("underline")
+						.then(ArgumentBuilderRequired.<CommandSource, Boolean>argument("value", ArgumentTypeBool.bool())
 							.executes(context ->
 								{
 									PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -117,8 +117,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 							)
 						)
 					)
-					.then(LiteralArgumentBuilder.<CommandSource>literal("bold")
-						.then(RequiredArgumentBuilder.<CommandSource, Boolean>argument("value", BoolArgumentType.bool())
+					.then(ArgumentBuilderLiteral.<CommandSource>literal("bold")
+						.then(ArgumentBuilderRequired.<CommandSource, Boolean>argument("value", ArgumentTypeBool.bool())
 							.executes(context ->
 								{
 									PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -129,8 +129,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 							)
 						)
 					)
-					.then(LiteralArgumentBuilder.<CommandSource>literal("italics")
-						.then(RequiredArgumentBuilder.<CommandSource, Boolean>argument("value", BoolArgumentType.bool())
+					.then(ArgumentBuilderLiteral.<CommandSource>literal("italics")
+						.then(ArgumentBuilderRequired.<CommandSource, Boolean>argument("value", ArgumentTypeBool.bool())
 							.executes(context ->
 								{
 									PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -141,9 +141,9 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 							)
 						)
 					)
-					.then(LiteralArgumentBuilder.<CommandSource>literal("border")
-						.then(LiteralArgumentBuilder.<CommandSource>literal("color")
-							.then(RequiredArgumentBuilder.<CommandSource, String>argument("color", ArgumentTypeColor.color())
+					.then(ArgumentBuilderLiteral.<CommandSource>literal("border")
+						.then(ArgumentBuilderLiteral.<CommandSource>literal("color")
+							.then(ArgumentBuilderRequired.<CommandSource, String>argument("color", ArgumentTypeColor.color())
 								.executes(context ->
 									{
 										PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -153,7 +153,7 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 									}
 								)
 							)
-							.then(RequiredArgumentBuilder.<CommandSource, String>argument("hex", StringArgumentType.string())
+							.then(ArgumentBuilderRequired.<CommandSource, String>argument("hex", ArgumentTypeString.string())
 								.executes(context ->
 									{
 										PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -164,8 +164,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 								)
 							)
 						)
-						.then(LiteralArgumentBuilder.<CommandSource>literal("style")
-							.then(LiteralArgumentBuilder.<CommandSource>literal("none")
+						.then(ArgumentBuilderLiteral.<CommandSource>literal("style")
+							.then(ArgumentBuilderLiteral.<CommandSource>literal("none")
 								.executes(context ->
 									{
 										PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -174,7 +174,7 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 									}
 								)
 							)
-							.then(LiteralArgumentBuilder.<CommandSource>literal("bracket")
+							.then(ArgumentBuilderLiteral.<CommandSource>literal("bracket")
 								.executes(context ->
 									{
 										PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -183,7 +183,7 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 									}
 								)
 							)
-							.then(LiteralArgumentBuilder.<CommandSource>literal("curly")
+							.then(ArgumentBuilderLiteral.<CommandSource>literal("curly")
 								.executes(context ->
 									{
 										PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -192,7 +192,7 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 									}
 								)
 							)
-							.then(LiteralArgumentBuilder.<CommandSource>literal("caret")
+							.then(ArgumentBuilderLiteral.<CommandSource>literal("caret")
 								.executes(context ->
 									{
 										PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -201,9 +201,9 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 									}
 								)
 							)
-							.then(LiteralArgumentBuilder.<CommandSource>literal("custom")
-								.then(LiteralArgumentBuilder.<CommandSource>literal("prefix")
-									.then(RequiredArgumentBuilder.<CommandSource, String>argument("customaffix", StringArgumentType.greedyString())
+							.then(ArgumentBuilderLiteral.<CommandSource>literal("custom")
+								.then(ArgumentBuilderLiteral.<CommandSource>literal("prefix")
+									.then(ArgumentBuilderRequired.<CommandSource, String>argument("customaffix", ArgumentTypeString.greedyString())
 										.executes(context ->
 											{
 												PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -214,8 +214,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 										)
 									)
 								)
-								.then(LiteralArgumentBuilder.<CommandSource>literal("suffix")
-									.then(RequiredArgumentBuilder.<CommandSource, String>argument("customaffix", StringArgumentType.greedyString())
+								.then(ArgumentBuilderLiteral.<CommandSource>literal("suffix")
+									.then(ArgumentBuilderRequired.<CommandSource, String>argument("customaffix", ArgumentTypeString.greedyString())
 										.executes(context ->
 											{
 												PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -230,10 +230,10 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 						)
 					)
 				)
-				.then(LiteralArgumentBuilder.<CommandSource>literal("username")
-					.then(LiteralArgumentBuilder.<CommandSource>literal("border")
-						.then(LiteralArgumentBuilder.<CommandSource>literal("color")
-							.then(RequiredArgumentBuilder.<CommandSource, String>argument("color", ArgumentTypeColor.color())
+				.then(ArgumentBuilderLiteral.<CommandSource>literal("username")
+					.then(ArgumentBuilderLiteral.<CommandSource>literal("border")
+						.then(ArgumentBuilderLiteral.<CommandSource>literal("color")
+							.then(ArgumentBuilderRequired.<CommandSource, String>argument("color", ArgumentTypeColor.color())
 								.executes(context ->
 									{
 										PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -243,7 +243,7 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 									}
 								)
 							)
-							.then(RequiredArgumentBuilder.<CommandSource, String>argument("hex", StringArgumentType.string())
+							.then(ArgumentBuilderRequired.<CommandSource, String>argument("hex", ArgumentTypeString.string())
 								.executes(context ->
 									{
 										PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -254,8 +254,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 								)
 							)
 						)
-						.then(LiteralArgumentBuilder.<CommandSource>literal("style")
-							.then(LiteralArgumentBuilder.<CommandSource>literal("none")
+						.then(ArgumentBuilderLiteral.<CommandSource>literal("style")
+							.then(ArgumentBuilderLiteral.<CommandSource>literal("none")
 								.executes(context ->
 									{
 										PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -264,7 +264,7 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 									}
 								)
 							)
-							.then(LiteralArgumentBuilder.<CommandSource>literal("bracket")
+							.then(ArgumentBuilderLiteral.<CommandSource>literal("bracket")
 								.executes(context ->
 									{
 										PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -273,7 +273,7 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 									}
 								)
 							)
-							.then(LiteralArgumentBuilder.<CommandSource>literal("curly")
+							.then(ArgumentBuilderLiteral.<CommandSource>literal("curly")
 								.executes(context ->
 									{
 										PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -282,7 +282,7 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 									}
 								)
 							)
-							.then(LiteralArgumentBuilder.<CommandSource>literal("caret")
+							.then(ArgumentBuilderLiteral.<CommandSource>literal("caret")
 								.executes(context ->
 									{
 										PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -291,9 +291,9 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 									}
 								)
 							)
-							.then(LiteralArgumentBuilder.<CommandSource>literal("custom")
-								.then(LiteralArgumentBuilder.<CommandSource>literal("prefix")
-									.then(RequiredArgumentBuilder.<CommandSource, String>argument("customaffix", StringArgumentType.greedyString())
+							.then(ArgumentBuilderLiteral.<CommandSource>literal("custom")
+								.then(ArgumentBuilderLiteral.<CommandSource>literal("prefix")
+									.then(ArgumentBuilderRequired.<CommandSource, String>argument("customaffix", ArgumentTypeString.greedyString())
 										.executes(context ->
 											{
 												PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -304,8 +304,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 										)
 									)
 								)
-								.then(LiteralArgumentBuilder.<CommandSource>literal("suffix")
-									.then(RequiredArgumentBuilder.<CommandSource, String>argument("customaffix", StringArgumentType.greedyString())
+								.then(ArgumentBuilderLiteral.<CommandSource>literal("suffix")
+									.then(ArgumentBuilderRequired.<CommandSource, String>argument("customaffix", ArgumentTypeString.greedyString())
 										.executes(context ->
 											{
 												PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -320,9 +320,9 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 						)
 					)
 				)
-				.then(LiteralArgumentBuilder.<CommandSource>literal("text")
-					.then(LiteralArgumentBuilder.<CommandSource>literal("color")
-						.then(RequiredArgumentBuilder.<CommandSource, String>argument("color", ArgumentTypeColor.color())
+				.then(ArgumentBuilderLiteral.<CommandSource>literal("text")
+					.then(ArgumentBuilderLiteral.<CommandSource>literal("color")
+						.then(ArgumentBuilderRequired.<CommandSource, String>argument("color", ArgumentTypeColor.color())
 							.executes(context ->
 								{
 									PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -332,7 +332,7 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 								}
 							)
 						)
-						.then(RequiredArgumentBuilder.<CommandSource, String>argument("hex", StringArgumentType.string())
+						.then(ArgumentBuilderRequired.<CommandSource, String>argument("hex", ArgumentTypeString.string())
 							.executes(context ->
 								{
 									PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -343,8 +343,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 							)
 						)
 					)
-					.then(LiteralArgumentBuilder.<CommandSource>literal("underline")
-						.then(RequiredArgumentBuilder.<CommandSource, Boolean>argument("value", BoolArgumentType.bool())
+					.then(ArgumentBuilderLiteral.<CommandSource>literal("underline")
+						.then(ArgumentBuilderRequired.<CommandSource, Boolean>argument("value", ArgumentTypeBool.bool())
 							.executes(context ->
 								{
 									PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -355,8 +355,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 							)
 						)
 					)
-					.then(LiteralArgumentBuilder.<CommandSource>literal("bold")
-						.then(RequiredArgumentBuilder.<CommandSource, Boolean>argument("value", BoolArgumentType.bool())
+					.then(ArgumentBuilderLiteral.<CommandSource>literal("bold")
+						.then(ArgumentBuilderRequired.<CommandSource, Boolean>argument("value", ArgumentTypeBool.bool())
 							.executes(context ->
 								{
 									PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -367,8 +367,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 							)
 						)
 					)
-					.then(LiteralArgumentBuilder.<CommandSource>literal("italics")
-						.then(RequiredArgumentBuilder.<CommandSource, Boolean>argument("value", BoolArgumentType.bool())
+					.then(ArgumentBuilderLiteral.<CommandSource>literal("italics")
+						.then(ArgumentBuilderRequired.<CommandSource, Boolean>argument("value", ArgumentTypeBool.bool())
 							.executes(context ->
 								{
 									PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -385,10 +385,10 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> roleGrant(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("grant")
-			.then(RequiredArgumentBuilder.<CommandSource, Role>argument("role", ArgumentTypeRole.role())
-				.then(RequiredArgumentBuilder.<CommandSource, EntitySelector>argument("target", ArgumentTypeEntity.player())
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> roleGrant(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("grant")
+			.then(ArgumentBuilderRequired.<CommandSource, Role>argument("role", ArgumentTypeRole.role())
+				.then(ArgumentBuilderRequired.<CommandSource, EntitySelector>argument("target", ArgumentTypeEntity.username())
 					.executes(
 						context ->
 						{
@@ -404,10 +404,10 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> roleRevoke(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("revoke")
-			.then(RequiredArgumentBuilder.<CommandSource, Role>argument("role", ArgumentTypeRole.role())
-				.then(RequiredArgumentBuilder.<CommandSource, EntitySelector>argument("target", ArgumentTypeEntity.player())
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> roleRevoke(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("revoke")
+			.then(ArgumentBuilderRequired.<CommandSource, Role>argument("role", ArgumentTypeRole.role())
+				.then(ArgumentBuilderRequired.<CommandSource, EntitySelector>argument("target", ArgumentTypeEntity.username())
 					.executes(context ->
 						{
 							Role role = context.getArgument("role", Role.class);
@@ -422,10 +422,10 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> roleSet(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("set")
-			.then(LiteralArgumentBuilder.<CommandSource>literal("defaultrole")
-				.then(RequiredArgumentBuilder.<CommandSource, Role>argument("role", ArgumentTypeRole.role())
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> roleSet(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("set")
+			.then(ArgumentBuilderLiteral.<CommandSource>literal("defaultrole")
+				.then(ArgumentBuilderRequired.<CommandSource, Role>argument("role", ArgumentTypeRole.role())
 					.executes(context ->
 						{
 							PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -434,7 +434,7 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 						}
 					)
 				)
-				.then(LiteralArgumentBuilder.<CommandSource>literal("none")
+				.then(ArgumentBuilderLiteral.<CommandSource>literal("none")
 					.executes(context ->
 						{
 							PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -443,8 +443,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 					)
 				)
 			)
-			.then(LiteralArgumentBuilder.<CommandSource>literal("displaymode")
-				.then(LiteralArgumentBuilder.<CommandSource>literal("single")
+			.then(ArgumentBuilderLiteral.<CommandSource>literal("displaymode")
+				.then(ArgumentBuilderLiteral.<CommandSource>literal("single")
 					.executes(context ->
 						{
 							PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -452,7 +452,7 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 						}
 					)
 				)
-				.then(LiteralArgumentBuilder.<CommandSource>literal("multi")
+				.then(ArgumentBuilderLiteral.<CommandSource>literal("multi")
 					.executes(context ->
 						{
 							PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -465,8 +465,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> roleList(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("list")
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> roleList(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("list")
 			.executes(context ->
 				{
 					PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -477,8 +477,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> roleReload(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("reload")
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> roleReload(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("reload")
 			.executes(context ->
 				{
 					PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -489,7 +489,7 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-/*	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> role(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
+/*	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> role(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
 		builder.executes(
 			context -> CommandLogicRole.role((PlayerServer) context.getSource().getSender())
 		);
@@ -498,7 +498,7 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 
 	@Override
 	public void register(CommandDispatcher<CommandSource> dispatcher) {
-		LiteralArgumentBuilder<CommandSource> commandBuilder = LiteralArgumentBuilder.<CommandSource>literal("role").requires(CommandSource::hasAdmin);
+		ArgumentBuilderLiteral<CommandSource> commandBuilder = ArgumentBuilderLiteral.<CommandSource>literal("role").requires(CommandSource::hasAdmin);
 
 		//role(commandBuilder);
 		roleCreate(commandBuilder);
diff --git a/src/main/java/MelonUtilities/command/commands/CommandRollback.java b/src/main/java/MelonUtilities/command/commands/CommandRollback.java
index 5009323..10fd9e3 100644
--- a/src/main/java/MelonUtilities/command/commands/CommandRollback.java
+++ b/src/main/java/MelonUtilities/command/commands/CommandRollback.java
@@ -3,8 +3,8 @@
 import MelonUtilities.command.commandlogic.CommandLogicRollback;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.builder.ArgumentBuilder;
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import com.mojang.brigadier.builder.RequiredArgumentBuilder;
+import com.mojang.brigadier.builder.ArgumentBuilderLiteral;
+import com.mojang.brigadier.builder.ArgumentBuilderRequired;
 import net.minecraft.core.net.command.CommandManager;
 import net.minecraft.core.net.command.CommandSource;
 import net.minecraft.core.net.command.arguments.ArgumentTypeChunkCoordinates;
@@ -13,7 +13,7 @@
 
 @SuppressWarnings("UnusedReturnValue")
 public class CommandRollback implements CommandManager.CommandRegistry{
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> rollback(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> rollback(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
 		builder.requires(CommandSource::hasAdmin).executes(context ->
 			{
 				PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -23,10 +23,10 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> rollbackArea(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("area")
-			.then(RequiredArgumentBuilder.<CommandSource, Coordinates2D>argument("x1 z1", ArgumentTypeChunkCoordinates.chunkCoordinates())
-				.then(RequiredArgumentBuilder.<CommandSource, Coordinates2D>argument("x2 z2", ArgumentTypeChunkCoordinates.chunkCoordinates())
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> rollbackArea(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("area")
+			.then(ArgumentBuilderRequired.<CommandSource, Coordinates2D>argument("x1 z1", ArgumentTypeChunkCoordinates.chunkCoordinates())
+				.then(ArgumentBuilderRequired.<CommandSource, Coordinates2D>argument("x2 z2", ArgumentTypeChunkCoordinates.chunkCoordinates())
 					.executes(context ->
 						{
 							CommandSource source = context.getSource();
@@ -47,8 +47,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> rollbackTakeSnapshot(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("takesnapshot")
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> rollbackTakeSnapshot(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("takesnapshot")
 			.executes(context ->
 				{
 					PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -59,8 +59,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> rollbackTakeBackup(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("takebackup")
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> rollbackTakeBackup(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("takebackup")
 			.executes(context ->
 				{
 					PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -71,8 +71,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> rollbackPruneSnapshots(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("prunesnapshots")
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> rollbackPruneSnapshots(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("prunesnapshots")
 			.executes(context ->
 				{
 					PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -83,8 +83,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> rollbackPruneBackups(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("prunebackups")
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> rollbackPruneBackups(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("prunebackups")
 			.executes(context ->
 				{
 					PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -95,8 +95,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> rollbackAutoSnapshots(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("autosnapshots")
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> rollbackAutoSnapshots(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("autosnapshots")
 			.executes(context ->
 				{
 					PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -107,8 +107,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> rollbackAutoBackups(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("autobackups")
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> rollbackAutoBackups(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("autobackups")
 			.executes(context ->
 				{
 					PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -122,7 +122,7 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 
 	@Override
 	public void register(CommandDispatcher<CommandSource> dispatcher) {
-		LiteralArgumentBuilder<CommandSource> builder = LiteralArgumentBuilder.literal("rollback");
+		ArgumentBuilderLiteral<CommandSource> builder = ArgumentBuilderLiteral.literal("rollback");
 
 		rollback(builder);
 		rollbackArea(builder);
diff --git a/src/main/java/MelonUtilities/command/commands/CommandTPA.java b/src/main/java/MelonUtilities/command/commands/CommandTPA.java
index faed180..bb4d5ec 100644
--- a/src/main/java/MelonUtilities/command/commands/CommandTPA.java
+++ b/src/main/java/MelonUtilities/command/commands/CommandTPA.java
@@ -4,8 +4,8 @@
 import MelonUtilities.command.commandlogic.CommandLogicTPA;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.builder.ArgumentBuilder;
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import com.mojang.brigadier.builder.RequiredArgumentBuilder;
+import com.mojang.brigadier.builder.ArgumentBuilderLiteral;
+import com.mojang.brigadier.builder.ArgumentBuilderRequired;
 import net.minecraft.core.net.command.CommandManager;
 import net.minecraft.core.net.command.CommandSource;
 import net.minecraft.server.entity.player.PlayerServer;
@@ -13,8 +13,8 @@
 @SuppressWarnings("UnusedReturnValue")
 public class CommandTPA implements CommandManager.CommandRegistry{
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> tpa(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(RequiredArgumentBuilder.<CommandSource, String>argument("target", ArgumentTypeUsername.string())
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> tpa(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderRequired.<CommandSource, String>argument("target", ArgumentTypeUsername.string())
 			.executes(context ->
 				{
 					PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -28,7 +28,7 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 
 	@Override
 	public void register(CommandDispatcher<CommandSource> dispatcher) {
-		LiteralArgumentBuilder<CommandSource> builder = LiteralArgumentBuilder.literal("tpa");
+		ArgumentBuilderLiteral<CommandSource> builder = ArgumentBuilderLiteral.literal("tpa");
 
 		tpa(builder);
 
diff --git a/src/main/java/MelonUtilities/command/commands/CommandTPAHere.java b/src/main/java/MelonUtilities/command/commands/CommandTPAHere.java
index f969ac7..0cc6a85 100644
--- a/src/main/java/MelonUtilities/command/commands/CommandTPAHere.java
+++ b/src/main/java/MelonUtilities/command/commands/CommandTPAHere.java
@@ -4,8 +4,8 @@
 import MelonUtilities.command.commandlogic.CommandLogicTPAHere;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.builder.ArgumentBuilder;
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import com.mojang.brigadier.builder.RequiredArgumentBuilder;
+import com.mojang.brigadier.builder.ArgumentBuilderLiteral;
+import com.mojang.brigadier.builder.ArgumentBuilderRequired;
 import net.minecraft.core.net.command.CommandManager;
 import net.minecraft.core.net.command.CommandSource;
 import net.minecraft.server.entity.player.PlayerServer;
@@ -13,8 +13,8 @@
 @SuppressWarnings("UnusedReturnValue")
 public class CommandTPAHere implements CommandManager.CommandRegistry{
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> tpahere(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(RequiredArgumentBuilder.<CommandSource, String>argument("target", ArgumentTypeUsername.string())
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> tpahere(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderRequired.<CommandSource, String>argument("target", ArgumentTypeUsername.string())
 			.executes(context ->
 				{
 					PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -28,7 +28,7 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 
 	@Override
 	public void register(CommandDispatcher<CommandSource> dispatcher) {
-		LiteralArgumentBuilder<CommandSource> builder = LiteralArgumentBuilder.literal("tpahere");
+		ArgumentBuilderLiteral<CommandSource> builder = ArgumentBuilderLiteral.literal("tpahere");
 
 		tpahere(builder);
 
diff --git a/src/main/java/MelonUtilities/command/commands/CommandTPAccept.java b/src/main/java/MelonUtilities/command/commands/CommandTPAccept.java
index c00704d..97b727d 100644
--- a/src/main/java/MelonUtilities/command/commands/CommandTPAccept.java
+++ b/src/main/java/MelonUtilities/command/commands/CommandTPAccept.java
@@ -3,7 +3,7 @@
 import MelonUtilities.command.commandlogic.CommandLogicTPA;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.builder.ArgumentBuilder;
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.builder.ArgumentBuilderLiteral;
 import net.minecraft.core.net.command.CommandManager;
 import net.minecraft.core.net.command.CommandSource;
 import net.minecraft.server.entity.player.PlayerServer;
@@ -11,7 +11,7 @@
 @SuppressWarnings("UnusedReturnValue")
 public class CommandTPAccept implements CommandManager.CommandRegistry{
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> tpaccept(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> tpaccept(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
 		builder.executes(context ->
 			{
 				PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -23,7 +23,7 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 
 	@Override
 	public void register(CommandDispatcher<CommandSource> dispatcher) {
-		LiteralArgumentBuilder<CommandSource> builder = LiteralArgumentBuilder.literal("tpaccept");
+		ArgumentBuilderLiteral<CommandSource> builder = ArgumentBuilderLiteral.literal("tpaccept");
 
 		tpaccept(builder);
 
diff --git a/src/main/java/MelonUtilities/command/commands/CommandTPDeny.java b/src/main/java/MelonUtilities/command/commands/CommandTPDeny.java
index 9a5237a..04810c3 100644
--- a/src/main/java/MelonUtilities/command/commands/CommandTPDeny.java
+++ b/src/main/java/MelonUtilities/command/commands/CommandTPDeny.java
@@ -3,7 +3,7 @@
 import MelonUtilities.command.commandlogic.CommandLogicTPA;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.builder.ArgumentBuilder;
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.builder.ArgumentBuilderLiteral;
 import net.minecraft.core.net.command.CommandManager;
 import net.minecraft.core.net.command.CommandSource;
 import net.minecraft.server.entity.player.PlayerServer;
@@ -11,7 +11,7 @@
 @SuppressWarnings("UnusedReturnValue")
 public class CommandTPDeny implements CommandManager.CommandRegistry{
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> tpdeny(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> tpdeny(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
 		builder.executes(context ->
 			{
 				PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -23,7 +23,7 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 
 	@Override
 	public void register(CommandDispatcher<CommandSource> dispatcher) {
-		LiteralArgumentBuilder<CommandSource> builder = LiteralArgumentBuilder.literal("tpdeny");
+		ArgumentBuilderLiteral<CommandSource> builder = ArgumentBuilderLiteral.literal("tpdeny");
 
 		tpdeny(builder);
 
diff --git a/src/main/java/MelonUtilities/command/commands/CommandWarp.java b/src/main/java/MelonUtilities/command/commands/CommandWarp.java
index 41e87be..cd78e12 100644
--- a/src/main/java/MelonUtilities/command/commands/CommandWarp.java
+++ b/src/main/java/MelonUtilities/command/commands/CommandWarp.java
@@ -4,19 +4,19 @@
 import MelonUtilities.command.commandlogic.CommandLogicWarp;
 import MelonUtilities.config.datatypes.data.Warp;
 import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.arguments.ArgumentTypeString;
 import com.mojang.brigadier.builder.ArgumentBuilder;
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import com.mojang.brigadier.builder.RequiredArgumentBuilder;
+import com.mojang.brigadier.builder.ArgumentBuilderLiteral;
+import com.mojang.brigadier.builder.ArgumentBuilderRequired;
 import net.minecraft.core.net.command.CommandManager;
 import net.minecraft.core.net.command.CommandSource;
 import net.minecraft.server.entity.player.PlayerServer;
 
 @SuppressWarnings("UnusedReturnValue")
 public class CommandWarp implements CommandManager.CommandRegistry{
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> warpTP(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("tp")
-			.then(RequiredArgumentBuilder.<CommandSource, Warp>argument("warp", ArgumentTypeWarp.warp())
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> warpTP(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("tp")
+			.then(ArgumentBuilderRequired.<CommandSource, Warp>argument("warp", ArgumentTypeWarp.warp())
 				.executes(context ->
 					{
 						PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -29,9 +29,9 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> warpDelete(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("delete").requires(CommandSource::hasAdmin)
-			.then(RequiredArgumentBuilder.<CommandSource, Warp>argument("warp", ArgumentTypeWarp.warp())
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> warpDelete(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("delete").requires(CommandSource::hasAdmin)
+			.then(ArgumentBuilderRequired.<CommandSource, Warp>argument("warp", ArgumentTypeWarp.warp())
 				.executes(context ->
 					{
 						PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -44,9 +44,9 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> warpCreate(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("create").requires(CommandSource::hasAdmin)
-			.then(RequiredArgumentBuilder.<CommandSource, String>argument("name", StringArgumentType.string())
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> warpCreate(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("create").requires(CommandSource::hasAdmin)
+			.then(ArgumentBuilderRequired.<CommandSource, String>argument("name", ArgumentTypeString.string())
 				.executes(context ->
 					{
 						PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -59,10 +59,10 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> warpRename(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("rename").requires(CommandSource::hasAdmin)
-			.then(RequiredArgumentBuilder.<CommandSource, Warp>argument("warp", ArgumentTypeWarp.warp())
-				.then(RequiredArgumentBuilder.<CommandSource, String>argument("name", StringArgumentType.string())
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> warpRename(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("rename").requires(CommandSource::hasAdmin)
+			.then(ArgumentBuilderRequired.<CommandSource, Warp>argument("warp", ArgumentTypeWarp.warp())
+				.then(ArgumentBuilderRequired.<CommandSource, String>argument("name", ArgumentTypeString.string())
 					.executes(context ->
 						{
 							PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -77,8 +77,8 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 		return builder;
 	}
 
-	public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> warpList(ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSource>> builder) {
-		builder.then(LiteralArgumentBuilder.<CommandSource>literal("list")
+	public static ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> warpList(ArgumentBuilder<CommandSource, ArgumentBuilderLiteral<CommandSource>> builder) {
+		builder.then(ArgumentBuilderLiteral.<CommandSource>literal("list")
 			.executes(context ->
 				{
 					PlayerServer sender = (PlayerServer) context.getSource().getSender(); if(sender == null){return 0;}
@@ -91,7 +91,7 @@ public static ArgumentBuilder<CommandSource, LiteralArgumentBuilder<CommandSourc
 
 	@Override
 	public void register(CommandDispatcher<CommandSource> dispatcher) {
-		LiteralArgumentBuilder<CommandSource> builder = LiteralArgumentBuilder.<CommandSource>literal("warp");
+		ArgumentBuilderLiteral<CommandSource> builder = ArgumentBuilderLiteral.<CommandSource>literal("warp");
 
 		warpTP(builder);
 		warpDelete(builder);
diff --git a/src/main/java/MelonUtilities/config/datatypes/jsonadapters/ConfigJsonAdapter.java b/src/main/java/MelonUtilities/config/datatypes/jsonadapters/ConfigJsonAdapter.java
index 0077344..049cbf2 100644
--- a/src/main/java/MelonUtilities/config/datatypes/jsonadapters/ConfigJsonAdapter.java
+++ b/src/main/java/MelonUtilities/config/datatypes/jsonadapters/ConfigJsonAdapter.java
@@ -28,7 +28,7 @@ public Config deserialize(JsonElement json, Type typeOfT, JsonDeserializationCon
 		JsonObject rollbackConfig = obj.getAsJsonObject("Rollback Config");
 		JsonObject elevatorConfig = obj.getAsJsonObject("Elevator Config");
 		JsonObject sqlLogConfig = obj.getAsJsonObject("SQL Log Config");
-		JsonObject warpConfig = obj.getAsJsonObject("Warp Config");
+		JsonObject warpConfig = obj.getAsJsonObject("Warp Data");
 		JsonObject discordIntegrationConfig = obj.getAsJsonObject("Discord Integration Config");
 
 
diff --git a/src/main/java/MelonUtilities/mixins/PacketHandlerServerMixin.java b/src/main/java/MelonUtilities/mixins/PacketHandlerServerMixin.java
index bb83ec0..423cf24 100644
--- a/src/main/java/MelonUtilities/mixins/PacketHandlerServerMixin.java
+++ b/src/main/java/MelonUtilities/mixins/PacketHandlerServerMixin.java
@@ -202,8 +202,31 @@ private void handleBlockDigInject(PacketPlayerAction packet, CallbackInfo ci){
 				&& !Data.Users.getOrCreate(player.uuid).lockBypass){
 				ci.cancel();
 				sendPacket(new PacketBlockUpdate(packet.xPosition, packet.yPosition, packet.zPosition, world));
+				return;
 			}
-			if(packet.action == PacketPlayerAction.ACTION_DIG_CONTINUED && Data.Users.getOrCreate(player.uuid).lockOnBlockPunched && !lockable.getIsLocked()){
+
+			if (packet.action == PacketPlayerAction.ACTION_DIG_START
+				&& Data.Users.getOrCreate(player.uuid).lockOnBlockPunched
+				&& lockable.getIsLocked()
+				&& !lockable.getLockOwner().equals(player.uuid))
+			{
+				FeedbackHandlerServer.sendFeedback(FeedbackType.error, player, "Failed to Lock Container! (Not Owned By You)");
+				ci.cancel();
+				return;
+			}
+
+			if (packet.action == PacketPlayerAction.ACTION_DIG_START
+				&& Data.Users.getOrCreate(player.uuid).lockOnBlockPunched
+				&& lockable.getIsLocked()
+				&& lockable.getLockOwner().equals(player.uuid))
+			{
+				FeedbackHandlerServer.sendFeedback(FeedbackType.error, player, "Failed to Lock Container! (Already Locked)");
+				FeedbackHandlerServer.sendFeedback(FeedbackType.error, player, packet.toString());
+				ci.cancel();
+				return;
+			}
+
+			if(packet.action == PacketPlayerAction.ACTION_DIG_START && Data.Users.getOrCreate(player.uuid).lockOnBlockPunched && !lockable.getIsLocked()){
 				if (container instanceof TileEntityChest) {
 					Lockable iOtherContainer = (Lockable) MUtil.getOtherChest(world, (TileEntityChest) container);
 					if (iOtherContainer != null) {
@@ -213,6 +236,7 @@ private void handleBlockDigInject(PacketPlayerAction packet, CallbackInfo ci){
 						iOtherContainer.setLockOwner(player.uuid);
 						FeedbackHandlerServer.sendFeedback(FeedbackType.success, player, "Locked Double Chest!");
 						ci.cancel();
+						return;
 					} else {
 						FeedbackHandlerServer.sendFeedback(FeedbackType.success, player, "Locked Chest!");
 					}
@@ -235,24 +259,7 @@ private void handleBlockDigInject(PacketPlayerAction packet, CallbackInfo ci){
 				lockable.setIsLocked(true);
 				lockable.setLockOwner(player.uuid);
 				ci.cancel();
-			}
-
-			else if (packet.action == PacketPlayerAction.ACTION_DIG_CONTINUED
-			&& Data.Users.getOrCreate(player.uuid).lockOnBlockPunched
-			&& lockable.getIsLocked()
-			&& !lockable.getLockOwner().equals(player.uuid))
-			{
-				FeedbackHandlerServer.sendFeedback(FeedbackType.error, player, "Failed to Lock Container! (Not Owned By You)");
-				ci.cancel();
-			}
-
-			else if (packet.action == PacketPlayerAction.ACTION_DIG_CONTINUED
-			&& Data.Users.getOrCreate(player.uuid).lockOnBlockPunched
-			&& lockable.getIsLocked()
-			&& lockable.getLockOwner().equals(player.uuid))
-			{
-				FeedbackHandlerServer.sendFeedback(FeedbackType.error, player, "Failed to Lock Container! (Already Locked)");
-				ci.cancel();
+				return;
 			}
 		}
 	}