diff --git a/build.gradle b/build.gradle
index 9057129a..192c1603 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,7 +38,7 @@ allprojects {
     dependencies {
         // Fabric
         minecraft "com.mojang:minecraft:${project.minecraft_version}"
-        mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+        mappings loom.officialMojangMappings()
         modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
         // Code Quality
diff --git a/ec-core/src/main/java/dev/jpcode/eccore/config/Config.java b/ec-core/src/main/java/dev/jpcode/eccore/config/Config.java
index ebb913c3..c1a75d4e 100644
--- a/ec-core/src/main/java/dev/jpcode/eccore/config/Config.java
+++ b/ec-core/src/main/java/dev/jpcode/eccore/config/Config.java
@@ -10,17 +10,15 @@
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
-
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.network.chat.Style;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import net.minecraft.text.MutableText;
-import net.minecraft.text.Style;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
-
 public abstract class Config<T extends Config<T>> {
     static final Logger LOGGER = LogManager.getLogger("ec-core-config");
 
@@ -110,16 +108,16 @@ public void storeProperties() {
 
     }
 
-    static final Style DEFAULT_STYLE = Style.EMPTY.withFormatting(Formatting.GOLD);
-    static final Style ACCENT_STYLE = Style.EMPTY.withFormatting(Formatting.GREEN);
+    static final Style DEFAULT_STYLE = Style.EMPTY.applyFormat(ChatFormatting.GOLD);
+    static final Style ACCENT_STYLE = Style.EMPTY.applyFormat(ChatFormatting.GREEN);
 
-    public @NotNull Text stateAsText() {
-        var result = Text.empty();
+    public @NotNull Component stateAsText() {
+        var result = Component.empty();
         String newLine = "\n";//System.getProperty("line.separator");
 
-        result.append(Text.literal(displayName + " {").setStyle(DEFAULT_STYLE));
+        result.append(Component.literal(displayName + " {").setStyle(DEFAULT_STYLE));
         result.append(newLine);
-        var propsText = Text.empty();
+        var propsText = Component.empty();
         result.append(propsText);
 
         //print field names paired with their values
@@ -132,7 +130,7 @@ public void storeProperties() {
                 ex.printStackTrace();
             }
         }
-        result.append(Text.literal("}").setStyle(ACCENT_STYLE));
+        result.append(Component.literal("}").setStyle(ACCENT_STYLE));
 
         return result;
 
@@ -159,14 +157,14 @@ public List<String> getPublicFieldNames() {
         return publicFieldNames;
     }
 
-    private MutableText fieldAsText(Field field) throws IllegalAccessException {
+    private MutableComponent fieldAsText(Field field) throws IllegalAccessException {
         var value = (Option<?>) field.get(this);
-        return Text.empty()
-            .append(Text.literal(field.getName() + ": ").setStyle(DEFAULT_STYLE))
-            .append(Text.literal(value.getValue().toString()));
+        return Component.empty()
+            .append(Component.literal(field.getName() + ": ").setStyle(DEFAULT_STYLE))
+            .append(Component.literal(value.getValue().toString()));
     }
 
-    public @Nullable MutableText getFieldValueAsText(String fieldName) throws NoSuchFieldException {
+    public @Nullable MutableComponent getFieldValueAsText(String fieldName) throws NoSuchFieldException {
         try {
             return fieldAsText(this.getClass().getField(fieldName));
         } catch (IllegalAccessException e) {
diff --git a/ec-core/src/main/java/dev/jpcode/eccore/config/ConfigUtil.java b/ec-core/src/main/java/dev/jpcode/eccore/config/ConfigUtil.java
index b2afc7b5..b2b1836b 100644
--- a/ec-core/src/main/java/dev/jpcode/eccore/config/ConfigUtil.java
+++ b/ec-core/src/main/java/dev/jpcode/eccore/config/ConfigUtil.java
@@ -4,7 +4,10 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.Style;
+import net.minecraft.util.GsonHelper;
 import com.google.gson.JsonNull;
 import com.google.gson.JsonSyntaxException;
 import org.apache.logging.log4j.Level;
@@ -13,12 +16,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import com.mojang.serialization.JsonOps;
-
-import net.minecraft.text.Style;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
-import net.minecraft.util.JsonHelper;
-
 import dev.jpcode.eccore.util.TimeUtil;
 
 import static dev.jpcode.eccore.config.Config.LOGGER;
@@ -53,16 +50,16 @@ public static Style parseStyleOrDefault(String styleStr, String defaultStyleStr)
     @Nullable
     public static Style parseStyle(String styleStr) {
         Style outStyle = null;
-        Formatting formatting = Formatting.byName(styleStr);
+        ChatFormatting formatting = ChatFormatting.getByName(styleStr);
         if (formatting != null) {
-            outStyle = Style.EMPTY.withFormatting(formatting);
+            outStyle = Style.EMPTY.applyFormat(formatting);
         }
 
         if (outStyle == null) {
             try {
-                outStyle = Style.Codecs.CODEC.parse(
+                outStyle = Style.Serializer.CODEC.parse(
                     JsonOps.INSTANCE,
-                    JsonHelper.deserialize(styleStr)
+                    GsonHelper.parse(styleStr)
                 ).result().orElse(null);
             } catch (JsonSyntaxException e) {
                 LOGGER.log(Level.ERROR, String.format(
@@ -74,8 +71,8 @@ public static Style parseStyle(String styleStr) {
         return outStyle;
     }
 
-    public static Text parseTextOrDefault(String textStr, String defaultTextStr) {
-        Text outText = null;
+    public static Component parseTextOrDefault(String textStr, String defaultTextStr) {
+        Component outText = null;
         if (textStr != null) {
             outText = parseText(textStr);
         }
@@ -154,7 +151,7 @@ private static void logNumberParseError(String num, String type) {
     }
 
     public static String serializeStyle(Style style) {
-        return Style.Codecs.CODEC.encodeStart(JsonOps.INSTANCE, style).result().orElse(JsonNull.INSTANCE).toString();
+        return Style.Serializer.CODEC.encodeStart(JsonOps.INSTANCE, style).result().orElse(JsonNull.INSTANCE).toString();
     }
 
     public static int parseDurationToTicks(String str) {
diff --git a/ec-core/src/main/java/dev/jpcode/eccore/util/StringToTextParser.java b/ec-core/src/main/java/dev/jpcode/eccore/util/StringToTextParser.java
index 282191e6..f2c068de 100644
--- a/ec-core/src/main/java/dev/jpcode/eccore/util/StringToTextParser.java
+++ b/ec-core/src/main/java/dev/jpcode/eccore/util/StringToTextParser.java
@@ -1,9 +1,9 @@
 package dev.jpcode.eccore.util;
 
-import net.minecraft.text.Text;
+import net.minecraft.network.chat.Component;
 
 @FunctionalInterface
 public interface StringToTextParser {
 
-    Text parseText(String str);
+    Component parseText(String str);
 }
diff --git a/ec-core/src/main/java/dev/jpcode/eccore/util/TextUtil.java b/ec-core/src/main/java/dev/jpcode/eccore/util/TextUtil.java
index a2c7d59f..07fa19ad 100644
--- a/ec-core/src/main/java/dev/jpcode/eccore/util/TextUtil.java
+++ b/ec-core/src/main/java/dev/jpcode/eccore/util/TextUtil.java
@@ -13,20 +13,21 @@
 
 import com.mojang.serialization.JsonOps;
 
-import net.minecraft.text.*;
+import net.minecraft.network.chat.*;
+import net.minecraft.network.chat.contents.PlainTextContents;
 
 public final class TextUtil {
     private TextUtil() {}
 
-    public static MutableText concat(Text... arr) {
-        MutableText out = Text.empty();
-        for (Text text : arr) {
+    public static MutableComponent concat(Component... arr) {
+        MutableComponent out = Component.empty();
+        for (Component text : arr) {
             out.append(text);
         }
         return out;
     }
 
-    public static MutableText deepCopy(Text text) {
+    public static MutableComponent deepCopy(Component text) {
         if (text.getSiblings().isEmpty()) {
             return text.copy();
         }
@@ -41,8 +42,8 @@ public static MutableText deepCopy(Text text) {
     }
 
     /**
-     * <p>Joins the elements of the provided array into a single Text
-     * containing the provided list of elements.</p>
+     * Joins the elements of the provided array into a single Text
+     * containing the provided list of elements.
      *
      * <p>No delimiter is added before or after the list.
      * Null objects or empty strings within the array are represented by
@@ -62,26 +63,26 @@ public static MutableText deepCopy(Text text) {
      * @return the joined String, <code>null</code> if null array input
      * @since 2.0
      */
-    public static MutableText join(Text[] array, Text separator) {
+    public static MutableComponent join(Component[] array, Component separator) {
         if (array == null) {
             return null;
         }
         return join(array, separator, 0, array.length);
     }
 
-    public static MutableText join(Collection<Text> textCollection, Text separator) {
+    public static MutableComponent join(Collection<Component> textCollection, Component separator) {
         if (textCollection == null) {
             return null;
         }
-        return join(textCollection.toArray(new Text[0]), separator, 0, textCollection.size());
+        return join(textCollection.toArray(new Component[0]), separator, 0, textCollection.size());
     }
 
-    public static MutableText join(Collection<String> stringCollection, Text separator, Style stringsFormatting) {
+    public static MutableComponent join(Collection<String> stringCollection, Component separator, Style stringsFormatting) {
         if (stringCollection == null) {
             return null;
         }
         return join(
-            stringCollection.stream().map(str -> Text.literal(str).setStyle(stringsFormatting)).toArray(Text[]::new),
+            stringCollection.stream().map(str -> Component.literal(str).setStyle(stringsFormatting)).toArray(Component[]::new),
             separator, 0, stringCollection.size()
         );
     }
@@ -116,7 +117,7 @@ public static String joinStrings(String[] array, String separator, int startInde
         return buf.toString();
     }
 
-    public static MutableText join(Text[] array, Text separator, int startIndex, int endIndex) {
+    public static MutableComponent join(Component[] array, Component separator, int startIndex, int endIndex) {
         if (array == null) {
             return null;
         }
@@ -124,7 +125,7 @@ public static MutableText join(Text[] array, Text separator, int startIndex, int
         if (bufSize <= 0) {
             return null;
         }
-        MutableText buf = Text.empty();
+        MutableComponent buf = Component.empty();
         for (int i = startIndex; i < endIndex; i++) {
             if (i > startIndex) {
                 buf.append(separator);
@@ -136,9 +137,9 @@ public static MutableText join(Text[] array, Text separator, int startIndex, int
         return buf;
     }
 
-    public static MutableText spaceBetween(Text[] array, int totalWidth, int padding) {
+    public static MutableComponent spaceBetween(Component[] array, int totalWidth, int padding) {
         int totalTextSize = 0;
-        for (Text txt : array) {
+        for (Component txt : array) {
             String str = txt.getString();
             totalTextSize += str.length();
         }
@@ -148,37 +149,37 @@ public static MutableText spaceBetween(Text[] array, int totalWidth, int padding
             return concat(array);
         }
 
-        MutableText outText = Text.empty();
+        MutableComponent outText = Component.empty();
         String lrPadStr = " ".repeat(padding);
         String spaceStr = " ".repeat((totalWidth - padding * 2 - totalTextSize) / (array.length - 1));
-        outText.append(Text.literal(lrPadStr));
+        outText.append(Component.literal(lrPadStr));
 
         for (int i = 0; i < array.length; i++) {
             outText.append(array[i]);
             if (i != array.length - 1) {
-                outText.append(Text.literal(spaceStr));
+                outText.append(Component.literal(spaceStr));
             }
         }
 
-        outText.append(Text.literal(lrPadStr));
+        outText.append(Component.literal(lrPadStr));
 
         return outText;
     }
 
-    public static MutableText clickableTeleport(MutableText originalText, String destinationName, String commandBaseString) {
+    public static MutableComponent clickableTeleport(MutableComponent originalText, String destinationName, String commandBaseString) {
         String teleportCommand = String.format("%s %s", commandBaseString, destinationName);
 
         Style outStyle = originalText.getStyle()
             .withClickEvent(new ClickEvent.RunCommand(teleportCommand))
-            .withHoverEvent(new HoverEvent.ShowText(Text.literal("Click to teleport to "
+            .withHoverEvent(new HoverEvent.ShowText(Component.literal("Click to teleport to "
                 + destinationName
                 + ".")));
 
         return originalText.setStyle(outStyle);
     }
 
-    public static String toJsonString(Text text) {
-        return TextCodecs.CODEC
+    public static String toJsonString(Component text) {
+        return ComponentSerialization.CODEC
             .encodeStart(JsonOps.INSTANCE, text)
             .getOrThrow()
             .toString();
@@ -194,12 +195,12 @@ public static void registerTextParser(StringToTextParser parser) {
     }
 
     static {
-        registerTextParser(str -> TextCodecs.CODEC.parse(JsonOps.INSTANCE, JsonParser.parseString(str)).getOrThrow());
+        registerTextParser(str -> ComponentSerialization.CODEC.parse(JsonOps.INSTANCE, JsonParser.parseString(str)).getOrThrow());
         registerTextParser(str -> TagParser.DEFAULT.parseText(str, ParserContext.of()));
     }
 
-    public static Text parseText(String textStr) {
-        Text outText = null;
+    public static Component parseText(String textStr) {
+        Component outText = null;
         for (StringToTextParser parser : TEXT_PARSERS) {
             try {
                 outText = parser.parseText(textStr);
@@ -215,20 +216,20 @@ public static Text parseText(String textStr) {
         throw new RuntimeException(String.format("Failed to parse string '%s' as MinecraftText using any parsing strategy", textStr));
     }
 
-    public static Collector<Text, MutableText, MutableText> collect() {
+    public static Collector<Component, MutableComponent, MutableComponent> collect() {
         return new Collector<>() {
             @Override
-            public Supplier<MutableText> supplier() {
-                return Text::empty;
+            public Supplier<MutableComponent> supplier() {
+                return Component::empty;
             }
 
             @Override
-            public BiConsumer<MutableText, Text> accumulator() {
-                return MutableText::append;
+            public BiConsumer<MutableComponent, Component> accumulator() {
+                return MutableComponent::append;
             }
 
             @Override
-            public BinaryOperator<MutableText> combiner() {
+            public BinaryOperator<MutableComponent> combiner() {
                 return (r1, r2) -> {
                     r1.append(r2);
                     return r1;
@@ -236,7 +237,7 @@ public BinaryOperator<MutableText> combiner() {
             }
 
             @Override
-            public Function<MutableText, MutableText> finisher() {
+            public Function<MutableComponent, MutableComponent> finisher() {
                 return (a) -> a;
             }
 
@@ -252,17 +253,17 @@ public Set<Characteristics> characteristics() {
      *
      * @return flattened text
      */
-    public static List<Text> flattenRoot(Text text) {
+    public static List<Component> flattenRoot(Component text) {
         var siblings = text.getSiblings();
-        if (text.getContent().equals(PlainTextContent.EMPTY) && siblings.size() == 1) {
+        if (text.getContents().equals(PlainTextContents.EMPTY) && siblings.size() == 1) {
             return siblings;
         } else if (siblings.size() == 0) {
             return List.of(text);
         }
 
-        List<Text> content = new ArrayList<>(siblings.size() + 1);
-        if (!text.getContent().equals(PlainTextContent.EMPTY)) {
-            content.add(text.copyContentOnly().setStyle(text.getStyle()));
+        List<Component> content = new ArrayList<>(siblings.size() + 1);
+        if (!text.getContents().equals(PlainTextContents.EMPTY)) {
+            content.add(text.plainCopy().setStyle(text.getStyle()));
         }
         content.addAll(siblings);
 
diff --git a/ec-core/src/main/java/dev/jpcode/eccore/util/TimeUtil.java b/ec-core/src/main/java/dev/jpcode/eccore/util/TimeUtil.java
index f4228e04..ed15e54c 100644
--- a/ec-core/src/main/java/dev/jpcode/eccore/util/TimeUtil.java
+++ b/ec-core/src/main/java/dev/jpcode/eccore/util/TimeUtil.java
@@ -17,7 +17,7 @@ public static void init(MinecraftServer server) {
     }
 
     public static int getTicks() {
-        return server.getTicks();
+        return server.getTickCount();
     }
 
     public static long ticksToMs(int ticks) {
@@ -29,12 +29,12 @@ public static int msToTicks(long ms) {
     }
 
     public static long tickTimeToEpochMs(int ticks) {
-        return ticksToMs(ticks - server.getTicks()) + net.minecraft.util.Util.getEpochTimeMs();
+        return ticksToMs(ticks - server.getTickCount()) + net.minecraft.util.Util.getEpochMillis();
     }
 
     public static int epochTimeMsToTicks(long epochTimeMs) {
-        var msFromNow = epochTimeMs - net.minecraft.util.Util.getEpochTimeMs();
-        return server.getTicks() + msToTicks(msFromNow);
+        var msFromNow = epochTimeMs - net.minecraft.util.Util.getEpochMillis();
+        return server.getTickCount() + msToTicks(msFromNow);
     }
 
     public static int durationToTicks(Duration duration) {
diff --git a/ec-core/src/test/java/dev/jpcode/eccore/config/ConfigUtilTest.java b/ec-core/src/test/java/dev/jpcode/eccore/config/ConfigUtilTest.java
new file mode 100644
index 00000000..fd0bf35f
--- /dev/null
+++ b/ec-core/src/test/java/dev/jpcode/eccore/config/ConfigUtilTest.java
@@ -0,0 +1,27 @@
+package dev.jpcode.eccore.config;
+
+import net.minecraft.ChatFormatting;
+import net.minecraft.SharedConstants;
+import net.minecraft.server.Bootstrap;
+import net.minecraft.network.chat.Style;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class ConfigUtilTest {
+    @BeforeEach
+    void setUp() {
+        SharedConstants.tryDetectVersion();
+        Bootstrap.bootStrap();
+    }
+
+    @Test
+    void testStyleParser() {
+        Style expected = Style.EMPTY.withColor(ChatFormatting.RED);
+        Style thing = ConfigUtil.parseStyle("{\"color\":\"red\"}");
+
+        assertEquals(thing, expected);
+    }
+}
diff --git a/ec-core/src/test/java/dev/jpcode/eccore/util/TextUtilTests.java b/ec-core/src/test/java/dev/jpcode/eccore/util/TextUtilTests.java
index 43c5ff32..56895dbc 100644
--- a/ec-core/src/test/java/dev/jpcode/eccore/util/TextUtilTests.java
+++ b/ec-core/src/test/java/dev/jpcode/eccore/util/TextUtilTests.java
@@ -5,36 +5,36 @@
 
 import com.mojang.serialization.JsonOps;
 
-import net.minecraft.Bootstrap;
+import net.minecraft.server.Bootstrap;
 import net.minecraft.SharedConstants;
-import net.minecraft.registry.Registries;
-import net.minecraft.text.Style;
-import net.minecraft.text.Text;
-import net.minecraft.text.TextCodecs;
-import net.minecraft.util.Formatting;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.ComponentSerialization;
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.Style;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @DisplayName("TextUtil")
 public class TextUtilTests {
     static {
-        SharedConstants.createGameVersion();
-        Bootstrap.initialize();
-        Registries.bootstrap();
+        SharedConstants.tryDetectVersion();
+        Bootstrap.bootStrap();
+        BuiltInRegistries.bootStrap();
     }
 
     @Test
     @DisplayName("flattenRoot output is shaped correctly")
     void flattenRoot_flattensCorrectly()
     {
-        var baseStyle = Style.EMPTY.withColor(Formatting.AQUA);
-        var input = Text.literal("testing").setStyle(baseStyle)
+        var baseStyle = Style.EMPTY.withColor(ChatFormatting.AQUA);
+        var input = Component.literal("testing").setStyle(baseStyle)
             .append("token2")
             .append("token3");
 
         var output = TextUtil.flattenRoot(input);
 
-        assertEquals(output.getFirst().getContent(), input.getContent());
+        assertEquals(output.getFirst().getContents(), input.getContents());
         assertEquals(output.getFirst().getStyle(), baseStyle);
 
         var inputSiblings = input.getSiblings();
@@ -42,7 +42,7 @@ void flattenRoot_flattensCorrectly()
             var inputToken = inputSiblings.get(i - 1);
             var outToken = output.get(i);
 
-            assertEquals(inputToken.getContent(), outToken.getContent());
+            assertEquals(inputToken.getContents(), outToken.getContents());
             assertEquals(inputToken.getStyle(), outToken.getStyle());
         }
     }
@@ -51,12 +51,12 @@ void flattenRoot_flattensCorrectly()
     @DisplayName("from-to json is remotely sane")
     void fromToJson_isSane()
     {
-        var originalText = Text.literal(" hi there! ");
-        var textAsJson = TextCodecs.CODEC.encodeStart(JsonOps.INSTANCE, originalText)
+        var originalText = Component.literal(" hi there! ");
+        var textAsJson = ComponentSerialization.CODEC.encodeStart(JsonOps.INSTANCE, originalText)
             .getOrThrow();
-        var parsedText = TextCodecs.CODEC.parse(JsonOps.INSTANCE, textAsJson)
+        var parsedText = ComponentSerialization.CODEC.parse(JsonOps.INSTANCE, textAsJson)
             .getOrThrow();
-        assertEquals(originalText.getContent(), parsedText.getContent());
+        assertEquals(originalText.getContents(), parsedText.getContents());
         assertEquals(originalText.getStyle(), parsedText.getStyle()); // I think both null?
     }
 }
diff --git a/gradle.properties b/gradle.properties
index b3a6cfb0..6d17e998 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,6 @@ org.gradle.jvmargs=-Xmx2048M
 # Fabric Properties
 # check these on https://fabricmc.net/develup
 minecraft_version=1.21.11
-yarn_mappings=1.21.11+build.1
 loader_version=0.18.2
 loom_version=1.13-SNAPSHOT
 
diff --git a/src/main/java/com/fibermc/essentialcommands/ECPerms.java b/src/main/java/com/fibermc/essentialcommands/ECPerms.java
index eb04b4da..7f2ff2ad 100644
--- a/src/main/java/com/fibermc/essentialcommands/ECPerms.java
+++ b/src/main/java/com/fibermc/essentialcommands/ECPerms.java
@@ -6,15 +6,12 @@
 import java.util.stream.Stream;
 
 import me.lucko.fabric.api.permissions.v0.Permissions;
-
-import net.minecraft.command.permission.Permission;
-
-import net.minecraft.command.permission.PermissionLevel;
-
 import org.jetbrains.annotations.NotNull;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.permissions.Permission;
+import net.minecraft.server.permissions.PermissionLevel;
 
 import static com.fibermc.essentialcommands.EssentialCommands.CONFIG;
 
@@ -116,37 +113,38 @@ static void init() {
         });
     }
 
-    private static boolean isSuperAdmin(ServerCommandSource source) {
-        return source.getPermissions().hasPermission(new Permission.Level(PermissionLevel.OWNERS));
+    private static boolean isSuperAdmin(CommandSourceStack source) {
+        return source.permissions().hasPermission(new Permission.HasCommandLevel(PermissionLevel.OWNERS));
     }
 
-    public static @NotNull Predicate<ServerCommandSource> require(@NotNull String permission, int defaultRequireLevel) {
+    public static @NotNull Predicate<CommandSourceStack> require(@NotNull String permission, int defaultRequireLevel) {
         return player -> check(player, permission, defaultRequireLevel);
     }
 
-    public static @NotNull Predicate<ServerCommandSource> requireAny(@NotNull String[] permissions, int defaultRequireLevel) {
+    public static @NotNull Predicate<CommandSourceStack> requireAny(@NotNull String[] permissions, int defaultRequireLevel) {
         return player -> checkAny(player, permissions, defaultRequireLevel);
     }
 
-    public static boolean check(@NotNull ServerCommandSource source, @NotNull String permission, int defaultRequireLevel) {
+    public static boolean check(@NotNull CommandSourceStack source, @NotNull String permission, int defaultRequireLevel) {
         if (CONFIG.USE_PERMISSIONS_API) {
             try {
                 // TODO: In the future, config option for granting ops all perms.
-                return Permissions.getPermissionValue(source, permission).orElse(source.getPermissions().hasPermission(new Permission.Level(PermissionLevel.fromLevel(Math.max(2, defaultRequireLevel)))));
+                return Permissions.getPermissionValue(source, permission).orElse(source.permissions()
+                    .hasPermission(new Permission.HasCommandLevel(PermissionLevel.byId(Math.max(2, defaultRequireLevel)))));
             } catch (Exception e) {
                 EssentialCommands.LOGGER.error(e);
                 return false;
             }
         } else {
-            return source.getPermissions().hasPermission(new Permission.Level(PermissionLevel.fromLevel(defaultRequireLevel)));
+            return source.permissions().hasPermission(new Permission.HasCommandLevel(PermissionLevel.byId(defaultRequireLevel)));
         }
     }
 
-    public static boolean check(@NotNull ServerCommandSource source, @NotNull String permission) {
+    public static boolean check(@NotNull CommandSourceStack source, @NotNull String permission) {
         return check(source, permission, 4);
     }
 
-    public static boolean checkAny(@NotNull ServerCommandSource source, @NotNull String[] permissions, int defaultRequireLevel) {
+    public static boolean checkAny(@NotNull CommandSourceStack source, @NotNull String[] permissions, int defaultRequireLevel) {
         for (String permission : permissions) {
             if (check(source, permission, defaultRequireLevel)) {
                 return true;
@@ -159,7 +157,7 @@ private static int getNumericValue(String permission) {
         return Integer.parseInt(permission.substring(permission.lastIndexOf('.') + 1));
     }
 
-    public static int getHighestNumericPermission(@NotNull ServerCommandSource source, @NotNull String[] permissionGroup) {
+    public static int getHighestNumericPermission(@NotNull CommandSourceStack source, @NotNull String[] permissionGroup) {
         // No effective numeric limits for ops.
         if (isSuperAdmin(source)) {
             return Integer.MAX_VALUE;
@@ -198,10 +196,10 @@ public static String[] makeNumericPermissionGroup(String basePermission, Collect
         return numericValues.stream().map(el -> trueBasePermission.concat(el.toString())).toArray(String[]::new);
     }
 
-    public static Stream<String> getGrantedStatefulPlayerAbilityPermissions(ServerPlayerEntity player) {
+    public static Stream<String> getGrantedStatefulPlayerAbilityPermissions(ServerPlayer player) {
         var list = Arrays.stream(Registry.Group.stateful_player_abilities);
-        return player.getPermissions().hasPermission(new Permission.Level(PermissionLevel.GAMEMASTERS))
+        return player.permissions().hasPermission(new Permission.HasCommandLevel(PermissionLevel.GAMEMASTERS))
             ? list // TODO: this is hacky
-            : list.filter(permission -> check(player.getCommandSource(), permission));
+            : list.filter(permission -> check(player.createCommandSourceStack(), permission));
     }
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/ECPlaceholderRegistry.java b/src/main/java/com/fibermc/essentialcommands/ECPlaceholderRegistry.java
index 03765d44..4856ccbc 100644
--- a/src/main/java/com/fibermc/essentialcommands/ECPlaceholderRegistry.java
+++ b/src/main/java/com/fibermc/essentialcommands/ECPlaceholderRegistry.java
@@ -4,7 +4,7 @@
 import eu.pb4.placeholders.api.PlaceholderResult;
 import eu.pb4.placeholders.api.Placeholders;
 
-import net.minecraft.util.Identifier;
+import net.minecraft.resources.Identifier;
 
 final class ECPlaceholderRegistry {
     private ECPlaceholderRegistry() {}
@@ -12,7 +12,7 @@ private ECPlaceholderRegistry() {}
     public static void register() {
         var namespace = EssentialCommands.MOD_ID;
         Placeholders.register(
-            Identifier.of(namespace, "nickname"),
+            Identifier.fromNamespaceAndPath(namespace, "nickname"),
             (ctx, arg) -> {
                 if (ctx.hasPlayer()) {
                     return PlaceholderResult.value(
diff --git a/src/main/java/com/fibermc/essentialcommands/EssentialCommandRegistry.java b/src/main/java/com/fibermc/essentialcommands/EssentialCommandRegistry.java
index cb3cf35d..523a27ab 100644
--- a/src/main/java/com/fibermc/essentialcommands/EssentialCommandRegistry.java
+++ b/src/main/java/com/fibermc/essentialcommands/EssentialCommandRegistry.java
@@ -17,11 +17,6 @@
 import com.fibermc.essentialcommands.types.NamedMinecraftLocation;
 import com.fibermc.essentialcommands.util.EssentialsConvertor;
 import com.fibermc.essentialcommands.util.EssentialsXParser;
-
-import net.minecraft.command.permission.Permission;
-
-import net.minecraft.command.permission.PermissionLevel;
-
 import org.apache.logging.log4j.Level;
 import org.spongepowered.asm.util.IConsumer;
 
@@ -33,17 +28,19 @@
 import com.mojang.brigadier.tree.LiteralCommandNode;
 import com.mojang.brigadier.tree.RootCommandNode;
 
-import net.minecraft.command.CommandRegistryAccess;
-import net.minecraft.command.argument.EntityArgumentType;
-import net.minecraft.command.argument.TextArgumentType;
-import net.minecraft.server.command.CommandManager;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.text.Text;
+import net.minecraft.commands.CommandBuildContext;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.commands.arguments.ComponentArgument;
+import net.minecraft.commands.arguments.EntityArgument;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.permissions.Permission;
+import net.minecraft.server.permissions.PermissionLevel;
 
 import static com.fibermc.essentialcommands.EssentialCommands.BACKING_CONFIG;
 import static com.fibermc.essentialcommands.EssentialCommands.CONFIG;
-import static net.minecraft.server.command.CommandManager.argument;
-import static net.minecraft.server.command.CommandManager.literal;
+import static net.minecraft.commands.Commands.argument;
+import static net.minecraft.commands.Commands.literal;
 
 /**
  * Primary registry class for EssentialCommands.
@@ -54,19 +51,19 @@ public final class EssentialCommandRegistry {
     private EssentialCommandRegistry() {}
 
     public static void register(
-        CommandDispatcher<ServerCommandSource> dispatcher,
-        CommandRegistryAccess commandRegistryAccess,
-        CommandManager.RegistrationEnvironment registrationEnvironment
+        CommandDispatcher<CommandSourceStack> dispatcher,
+        CommandBuildContext commandRegistryAccess,
+        Commands.CommandSelection registrationEnvironment
     ) {
-        RootCommandNode<ServerCommandSource> rootNode = dispatcher.getRoot();
+        RootCommandNode<CommandSourceStack> rootNode = dispatcher.getRoot();
 
-        LiteralCommandNode<ServerCommandSource> essentialCommandsRootNode;
+        LiteralCommandNode<CommandSourceStack> essentialCommandsRootNode;
         {
-            LiteralCommandNode<ServerCommandSource> ecInfoNode = CommandManager.literal("info")
+            LiteralCommandNode<CommandSourceStack> ecInfoNode = Commands.literal("info")
                 .executes(new ModInfoCommand())
                 .build();
 
-            essentialCommandsRootNode = CommandManager.literal("essentialcommands")
+            essentialCommandsRootNode = Commands.literal("essentialcommands")
                 .executes(ecInfoNode.getCommand())
                 .build();
 
@@ -74,7 +71,7 @@ public static void register(
         }
 
         var excludedTopLevelCommands = new HashSet<>(CONFIG.EXCLUDED_TOP_LEVEL_COMMANDS);
-        IConsumer<LiteralCommandNode<ServerCommandSource>> registerNode = CONFIG.REGISTER_TOP_LEVEL_COMMANDS
+        IConsumer<LiteralCommandNode<CommandSourceStack>> registerNode = CONFIG.REGISTER_TOP_LEVEL_COMMANDS
             ? (node) -> {
                 if (excludedTopLevelCommands.contains(node.getLiteral())) {
                     excludedTopLevelCommands.remove(node.getLiteral());
@@ -86,18 +83,18 @@ public static void register(
             : essentialCommandsRootNode::addChild;
 
         if (CONFIG.ENABLE_TPA) {
-            registerNode.accept(CommandManager.literal("tpa")
+            registerNode.accept(Commands.literal("tpa")
                 .requires(ECPerms.require(ECPerms.Registry.tpa, 0))
                 .then(CommandUtil.targetPlayerArgument()
                     .executes(new TeleportAskCommand()))
                 .build());
 
-            registerNode.accept(CommandManager.literal("tpcancel")
+            registerNode.accept(Commands.literal("tpcancel")
                 .requires(ECPerms.require(ECPerms.Registry.tpa, 0))
                 .executes(new TeleportCancelCommand())
                 .build());
 
-            registerNode.accept(CommandManager.literal("tpaccept")
+            registerNode.accept(Commands.literal("tpaccept")
                 .requires(ECPerms.require(ECPerms.Registry.tpaccept, 0))
                 .executes(new TeleportAcceptCommand()::runDefault)
                 .then(CommandUtil.targetPlayerArgument()
@@ -105,7 +102,7 @@ public static void register(
                     .executes(new TeleportAcceptCommand()))
                 .build());
 
-            registerNode.accept(CommandManager.literal("tpdeny")
+            registerNode.accept(Commands.literal("tpdeny")
                 .requires(ECPerms.require(ECPerms.Registry.tpdeny, 0))
                 .executes(new TeleportDenyCommand()::runDefault)
                 .then(CommandUtil.targetPlayerArgument()
@@ -113,7 +110,7 @@ public static void register(
                     .executes(new TeleportDenyCommand()))
                 .build());
 
-            registerNode.accept(CommandManager.literal("tpahere")
+            registerNode.accept(Commands.literal("tpahere")
                 .requires(ECPerms.require(ECPerms.Registry.tpahere, 0))
                 .then(CommandUtil.targetPlayerArgument()
                     .executes(new TeleportAskHereCommand()))
@@ -121,15 +118,15 @@ public static void register(
         }
 
         if (CONFIG.ENABLE_HOME) {
-            LiteralArgumentBuilder<ServerCommandSource> homeBuilder = CommandManager.literal("home");
-            LiteralArgumentBuilder<ServerCommandSource> homeSetBuilder = CommandManager.literal("set");
-            LiteralArgumentBuilder<ServerCommandSource> homeTpBuilder = CommandManager.literal("tp");
-            LiteralArgumentBuilder<ServerCommandSource> homeTpOtherBuilder = CommandManager.literal("tp_other");
-            LiteralArgumentBuilder<ServerCommandSource> homeTpOfflineBuilder = CommandManager.literal("tp_offline");
-            LiteralArgumentBuilder<ServerCommandSource> homeDeleteBuilder = CommandManager.literal("delete");
-            LiteralArgumentBuilder<ServerCommandSource> homeListBuilder = CommandManager.literal("list");
-            LiteralArgumentBuilder<ServerCommandSource> homeListOfflineBuilder = CommandManager.literal("list_offline");
-            LiteralArgumentBuilder<ServerCommandSource> homeOverwriteBuilder = CommandManager.literal("overwritehome");
+            LiteralArgumentBuilder<CommandSourceStack> homeBuilder = Commands.literal("home");
+            LiteralArgumentBuilder<CommandSourceStack> homeSetBuilder = Commands.literal("set");
+            LiteralArgumentBuilder<CommandSourceStack> homeTpBuilder = Commands.literal("tp");
+            LiteralArgumentBuilder<CommandSourceStack> homeTpOtherBuilder = Commands.literal("tp_other");
+            LiteralArgumentBuilder<CommandSourceStack> homeTpOfflineBuilder = Commands.literal("tp_offline");
+            LiteralArgumentBuilder<CommandSourceStack> homeDeleteBuilder = Commands.literal("delete");
+            LiteralArgumentBuilder<CommandSourceStack> homeListBuilder = Commands.literal("list");
+            LiteralArgumentBuilder<CommandSourceStack> homeListOfflineBuilder = Commands.literal("list_offline");
+            LiteralArgumentBuilder<CommandSourceStack> homeOverwriteBuilder = Commands.literal("overwritehome");
 
             homeSetBuilder
                 .requires(ECPerms.require(ECPerms.Registry.home_set, 0))
@@ -146,7 +143,7 @@ public static void register(
 
             homeTpOtherBuilder
                 .requires(ECPerms.require(ECPerms.Registry.home_tp_others, 2))
-                .then(argument("target_player", EntityArgumentType.player())
+                .then(argument("target_player", EntityArgument.player())
                     .then(argument("home_name", StringArgumentType.word())
                         .suggests(HomeTeleportOtherCommand.Suggestion.LIST_SUGGESTION_PROVIDER)
                         .executes(new HomeTeleportOtherCommand())));
@@ -180,7 +177,7 @@ public static void register(
                 .then(argument("home_name", StringArgumentType.word())
                 .executes(new HomeOverwriteCommand()));
 
-            LiteralCommandNode<ServerCommandSource> homeNode = homeBuilder
+            LiteralCommandNode<CommandSourceStack> homeNode = homeBuilder
                 .requires(ECPerms.requireAny(ECPerms.Registry.Group.home_group, 0))
                 .build();
             homeNode.addChild(homeTpBuilder.build());
@@ -198,12 +195,12 @@ public static void register(
 
         //Back
         if (CONFIG.ENABLE_BACK) {
-            LiteralArgumentBuilder<ServerCommandSource> backBuilder = CommandManager.literal("back");
+            LiteralArgumentBuilder<CommandSourceStack> backBuilder = Commands.literal("back");
             backBuilder
                 .requires(ECPerms.require(ECPerms.Registry.back, 0))
                 .executes(new BackCommand());
 
-            LiteralCommandNode<ServerCommandSource> backNode = backBuilder.build();
+            LiteralCommandNode<CommandSourceStack> backNode = backBuilder.build();
 
             rootNode.addChild(backNode);
             essentialCommandsRootNode.addChild(backNode);
@@ -211,12 +208,12 @@ public static void register(
 
         //Warp
         if (CONFIG.ENABLE_WARP) {
-            LiteralArgumentBuilder<ServerCommandSource> warpBuilder = CommandManager.literal("warp");
-            LiteralArgumentBuilder<ServerCommandSource> warpSetBuilder = CommandManager.literal("set");
-            LiteralArgumentBuilder<ServerCommandSource> warpTpBuilder = CommandManager.literal("tp");
-            LiteralArgumentBuilder<ServerCommandSource> warpTpOtherBuilder = CommandManager.literal("tp_other");
-            LiteralArgumentBuilder<ServerCommandSource> warpDeleteBuilder = CommandManager.literal("delete");
-            LiteralArgumentBuilder<ServerCommandSource> warpListBuilder = CommandManager.literal("list");
+            LiteralArgumentBuilder<CommandSourceStack> warpBuilder = Commands.literal("warp");
+            LiteralArgumentBuilder<CommandSourceStack> warpSetBuilder = Commands.literal("set");
+            LiteralArgumentBuilder<CommandSourceStack> warpTpBuilder = Commands.literal("tp");
+            LiteralArgumentBuilder<CommandSourceStack> warpTpOtherBuilder = Commands.literal("tp_other");
+            LiteralArgumentBuilder<CommandSourceStack> warpDeleteBuilder = Commands.literal("delete");
+            LiteralArgumentBuilder<CommandSourceStack> warpListBuilder = Commands.literal("list");
 
             warpSetBuilder
                 .requires(ECPerms.require(ECPerms.Registry.warp_set, 4))
@@ -233,7 +230,7 @@ public static void register(
 
             warpTpOtherBuilder
                 .requires(ECPerms.require(ECPerms.Registry.home_tp_others, 2))
-                .then(argument("target_player", EntityArgumentType.player())
+                .then(argument("target_player", EntityArgument.player())
                     .then(argument("warp_name", StringArgumentType.word())
                         .suggests(WarpSuggestion.STRING_SUGGESTIONS_PROVIDER)
                         .executes(new WarpTpCommand()::runOther)));
@@ -249,11 +246,11 @@ public static void register(
                 .executes(ListCommandFactory.create(
                     ECText.getInstance().getString("cmd.warp.list.start"),
                     "warp tp",
-                    (context) -> ManagerLocator.getInstance().getWorldDataManager().getAccessibleWarps(context.getSource().getPlayerOrThrow()).toList(),
+                    (context) -> ManagerLocator.getInstance().getWorldDataManager().getAccessibleWarps(context.getSource().getPlayerOrException()).toList(),
                     NamedMinecraftLocation::getName
                 ));
 
-            LiteralCommandNode<ServerCommandSource> warpNode = warpBuilder
+            LiteralCommandNode<CommandSourceStack> warpNode = warpBuilder
                 .requires(ECPerms.requireAny(ECPerms.Registry.Group.warp_group, 0))
                 .build();
             warpNode.addChild(warpTpBuilder.build());
@@ -267,9 +264,9 @@ public static void register(
 
         //Spawn
         if (CONFIG.ENABLE_SPAWN) {
-            LiteralArgumentBuilder<ServerCommandSource> spawnBuilder = CommandManager.literal("spawn");
-            LiteralArgumentBuilder<ServerCommandSource> spawnSetBuilder = CommandManager.literal("set");
-            LiteralArgumentBuilder<ServerCommandSource> spawnTpBuilder = CommandManager.literal("tp");
+            LiteralArgumentBuilder<CommandSourceStack> spawnBuilder = Commands.literal("spawn");
+            LiteralArgumentBuilder<CommandSourceStack> spawnSetBuilder = Commands.literal("set");
+            LiteralArgumentBuilder<CommandSourceStack> spawnTpBuilder = Commands.literal("tp");
 
             spawnSetBuilder
                 .requires(ECPerms.require(ECPerms.Registry.spawn_set, 4))
@@ -283,7 +280,7 @@ public static void register(
                 .requires(ECPerms.require(ECPerms.Registry.spawn_tp, 0))
                 .executes(cmd);
 
-            LiteralCommandNode<ServerCommandSource> spawnNode = spawnBuilder.build();
+            LiteralCommandNode<CommandSourceStack> spawnNode = spawnBuilder.build();
             spawnNode.addChild(spawnSetBuilder.build());
             spawnNode.addChild(spawnTpBuilder.build());
 
@@ -291,19 +288,19 @@ public static void register(
         }
 
         if (CONFIG.ENABLE_NICK) {
-            LiteralArgumentBuilder<ServerCommandSource> nickBuilder = CommandManager.literal("nickname");
-            LiteralArgumentBuilder<ServerCommandSource> nickSetBuilder = CommandManager.literal("set");
-            LiteralArgumentBuilder<ServerCommandSource> nickClearBuilder = CommandManager.literal("clear");
-            LiteralArgumentBuilder<ServerCommandSource> nickRevealBuilder = CommandManager.literal("reveal");
+            LiteralArgumentBuilder<CommandSourceStack> nickBuilder = Commands.literal("nickname");
+            LiteralArgumentBuilder<CommandSourceStack> nickSetBuilder = Commands.literal("set");
+            LiteralArgumentBuilder<CommandSourceStack> nickClearBuilder = Commands.literal("clear");
+            LiteralArgumentBuilder<CommandSourceStack> nickRevealBuilder = Commands.literal("reveal");
 
-            Predicate<ServerCommandSource> permissionSelf = ECPerms.require(ECPerms.Registry.nickname_self, 2);
-            Predicate<ServerCommandSource> permissionOther = ECPerms.require(ECPerms.Registry.nickname_others, 2);
+            Predicate<CommandSourceStack> permissionSelf = ECPerms.require(ECPerms.Registry.nickname_self, 2);
+            Predicate<CommandSourceStack> permissionOther = ECPerms.require(ECPerms.Registry.nickname_others, 2);
             nickSetBuilder.requires(permissionSelf)
-                .then(argument("nickname", TextArgumentType.text(commandRegistryAccess))
+                .then(argument("nickname", ComponentArgument.textComponent(commandRegistryAccess))
                     .executes(new NicknameSetCommand())
                 ).then(CommandUtil.targetPlayerArgument()
                     .requires(permissionOther)
-                    .then(argument("nickname", TextArgumentType.text(commandRegistryAccess))
+                    .then(argument("nickname", ComponentArgument.textComponent(commandRegistryAccess))
                         .executes(new NicknameSetCommand())
                     ).then(argument("nickname_placeholder_api", StringArgumentType.greedyString())
                         .executes(NicknameSetCommand::runStringToText)
@@ -327,7 +324,7 @@ public static void register(
                     .executes(new RealNameCommand())
                 );
 
-            LiteralCommandNode<ServerCommandSource> nickNode = nickBuilder
+            LiteralCommandNode<CommandSourceStack> nickNode = nickBuilder
                 .requires(ECPerms.requireAny(ECPerms.Registry.Group.nickname_group, 2))
                 .build();
             nickNode.addChild(nickSetBuilder.build());
@@ -338,12 +335,12 @@ public static void register(
         }
 
         if (CONFIG.ENABLE_RTP) {
-            registerNode.accept(CommandManager.literal("randomteleport")
+            registerNode.accept(Commands.literal("randomteleport")
                 .requires(ECPerms.require(ECPerms.Registry.randomteleport, 2))
                 .executes(new RandomTeleportCommand())
                 .build());
 
-            registerNode.accept(CommandManager.literal("rtp")
+            registerNode.accept(Commands.literal("rtp")
                 .requires(ECPerms.require(ECPerms.Registry.randomteleport, 2))
                 .executes(new RandomTeleportCommand())
                 .build()
@@ -351,11 +348,11 @@ public static void register(
         }
 
         if (CONFIG.ENABLE_FLY) {
-            LiteralArgumentBuilder<ServerCommandSource> flyBuilder = CommandManager.literal("fly");
-            LiteralArgumentBuilder<ServerCommandSource> flySpeedBuilder = CommandManager.literal("speed");
+            LiteralArgumentBuilder<CommandSourceStack> flyBuilder = Commands.literal("fly");
+            LiteralArgumentBuilder<CommandSourceStack> flySpeedBuilder = Commands.literal("speed");
 
-            Predicate<ServerCommandSource> permissionSelf = ECPerms.require(ECPerms.Registry.fly_self, 2);
-            Predicate<ServerCommandSource> permissionOther = ECPerms.require(ECPerms.Registry.fly_others, 2);
+            Predicate<CommandSourceStack> permissionSelf = ECPerms.require(ECPerms.Registry.fly_self, 2);
+            Predicate<CommandSourceStack> permissionOther = ECPerms.require(ECPerms.Registry.fly_others, 2);
 
             flyBuilder
                 .requires(permissionSelf)
@@ -369,18 +366,18 @@ public static void register(
 
             flySpeedBuilder
                 .requires(permissionSelf)
-                .then(CommandManager.literal("reset")
+                .then(Commands.literal("reset")
                     .executes(new FlySpeedCommand()::reset))
                 .then(argument("fly_speed", IntegerArgumentType.integer(0))
                     .executes(new FlySpeedCommand()))
                 .then(CommandUtil.targetPlayerArgument()
                     .requires(permissionOther)
-                    .then(CommandManager.literal("reset")
+                    .then(Commands.literal("reset")
                         .executes(new FlySpeedCommand()::reset))
                     .then(argument("fly_speed", IntegerArgumentType.integer(0))
                         .executes(new FlySpeedCommand())));
 
-            LiteralCommandNode<ServerCommandSource> flyNode = flyBuilder.build();
+            LiteralCommandNode<CommandSourceStack> flyNode = flyBuilder.build();
             flyNode.addChild(flySpeedBuilder.build());
 
             registerNode.accept(flyNode);
@@ -388,7 +385,7 @@ public static void register(
 
         if (CONFIG.ENABLE_INVULN) {
             registerNode.accept(
-                CommandManager.literal("invuln")
+                Commands.literal("invuln")
                     .requires(ECPerms.require(ECPerms.Registry.invuln_self, 2))
                     .executes(new InvulnCommand())
                     .then(CommandUtil.targetPlayerArgument()
@@ -399,79 +396,79 @@ public static void register(
         }
 
         if (CONFIG.ENABLE_WORKBENCH) {
-            registerNode.accept(CommandManager.literal("workbench")
+            registerNode.accept(Commands.literal("workbench")
                 .requires(ECPerms.require(ECPerms.Registry.workbench, 0))
                 .executes(new WorkbenchCommand())
                 .build());
 
-            registerNode.accept(CommandManager.literal("stonecutter")
+            registerNode.accept(Commands.literal("stonecutter")
                 .requires(ECPerms.require(ECPerms.Registry.stonecutter, 0))
                 .executes(new StonecutterCommand())
                 .build());
 
-            registerNode.accept(CommandManager.literal("grindstone")
+            registerNode.accept(Commands.literal("grindstone")
                 .requires(ECPerms.require(ECPerms.Registry.grindstone, 0))
                 .executes(new GrindstoneCommand())
                 .build());
         }
 
         if (CONFIG.ENABLE_ANVIL) {
-            registerNode.accept(CommandManager.literal("anvil")
+            registerNode.accept(Commands.literal("anvil")
                 .requires(ECPerms.require(ECPerms.Registry.anvil, 0))
                 .executes(new AnvilCommand())
                 .build());
         }
 
         if (CONFIG.ENABLE_ENDERCHEST) {
-            registerNode.accept(CommandManager.literal("enderchest")
+            registerNode.accept(Commands.literal("enderchest")
                     .requires(ECPerms.require(ECPerms.Registry.enderchest, 0))
                     .executes(new EnderchestCommand())
                 .build());
         }
 
         if (CONFIG.ENABLE_WASTEBIN) {
-            registerNode.accept(CommandManager.literal("wastebin")
+            registerNode.accept(Commands.literal("wastebin")
                 .requires(ECPerms.require(ECPerms.Registry.wastebin, 0))
                 .executes(new WastebinCommand())
                 .build());
         }
 
         if (CONFIG.ENABLE_TOP) {
-            registerNode.accept(CommandManager.literal("top")
+            registerNode.accept(Commands.literal("top")
                 .requires(ECPerms.require(ECPerms.Registry.top, 2))
                 .executes(new TopCommand())
                 .build());
         }
 
         if (CONFIG.ENABLE_GAMETIME) {
-            registerNode.accept(CommandManager.literal("gametime")
+            registerNode.accept(Commands.literal("gametime")
                 .requires(ECPerms.require(ECPerms.Registry.gametime, 0))
                 .executes(new GametimeCommand())
                 .build());
         }
 
         if (CONFIG.ENABLE_AFK) {
-            registerNode.accept(CommandManager.literal("afk")
+            registerNode.accept(Commands.literal("afk")
                 .requires(ECPerms.require(ECPerms.Registry.afk, 0))
                 .executes(new AfkCommand())
                 .build());
         }
 
         if (CONFIG.ENABLE_BED) {
-            registerNode.accept(CommandManager.literal("bed")
+            registerNode.accept(Commands.literal("bed")
                 .requires(ECPerms.require(ECPerms.Registry.bed, 0))
                 .executes(new BedCommand())
                 .build());
         }
 
         if (CONFIG.ENABLE_SLEEP) {
-            registerNode.accept(CommandManager.literal("sleep")
+            registerNode.accept(Commands.literal("sleep")
                 .requires(ECPerms.require(ECPerms.Registry.sleep, 0))
                 .executes(new SleepCommand())
                 .build());
         }
 
-        registerNode.accept(CommandManager.literal("lastPos")
+        registerNode.accept(Commands.literal("lastPos")
             .requires(ECPerms.require("essentialcommands.admin.lastpos", 2))
                 .then(argument("target_player", StringArgumentType.word())
                 .executes((context) -> {
@@ -481,11 +478,11 @@ public static void register(
                         .getOfflinePlayerByNameAsync(targetPlayerName)
                         .whenComplete((playerEntity, err) -> {
                             if (playerEntity == null) {
-                                context.getSource().sendError(Text.of("No player with the specified name found."));
+                                context.getSource().sendFailure(Component.nullToEmpty("No player with the specified name found."));
                                 return;
                             }
-                            context.getSource().sendFeedback(() ->
-                                Text.of(playerEntity.getEntityPos().toString()),
+                            context.getSource().sendSuccess(() ->
+                                Component.nullToEmpty(playerEntity.position().toString()),
                                 EssentialCommands.CONFIG.BROADCAST_TO_OPS);
                         });
                     return 1;
@@ -493,14 +490,14 @@ public static void register(
             .build());
 
         if (CONFIG.ENABLE_DAY) {
-            registerNode.accept(CommandManager.literal("day")
+            registerNode.accept(Commands.literal("day")
                 .requires(ECPerms.require(ECPerms.Registry.time_set_day, 2))
                 .executes(new DayCommand())
                 .build());
         }
 
         if (CONFIG.ENABLE_RULES) {
-            registerNode.accept(CommandManager.literal("rules")
+            registerNode.accept(Commands.literal("rules")
                 .requires(ECPerms.require(ECPerms.Registry.rules, 0))
                 .executes(RulesCommand::run)
                 .then(literal("reload")
@@ -510,7 +507,7 @@ public static void register(
         }
 
         if (CONFIG.ENABLE_FEED) {
-            registerNode.accept(CommandManager.literal("feed")
+            registerNode.accept(Commands.literal("feed")
                 .requires(ECPerms.require(ECPerms.Registry.feed_self, 2))
                 .executes(new FeedCommand())
                 .then(CommandUtil.targetPlayerArgument()
@@ -520,7 +517,7 @@ public static void register(
         }
 
         if (CONFIG.ENABLE_HEAL) {
-            registerNode.accept(CommandManager.literal("heal")
+            registerNode.accept(Commands.literal("heal")
                 .requires(ECPerms.require(ECPerms.Registry.heal_self, 2))
                 .executes(new HealCommand())
                 .then(CommandUtil.targetPlayerArgument()
@@ -530,7 +527,7 @@ public static void register(
         }
 
         if (CONFIG.ENABLE_EXTINGUISH) {
-            LiteralCommandNode<ServerCommandSource> node = CommandManager.literal("extinguish")
+            LiteralCommandNode<CommandSourceStack> node = Commands.literal("extinguish")
                 .requires(ECPerms.require(ECPerms.Registry.extinguish_self, 2))
                 .executes(new ExtinguishCommand())
                 .then(CommandUtil.targetPlayerArgument()
@@ -539,25 +536,25 @@ public static void register(
                     .build();
 
             registerNode.accept(node);
-            registerNode.accept(CommandManager.literal("ext").redirect(node).build());
+            registerNode.accept(Commands.literal("ext").redirect(node).build());
         }
 
         if (CONFIG.ENABLE_SUICIDE) {
-            registerNode.accept(CommandManager.literal("suicide")
+            registerNode.accept(Commands.literal("suicide")
                 .requires(ECPerms.require(ECPerms.Registry.suicide, 0))
                 .executes(new SuicideCommand())
                 .build());
         }
 
         if (CONFIG.ENABLE_NIGHT) {
-            registerNode.accept(CommandManager.literal("night")
+            registerNode.accept(Commands.literal("night")
                 .requires(ECPerms.require(ECPerms.Registry.time_set_night, 2))
                 .executes(new NightCommand())
                 .build());
         }
 
         if (CONFIG.ENABLE_REPAIR) {
-            registerNode.accept(CommandManager.literal("repair")
+            registerNode.accept(Commands.literal("repair")
                 .requires(ECPerms.require(ECPerms.Registry.repair_self, 2))
                 .executes(new RepairCommand())
                 .then(CommandUtil.targetPlayerArgument()
@@ -567,7 +564,7 @@ public static void register(
         }
 
         if (CONFIG.ENABLE_NEAR) {
-            registerNode.accept(CommandManager.literal("near")
+            registerNode.accept(Commands.literal("near")
                 .requires(ECPerms.require(ECPerms.Registry.near_self, 2))
                 .executes(new NearCommand())
                 .then(argument("range", IntegerArgumentType.integer())
@@ -579,7 +576,7 @@ public static void register(
         }
 
         if (CONFIG.ENABLE_MOTD) {
-            registerNode.accept(CommandManager.literal("motd")
+            registerNode.accept(Commands.literal("motd")
                 .requires(ECPerms.require(ECPerms.Registry.motd, 0))
                 .executes(MotdCommand::run)
                 .build());
@@ -588,14 +585,14 @@ public static void register(
         var profileNode = ProfileCommand.buildNode();
         essentialCommandsRootNode.addChild(profileNode);
 
-        LiteralCommandNode<ServerCommandSource> configNode = CommandManager.literal("config")
+        LiteralCommandNode<CommandSourceStack> configNode = Commands.literal("config")
             .requires(ECPerms.requireAny(ECPerms.Registry.Group.config_group, 4))
-            .then(CommandManager.literal("reload")
+            .then(Commands.literal("reload")
                 .executes((context) -> {
                     BACKING_CONFIG.loadOrCreateProperties();
                     var player = context.getSource().getPlayer();
                     var ecText = player != null ? ECText.access(player) : ECText.getInstance();
-                    context.getSource().sendFeedback(() ->
+                    context.getSource().sendSuccess(() ->
                         ecText.getText("cmd.config.reload"),
                         true
                     );
@@ -603,23 +600,23 @@ public static void register(
                 }).requires(
                     ECPerms.require(ECPerms.Registry.config_reload, 4)
                 ).build())
-            .then(CommandManager.literal("display")
+            .then(Commands.literal("display")
                 .requires(ECPerms.require(ECPerms.Registry.config_reload, 4))
                 .executes((context) -> {
                     BACKING_CONFIG.loadOrCreateProperties();
-                    context.getSource().sendFeedback(
+                    context.getSource().sendSuccess(
                         BACKING_CONFIG::stateAsText,
                         false
                     );
                     return 1;
                 })
-                .then(CommandManager.argument("config_property", StringArgumentType.word())
+                .then(Commands.argument("config_property", StringArgumentType.word())
                     .suggests(ListSuggestion.of(BACKING_CONFIG::getPublicFieldNames))
                     .executes(context -> {
                         try {
-                            Text t = BACKING_CONFIG.getFieldValueAsText(
+                            Component t = BACKING_CONFIG.getFieldValueAsText(
                                 StringArgumentType.getString(context, "config_property"));
-                            context.getSource().sendFeedback(() -> t, false);
+                            context.getSource().sendSuccess(() -> t, false);
                         } catch (NoSuchFieldException e) {
                             e.printStackTrace();
                         }
@@ -632,40 +629,40 @@ public static void register(
         essentialCommandsRootNode.addChild(configNode);
 
         if (true) {
-            essentialCommandsRootNode.addChild(CommandManager.literal("deleteAllPlayerData")
-                .requires(source -> source.getPermissions().hasPermission(new Permission.Level(PermissionLevel.OWNERS)))
+            essentialCommandsRootNode.addChild(Commands.literal("deleteAllPlayerData")
+                .requires(source -> source.permissions().hasPermission(new Permission.HasCommandLevel(PermissionLevel.OWNERS)))
                 .executes(new ClearPlayerDataCommand())
                 .build()
             );
         }
 
         if (CONFIG.ENABLE_ESSENTIALSX_CONVERT) {
-            essentialCommandsRootNode.addChild(CommandManager.literal("convertEssentialsXPlayerHomes")
-                .requires(source -> source.getPermissions().hasPermission(new Permission.Level(PermissionLevel.OWNERS)))
+            essentialCommandsRootNode.addChild(Commands.literal("convertEssentialsXPlayerHomes")
+                .requires(source -> source.permissions().hasPermission(new Permission.HasCommandLevel(PermissionLevel.OWNERS)))
                 .executes((source) -> {
-                    Path mcDir = source.getSource().getServer().getRunDirectory();
+                    Path mcDir = source.getSource().getServer().getServerDirectory();
                     try {
                         EssentialsXParser.convertPlayerDataDir(
                             mcDir.resolve("plugins/Essentials/userdata").toFile(),
                             mcDir.resolve("world/modplayerdata").toFile(),
                             source.getSource().getServer()
                         );
-                        source.getSource().sendFeedback(() -> Text.literal("Successfully converted data dirs."), CONFIG.BROADCAST_TO_OPS);
+                        source.getSource().sendSuccess(() -> Component.literal("Successfully converted data dirs."), CONFIG.BROADCAST_TO_OPS);
                     } catch (NotDirectoryException | FileNotFoundException e) {
                         e.printStackTrace();
                     }
                     return 0;
                 }).build()
             );
-            essentialCommandsRootNode.addChild(CommandManager.literal("convertEssentialsXWarps")
-                .requires(source -> source.getPermissions().hasPermission(new Permission.Level(PermissionLevel.OWNERS)))
+            essentialCommandsRootNode.addChild(Commands.literal("convertEssentialsXWarps")
+                .requires(source -> source.permissions().hasPermission(new Permission.HasCommandLevel(PermissionLevel.OWNERS)))
                 .executes((source) -> {
-                    Path mcDir = source.getSource().getServer().getRunDirectory();
+                    Path mcDir = source.getSource().getServer().getServerDirectory();
                     EssentialsConvertor.warpConvert(
                         source.getSource().getServer(),
                         mcDir.resolve("plugins/Essentials/warps").toFile()
                     );
-                    source.getSource().sendFeedback(() -> Text.literal("Successfully converted warps."), CONFIG.BROADCAST_TO_OPS);
+                    source.getSource().sendSuccess(() -> Component.literal("Successfully converted warps."), CONFIG.BROADCAST_TO_OPS);
                     return 0;
                 }).build()
             );
diff --git a/src/main/java/com/fibermc/essentialcommands/WorldData.java b/src/main/java/com/fibermc/essentialcommands/WorldData.java
index d1056fe0..5703bf00 100644
--- a/src/main/java/com/fibermc/essentialcommands/WorldData.java
+++ b/src/main/java/com/fibermc/essentialcommands/WorldData.java
@@ -13,9 +13,9 @@
 import com.mojang.serialization.Dynamic;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.nbt.NbtElement;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
+import net.minecraft.nbt.Tag;
 
 public class WorldData {
     private @Nullable MinecraftLocation spawnLocation;
@@ -43,20 +43,20 @@ public void setSpawn(@Nullable MinecraftLocation spawn) {
         this.spawnLocation = spawn;
     }
 
-    public static WorldData fromNbt(NbtCompound nbt) {
+    public static WorldData fromNbt(CompoundTag nbt) {
         // Handle legacy "data" wrapper if present
         nbt = nbt.getCompound("data").orElse(nbt);
         nbt = WorldDataDataFixer.createDataFixer().build().fixer().update(
             WorldDataDataFixer.TYPE,
-            new Dynamic<NbtElement>(NbtOps.INSTANCE, nbt),
-            nbt.getInt(SCHEMA_VERSION_KEY, 0),
+            new Dynamic<Tag>(NbtOps.INSTANCE, nbt),
+            nbt.getIntOr(SCHEMA_VERSION_KEY, 0),
             WorldData.SCHEMA_VERSION
         ).getValue().asCompound().orElseThrow();
 
         return CODEC.parse(NbtOps.INSTANCE, nbt).getOrThrow();
     }
 
-    public NbtCompound toNbt() {
+    public CompoundTag toNbt() {
         var data = CODEC.encodeStart(NbtOps.INSTANCE, this).getOrThrow().asCompound().orElseThrow();
         data.putInt(SCHEMA_VERSION_KEY, SCHEMA_VERSION);
         return data;
diff --git a/src/main/java/com/fibermc/essentialcommands/WorldDataManager.java b/src/main/java/com/fibermc/essentialcommands/WorldDataManager.java
index ef1a23c2..2d4e544f 100644
--- a/src/main/java/com/fibermc/essentialcommands/WorldDataManager.java
+++ b/src/main/java/com/fibermc/essentialcommands/WorldDataManager.java
@@ -18,18 +18,18 @@
 
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.nbt.NbtCompound;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtAccounter;
 import net.minecraft.nbt.NbtIo;
-import net.minecraft.nbt.NbtSizeTracker;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.util.WorldSavePath;
-import net.minecraft.world.PersistentState;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.level.saveddata.SavedData;
+import net.minecraft.world.level.storage.LevelResource;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
 
-public class WorldDataManager extends PersistentState {
+public class WorldDataManager extends SavedData {
     private Path saveDir;
     private File worldDataFile;
     private WorldData data;
@@ -46,7 +46,7 @@ public static WorldDataManager createForServer(MinecraftServer server)
     }
 
     public void onServerStart(MinecraftServer server) {
-        this.saveDir = server.getSavePath(WorldSavePath.ROOT).resolve("essentialcommands");
+        this.saveDir = server.getWorldPath(LevelResource.ROOT).resolve("essentialcommands");
         try {
             Files.createDirectories(saveDir);
         } catch (IOException e) {
@@ -59,12 +59,12 @@ public void onServerStart(MinecraftServer server) {
             boolean fileExisted = !worldDataFile.createNewFile();
             if (fileExisted && worldDataFile.length() > 0) {
                 // if files was not JUST created, read data from it.
-                var tag = NbtIo.readCompressed(worldDataFile.toPath(), NbtSizeTracker.ofUnlimitedBytes());
+                var tag = NbtIo.readCompressed(worldDataFile.toPath(), NbtAccounter.unlimitedHeap());
                 // `data` was the main obj key in old mc PersistentState schema
                 this.data = WorldData.fromNbt(tag.getCompound("data").orElse(tag));
                 warpsLoadEvent.invoker().accept(this.data.warps());
             } else {
-                this.markDirty();
+                this.setDirty();
                 this.save();
             }
         } catch (IOException e) {
@@ -87,7 +87,7 @@ private File getDataFile() {
 
     public void save() {
         EssentialCommands.log(Level.INFO, "Saving world_data.dat (Spawn/Warps)...");
-        NbtCompound data = this.data.toNbt();
+        CompoundTag data = this.data.toNbt();
         try {
             NbtIo.writeCompressed(data, this.worldDataFile.toPath());
         } catch (IOException e) {
@@ -103,13 +103,13 @@ public void setWarp(String warpName, MinecraftLocation location, boolean require
             requiresPermission ? warpName : null,
             warpName
         ));
-        this.markDirty();
+        this.setDirty();
         this.save();
     }
 
     public boolean delWarp(String warpName) {
         MinecraftLocation prevValue = this.data.warps().remove(warpName);
-        this.markDirty();
+        this.setDirty();
         this.save();
         return prevValue != null;
     }
@@ -122,7 +122,7 @@ public List<String> getWarpNames() {
         return this.data.warps().keySet().stream().toList();
     }
 
-    public Stream<WarpLocation> getAccessibleWarps(ServerPlayerEntity player) {
+    public Stream<WarpLocation> getAccessibleWarps(ServerPlayer player) {
         var warpsStream = this.data.warps().values().stream();
         return (EssentialCommands.CONFIG.USE_PERMISSIONS_API
             ? warpsStream.filter(loc -> loc.hasPermission(player))
@@ -135,7 +135,7 @@ public Set<Entry<String, WarpLocation>> getWarpEntries() {
 
     public void setSpawn(MinecraftLocation location) {
         this.data.setSpawn(location);
-        this.markDirty();
+        this.setDirty();
         this.save();
     }
 
diff --git a/src/main/java/com/fibermc/essentialcommands/codec/Codecs.java b/src/main/java/com/fibermc/essentialcommands/codec/Codecs.java
index 4aae52a0..2f73d0bd 100644
--- a/src/main/java/com/fibermc/essentialcommands/codec/Codecs.java
+++ b/src/main/java/com/fibermc/essentialcommands/codec/Codecs.java
@@ -9,14 +9,14 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 
-import net.minecraft.registry.RegistryKey;
-import net.minecraft.registry.RegistryKeys;
-import net.minecraft.world.World;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.level.Level;
 
 public final class Codecs {
     private Codecs() {}
 
-    public static final Codec<RegistryKey<World>> WORLD_KEY = RegistryKey.createCodec(RegistryKeys.WORLD);
+    public static final Codec<ResourceKey<Level>> WORLD_KEY = ResourceKey.codec(Registries.DIMENSION);
 
     public static final Codec<MinecraftLocation> MINECRAFT_LOCATION = RecordCodecBuilder.create(instance ->
         instance.group(
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/AfkCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/AfkCommand.java
index 73d59be2..28462868 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/AfkCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/AfkCommand.java
@@ -6,15 +6,15 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.commands.CommandSourceStack;
 
 import static com.fibermc.essentialcommands.EssentialCommands.CONFIG;
 
-public class AfkCommand implements Command<ServerCommandSource> {
+public class AfkCommand implements Command<CommandSourceStack> {
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         var source = context.getSource();
-        var player = source.getPlayerOrThrow();
+        var player = source.getPlayerOrException();
         var playerAccess = ((ServerPlayerEntityAccess) player);
         var playerData = playerAccess.ec$getPlayerData();
 
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/BackCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/BackCommand.java
index 03fced6b..37c0d917 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/BackCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/BackCommand.java
@@ -10,17 +10,17 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.level.ServerPlayer;
 
-public class BackCommand implements Command<ServerCommandSource> {
+public class BackCommand implements Command<CommandSourceStack> {
 
     public BackCommand() {}
 
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         //Store command sender
-        ServerPlayerEntity player = context.getSource().getPlayerOrThrow();
+        ServerPlayer player = context.getSource().getPlayerOrException();
         PlayerData playerData = ((ServerPlayerEntityAccess) player).ec$getPlayerData();
 
         //Get previous location
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/BedCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/BedCommand.java
index 0c84da60..acd84a9b 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/BedCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/BedCommand.java
@@ -12,22 +12,22 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.block.BedBlock;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.RespawnAnchorBlock;
-import net.minecraft.entity.EntityType;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.server.world.ServerWorld;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.attribute.EnvironmentAttributes;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.level.block.BedBlock;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.RespawnAnchorBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.Vec3;
 
-public class BedCommand implements Command<ServerCommandSource> {
+public class BedCommand implements Command<CommandSourceStack> {
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         var source = context.getSource();
-        var player = source.getPlayerOrThrow();
+        var player = source.getPlayerOrException();
 
         var safeSpawnPos = getSafeSpawnPos(player);
         if (safeSpawnPos.isEmpty()) {
@@ -50,40 +50,40 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
      * if a "safe" spawnpoint cannot be found, we'll return a point just above the respawn target
      * block)
      */
-    private static Optional<MinecraftLocation> getSafeSpawnPos(ServerPlayerEntity player) {
-        var respawn = player.getRespawn();
+    private static Optional<MinecraftLocation> getSafeSpawnPos(ServerPlayer player) {
+        var respawn = player.getRespawnConfig();
         if (respawn == null) {
             return Optional.empty();
         }
 
         var respawnPosData = respawn.respawnData().globalPos();
-        ServerWorld world = player.getEntityWorld().getServer().getWorld(respawnPosData.dimension());
+        ServerLevel world = player.level().getServer().getLevel(respawnPosData.dimension());
         var spawnPos = respawnPosData.pos();
 
         // Safe Position Calculation, based on the game respawn position calculation logic,
         // which was basically rewritten because the game code caused the state of the RespawnAnchorBlock to be refreshed.
-        Vec3d safeSpawnPos;
+        Vec3 safeSpawnPos;
         BlockState blockState = world.getBlockState(spawnPos);
         Block block = blockState.getBlock();
         if (block instanceof RespawnAnchorBlock
-            && blockState.get(RespawnAnchorBlock.CHARGES) > 0 && RespawnAnchorBlock.isUsable(world, spawnPos)
+            && blockState.getValue(RespawnAnchorBlock.CHARGE) > 0 && RespawnAnchorBlock.canSetSpawn(world, spawnPos)
         ) {
-            Optional<Vec3d> optional = RespawnAnchorBlock.findRespawnPosition(EntityType.PLAYER, world, spawnPos);
-            safeSpawnPos = optional.orElseGet(() -> new Vec3d((double) spawnPos.getX() + 0.5, (double) spawnPos.getY() + 1, (double) spawnPos.getZ() + 0.5));
-        } else if (block instanceof BedBlock && world.getEnvironmentAttributes().getAttributeValue(EnvironmentAttributes.BED_RULE_GAMEPLAY, spawnPos).canSetSpawn(world)) {
-            Optional<Vec3d> optional = BedBlock.findWakeUpPosition(EntityType.PLAYER, world, spawnPos, blockState.get(BedBlock.FACING), respawn.respawnData().pitch());
-            safeSpawnPos = optional.orElseGet(() -> new Vec3d((double) spawnPos.getX() + 0.5, (double) spawnPos.getY() + 0.5625, (double) spawnPos.getZ() + 0.5));
+            Optional<Vec3> optional = RespawnAnchorBlock.findStandUpPosition(EntityType.PLAYER, world, spawnPos);
+            safeSpawnPos = optional.orElseGet(() -> new Vec3((double) spawnPos.getX() + 0.5, (double) spawnPos.getY() + 1, (double) spawnPos.getZ() + 0.5));
+        } else if (block instanceof BedBlock && world.environmentAttributes().getValue(EnvironmentAttributes.BED_RULE, spawnPos).canSetSpawn(world)) {
+            Optional<Vec3> optional = BedBlock.findStandUpPosition(EntityType.PLAYER, world, spawnPos, blockState.getValue(BedBlock.FACING), respawn.respawnData().pitch());
+            safeSpawnPos = optional.orElseGet(() -> new Vec3((double) spawnPos.getX() + 0.5, (double) spawnPos.getY() + 0.5625, (double) spawnPos.getZ() + 0.5));
         } else {
-            boolean bl = block.canMobSpawnInside(blockState);
-            BlockState blockState2 = world.getBlockState(spawnPos.up());
-            boolean bl2 = blockState2.getBlock().canMobSpawnInside(blockState2);
+            boolean bl = block.isPossibleToRespawnInThis(blockState);
+            BlockState blockState2 = world.getBlockState(spawnPos.above());
+            boolean bl2 = blockState2.getBlock().isPossibleToRespawnInThis(blockState2);
             if (bl && bl2) {
-                safeSpawnPos = new Vec3d((double) spawnPos.getX() + 0.5, (double) spawnPos.getY() + 0.1, (double) spawnPos.getZ() + 0.5);
+                safeSpawnPos = new Vec3((double) spawnPos.getX() + 0.5, (double) spawnPos.getY() + 0.1, (double) spawnPos.getZ() + 0.5);
             } else {
-                safeSpawnPos = Vec3d.ofBottomCenter(spawnPos);
+                safeSpawnPos = Vec3.atBottomCenterOf(spawnPos);
             }
         }
 
-        return Optional.of(new MinecraftLocation(respawnPosData.dimension(), safeSpawnPos.getX(), safeSpawnPos.getY(), safeSpawnPos.getZ()));
+        return Optional.of(new MinecraftLocation(respawnPosData.dimension(), safeSpawnPos.x(), safeSpawnPos.y(), safeSpawnPos.z()));
     }
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/ClearPlayerDataCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/ClearPlayerDataCommand.java
index 62c11f6a..a399362f 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/ClearPlayerDataCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/ClearPlayerDataCommand.java
@@ -12,12 +12,12 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.text.Text;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.chat.Component;
 
 import static com.fibermc.essentialcommands.EssentialCommands.CONFIG;
 
-public class ClearPlayerDataCommand implements Command<ServerCommandSource> {
+public class ClearPlayerDataCommand implements Command<CommandSourceStack> {
     // divide by 2 to prevent overflow...
     static final int INITIAL_LAST_EXEC_TIME = Integer.MIN_VALUE / 2;
     static final int MAX_SECONDS_FOR_CONFIRM = 30;
@@ -25,19 +25,19 @@ public class ClearPlayerDataCommand implements Command<ServerCommandSource> {
     static int lastConsoleExecTime = INITIAL_LAST_EXEC_TIME;
 
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         var source = context.getSource();
         if (!CONFIG.ENABLE_DELETE_ALL_PLAYER_DATA) {
-            source.sendError(Text.literal("This command is not enabled"));
+            source.sendFailure(Component.literal("This command is not enabled"));
             return -1;
         }
 
         var server = source.getServer();
 
-        int currentTicks = server.getTicks();
+        int currentTicks = server.getTickCount();
         int lastExecTime;
-        if (source.isExecutedByPlayer()) {
-            var playerId = source.getPlayerOrThrow().getUuid();
+        if (source.isPlayer()) {
+            var playerId = source.getPlayerOrException().getUUID();
             lastExecTime = LAST_EXEC_TIME_PER_PLAYER_MAP.getOrDefault(playerId, INITIAL_LAST_EXEC_TIME);
             LAST_EXEC_TIME_PER_PLAYER_MAP.put(playerId, currentTicks);
         } else {
@@ -46,7 +46,7 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
         }
 
         if (currentTicks - lastExecTime > 20 * MAX_SECONDS_FOR_CONFIRM) {
-            source.sendFeedback(() -> Text.literal(
+            source.sendSuccess(() -> Component.literal(
                 "Are you sure you want to disconnect all players and permanently delete ALL"
                     + " Essential Commands player data?"
                     + " This action is irreversible. Run the command again to confirm."),
@@ -54,7 +54,7 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
             return 0;
         }
 
-        server.getPlayerManager().disconnectAllPlayers();
+        server.getPlayerList().removeAll();
 
         try {
             var playerDataDirPath = PlayerDataFactory.getPlayerDataDirectoryPath(server);
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/CommandUtil.java b/src/main/java/com/fibermc/essentialcommands/commands/CommandUtil.java
index 474a71b5..99f67f75 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/CommandUtil.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/CommandUtil.java
@@ -8,11 +8,11 @@
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
 import com.mojang.brigadier.tree.CommandNode;
 
-import net.minecraft.command.EntitySelector;
-import net.minecraft.command.argument.EntityArgumentType;
-import net.minecraft.server.command.CommandManager;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.commands.arguments.EntityArgument;
+import net.minecraft.commands.arguments.selector.EntitySelector;
+import net.minecraft.server.level.ServerPlayer;
 
 import dev.jpcode.eccore.util.TextUtil;
 
@@ -20,12 +20,12 @@ public final class CommandUtil {
 
     private CommandUtil() {}
 
-    public static RequiredArgumentBuilder<ServerCommandSource, EntitySelector> targetPlayerArgument() {
-        return CommandManager.argument("target_player", EntityArgumentType.player());
+    public static RequiredArgumentBuilder<CommandSourceStack, EntitySelector> targetPlayerArgument() {
+        return Commands.argument("target_player", EntityArgument.player());
     }
 
-    public static String getCommandString(ServerCommandSource source, CommandNode<ServerCommandSource> commandNode) {
-        CommandDispatcher<ServerCommandSource> dispatcher = source.getServer().getCommandManager().getDispatcher();
+    public static String getCommandString(CommandSourceStack source, CommandNode<CommandSourceStack> commandNode) {
+        CommandDispatcher<CommandSourceStack> dispatcher = source.getServer().getCommands().getDispatcher();
 
         return "/" + TextUtil.joinStrings(
             dispatcher.getPath(commandNode),
@@ -37,9 +37,9 @@ public static CommandSyntaxException createSimpleException(Message msg) {
         return new CommandSyntaxException(new SimpleCommandExceptionType(msg), msg);
     }
 
-    public static ServerPlayerEntity getCommandTargetPlayer(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public static ServerPlayer getCommandTargetPlayer(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         try {
-            return EntityArgumentType.getPlayer(context, "target_player");
+            return EntityArgument.getPlayer(context, "target_player");
         } catch (IllegalArgumentException e) {
             return context.getSource().getPlayer();
         }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/FlyCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/FlyCommand.java
index c4705ffb..ee7788cd 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/FlyCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/FlyCommand.java
@@ -13,19 +13,19 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.entity.player.PlayerAbilities;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.player.Abilities;
 
-public class FlyCommand implements Command<ServerCommandSource> {
+public class FlyCommand implements Command<CommandSourceStack> {
 
     public FlyCommand() {
     }
 
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        ServerCommandSource source = context.getSource();
-        ServerPlayerEntity targetPlayer = CommandUtil.getCommandTargetPlayer(context);
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        CommandSourceStack source = context.getSource();
+        ServerPlayer targetPlayer = CommandUtil.getCommandTargetPlayer(context);
 
         boolean shouldEnableFly;
         try {
@@ -38,7 +38,7 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
                     .getTracker(targetPlayer).isGrantedBy(ECAbilitySources.FLY_COMMAND);
             } catch (NoClassDefFoundError ign) {
                 // If PAL is not found, fall back to toggling the current vanilla flight state.
-                shouldEnableFly = !targetPlayer.getAbilities().allowFlying;
+                shouldEnableFly = !targetPlayer.getAbilities().mayfly;
             }
         }
 
@@ -46,25 +46,25 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
         return 0;
     }
 
-    public static void exec(ServerCommandSource source, ServerPlayerEntity target, boolean shouldEnableFly) throws CommandSyntaxException {
-        PlayerAbilities playerAbilities = target.getAbilities();
+    public static void exec(CommandSourceStack source, ServerPlayer target, boolean shouldEnableFly) throws CommandSyntaxException {
+        Abilities playerAbilities = target.getAbilities();
 
         PlayerData playerData = ((ServerPlayerEntityAccess) target).ec$getPlayerData();
 
         try {
             playerData.setFlight(shouldEnableFly);
         } catch (NoClassDefFoundError ign) {
-            playerAbilities.allowFlying = shouldEnableFly;
+            playerAbilities.mayfly = shouldEnableFly;
             if (!shouldEnableFly) {
                 playerAbilities.flying = false;
             }
         }
 
-        target.sendAbilitiesUpdate();
+        target.onUpdateAbilities();
 
         // Label boolean values in suggestions, or switch to single state value (present or it's not)
 
-        var senderPlayer = source.getPlayerOrThrow();
+        var senderPlayer = source.getPlayerOrException();
         var senderPlayerData = PlayerData.access(senderPlayer);
         var ecTextTarget = ECText.access(target);
         String enabledString = ecTextTarget.getString(shouldEnableFly ? "generic.enabled" : "generic.disabled");
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/FlySpeedCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/FlySpeedCommand.java
index d87ca002..5c2ad73b 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/FlySpeedCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/FlySpeedCommand.java
@@ -10,21 +10,21 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.level.ServerPlayer;
 
 import static com.fibermc.essentialcommands.EssentialCommands.CONFIG;
 
-public class FlySpeedCommand implements Command<ServerCommandSource> {
+public class FlySpeedCommand implements Command<CommandSourceStack> {
     static int speedMultiplier = 20;
 
     public FlySpeedCommand() {
     }
 
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        ServerCommandSource source = context.getSource();
-        ServerPlayerEntity targetPlayer = CommandUtil.getCommandTargetPlayer(context);
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        CommandSourceStack source = context.getSource();
+        ServerPlayer targetPlayer = CommandUtil.getCommandTargetPlayer(context);
 
         int newSpeed = IntegerArgumentType.getInteger(context, "fly_speed");
 
@@ -32,15 +32,15 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
         return SINGLE_SUCCESS;
     }
 
-    public int reset(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        ServerCommandSource source = context.getSource();
-        ServerPlayerEntity targetPlayer = CommandUtil.getCommandTargetPlayer(context);
+    public int reset(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        CommandSourceStack source = context.getSource();
+        ServerPlayer targetPlayer = CommandUtil.getCommandTargetPlayer(context);
 
         exec(source, targetPlayer, 1);
         return SINGLE_SUCCESS;
     }
 
-    public static void exec(ServerCommandSource source, ServerPlayerEntity target, int flySpeed) throws CommandSyntaxException {
+    public static void exec(CommandSourceStack source, ServerPlayer target, int flySpeed) throws CommandSyntaxException {
         ECText ecTextTarget = ECText.access(target);
 
         if (flySpeed > CONFIG.FLY_MAX_SPEED)
@@ -51,13 +51,13 @@ public static void exec(ServerCommandSource source, ServerPlayerEntity target, i
                     ecTextTarget.accent(String.valueOf(CONFIG.FLY_MAX_SPEED))
                 ));
 
-        int oldFlySpeed = (int)(target.getAbilities().getFlySpeed() * speedMultiplier);
-        target.getAbilities().setFlySpeed((float)flySpeed / speedMultiplier);
-        target.sendAbilitiesUpdate();
+        int oldFlySpeed = (int)(target.getAbilities().getFlyingSpeed() * speedMultiplier);
+        target.getAbilities().setFlyingSpeed((float)flySpeed / speedMultiplier);
+        target.onUpdateAbilities();
 
         if (!Objects.equals(source.getPlayer(), target)) {
             ECText ecTextSource = ECText.access(source.getPlayer());
-            source.sendFeedback(() ->
+            source.sendSuccess(() ->
                 ecTextSource.getText(
                     "cmd.fly.speed.feedback.update.other",
                     ecTextSource.accent(String.valueOf(oldFlySpeed)),
@@ -67,7 +67,7 @@ public static void exec(ServerCommandSource source, ServerPlayerEntity target, i
                 CONFIG.BROADCAST_TO_OPS
             );
         }
-        target.sendMessage(
+        target.sendSystemMessage(
             ecTextTarget.getText(
                 "cmd.fly.speed.feedback.update",
                 ecTextTarget.accent(String.valueOf(oldFlySpeed)),
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/HomeCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/HomeCommand.java
index 4606ca90..9881d524 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/HomeCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/HomeCommand.java
@@ -22,23 +22,23 @@
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
 import com.mojang.brigadier.suggestion.SuggestionProvider;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.text.Text;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.chat.Component;
 
-public class HomeCommand implements Command<ServerCommandSource> {
+public class HomeCommand implements Command<CommandSourceStack> {
 
     public HomeCommand() {}
 
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        PlayerData senderPlayerData = ((ServerPlayerEntityAccess) context.getSource().getPlayerOrThrow()).ec$getPlayerData();
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        PlayerData senderPlayerData = ((ServerPlayerEntityAccess) context.getSource().getPlayerOrException()).ec$getPlayerData();
         String homeName = StringArgumentType.getString(context, "home_name");
 
         return exec(senderPlayerData, homeName);
     }
 
-    private static PlayerData getTargetPlayerData(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        return ((ServerPlayerEntityAccess) context.getSource().getPlayerOrThrow()).ec$getPlayerData();
+    private static PlayerData getTargetPlayerData(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        return ((ServerPlayerEntityAccess) context.getSource().getPlayerOrException()).ec$getPlayerData();
     }
 
     // TODO: Ideally the styling here should come from a context, intead of from the player we're
@@ -57,8 +57,8 @@ public static String getSoleHomeName(PlayerData playerData) throws CommandSyntax
         return homeNames.stream().findAny().get();
     }
 
-    public int runDefault(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        PlayerData playerData = ((ServerPlayerEntityAccess) context.getSource().getPlayerOrThrow()).ec$getPlayerData();
+    public int runDefault(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        PlayerData playerData = ((ServerPlayerEntityAccess) context.getSource().getPlayerOrException()).ec$getPlayerData();
 
         return exec(
             playerData,
@@ -78,7 +78,7 @@ public static int exec(PlayerData senderPlayerData, PlayerData targetPlayerData,
             Message msg = ecText.getText(
                 "cmd.home.tp.error.not_found",
                 TextFormatType.Error,
-                Text.literal(homeName));
+                Component.literal(homeName));
             throw new CommandSyntaxException(new SimpleCommandExceptionType(msg), msg);
         }
 
@@ -94,20 +94,20 @@ public static int exec(PlayerData senderPlayerData, PlayerData targetPlayerData,
 
     public static class Suggestion {
         //Brigader Suggestions
-        public static final SuggestionProvider<ServerCommandSource> LIST_SUGGESTION_PROVIDER
+        public static final SuggestionProvider<CommandSourceStack> LIST_SUGGESTION_PROVIDER
             = ListSuggestion.ofContext(Suggestion::getSuggestionsList);
 
         /**
          * Gets a list of suggested strings to be used with Brigader
          */
-        public static List<String> getSuggestionsList(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+        public static List<String> getSuggestionsList(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
             return new ArrayList<>(HomeCommand.getTargetPlayerData(context).getHomeNames());
         }
 
         /**
          * Gets a set of suggestion entries to be used with ListCommandFactory
          */
-        public static Set<Map.Entry<String, NamedMinecraftLocation>> getSuggestionEntries(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+        public static Set<Map.Entry<String, NamedMinecraftLocation>> getSuggestionEntries(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
             return HomeCommand.getTargetPlayerData(context).getHomeEntries();
         }
     }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/HomeDeleteCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/HomeDeleteCommand.java
index 7dac4eb1..1432ac9e 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/HomeDeleteCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/HomeDeleteCommand.java
@@ -9,18 +9,18 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.level.ServerPlayer;
 
-public class HomeDeleteCommand implements Command<ServerCommandSource> {
+public class HomeDeleteCommand implements Command<CommandSourceStack> {
 
     public HomeDeleteCommand() {}
 
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        ServerCommandSource source = context.getSource();
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        CommandSourceStack source = context.getSource();
         //Store command sender
-        ServerPlayerEntity senderPlayer = source.getPlayerOrThrow();
+        ServerPlayer senderPlayer = source.getPlayerOrException();
         PlayerData senderPlayerData = ((ServerPlayerEntityAccess) senderPlayer).ec$getPlayerData();
         //Store home name
         String homeName = StringArgumentType.getString(context, "home_name");
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/HomeOverwriteCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/HomeOverwriteCommand.java
index 1197b76f..2e1863e6 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/HomeOverwriteCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/HomeOverwriteCommand.java
@@ -10,17 +10,17 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.level.ServerPlayer;
 
-public class HomeOverwriteCommand implements Command<ServerCommandSource> {
+public class HomeOverwriteCommand implements Command<CommandSourceStack> {
     public HomeOverwriteCommand() {}
 
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         String homeName = StringArgumentType.getString(context, "home_name");
-        ServerCommandSource source = context.getSource();
-        ServerPlayerEntity senderPlayer = source.getPlayerOrThrow();
+        CommandSourceStack source = context.getSource();
+        ServerPlayer senderPlayer = source.getPlayerOrException();
         PlayerData playerData = ((ServerPlayerEntityAccess) senderPlayer).ec$getPlayerData();
 
         var homeNameText = ECText.access(senderPlayer).accent(homeName);
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/HomeSetCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/HomeSetCommand.java
index a4e11970..cc49d150 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/HomeSetCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/HomeSetCommand.java
@@ -11,27 +11,27 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.Text;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
 
-public class HomeSetCommand implements Command<ServerCommandSource> {
+public class HomeSetCommand implements Command<CommandSourceStack> {
     public HomeSetCommand() {}
 
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         String homeName = StringArgumentType.getString(context, "home_name");
 
         return exec(context, homeName);
     }
 
-    public int runDefault(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public int runDefault(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         return exec(context, "unnamed");
     }
 
-    private static int exec(CommandContext<ServerCommandSource> context, String homeName) throws CommandSyntaxException {
-        ServerCommandSource source = context.getSource();
-        ServerPlayerEntity senderPlayer = source.getPlayerOrThrow();
+    private static int exec(CommandContext<CommandSourceStack> context, String homeName) throws CommandSyntaxException {
+        CommandSourceStack source = context.getSource();
+        ServerPlayer senderPlayer = source.getPlayerOrException();
         PlayerData playerData = ((ServerPlayerEntityAccess) senderPlayer).ec$getPlayerData();
 
         if (playerData.existsHome(homeName)) {
@@ -48,7 +48,7 @@ private static int exec(CommandContext<ServerCommandSource> context, String home
                 playerEcText.accent("[" + ECText.getInstance().getString("generic.confirm") + "]")
             ).send();
         } else {
-            Text homeNameText = ECText.access(senderPlayer).accent(homeName);
+            Component homeNameText = ECText.access(senderPlayer).accent(homeName);
             playerData.addHome(homeName, new MinecraftLocation(senderPlayer));
 
             playerData.save();
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/HomeTeleportOtherCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/HomeTeleportOtherCommand.java
index 98717593..9c288d5b 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/HomeTeleportOtherCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/HomeTeleportOtherCommand.java
@@ -20,27 +20,27 @@
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.suggestion.SuggestionProvider;
 
-import net.minecraft.command.argument.EntityArgumentType;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.text.Text;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.arguments.EntityArgument;
+import net.minecraft.network.chat.Component;
 
 import static com.fibermc.essentialcommands.EssentialCommands.CONFIG;
 
-public class HomeTeleportOtherCommand extends HomeCommand implements Command<ServerCommandSource> {
+public class HomeTeleportOtherCommand extends HomeCommand implements Command<CommandSourceStack> {
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        PlayerData senderPlayerData = ((ServerPlayerEntityAccess) context.getSource().getPlayerOrThrow()).ec$getPlayerData();
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        PlayerData senderPlayerData = ((ServerPlayerEntityAccess) context.getSource().getPlayerOrException()).ec$getPlayerData();
         String homeName = StringArgumentType.getString(context, "home_name");
 
         return HomeCommand.exec(senderPlayerData, getTargetPlayerData(context), homeName);
     }
 
-    private static PlayerData getTargetPlayerData(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        return ((ServerPlayerEntityAccess) EntityArgumentType.getPlayer(context, "target_player")).ec$getPlayerData();
+    private static PlayerData getTargetPlayerData(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        return ((ServerPlayerEntityAccess) EntityArgument.getPlayer(context, "target_player")).ec$getPlayerData();
     }
 
-    public int runDefault(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        var senderPlayerData = ((ServerPlayerEntityAccess) context.getSource().getPlayerOrThrow()).ec$getPlayerData();
+    public int runDefault(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        var senderPlayerData = ((ServerPlayerEntityAccess) context.getSource().getPlayerOrException()).ec$getPlayerData();
         var targetPlayerData = getTargetPlayerData(context);
 
         return HomeCommand.exec(
@@ -50,8 +50,8 @@ public int runDefault(CommandContext<ServerCommandSource> context) throws Comman
         );
     }
 
-    public int runOfflinePlayer(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        PlayerData senderPlayerData = ((ServerPlayerEntityAccess) context.getSource().getPlayerOrThrow()).ec$getPlayerData();
+    public int runOfflinePlayer(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        PlayerData senderPlayerData = ((ServerPlayerEntityAccess) context.getSource().getPlayerOrException()).ec$getPlayerData();
         String homeName = StringArgumentType.getString(context, "home_name");
 
         var targetPlayerName = StringArgumentType.getString(context, "target_player");
@@ -60,7 +60,7 @@ public int runOfflinePlayer(CommandContext<ServerCommandSource> context) throws
             .getOfflinePlayerByNameAsync(targetPlayerName)
             .whenComplete((playerEntity, err) -> {
                 if (playerEntity == null) {
-                    context.getSource().sendError(Text.of("No player with the specified name found."));
+                    context.getSource().sendFailure(Component.nullToEmpty("No player with the specified name found."));
                     return;
                 }
 
@@ -73,14 +73,14 @@ public int runOfflinePlayer(CommandContext<ServerCommandSource> context) throws
                         homeName
                     );
                 } catch (CommandSyntaxException e) {
-                    context.getSource().sendError(ECText.access(senderPlayerData.getPlayer()).error(e.getMessage()));
+                    context.getSource().sendFailure(ECText.access(senderPlayerData.getPlayer()).error(e.getMessage()));
                 }
             });
         return SINGLE_SUCCESS;
 
     }
 
-    public static int runListOffline(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public static int runListOffline(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         var targetPlayerName = StringArgumentType.getString(context, "target_player");
         var senderPlayerProfile = PlayerProfile.accessFromContextOrThrow(context);
         ManagerLocator.getInstance()
@@ -88,7 +88,7 @@ public static int runListOffline(CommandContext<ServerCommandSource> context) th
             .getOfflinePlayerByNameAsync(targetPlayerName)
             .whenComplete((targetPlayerEntity, err) -> {
                 if (targetPlayerEntity == null) {
-                    context.getSource().sendError(Text.of("No player with the specified name found."));
+                    context.getSource().sendFailure(Component.nullToEmpty("No player with the specified name found."));
                     return;
                 }
 
@@ -101,7 +101,7 @@ public static int runListOffline(CommandContext<ServerCommandSource> context) th
                     senderPlayerProfile
                 );
 
-                context.getSource().sendFeedback(() ->
+                context.getSource().sendSuccess(() ->
                     suggestionText,
                     CONFIG.BROADCAST_TO_OPS
                 );
@@ -112,20 +112,20 @@ public static int runListOffline(CommandContext<ServerCommandSource> context) th
 
     public static class Suggestion {
         //Brigader Suggestions
-        public static final SuggestionProvider<ServerCommandSource> LIST_SUGGESTION_PROVIDER
+        public static final SuggestionProvider<CommandSourceStack> LIST_SUGGESTION_PROVIDER
             = ListSuggestion.ofContext(HomeTeleportOtherCommand.Suggestion::getSuggestionsList);
 
         /**
          * Gets a list of suggested strings to be used with Brigader
          */
-        public static List<String> getSuggestionsList(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+        public static List<String> getSuggestionsList(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
             return new ArrayList<>(HomeTeleportOtherCommand.getTargetPlayerData(context).getHomeNames());
         }
 
         /**
          * Gets a set of suggestion entries to be used with ListCommandFactory
          */
-        public static Set<Map.Entry<String, NamedMinecraftLocation>> getSuggestionEntries(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+        public static Set<Map.Entry<String, NamedMinecraftLocation>> getSuggestionEntries(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
             return HomeTeleportOtherCommand.getTargetPlayerData(context).getHomeEntries();
         }
 
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/InvulnCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/InvulnCommand.java
index ebe1ab76..017fb518 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/InvulnCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/InvulnCommand.java
@@ -11,14 +11,14 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.level.ServerPlayer;
 
-public class InvulnCommand implements Command<ServerCommandSource> {
+public class InvulnCommand implements Command<CommandSourceStack> {
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        ServerCommandSource source = context.getSource();
-        ServerPlayerEntity targetPlayer = CommandUtil.getCommandTargetPlayer(context);
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        CommandSourceStack source = context.getSource();
+        ServerPlayer targetPlayer = CommandUtil.getCommandTargetPlayer(context);
 
         boolean shouldEnableInvuln;
         try {
@@ -33,7 +33,7 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
 
         // TODO Label boolean values in suggestions, or switch to single state value (present, or it's not)
 
-        var senderPlayerAccess = ((ServerPlayerEntityAccess) source.getPlayerOrThrow());
+        var senderPlayerAccess = ((ServerPlayerEntityAccess) source.getPlayerOrException());
         var enabledText = senderPlayerAccess.ec$getEcText().getText(
             shouldEnableInvuln ? "generic.enabled" : "generic.disabled",
             TextFormatType.Accent);
@@ -47,12 +47,12 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
         return 0;
     }
 
-    public static void exec(ServerPlayerEntity target, boolean shouldEnableInvuln) {
+    public static void exec(ServerPlayer target, boolean shouldEnableInvuln) {
         if (shouldEnableInvuln) {
             Pal.grantAbility(target, VanillaAbilities.INVULNERABLE, ECAbilitySources.INVULN_COMMAND);
         } else {
             Pal.revokeAbility(target, VanillaAbilities.INVULNERABLE, ECAbilitySources.INVULN_COMMAND);
         }
-        target.sendAbilitiesUpdate();
+        target.onUpdateAbilities();
     }
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/ListCommandFactory.java b/src/main/java/com/fibermc/essentialcommands/commands/ListCommandFactory.java
index 2ad2339c..44b77e10 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/ListCommandFactory.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/ListCommandFactory.java
@@ -15,9 +15,9 @@
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.context.CommandContext;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.text.MutableText;
-import net.minecraft.text.Text;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
 
 import dev.jpcode.eccore.util.TextUtil;
 
@@ -28,16 +28,16 @@ public final class ListCommandFactory {
     private ListCommandFactory() {}
 
     // Specify leading response text, and supplier of list of strings/Text
-    public static <T> Command<ServerCommandSource> create(
+    public static <T> Command<CommandSourceStack> create(
         String responsePreText,
         String commandExecText,
         SuggestionListProvider<Entry<String, T>> suggestionsProvider)
     {
-        return (CommandContext<ServerCommandSource> context) -> {
+        return (CommandContext<CommandSourceStack> context) -> {
             var styleProvider = PlayerProfile.accessFromContextOrThrow(context);
             Collection<Entry<String, T>> suggestionsList = suggestionsProvider.getSuggestionList(context);
 
-            context.getSource().sendFeedback(() ->
+            context.getSource().sendSuccess(() ->
                 getSuggestionText(responsePreText, commandExecText, suggestionsList, Entry::getKey, styleProvider),
                 CONFIG.BROADCAST_TO_OPS
             );
@@ -45,17 +45,17 @@ public static <T> Command<ServerCommandSource> create(
         };
     }
 
-    public static <T> Command<ServerCommandSource> create(
+    public static <T> Command<CommandSourceStack> create(
         String responsePreText,
         String commandExecText,
         SuggestionListProvider<T> suggestionsProvider,
         Function<T, String> nameAccessor)
     {
-        return (CommandContext<ServerCommandSource> context) -> {
+        return (CommandContext<CommandSourceStack> context) -> {
             var styleProvider = PlayerProfile.accessFromContextOrThrow(context);
             Collection<T> suggestionsList = suggestionsProvider.getSuggestionList(context);
 
-            context.getSource().sendFeedback(() ->
+            context.getSource().sendSuccess(() ->
                     getSuggestionText(responsePreText, commandExecText, suggestionsList, nameAccessor, styleProvider),
                 CONFIG.BROADCAST_TO_OPS
             );
@@ -63,20 +63,20 @@ public static <T> Command<ServerCommandSource> create(
         };
     }
 
-    public static <T> Text getSuggestionText(
+    public static <T> Component getSuggestionText(
         String responsePreText,
         String commandExecText,
         Collection<T> suggestionsList,
         Function<T, String> nameAccessor,
         IStyleProvider styleProvider)
     {
-        MutableText responseText = Text.empty()
-            .append(Text.literal(responsePreText).setStyle(styleProvider.getStyle(TextFormatType.Default)));
+        MutableComponent responseText = Component.empty()
+            .append(Component.literal(responsePreText).setStyle(styleProvider.getStyle(TextFormatType.Default)));
 
-        List<Text> suggestionTextList = suggestionsList.stream()
+        List<Component> suggestionTextList = suggestionsList.stream()
             .map(nameAccessor)
             .map((name) -> clickableTeleport(
-                Text.literal(name).setStyle(styleProvider.getStyle(TextFormatType.Accent)),
+                Component.literal(name).setStyle(styleProvider.getStyle(TextFormatType.Accent)),
                 name,
                 String.format("/%s", commandExecText)))
             .collect(Collectors.toList());
@@ -84,7 +84,7 @@ public static <T> Text getSuggestionText(
         if (suggestionTextList.size() > 0) {
             responseText.append(TextUtil.join(
                 suggestionTextList,
-                Text.literal(", ").setStyle(styleProvider.getStyle(TextFormatType.Default))
+                Component.literal(", ").setStyle(styleProvider.getStyle(TextFormatType.Default))
             ));
         } else {
             responseText.append(ECText.getInstance().getText("cmd.list.feedback.empty", TextFormatType.Error, styleProvider));
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/ModInfoCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/ModInfoCommand.java
index 2d505328..12814eee 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/ModInfoCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/ModInfoCommand.java
@@ -8,22 +8,22 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.text.Text;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.chat.Component;
 
 import dev.jpcode.eccore.util.TextUtil;
 
-public class ModInfoCommand implements Command<ServerCommandSource> {
+public class ModInfoCommand implements Command<CommandSourceStack> {
 
     private final String modVersion = EssentialCommands.MOD_METADATA.getVersion().getFriendlyString();
 
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        var senderPlayer = context.getSource().getPlayerOrThrow();
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        var senderPlayer = context.getSource().getPlayerOrException();
         var ecText = ECText.access(senderPlayer);
         PlayerData.access(senderPlayer).sendCommandFeedback(TextUtil.concat(
             ecText.literal(EssentialCommands.MOD_METADATA.getName()),
-            Text.literal(" "),
+            Component.literal(" "),
             ecText.accent(modVersion)
         ));
 
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/MotdCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/MotdCommand.java
index 553b578a..985dcd0a 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/MotdCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/MotdCommand.java
@@ -9,8 +9,8 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.level.ServerPlayer;
 
 import static com.fibermc.essentialcommands.EssentialCommands.CONFIG;
 
@@ -22,14 +22,14 @@ private MotdCommand() {}
         .add(TagParser.QUICK_TEXT_WITH_STF)
         .build();
 
-    public static int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        var player = context.getSource().getPlayerOrThrow();
+    public static int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        var player = context.getSource().getPlayerOrException();
         exec(player);
         return 0;
     }
 
-    public static void exec(ServerPlayerEntity player) {
-        player.getCommandSource().sendFeedback(
+    public static void exec(ServerPlayer player) {
+        player.createCommandSourceStack().sendSuccess(
             () -> Placeholders.parseText(
                 NODE_PARSER.parseNode(CONFIG.MOTD),
                 PlaceholderContext.of(player)
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/NicknameClearCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/NicknameClearCommand.java
index 0834ab89..9b9676fb 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/NicknameClearCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/NicknameClearCommand.java
@@ -6,12 +6,12 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.text.Text;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.chat.Component;
 
-public class NicknameClearCommand implements Command<ServerCommandSource> {
+public class NicknameClearCommand implements Command<CommandSourceStack> {
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         var senderPlayerData = PlayerData.accessFromContextOrThrow(context);
 
         var targetPlayer = CommandUtil.getCommandTargetPlayer(context);
@@ -22,7 +22,7 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
         //inform command sender that the nickname has been set
         senderPlayerData.sendCommandFeedback(
             "cmd.nickname.set.feedback",
-            Text.literal(targetPlayer.getGameProfile().name())
+            Component.literal(targetPlayer.getGameProfile().name())
         );
 
         return SINGLE_SUCCESS;
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/NicknameSetCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/NicknameSetCommand.java
index ea5e7d6f..b42eeb1b 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/NicknameSetCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/NicknameSetCommand.java
@@ -14,33 +14,33 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.command.argument.TextArgumentType;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.MutableText;
-import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.arguments.ComponentArgument;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.ComponentUtils;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.server.level.ServerPlayer;
 
 import dev.jpcode.eccore.util.TextUtil;
 
 import static com.fibermc.essentialcommands.EssentialCommands.CONFIG;
 
-public class NicknameSetCommand implements Command<ServerCommandSource> {
+public class NicknameSetCommand implements Command<CommandSourceStack> {
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        return exec(context, TextArgumentType.getTextArgument(context, "nickname"));
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        return exec(context, ComponentArgument.getRawComponent(context, "nickname"));
     }
 
-    public static int runStringToText(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public static int runStringToText(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         NicknameSetCommand.exec(context, TextUtil.parseText(StringArgumentType.getString(context, "nickname_placeholder_api")));
         return SINGLE_SUCCESS;
     }
 
-    public static int exec(CommandContext<ServerCommandSource> context, Text rawNicknameText) throws CommandSyntaxException {
-        ServerPlayerEntity targetPlayer = CommandUtil.getCommandTargetPlayer(context);
+    public static int exec(CommandContext<CommandSourceStack> context, Component rawNicknameText) throws CommandSyntaxException {
+        ServerPlayer targetPlayer = CommandUtil.getCommandTargetPlayer(context);
 
         var nicknameWithContext = ECPerms.check(context.getSource(), ECPerms.Registry.nickname_selector_and_ctx, 2)
-            ? Texts.parse(
+            ? ComponentUtils.updateForEntity(
                 context.getSource(),
                 rawNicknameText,
                 targetPlayer,
@@ -61,10 +61,10 @@ public static int exec(CommandContext<ServerCommandSource> context, Text rawNick
         if (successCode >= 0) {
             senderFeedbackReceiver.sendCommandFeedback(
                 "cmd.nickname.set.feedback",
-                nicknameText != null ? nicknameText : Text.literal(targetPlayer.getGameProfile().name())
+                nicknameText != null ? nicknameText : Component.literal(targetPlayer.getGameProfile().name())
             );
         } else {
-            MutableText failReason = switch (successCode) {
+            MutableComponent failReason = switch (successCode) {
                 case -1 -> ecText.getText("cmd.nickname.set.error.perms", TextFormatType.Error);
                 case -2 -> ecText.getText(
                     "cmd.nickname.set.error.length", TextFormatType.Error,
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/ProfileCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/ProfileCommand.java
index 17e8e273..f9071d76 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/ProfileCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/ProfileCommand.java
@@ -8,42 +8,42 @@
 
 import com.mojang.brigadier.tree.LiteralCommandNode;
 
-import net.minecraft.server.command.CommandManager;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.text.Text;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.network.chat.Component;
 
 import static com.fibermc.essentialcommands.EssentialCommands.CONFIG;
-import static net.minecraft.server.command.CommandManager.argument;
+import static net.minecraft.commands.Commands.argument;
 
 public final class ProfileCommand {
     private ProfileCommand() {}
 
-    public static LiteralCommandNode<ServerCommandSource> buildNode() {
-        var root = CommandManager.literal("profile");
-        var set = CommandManager.literal("set");
-        var get = CommandManager.literal("get");
+    public static LiteralCommandNode<CommandSourceStack> buildNode() {
+        var root = Commands.literal("profile");
+        var set = Commands.literal("set");
+        var get = Commands.literal("get");
 
         for (Map.Entry<String, ProfileOption<?>> entry : PlayerProfile.OPTIONS.entrySet()) {
             var name = entry.getKey();
             var option = entry.getValue();
 
-            set.then(CommandManager.literal(name)
+            set.then(Commands.literal(name)
                 .then(argument("value", option.argumentType()).executes((context) -> {
-                    var player = context.getSource().getPlayerOrThrow();
+                    var player = context.getSource().getPlayerOrException();
                     var profile = ((ServerPlayerEntityAccess) player).ec$getProfile();
                     option.profileSetter().setValue(context, "value", profile);
-                    profile.markDirty();
-                    profile.save(context.getSource().getServer().getRegistryManager());
+                    profile.setDirty();
+                    profile.save(context.getSource().getServer().registryAccess());
                     return 0;
                 }))
             );
 
-            get.then(CommandManager.literal(name)
+            get.then(Commands.literal(name)
                 .executes((context) -> {
-                    var player = context.getSource().getPlayerOrThrow();
+                    var player = context.getSource().getPlayerOrException();
                     var profile = ((ServerPlayerEntityAccess) player).ec$getProfile();
-                    context.getSource().sendFeedback(() ->
-                        Text.literal(option.profileGetter().getValue(profile).map(Object::toString).orElse("<not set>")),
+                    context.getSource().sendSuccess(() ->
+                        Component.literal(option.profileGetter().getValue(profile).map(Object::toString).orElse("<not set>")),
                         CONFIG.BROADCAST_TO_OPS);
                     return 0;
                 })
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/RandomTeleportCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/RandomTeleportCommand.java
index 0443058c..deb96413 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/RandomTeleportCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/RandomTeleportCommand.java
@@ -24,16 +24,16 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.server.world.ServerWorld;
-import net.minecraft.text.Text;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.ChunkPos;
-import net.minecraft.util.math.Vec3i;
-import net.minecraft.world.chunk.Chunk;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Vec3i;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.chunk.ChunkAccess;
 
 import dev.jpcode.eccore.util.TextUtil;
 
@@ -48,7 +48,7 @@
  *
  */
 @SuppressWarnings("checkstyle:all")
-public class RandomTeleportCommand implements Command<ServerCommandSource> {
+public class RandomTeleportCommand implements Command<CommandSourceStack> {
 
     public RandomTeleportCommand() {}
 
@@ -64,12 +64,12 @@ public RandomTeleportCommand() {}
     });
 
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        ServerPlayerEntity player = context.getSource().getPlayerOrThrow();
-        ServerWorld world = context.getSource().getWorld();
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        ServerPlayer player = context.getSource().getPlayerOrException();
+        ServerLevel world = context.getSource().getLevel();
         var ecText = ECText.access(player);
-        if (!CONFIG.RTP_ENABLED_WORLDS.contains(world.getRegistryKey())) {
-            var currentWorldAsText = Text.of(world.getRegistryKey().getValue().toString());
+        if (!CONFIG.RTP_ENABLED_WORLDS.contains(world.dimension())) {
+            var currentWorldAsText = Component.nullToEmpty(world.dimension().identifier().toString());
             PlayerData.access(player).sendCommandError(TextUtil.concat(
                 ecText.getText("cmd.rtp.error.pre", TextFormatType.Error),
                 ecText.getText("cmd.rtp.error.world_not_enabled", TextFormatType.Error, currentWorldAsText)
@@ -78,7 +78,7 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
         }
 
         if (CONFIG.RTP_COOLDOWN > 0 && !ECPerms.check(context.getSource(), ECPerms.Registry.bypass_randomteleport_cooldown)) {
-            int curServerTickTime = context.getSource().getServer().getTicks();
+            int curServerTickTime = context.getSource().getServer().getTickCount();
             var playerData = PlayerData.access(player);
             var rtpCooldownEndTime = playerData.getTimeUsedRtp() + CONFIG.RTP_COOLDOWN * 20;
             var rtpCooldownRemaining = rtpCooldownEndTime - curServerTickTime;
@@ -111,13 +111,13 @@ final static class ExecutionContext {
         public final int topY;
         public final int bottomY;
 
-        public ExecutionContext(ServerWorld world) {
-            this.topY = world.getTopYInclusive();
-            this.bottomY = world.getBottomY();
+        public ExecutionContext(ServerLevel world) {
+            this.topY = world.getMaxY();
+            this.bottomY = world.getMinY();
         }
     }
 
-    private static void exec(ServerPlayerEntity player, ServerWorld world) {
+    private static void exec(ServerPlayer player, ServerLevel world) {
         var centerOpt = getRtpCenter(player);
         if (centerOpt.isEmpty()) {
             return;
@@ -125,7 +125,7 @@ private static void exec(ServerPlayerEntity player, ServerWorld world) {
         Vec3i center = centerOpt.get();
 
         final var executionContext = new ExecutionContext(world);
-        final var heightFinder = HeightFindingStrategy.forWorld(world.getRegistryKey());
+        final var heightFinder = HeightFindingStrategy.forWorld(world.dimension());
 
         int timesRun = 0;
         Optional<BlockPos> pos;
@@ -141,12 +141,12 @@ private static void exec(ServerPlayerEntity player, ServerWorld world) {
         // Teleport the player
         PlayerTeleporter.requestTeleport(
             player,
-            new MinecraftLocation(world.getRegistryKey(), pos.get(), 0, 0),
+            new MinecraftLocation(world.dimension(), pos.get(), 0, 0),
             ECText.access(player).getText("cmd.rtp.location_name")
         );
     }
 
-    private static Optional<Vec3i> getRtpCenter(ServerPlayerEntity player) {
+    private static Optional<Vec3i> getRtpCenter(ServerPlayer player) {
         var configuredRtpCenter = CONFIG.RTP_CENTER.getPosition();
         if (configuredRtpCenter.isPresent()) {
             var pair = configuredRtpCenter.get();
@@ -172,12 +172,12 @@ private static Optional<Vec3i> getRtpCenter(ServerPlayerEntity player) {
         return Optional.empty();
     }
 
-    private static Optional<BlockPos> findRtpPosition(ServerWorld world, Vec3i center, HeightFinder heightFinder, ExecutionContext ctx) {
+    private static Optional<BlockPos> findRtpPosition(ServerLevel world, Vec3i center, HeightFinder heightFinder, ExecutionContext ctx) {
         // Search for a valid y-level (not in a block, underwater, out of the world, etc.)
         final BlockPos targetXZ = getRandomXZ(center);
-        final Chunk chunk = world.getChunk(targetXZ);
+        final ChunkAccess chunk = world.getChunk(targetXZ);
 
-        for (BlockPos.Mutable candidateBlock : getChunkCandidateBlocks(chunk.getPos())) {
+        for (BlockPos.MutableBlockPos candidateBlock : getChunkCandidateBlocks(chunk.getPos())) {
             final int x = candidateBlock.getX();
             final int z = candidateBlock.getZ();
             final OptionalInt yOpt = heightFinder.getY(chunk, x, z);
@@ -213,8 +213,8 @@ private static BlockPos getRandomXZ(Vec3i center) {
         return new BlockPos(new_x, 0, new_z);
     }
 
-    private static boolean isSafePosition(Chunk chunk, BlockPos pos, ExecutionContext ctx) {
-        if (pos.getY() <= chunk.getBottomY()) {
+    private static boolean isSafePosition(ChunkAccess chunk, BlockPos pos, ExecutionContext ctx) {
+        if (pos.getY() <= chunk.getMinY()) {
             return false;
         }
 
@@ -222,10 +222,10 @@ private static boolean isSafePosition(Chunk chunk, BlockPos pos, ExecutionContex
         return pos.getY() < ctx.topY && blockState.getFluidState().isEmpty() && blockState.getBlock() != Blocks.FIRE;
     }
 
-    public static Iterable<BlockPos.Mutable> getChunkCandidateBlocks(ChunkPos chunkPos) {
+    public static Iterable<BlockPos.MutableBlockPos> getChunkCandidateBlocks(ChunkPos chunkPos) {
         return () -> new Iterator<>() {
             private int _idx = -1;
-            private final BlockPos.Mutable _pos = new BlockPos.Mutable();
+            private final BlockPos.MutableBlockPos _pos = new BlockPos.MutableBlockPos();
 
             @Override
             public boolean hasNext() {
@@ -233,14 +233,14 @@ public boolean hasNext() {
             }
 
             @Override
-            public BlockPos.Mutable next() {
+            public BlockPos.MutableBlockPos next() {
                 _idx++;
                 return switch (_idx) {
-                    case 0 -> _pos.set(chunkPos.getStartX(), 0, chunkPos.getStartZ());
-                    case 1 -> _pos.set(chunkPos.getStartX(), 0, chunkPos.getEndZ());
-                    case 2 -> _pos.set(chunkPos.getEndX(), 0, chunkPos.getStartZ());
-                    case 3 -> _pos.set(chunkPos.getEndX(), 0, chunkPos.getEndZ());
-                    case 4 -> _pos.set(chunkPos.getCenterX(), 0, chunkPos.getCenterZ());
+                    case 0 -> _pos.set(chunkPos.getMinBlockX(), 0, chunkPos.getMinBlockZ());
+                    case 1 -> _pos.set(chunkPos.getMinBlockX(), 0, chunkPos.getMaxBlockZ());
+                    case 2 -> _pos.set(chunkPos.getMaxBlockX(), 0, chunkPos.getMinBlockZ());
+                    case 3 -> _pos.set(chunkPos.getMaxBlockX(), 0, chunkPos.getMaxBlockZ());
+                    case 4 -> _pos.set(chunkPos.getMiddleBlockX(), 0, chunkPos.getMiddleBlockZ());
                     default -> throw new IllegalStateException("Unexpected value: " + _idx);
                 };
             }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/RealNameCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/RealNameCommand.java
index 72133466..dfc8f7b1 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/RealNameCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/RealNameCommand.java
@@ -11,21 +11,21 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.text.MutableText;
-import net.minecraft.text.Text;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
 
 import static com.fibermc.essentialcommands.EssentialCommands.CONFIG;
 
-public class RealNameCommand implements Command<ServerCommandSource> {
+public class RealNameCommand implements Command<CommandSourceStack> {
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
 
         String nicknameStr = StringArgumentType.getString(context, "player_nickname");
         List<PlayerData> nicknamePlayers = PlayerDataManager.getInstance().getPlayerDataMatchingNickname(nicknameStr);
-        MutableText responseText = Text.empty();
+        MutableComponent responseText = Component.empty();
 
-        var ecText = ECText.access(context.getSource().getPlayerOrThrow());
+        var ecText = ECText.access(context.getSource().getPlayerOrException());
         var nicknameText = ecText.accent(nicknameStr);
         // If no players matched the provided nickname
         if (nicknamePlayers.size() == 0) {
@@ -42,7 +42,7 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
             }
         }
 
-        context.getSource().sendFeedback(() -> responseText, CONFIG.BROADCAST_TO_OPS);
+        context.getSource().sendSuccess(() -> responseText, CONFIG.BROADCAST_TO_OPS);
 
         return 0;
     }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/RulesCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/RulesCommand.java
index 13db013a..4f0908d1 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/RulesCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/RulesCommand.java
@@ -10,9 +10,9 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.chat.Component;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.text.Text;
 
 import dev.jpcode.eccore.util.TextUtil;
 
@@ -20,14 +20,14 @@ public final class RulesCommand {
 
     private RulesCommand() {}
 
-    private static Text rulesText;
+    private static Component rulesText;
 
-    public static int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        context.getSource().sendFeedback(() -> rulesText, false);
+    public static int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        context.getSource().sendSuccess(() -> rulesText, false);
         return 0;
     }
 
-    public static int reloadCommand(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public static int reloadCommand(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         var playerData = PlayerData.accessFromContextOrThrow(context);
 
         try {
@@ -42,7 +42,7 @@ public static int reloadCommand(CommandContext<ServerCommandSource> context) thr
 
     @SuppressWarnings("ResultOfMethodCallIgnored")
     public static void reload(MinecraftServer server) throws IOException {
-        Path mcDir = server.getRunDirectory();
+        Path mcDir = server.getServerDirectory();
         var rulesFile = mcDir.resolve("config/essentialcommands/rules.txt").toFile();
         rulesFile.getParentFile().mkdirs();
         if (rulesFile.createNewFile()) {
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/SleepCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/SleepCommand.java
index d694fc09..a00e2b24 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/SleepCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/SleepCommand.java
@@ -7,30 +7,30 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.text.Text;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.chat.Component;
 
 import static com.fibermc.essentialcommands.EssentialCommands.CONFIG;
 
-public class SleepCommand implements Command<ServerCommandSource> {
+public class SleepCommand implements Command<CommandSourceStack> {
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         var source = context.getSource();
-        var player = source.getPlayerOrThrow();
+        var player = source.getPlayerOrException();
         var playerData = PlayerData.access(player);
-        var pos = player.getBlockPos();
+        var pos = player.blockPosition();
 
         if (player.isSleeping()) {
-            player.wakeUp();
+            player.stopSleeping();
             return SINGLE_SUCCESS;
         }
 
         if (!CONFIG.SLEEP_NEAR_MONSTERS && PlayerUtilities.isNearAngryMonsters(player)) {
-            PlayerData.access(player).sendCommandError(Text.translatable("block.minecraft.bed.not_safe"));
+            PlayerData.access(player).sendCommandError(Component.translatable("block.minecraft.bed.not_safe"));
             return 0;
         }
 
-        player.sleep(pos);
+        player.startSleeping(pos);
         playerData.setIsSleepingFromCommand(true);
 
         return SINGLE_SUCCESS;
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/SpawnCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/SpawnCommand.java
index 98eccd6c..95a4365d 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/SpawnCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/SpawnCommand.java
@@ -10,14 +10,14 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.commands.CommandSourceStack;
 
-public class SpawnCommand implements Command<ServerCommandSource> {
+public class SpawnCommand implements Command<CommandSourceStack> {
 
     public SpawnCommand() {}
 
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         WorldDataManager worldDataManager = ManagerLocator.getInstance().getWorldDataManager();
         var loc = worldDataManager.getSpawn();
 
@@ -27,7 +27,7 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
             return -2;
         }
 
-        var senderPlayer = context.getSource().getPlayerOrThrow();
+        var senderPlayer = context.getSource().getPlayerOrException();
 
         // Teleport & chat message
         var styledLocationName = ECText.access(senderPlayer).getText("cmd.spawn.location_name");
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/SpawnSetCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/SpawnSetCommand.java
index 13322b12..3efe4345 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/SpawnSetCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/SpawnSetCommand.java
@@ -9,16 +9,16 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.commands.CommandSourceStack;
 
-public class SpawnSetCommand implements Command<ServerCommandSource> {
+public class SpawnSetCommand implements Command<CommandSourceStack> {
 
     public SpawnSetCommand() {}
 
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         var worldDataManager = ManagerLocator.getInstance().getWorldDataManager();
-        var senderPlayer = context.getSource().getPlayerOrThrow();
+        var senderPlayer = context.getSource().getPlayerOrException();
         var playerData = PlayerData.access(senderPlayer);
 
         //Set spawn
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/TeleportAcceptCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/TeleportAcceptCommand.java
index 74678f44..c4470629 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/TeleportAcceptCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/TeleportAcceptCommand.java
@@ -8,11 +8,11 @@
 
 import com.mojang.brigadier.context.CommandContext;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.level.ServerPlayer;
 
 public class TeleportAcceptCommand extends TeleportResponseCommand {
-    protected int exec(CommandContext<ServerCommandSource> context, ServerPlayerEntity respondingPlayer, ServerPlayerEntity requesterPlayer) {
+    protected int exec(CommandContext<CommandSourceStack> context, ServerPlayer respondingPlayer, ServerPlayer requesterPlayer) {
         var senderPlayerData = PlayerData.access(respondingPlayer);
         var targetPlayerData = ((ServerPlayerEntityAccess) requesterPlayer).ec$getPlayerData();
 
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/TeleportAskCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/TeleportAskCommand.java
index fbed6494..58f1215e 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/TeleportAskCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/TeleportAskCommand.java
@@ -13,19 +13,19 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.command.argument.EntityArgumentType;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.arguments.EntityArgument;
+import net.minecraft.server.level.ServerPlayer;
 
-public class TeleportAskCommand implements Command<ServerCommandSource> {
+public class TeleportAskCommand implements Command<CommandSourceStack> {
 
     public TeleportAskCommand() {}
 
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         TeleportManager tpMgr = ManagerLocator.getInstance().getTpManager();
-        ServerPlayerEntity senderPlayer = context.getSource().getPlayerOrThrow();
-        ServerPlayerEntity targetPlayer = EntityArgumentType.getPlayer(context, "target_player");
+        ServerPlayer senderPlayer = context.getSource().getPlayerOrException();
+        ServerPlayer targetPlayer = EntityArgument.getPlayer(context, "target_player");
         var senderPlayerData = PlayerData.access(senderPlayer);
         var targetPlayerData = PlayerData.access(targetPlayer);
 
@@ -46,7 +46,7 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
         var targetPlayerProfile = PlayerProfile.access(targetPlayer);
         targetPlayerData.sendMessage(
             "cmd.tpask.receive",
-            senderPlayer.getDisplayName().copy().fillStyle(targetPlayerProfile.getStyle(TextFormatType.Accent))
+            senderPlayer.getDisplayName().copy().withStyle(targetPlayerProfile.getStyle(TextFormatType.Accent))
         );
 
         String senderName = senderPlayer.getGameProfile().name();
@@ -63,7 +63,7 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
 
         //inform command sender that request has been sent
         var senderPlayerProfile = PlayerProfile.access(senderPlayer);
-        var targetPlayerText = targetPlayer.getDisplayName().copy().fillStyle(senderPlayerProfile.getStyle(TextFormatType.Accent));
+        var targetPlayerText = targetPlayer.getDisplayName().copy().withStyle(senderPlayerProfile.getStyle(TextFormatType.Accent));
         senderPlayerData.sendCommandFeedback("cmd.tpask.send", targetPlayerText);
 
         return SINGLE_SUCCESS;
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/TeleportAskHereCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/TeleportAskHereCommand.java
index 75f793c1..d6d51143 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/TeleportAskHereCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/TeleportAskHereCommand.java
@@ -11,19 +11,19 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.command.argument.EntityArgumentType;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.arguments.EntityArgument;
+import net.minecraft.server.level.ServerPlayer;
 
-public class TeleportAskHereCommand implements Command<ServerCommandSource> {
+public class TeleportAskHereCommand implements Command<CommandSourceStack> {
 
     public TeleportAskHereCommand() {}
 
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         TeleportManager tpMgr = ManagerLocator.getInstance().getTpManager();
-        ServerPlayerEntity senderPlayer = context.getSource().getPlayerOrThrow();
-        ServerPlayerEntity targetPlayer = EntityArgumentType.getPlayer(context, "target_player");
+        ServerPlayer senderPlayer = context.getSource().getPlayerOrException();
+        ServerPlayer targetPlayer = EntityArgument.getPlayer(context, "target_player");
         var senderPlayerData = PlayerData.access(senderPlayer);
         var targetPlayerData = PlayerData.access(targetPlayer);
 
@@ -43,7 +43,7 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
         var targetPlayerEcText = ECText.access(targetPlayer);
         targetPlayerData.sendMessage(
             "cmd.tpaskhere.receive",
-            targetPlayerEcText.accent(senderPlayer.getNameForScoreboard())
+            targetPlayerEcText.accent(senderPlayer.getScoreboardName())
         );
 
         String senderName = senderPlayer.getGameProfile().name();
@@ -59,7 +59,7 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
         tpMgr.startTpRequest(senderPlayer, targetPlayer, TeleportRequest.Type.TPA_HERE);
 
         //inform command sender that request has been sent
-        var targetPlayerText = ECText.access(senderPlayer).accent(targetPlayer.getNameForScoreboard());
+        var targetPlayerText = ECText.access(senderPlayer).accent(targetPlayer.getScoreboardName());
         senderPlayerData.sendCommandFeedback("cmd.tpask.send", targetPlayerText);
 
         return SINGLE_SUCCESS;
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/TeleportCancelCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/TeleportCancelCommand.java
index 176aafec..c0e4b95e 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/TeleportCancelCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/TeleportCancelCommand.java
@@ -7,20 +7,20 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.Text;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
 
 import dev.jpcode.eccore.util.TextUtil;
 
-public class TeleportCancelCommand implements Command<ServerCommandSource> {
+public class TeleportCancelCommand implements Command<CommandSourceStack> {
 
     public TeleportCancelCommand() {}
 
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         //Store command sender
-        ServerPlayerEntity senderPlayer = context.getSource().getPlayerOrThrow();
+        ServerPlayer senderPlayer = context.getSource().getPlayerOrException();
         var senderPlayerData = PlayerData.access(senderPlayer);
 
         var existingTeleportRequests = senderPlayerData.getSentTeleportRequests();
@@ -36,8 +36,8 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
         senderPlayerData.sendCommandFeedback(
             "cmd.tpcancel.feedback",
             TextUtil.join(
-                targetPlayers.stream().map(PlayerData::getPlayer).map(ServerPlayerEntity::getDisplayName).toList(),
-                Text.literal(", "))
+                targetPlayers.stream().map(PlayerData::getPlayer).map(ServerPlayer::getDisplayName).toList(),
+                Component.literal(", "))
         );
 
         return SINGLE_SUCCESS;
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/TeleportDenyCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/TeleportDenyCommand.java
index c242ab77..f9baf14e 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/TeleportDenyCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/TeleportDenyCommand.java
@@ -7,11 +7,11 @@
 
 import com.mojang.brigadier.context.CommandContext;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.level.ServerPlayer;
 
 public class TeleportDenyCommand extends TeleportResponseCommand {
-    protected int exec(CommandContext<ServerCommandSource> context, ServerPlayerEntity respondingPlayer, ServerPlayerEntity requesterPlayer) {
+    protected int exec(CommandContext<CommandSourceStack> context, ServerPlayer respondingPlayer, ServerPlayer requesterPlayer) {
         var targetPlayerData = PlayerData.access(requesterPlayer);
         var senderPlayerData = PlayerData.access(respondingPlayer);
 
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/TeleportResponseCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/TeleportResponseCommand.java
index 5b79d909..a6cd0659 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/TeleportResponseCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/TeleportResponseCommand.java
@@ -12,22 +12,22 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.command.argument.EntityArgumentType;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.arguments.EntityArgument;
+import net.minecraft.server.level.ServerPlayer;
 
-public abstract class TeleportResponseCommand implements Command<ServerCommandSource> {
+public abstract class TeleportResponseCommand implements Command<CommandSourceStack> {
 
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         return exec(
             context,
             context.getSource().getPlayer(),
-            EntityArgumentType.getPlayer(context, "target_player")
+            EntityArgument.getPlayer(context, "target_player")
         );
     }
 
-    public int runDefault(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        var respondingPlayer = context.getSource().getPlayerOrThrow();
+    public int runDefault(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        var respondingPlayer = context.getSource().getPlayerOrException();
         var respondingPlayerData = PlayerData.access(respondingPlayer);
         var ecText = ECText.access(respondingPlayer);
         LinkedHashMap<UUID, TeleportRequest> incomingTeleportRequests = respondingPlayerData.getIncomingTeleportRequests();
@@ -40,7 +40,7 @@ public int runDefault(CommandContext<ServerCommandSource> context) throws Comman
                 ecText.getText("cmd.tpa_reply.error.shortcut_none_exist", TextFormatType.Error));
         }
 
-        ServerPlayerEntity teleportRequestSender = incomingTeleportRequests.values().stream().findFirst().get().getSenderPlayer();
+        ServerPlayer teleportRequestSender = incomingTeleportRequests.values().stream().findFirst().get().getSenderPlayer();
         if (teleportRequestSender == null) {
             throw CommandUtil.createSimpleException(
                 ecText.getText("cmd.tpa_reply.error.no_request_from_target", TextFormatType.Error));
@@ -49,6 +49,6 @@ public int runDefault(CommandContext<ServerCommandSource> context) throws Comman
         return exec(context, respondingPlayer, teleportRequestSender);
     }
 
-    abstract int exec(CommandContext<ServerCommandSource> context, ServerPlayerEntity respondingPlayer, ServerPlayerEntity requesterPlayer);
+    abstract int exec(CommandContext<CommandSourceStack> context, ServerPlayer respondingPlayer, ServerPlayer requesterPlayer);
 
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/WarpDeleteCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/WarpDeleteCommand.java
index 35782169..7d9116f6 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/WarpDeleteCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/WarpDeleteCommand.java
@@ -10,14 +10,14 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.commands.CommandSourceStack;
 
-public class WarpDeleteCommand implements Command<ServerCommandSource> {
+public class WarpDeleteCommand implements Command<CommandSourceStack> {
 
     public WarpDeleteCommand() {}
 
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         WorldDataManager worldDataManager = ManagerLocator.getInstance().getWorldDataManager();
         var senderPlayerData = PlayerData.accessFromContextOrThrow(context);
         String warpName = StringArgumentType.getString(context, "warp_name");
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/WarpSetCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/WarpSetCommand.java
index 4dcb103f..b0710b46 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/WarpSetCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/WarpSetCommand.java
@@ -12,16 +12,16 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.commands.CommandSourceStack;
 
-public class WarpSetCommand implements Command<ServerCommandSource> {
+public class WarpSetCommand implements Command<CommandSourceStack> {
 
     public WarpSetCommand() {}
 
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         WorldDataManager worldDataManager = ManagerLocator.getInstance().getWorldDataManager();
-        var senderPlayer = context.getSource().getPlayerOrThrow();
+        var senderPlayer = context.getSource().getPlayerOrException();
         var senderPlayerData = PlayerData.access(senderPlayer);
         String warpName = StringArgumentType.getString(context, "warp_name");
 
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/WarpTpCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/WarpTpCommand.java
index 6cc2dbec..944ce037 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/WarpTpCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/WarpTpCommand.java
@@ -11,28 +11,28 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.command.argument.EntityArgumentType;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.arguments.EntityArgument;
+import net.minecraft.server.level.ServerPlayer;
 
-public class WarpTpCommand implements Command<ServerCommandSource> {
+public class WarpTpCommand implements Command<CommandSourceStack> {
 
     public WarpTpCommand() {}
 
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        ServerPlayerEntity senderPlayer = context.getSource().getPlayer();
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        ServerPlayer senderPlayer = context.getSource().getPlayer();
         exec(context, senderPlayer);
 
         return SINGLE_SUCCESS;
     }
 
     private void exec(
-        CommandContext<ServerCommandSource> context,
-        ServerPlayerEntity targetPlayer) throws CommandSyntaxException
+        CommandContext<CommandSourceStack> context,
+        ServerPlayer targetPlayer) throws CommandSyntaxException
     {
         var worldDataManager = ManagerLocator.getInstance().getWorldDataManager();
-        var senderPlayer = context.getSource().getPlayerOrThrow();
+        var senderPlayer = context.getSource().getPlayerOrException();
         var ecText = ECText.access(senderPlayer);
 
         String warpName = StringArgumentType.getString(context, "warp_name");
@@ -60,8 +60,8 @@ private void exec(
             ecText.getText("cmd.warp.location_name", warpNameText));
     }
 
-    public int runOther(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        exec(context, EntityArgumentType.getPlayer(context, "target_player"));
+    public int runOther(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        exec(context, EntityArgument.getPlayer(context, "target_player"));
         return 0;
     }
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/bench/AnvilCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/bench/AnvilCommand.java
index a91fb5ad..12ffda30 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/bench/AnvilCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/bench/AnvilCommand.java
@@ -3,32 +3,32 @@
 import com.fibermc.essentialcommands.screen.AnvilCommandScreenHandler;
 import org.jetbrains.annotations.NotNull;
 
-import net.minecraft.screen.ScreenHandlerContext;
-import net.minecraft.screen.ScreenHandlerFactory;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.stat.Stats;
-import net.minecraft.text.Text;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.stats.Stats;
+import net.minecraft.world.inventory.ContainerLevelAccess;
+import net.minecraft.world.inventory.MenuConstructor;
 
 public class AnvilCommand extends SimpleScreenCommand {
-    private static final ScreenHandlerFactory SCREEN_HANDLER_FACTORY = (syncId, inventory, player) ->
+    private static final MenuConstructor SCREEN_HANDLER_FACTORY = (syncId, inventory, player) ->
         new AnvilCommandScreenHandler(
             syncId,
             inventory,
-            ScreenHandlerContext.create(player.getEntityWorld(), player.getBlockPos())
+            ContainerLevelAccess.create(player.level(), player.blockPosition())
         );
 
     @Override
-    protected Text getScreenTitle() {
-        return Text.translatable("block.minecraft.anvil");
+    protected Component getScreenTitle() {
+        return Component.translatable("block.minecraft.anvil");
     }
 
     @Override
-    protected @NotNull ScreenHandlerFactory getScreenHandlerFactory() {
+    protected @NotNull MenuConstructor getScreenHandlerFactory() {
         return SCREEN_HANDLER_FACTORY;
     }
 
     @Override
-    protected void onOpen(ServerPlayerEntity player) {
-        player.incrementStat(Stats.INTERACT_WITH_ANVIL);
+    protected void onOpen(ServerPlayer player) {
+        player.awardStat(Stats.INTERACT_WITH_ANVIL);
     }
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/bench/EnderchestCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/bench/EnderchestCommand.java
index c5382859..62b16547 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/bench/EnderchestCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/bench/EnderchestCommand.java
@@ -2,30 +2,30 @@
 
 import org.jetbrains.annotations.NotNull;
 
-import net.minecraft.screen.GenericContainerScreenHandler;
-import net.minecraft.screen.NamedScreenHandlerFactory;
-import net.minecraft.screen.SimpleNamedScreenHandlerFactory;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.stat.Stats;
-import net.minecraft.text.Text;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.stats.Stats;
+import net.minecraft.world.MenuProvider;
+import net.minecraft.world.SimpleMenuProvider;
+import net.minecraft.world.inventory.ChestMenu;
 
 public class EnderchestCommand extends SimpleScreenCommand {
     @Override
-    protected Text getScreenTitle() {
-        return Text.translatable("container.enderchest");
+    protected Component getScreenTitle() {
+        return Component.translatable("container.enderchest");
     }
 
     @Override
-    protected @NotNull NamedScreenHandlerFactory getScreenHandlerFactory() {
-        return new SimpleNamedScreenHandlerFactory(
+    protected @NotNull MenuProvider getScreenHandlerFactory() {
+        return new SimpleMenuProvider(
             (syncId, inventory, player) ->
-                GenericContainerScreenHandler.createGeneric9x3(syncId, inventory, player.getEnderChestInventory()),
-            Text.translatable("container.enderchest")
+                ChestMenu.threeRows(syncId, inventory, player.getEnderChestInventory()),
+            Component.translatable("container.enderchest")
         );
     }
 
     @Override
-    protected void onOpen(ServerPlayerEntity player) {
-        player.incrementStat(Stats.OPEN_ENDERCHEST);
+    protected void onOpen(ServerPlayer player) {
+        player.awardStat(Stats.OPEN_ENDERCHEST);
     }
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/bench/GrindstoneCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/bench/GrindstoneCommand.java
index ffb174df..66ac386e 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/bench/GrindstoneCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/bench/GrindstoneCommand.java
@@ -3,32 +3,32 @@
 import com.fibermc.essentialcommands.screen.GrindstoneCommandScreenHandler;
 import org.jetbrains.annotations.NotNull;
 
-import net.minecraft.screen.ScreenHandlerContext;
-import net.minecraft.screen.ScreenHandlerFactory;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.stat.Stats;
-import net.minecraft.text.Text;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.stats.Stats;
+import net.minecraft.world.inventory.ContainerLevelAccess;
+import net.minecraft.world.inventory.MenuConstructor;
 
 public class GrindstoneCommand extends SimpleScreenCommand {
-    private static final ScreenHandlerFactory SCREEN_HANDLER_FACTORY = (syncId, inventory, player) ->
+    private static final MenuConstructor SCREEN_HANDLER_FACTORY = (syncId, inventory, player) ->
         new GrindstoneCommandScreenHandler(
             syncId,
             inventory,
-            ScreenHandlerContext.create(player.getEntityWorld(), player.getBlockPos())
+            ContainerLevelAccess.create(player.level(), player.blockPosition())
         );
 
     @Override
-    protected Text getScreenTitle() {
-        return Text.translatable("block.minecraft.grindstone");
+    protected Component getScreenTitle() {
+        return Component.translatable("block.minecraft.grindstone");
     }
 
     @Override
-    protected @NotNull ScreenHandlerFactory getScreenHandlerFactory() {
+    protected @NotNull MenuConstructor getScreenHandlerFactory() {
         return SCREEN_HANDLER_FACTORY;
     }
 
     @Override
-    protected void onOpen(ServerPlayerEntity player) {
-        player.incrementStat(Stats.INTERACT_WITH_GRINDSTONE);
+    protected void onOpen(ServerPlayer player) {
+        player.awardStat(Stats.INTERACT_WITH_GRINDSTONE);
     }
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/bench/SimpleScreenCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/bench/SimpleScreenCommand.java
index 0084ca93..e63e5f10 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/bench/SimpleScreenCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/bench/SimpleScreenCommand.java
@@ -7,20 +7,20 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.screen.NamedScreenHandlerFactory;
-import net.minecraft.screen.ScreenHandlerFactory;
-import net.minecraft.screen.SimpleNamedScreenHandlerFactory;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.Text;
-
-public abstract class SimpleScreenCommand implements Command<ServerCommandSource> {
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.MenuProvider;
+import net.minecraft.world.SimpleMenuProvider;
+import net.minecraft.world.inventory.MenuConstructor;
+
+public abstract class SimpleScreenCommand implements Command<CommandSourceStack> {
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        var senderPlayer = context.getSource().getPlayerOrThrow();
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        var senderPlayer = context.getSource().getPlayerOrException();
         var senderPlayerData = PlayerData.access(senderPlayer);
 
-        senderPlayer.openHandledScreen(createNamedScreenHandlerFactory());
+        senderPlayer.openMenu(createNamedScreenHandlerFactory());
 
         senderPlayerData.sendCommandFeedback("cmd.workbench.feedback", getScreenTitle());
 
@@ -29,13 +29,13 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
         return 0;
     }
 
-    protected NamedScreenHandlerFactory createNamedScreenHandlerFactory() {
-        return new SimpleNamedScreenHandlerFactory(getScreenHandlerFactory(), getScreenTitle());
+    protected MenuProvider createNamedScreenHandlerFactory() {
+        return new SimpleMenuProvider(getScreenHandlerFactory(), getScreenTitle());
     }
 
-    protected abstract Text getScreenTitle();
+    protected abstract Component getScreenTitle();
 
-    protected abstract @NotNull ScreenHandlerFactory getScreenHandlerFactory();
+    protected abstract @NotNull MenuConstructor getScreenHandlerFactory();
 
-    protected abstract void onOpen(ServerPlayerEntity player);
+    protected abstract void onOpen(ServerPlayer player);
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/bench/StonecutterCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/bench/StonecutterCommand.java
index 48470d53..c4b32949 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/bench/StonecutterCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/bench/StonecutterCommand.java
@@ -3,32 +3,32 @@
 import com.fibermc.essentialcommands.screen.StonecutterCommandScreenHandler;
 import org.jetbrains.annotations.NotNull;
 
-import net.minecraft.screen.ScreenHandlerContext;
-import net.minecraft.screen.ScreenHandlerFactory;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.stat.Stats;
-import net.minecraft.text.Text;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.stats.Stats;
+import net.minecraft.world.inventory.ContainerLevelAccess;
+import net.minecraft.world.inventory.MenuConstructor;
 
 public class StonecutterCommand extends SimpleScreenCommand {
-    private static final ScreenHandlerFactory SCREEN_HANDLER_FACTORY = (syncId, inventory, player) ->
+    private static final MenuConstructor SCREEN_HANDLER_FACTORY = (syncId, inventory, player) ->
         new StonecutterCommandScreenHandler(
             syncId,
             inventory,
-            ScreenHandlerContext.create(player.getEntityWorld(), player.getBlockPos())
+            ContainerLevelAccess.create(player.level(), player.blockPosition())
         );
 
     @Override
-    protected Text getScreenTitle() {
-        return Text.translatable("block.minecraft.stonecutter");
+    protected Component getScreenTitle() {
+        return Component.translatable("block.minecraft.stonecutter");
     }
 
     @Override
-    protected @NotNull ScreenHandlerFactory getScreenHandlerFactory() {
+    protected @NotNull MenuConstructor getScreenHandlerFactory() {
         return SCREEN_HANDLER_FACTORY;
     }
 
     @Override
-    protected void onOpen(ServerPlayerEntity player) {
-        player.incrementStat(Stats.INTERACT_WITH_STONECUTTER);
+    protected void onOpen(ServerPlayer player) {
+        player.awardStat(Stats.INTERACT_WITH_STONECUTTER);
     }
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/bench/WastebinCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/bench/WastebinCommand.java
index 5928c694..7b120277 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/bench/WastebinCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/bench/WastebinCommand.java
@@ -4,28 +4,28 @@
 import com.fibermc.essentialcommands.text.TextFormatType;
 import org.jetbrains.annotations.NotNull;
 
-import net.minecraft.inventory.SimpleInventory;
-import net.minecraft.screen.GenericContainerScreenHandler;
-import net.minecraft.screen.ScreenHandlerFactory;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.Text;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.SimpleContainer;
+import net.minecraft.world.inventory.ChestMenu;
+import net.minecraft.world.inventory.MenuConstructor;
 
 public class WastebinCommand extends SimpleScreenCommand {
-    private static final ScreenHandlerFactory SCREEN_HANDLER_FACTORY = (syncId, inventory, player) ->
-        GenericContainerScreenHandler.createGeneric9x3(syncId, inventory, new SimpleInventory(27));
+    private static final MenuConstructor SCREEN_HANDLER_FACTORY = (syncId, inventory, player) ->
+        ChestMenu.threeRows(syncId, inventory, new SimpleContainer(27));
 
     @Override
-    protected Text getScreenTitle() {
+    protected Component getScreenTitle() {
         return ECText.getInstance().getText("cmd.wastebin.name", TextFormatType.Empty);
     }
 
     @Override
-    protected @NotNull ScreenHandlerFactory getScreenHandlerFactory() {
+    protected @NotNull MenuConstructor getScreenHandlerFactory() {
         return SCREEN_HANDLER_FACTORY;
     }
 
     @Override
-    protected void onOpen(ServerPlayerEntity player) {
+    protected void onOpen(ServerPlayer player) {
 
     }
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/bench/WorkbenchCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/bench/WorkbenchCommand.java
index fa9f7598..75bf7557 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/bench/WorkbenchCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/bench/WorkbenchCommand.java
@@ -3,32 +3,32 @@
 import com.fibermc.essentialcommands.screen.CraftingCommandScreenHandler;
 import org.jetbrains.annotations.NotNull;
 
-import net.minecraft.screen.ScreenHandlerContext;
-import net.minecraft.screen.ScreenHandlerFactory;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.stat.Stats;
-import net.minecraft.text.Text;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.stats.Stats;
+import net.minecraft.world.inventory.ContainerLevelAccess;
+import net.minecraft.world.inventory.MenuConstructor;
 
 public class WorkbenchCommand extends SimpleScreenCommand {
-    private static final ScreenHandlerFactory SCREEN_HANDLER_FACTORY = (syncId, inventory, player) ->
+    private static final MenuConstructor SCREEN_HANDLER_FACTORY = (syncId, inventory, player) ->
         new CraftingCommandScreenHandler(
             syncId,
             inventory,
-            ScreenHandlerContext.create(player.getEntityWorld(), player.getBlockPos())
+            ContainerLevelAccess.create(player.level(), player.blockPosition())
         );
 
     @Override
-    protected Text getScreenTitle() {
-        return Text.translatable("block.minecraft.crafting_table");
+    protected Component getScreenTitle() {
+        return Component.translatable("block.minecraft.crafting_table");
     }
 
     @Override
-    protected @NotNull ScreenHandlerFactory getScreenHandlerFactory() {
+    protected @NotNull MenuConstructor getScreenHandlerFactory() {
         return SCREEN_HANDLER_FACTORY;
     }
 
     @Override
-    protected void onOpen(ServerPlayerEntity player) {
-        player.incrementStat(Stats.INTERACT_WITH_CRAFTING_TABLE);
+    protected void onOpen(ServerPlayer player) {
+        player.awardStat(Stats.INTERACT_WITH_CRAFTING_TABLE);
     }
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/helpers/FeedbackReceiver.java b/src/main/java/com/fibermc/essentialcommands/commands/helpers/FeedbackReceiver.java
index 18e90c46..f19715b0 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/helpers/FeedbackReceiver.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/helpers/FeedbackReceiver.java
@@ -4,20 +4,20 @@
 import com.fibermc.essentialcommands.text.ECText;
 import com.fibermc.essentialcommands.text.TextFormatType;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.text.Text;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.chat.Component;
 
 import static com.fibermc.essentialcommands.EssentialCommands.CONFIG;
 
 public final class FeedbackReceiver implements IFeedbackReceiver {
 
-    private final ServerCommandSource commandSource;
+    private final CommandSourceStack commandSource;
 
-    private FeedbackReceiver(ServerCommandSource commandSource) {
+    private FeedbackReceiver(CommandSourceStack commandSource) {
         this.commandSource = commandSource;
     }
 
-    public static IFeedbackReceiver ofSource(ServerCommandSource commandSource) {
+    public static IFeedbackReceiver ofSource(CommandSourceStack commandSource) {
         var player = commandSource.getPlayer();
         return player != null
             ? PlayerData.access(player)
@@ -25,21 +25,21 @@ public static IFeedbackReceiver ofSource(ServerCommandSource commandSource) {
     }
 
     @Override
-    public void sendCommandFeedback(Text text) {
-        commandSource.sendFeedback(() -> text, CONFIG.BROADCAST_TO_OPS);
+    public void sendCommandFeedback(Component text) {
+        commandSource.sendSuccess(() -> text, CONFIG.BROADCAST_TO_OPS);
     }
 
     @Override
-    public void sendCommandFeedback(String messageKey, Text... args) {
+    public void sendCommandFeedback(String messageKey, Component... args) {
         sendCommandFeedback(ECText.getInstance().getText(messageKey, TextFormatType.Default, args));
     }
 
-    public void sendCommandError(Text text) {
-        commandSource.sendError(text);
+    public void sendCommandError(Component text) {
+        commandSource.sendFailure(text);
     }
 
     @Override
-    public void sendCommandError(String messageKey, Text... args) {
+    public void sendCommandError(String messageKey, Component... args) {
         sendCommandError(ECText.getInstance().getText(messageKey, TextFormatType.Error, args));
     }
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/helpers/HeightFinder.java b/src/main/java/com/fibermc/essentialcommands/commands/helpers/HeightFinder.java
index d54bc527..279e7214 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/helpers/HeightFinder.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/helpers/HeightFinder.java
@@ -2,7 +2,7 @@
 
 import java.util.OptionalInt;
 
-import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.level.chunk.ChunkAccess;
 
 @FunctionalInterface
 public interface HeightFinder {
@@ -11,6 +11,6 @@ public interface HeightFinder {
      *
      * @return A Y value corresponding to the player's feet pos
      */
-    OptionalInt getY(Chunk chunk, int x, int z);
+    OptionalInt getY(ChunkAccess chunk, int x, int z);
 }
 
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/helpers/HeightFindingStrategy.java b/src/main/java/com/fibermc/essentialcommands/commands/helpers/HeightFindingStrategy.java
index 899899df..50935d31 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/helpers/HeightFindingStrategy.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/helpers/HeightFindingStrategy.java
@@ -4,13 +4,13 @@
 
 import com.fibermc.essentialcommands.commands.utility.TopCommand;
 
-import net.minecraft.block.BlockState;
-import net.minecraft.registry.RegistryKey;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.ChunkSectionPos;
-import net.minecraft.util.math.Direction;
-import net.minecraft.world.World;
-import net.minecraft.world.chunk.Chunk;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.core.SectionPos;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.chunk.ChunkAccess;
 
 public enum HeightFindingStrategy implements HeightFinder {
     SKY_TO_SURFACE__FIRST_SOLID(TopCommand::getTop),
@@ -24,11 +24,11 @@ public enum HeightFindingStrategy implements HeightFinder {
         this.heightFinder = heightFinder;
     }
 
-    public static HeightFindingStrategy forWorld(RegistryKey<World> worldRegistryKey) {
-        if (worldRegistryKey == World.OVERWORLD || worldRegistryKey == World.END) {
+    public static HeightFindingStrategy forWorld(ResourceKey<Level> worldRegistryKey) {
+        if (worldRegistryKey == Level.OVERWORLD || worldRegistryKey == Level.END) {
             return HeightFindingStrategy.SKY_TO_SURFACE__FIRST_SOLID;
         }
-        if (worldRegistryKey == World.NETHER) {
+        if (worldRegistryKey == Level.NETHER) {
             return HeightFindingStrategy.BOTTOM_TO_SKY__FIRST_SAFE_AIR;
         }
 
@@ -37,18 +37,18 @@ public static HeightFindingStrategy forWorld(RegistryKey<World> worldRegistryKey
     }
 
     @Override
-    public OptionalInt getY(Chunk chunk, int x, int z) {
+    public OptionalInt getY(ChunkAccess chunk, int x, int z) {
         return heightFinder.getY(chunk, x, z);
     }
 
-    private static OptionalInt findYBottomUp(Chunk chunk, int x, int z) {
+    private static OptionalInt findYBottomUp(ChunkAccess chunk, int x, int z) {
         final int topY = getChunkHighestNonEmptySectionYOffsetOrTopY(chunk);
-        final int bottomY = chunk.getBottomY();
+        final int bottomY = chunk.getMinY();
         if (topY <= bottomY) {
             return OptionalInt.empty();
         }
 
-        final BlockPos.Mutable mutablePos = new BlockPos.Mutable(x, bottomY, z);
+        final BlockPos.MutableBlockPos mutablePos = new BlockPos.MutableBlockPos(x, bottomY, z);
         BlockState bsFeet1 = chunk.getBlockState(mutablePos); // Block below feet
         BlockState bsBody2 = chunk.getBlockState(mutablePos.move(Direction.UP)); // Block at feet level
         BlockState bsHead3; // Block at head level
@@ -66,8 +66,8 @@ private static OptionalInt findYBottomUp(Chunk chunk, int x, int z) {
         return OptionalInt.empty();
     }
 
-    public static int getChunkHighestNonEmptySectionYOffsetOrTopY(Chunk chunk) {
-        int i = chunk.getHighestNonEmptySection();
-        return i == chunk.getTopYInclusive() ? chunk.getBottomY() : ChunkSectionPos.getBlockCoord(chunk.sectionIndexToCoord(i));
+    public static int getChunkHighestNonEmptySectionYOffsetOrTopY(ChunkAccess chunk) {
+        int i = chunk.getHighestFilledSectionIndex();
+        return i == chunk.getMaxY() ? chunk.getMinY() : SectionPos.sectionToBlockCoord(chunk.getSectionYFromSectionIndex(i));
     }
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/helpers/IFeedbackReceiver.java b/src/main/java/com/fibermc/essentialcommands/commands/helpers/IFeedbackReceiver.java
index a902c5c1..fec9aa19 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/helpers/IFeedbackReceiver.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/helpers/IFeedbackReceiver.java
@@ -1,13 +1,13 @@
 package com.fibermc.essentialcommands.commands.helpers;
 
-import net.minecraft.text.Text;
+import net.minecraft.network.chat.Component;
 
 public interface IFeedbackReceiver {
-    void sendCommandFeedback(Text text);
+    void sendCommandFeedback(Component text);
 
-    void sendCommandFeedback(String messageKey, Text... args);
+    void sendCommandFeedback(String messageKey, Component... args);
 
-    void sendCommandError(Text text);
+    void sendCommandError(Component text);
 
-    void sendCommandError(String messageKey, Text... args);
+    void sendCommandError(String messageKey, Component... args);
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/suggestions/ListSuggestion.java b/src/main/java/com/fibermc/essentialcommands/commands/suggestions/ListSuggestion.java
index 3c94c587..343867d0 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/suggestions/ListSuggestion.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/suggestions/ListSuggestion.java
@@ -13,7 +13,7 @@
 import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 
-import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.commands.CommandSourceStack;
 
 public final class ListSuggestion {
     private ListSuggestion() {}
@@ -34,8 +34,8 @@ public static CompletableFuture<Suggestions> buildSuggestions(SuggestionsBuilder
     }
 
     @Contract(pure = true)
-    public static @NotNull SuggestionProvider<ServerCommandSource> of(Supplier<Collection<String>> suggestionCollection) {
-        return (CommandContext<ServerCommandSource> context, SuggestionsBuilder builder)
+    public static @NotNull SuggestionProvider<CommandSourceStack> of(Supplier<Collection<String>> suggestionCollection) {
+        return (CommandContext<CommandSourceStack> context, SuggestionsBuilder builder)
             -> buildSuggestions(builder, suggestionCollection.get());
     }
 
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/suggestions/NicknamePlayersSuggestion.java b/src/main/java/com/fibermc/essentialcommands/commands/suggestions/NicknamePlayersSuggestion.java
index 152fddd4..80d606cd 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/suggestions/NicknamePlayersSuggestion.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/suggestions/NicknamePlayersSuggestion.java
@@ -7,20 +7,20 @@
 
 import com.mojang.brigadier.suggestion.SuggestionProvider;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.text.MutableText;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.chat.MutableComponent;
 
 public final class NicknamePlayersSuggestion {
     private NicknamePlayersSuggestion() {}
 
     //Brigader Suggestions
-    public static final SuggestionProvider<ServerCommandSource> STRING_SUGGESTIONS_PROVIDER =
+    public static final SuggestionProvider<CommandSourceStack> STRING_SUGGESTIONS_PROVIDER =
         ListSuggestion.ofContext(context ->
             PlayerDataManager.getInstance().getAllPlayerData().stream()
                 .map(PlayerData::getNickname)
                 .filter(Optional::isPresent)
                 .map(Optional::get)
-                .map(MutableText::getString)
+                .map(MutableComponent::getString)
                 .sorted(String.CASE_INSENSITIVE_ORDER)
                 .toList()
         );
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/suggestions/OfflinePlayerRepo.java b/src/main/java/com/fibermc/essentialcommands/commands/suggestions/OfflinePlayerRepo.java
index e18ac478..aea35333 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/suggestions/OfflinePlayerRepo.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/suggestions/OfflinePlayerRepo.java
@@ -9,10 +9,9 @@
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.yggdrasil.response.NameAndId;
 
-import net.minecraft.network.packet.c2s.common.SyncedClientOptions;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.PlayerConfigEntry;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.level.ClientInformation;
+import net.minecraft.server.level.ServerPlayer;
 
 public class OfflinePlayerRepo {
 
@@ -23,19 +22,19 @@ public OfflinePlayerRepo(MinecraftServer server) {
         this.server = server;
     }
 
-    public CompletableFuture<ServerPlayerEntity> getOfflinePlayerByNameAsync(String playerName) {
+    public CompletableFuture<ServerPlayer> getOfflinePlayerByNameAsync(String playerName) {
         return getGameProfile(playerName)
             .handle(((gameProfile, throwable) -> gameProfile.map(this::getOfflinePlayer).orElse(null)));
     }
 
-    public ServerPlayerEntity getOfflinePlayer(NameAndId playerProfile) {
-        var player = new ServerPlayerEntity(
+    public ServerPlayer getOfflinePlayer(NameAndId playerProfile) {
+        var player = new ServerPlayer(
             server,
-            server.getOverworld(),
+            server.overworld(),
             new GameProfile(playerProfile.id(), playerProfile.name()),
-            SyncedClientOptions.createDefault());
+            ClientInformation.createDefault());
 
-        server.getPlayerManager().loadPlayerData(new PlayerConfigEntry(playerProfile.id(), playerProfile.name()));
+        server.getPlayerList().loadPlayerData(new net.minecraft.server.players.NameAndId(playerProfile.id(), playerProfile.name()));
 
         return player;
     }
@@ -58,7 +57,7 @@ private CompletableFuture<Optional<NameAndId>> requestGameProfile(String playerN
 
         gameProfileExecutor.execute(() -> {
             try {
-                completable.complete(server.getApiServices().profileRepository().findProfileByName(playerName));
+                completable.complete(server.services().profileRepository().findProfileByName(playerName));
             } catch (Exception ex) {
                 completable.completeExceptionally(ex);
             }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/suggestions/SuggestionListProvider.java b/src/main/java/com/fibermc/essentialcommands/commands/suggestions/SuggestionListProvider.java
index f2317185..34ffacc5 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/suggestions/SuggestionListProvider.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/suggestions/SuggestionListProvider.java
@@ -5,9 +5,9 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.commands.CommandSourceStack;
 
 @FunctionalInterface
 public interface SuggestionListProvider<T> {
-    Collection<T> getSuggestionList(CommandContext<ServerCommandSource> context) throws CommandSyntaxException;
+    Collection<T> getSuggestionList(CommandContext<CommandSourceStack> context) throws CommandSyntaxException;
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/suggestions/TeleportResponseSuggestion.java b/src/main/java/com/fibermc/essentialcommands/commands/suggestions/TeleportResponseSuggestion.java
index e6b11423..c2a68167 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/suggestions/TeleportResponseSuggestion.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/suggestions/TeleportResponseSuggestion.java
@@ -7,14 +7,14 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.suggestion.SuggestionProvider;
 
-import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.commands.CommandSourceStack;
 
 public final class TeleportResponseSuggestion {
     private TeleportResponseSuggestion() {}
 
     //Brigader Suggestions
-    public static final SuggestionProvider<ServerCommandSource> STRING_SUGGESTIONS_PROVIDER
-        = ListSuggestion.ofContext((CommandContext<ServerCommandSource> context) ->
+    public static final SuggestionProvider<CommandSourceStack> STRING_SUGGESTIONS_PROVIDER
+        = ListSuggestion.ofContext((CommandContext<CommandSourceStack> context) ->
         ((ServerPlayerEntityAccess) context.getSource().getPlayer()).ec$getPlayerData().getIncomingTeleportRequests().values()
             .stream().map((entry) -> entry.getSenderPlayer().getGameProfile().name())
             .collect(Collectors.toList())
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/suggestions/WarpSuggestion.java b/src/main/java/com/fibermc/essentialcommands/commands/suggestions/WarpSuggestion.java
index db5ac8b0..d73c086d 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/suggestions/WarpSuggestion.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/suggestions/WarpSuggestion.java
@@ -5,17 +5,17 @@
 
 import com.mojang.brigadier.suggestion.SuggestionProvider;
 
-import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.commands.CommandSourceStack;
 
 public final class WarpSuggestion {
     private WarpSuggestion() {}
 
     //Brigader Suggestions
-    public static final SuggestionProvider<ServerCommandSource> STRING_SUGGESTIONS_PROVIDER
+    public static final SuggestionProvider<CommandSourceStack> STRING_SUGGESTIONS_PROVIDER
         = ListSuggestion.ofContext(
             (ctx) -> ManagerLocator.getInstance()
                 .getWorldDataManager()
-                .getAccessibleWarps(ctx.getSource().getPlayerOrThrow())
+                .getAccessibleWarps(ctx.getSource().getPlayerOrException())
                 .map(WarpLocation::getName)
                 .toList()
         );
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/utility/DayCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/utility/DayCommand.java
index 843f50b1..49179e97 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/utility/DayCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/utility/DayCommand.java
@@ -6,23 +6,23 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.world.ServerWorld;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.level.ServerLevel;
 
-public class DayCommand implements Command<ServerCommandSource> {
+public class DayCommand implements Command<CommandSourceStack> {
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        ServerCommandSource source = context.getSource();
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        CommandSourceStack source = context.getSource();
         PlayerData playerData = PlayerData.accessFromContextOrThrow(context);
-        ServerWorld world = source.getServer().getOverworld();
-        if (world.isDay()) {
+        ServerLevel world = source.getServer().overworld();
+        if (world.isBrightOutside()) {
             playerData.sendCommandFeedback("cmd.day.error.already_daytime");
             return -1;
         }
-        long time = world.getTimeOfDay();
+        long time = world.getDayTime();
         long timeToDay = 24000L - time % 24000L;
 
-        world.setTimeOfDay(time + timeToDay);
+        world.setDayTime(time + timeToDay);
         playerData.sendCommandFeedback("cmd.day.feedback");
         return 1;
     }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/utility/ExtinguishCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/utility/ExtinguishCommand.java
index db63a3fe..1d1b7606 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/utility/ExtinguishCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/utility/ExtinguishCommand.java
@@ -7,21 +7,21 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.level.ServerPlayer;
 
-public class ExtinguishCommand implements Command<ServerCommandSource> {
+public class ExtinguishCommand implements Command<CommandSourceStack> {
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         PlayerData senderPlayerData = PlayerData.accessFromContextOrThrow(context);
-        ServerPlayerEntity targetPlayer = CommandUtil.getCommandTargetPlayer(context);
+        ServerPlayer targetPlayer = CommandUtil.getCommandTargetPlayer(context);
 
         if (!targetPlayer.isOnFire()) {
             senderPlayerData.sendCommandError("cmd.extinguish.error.not_on_fire");
             return 0;
         }
 
-        targetPlayer.setFireTicks(0);
+        targetPlayer.setRemainingFireTicks(0);
 
         senderPlayerData.sendCommandFeedback("cmd.extinguish.feedback");
 
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/utility/FeedCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/utility/FeedCommand.java
index 40255896..33eafd37 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/utility/FeedCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/utility/FeedCommand.java
@@ -7,24 +7,24 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.entity.player.HungerManager;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.food.FoodData;
 
-public class FeedCommand implements Command<ServerCommandSource> {
+public class FeedCommand implements Command<CommandSourceStack> {
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         PlayerData senderPlayerData = PlayerData.accessFromContextOrThrow(context);
-        ServerPlayerEntity targetPlayer = CommandUtil.getCommandTargetPlayer(context);
+        ServerPlayer targetPlayer = CommandUtil.getCommandTargetPlayer(context);
 
-        HungerManager hungerManager = targetPlayer.getHungerManager();
-        if (!hungerManager.isNotFull()) {
+        FoodData hungerManager = targetPlayer.getFoodData();
+        if (!hungerManager.needsFood()) {
             senderPlayerData.sendCommandError("cmd.feed.error.full");
             return 0;
         }
 
         hungerManager.setFoodLevel(20);
-        hungerManager.setSaturationLevel(5);
+        hungerManager.setSaturation(5);
 //        hungerManager.setExhaustion(0);
         // idk, you ca only add to it now
 
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/utility/GametimeCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/utility/GametimeCommand.java
index 5130aa48..bd63ca03 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/utility/GametimeCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/utility/GametimeCommand.java
@@ -9,11 +9,11 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.text.HoverEvent;
-import net.minecraft.text.Text;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.HoverEvent;
 
-public class GametimeCommand implements Command<ServerCommandSource> {
+public class GametimeCommand implements Command<CommandSourceStack> {
 
     private final String modVersion = EssentialCommands.MOD_METADATA.getVersion().getFriendlyString();
     private static final int TICKS_PER_SECOND = 20;
@@ -25,11 +25,11 @@ public class GametimeCommand implements Command<ServerCommandSource> {
     private static final int MINUTES_PER_DAY = HOURS_PER_DAY * MINUTES_PER_HOUR;
 
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        Text t = getFormattedTime(
-                context.getSource().getWorld().getTimeOfDay(),
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        Component t = getFormattedTime(
+                context.getSource().getLevel().getDayTime(),
                 PlayerProfile.accessFromContextOrThrow(context));
-        context.getSource().sendFeedback(() -> t, false);
+        context.getSource().sendSuccess(() -> t, false);
 
         return 0;
     }
@@ -46,12 +46,12 @@ private static String formatGameTimeOfDay(long tickTime) {
         );
     }
 
-    private static Text getFormattedTime(long time, IStyleProvider styleProvider) {
-        return Text.translatable(
+    private static Component getFormattedTime(long time, IStyleProvider styleProvider) {
+        return Component.translatable(
                 "commands.time.query",
-                Text.literal(formatGameTimeOfDay(time)).setStyle(styleProvider.getStyle(TextFormatType.Accent)))
+                Component.literal(formatGameTimeOfDay(time)).setStyle(styleProvider.getStyle(TextFormatType.Accent)))
             .setStyle(styleProvider.getStyle(TextFormatType.Default)
                 .withHoverEvent(
-                    new HoverEvent.ShowText(Text.literal(String.valueOf(time % 24000L)))));
+                    new HoverEvent.ShowText(Component.literal(String.valueOf(time % 24000L)))));
     }
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/utility/HealCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/utility/HealCommand.java
index a2ebed9d..3afa601c 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/utility/HealCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/utility/HealCommand.java
@@ -7,14 +7,14 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.level.ServerPlayer;
 
-public class HealCommand implements Command<ServerCommandSource> {
+public class HealCommand implements Command<CommandSourceStack> {
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         PlayerData senderPlayerData = PlayerData.accessFromContextOrThrow(context);
-        ServerPlayerEntity targetPlayer = CommandUtil.getCommandTargetPlayer(context);
+        ServerPlayer targetPlayer = CommandUtil.getCommandTargetPlayer(context);
 
         float currentHealth = targetPlayer.getHealth();
         float maxHealth = targetPlayer.getMaxHealth();
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/utility/NearCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/utility/NearCommand.java
index 8965c2a7..ccdf78eb 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/utility/NearCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/utility/NearCommand.java
@@ -13,26 +13,26 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.Text;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.phys.Vec3;
 
 import dev.jpcode.eccore.util.TextUtil;
 
-public class NearCommand implements Command<ServerCommandSource> {
+public class NearCommand implements Command<CommandSourceStack> {
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         PlayerData senderPlayerData = PlayerData.accessFromContextOrThrow(context);
-        ServerPlayerEntity targetPlayer = CommandUtil.getCommandTargetPlayer(context);
+        ServerPlayer targetPlayer = CommandUtil.getCommandTargetPlayer(context);
 
         return exec(senderPlayerData, targetPlayer, EssentialCommands.CONFIG.NEAR_COMMAND_DEFAULT_RADIUS);
     }
 
-    public static int withRange(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public static int withRange(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         PlayerData senderPlayerData = PlayerData.accessFromContextOrThrow(context);
-        ServerPlayerEntity targetPlayer = CommandUtil.getCommandTargetPlayer(context);
+        ServerPlayer targetPlayer = CommandUtil.getCommandTargetPlayer(context);
 
         int range = IntegerArgumentType.getInteger(context, "range");
 
@@ -46,20 +46,20 @@ public static int withRange(CommandContext<ServerCommandSource> context) throws
         return exec(senderPlayerData, targetPlayer, range);
     }
 
-    public static int exec(PlayerData senderPlayerData, ServerPlayerEntity targetPlayer, int range) {
-        Vec3d basePos = targetPlayer.getEntityPos();
+    public static int exec(PlayerData senderPlayerData, ServerPlayer targetPlayer, int range) {
+        Vec3 basePos = targetPlayer.position();
 
-        List<Text> players = targetPlayer.getEntityWorld().getPlayers().stream()
+        List<Component> players = targetPlayer.level().players().stream()
             .filter(player ->
-                targetPlayer.getUuid() != player.getUuid()
-                && basePos.isInRange(player.getEntityPos(), range)
-                && (!EssentialCommands.VANISH_PRESENT || VanishAPI.canSeePlayer((ServerPlayerEntity) player, senderPlayerData.getPlayer()))
+                targetPlayer.getUUID() != player.getUUID()
+                && basePos.closerThan(player.position(), range)
+                && (!EssentialCommands.VANISH_PRESENT || VanishAPI.canSeePlayer((ServerPlayer) player, senderPlayerData.getPlayer()))
             )
-            .map(PlayerEntity::getDisplayName)
+            .map(Player::getDisplayName)
             .toList();
 
         if (players.isEmpty()) senderPlayerData.sendCommandFeedback("cmd.near.feedback.empty");
-        else senderPlayerData.sendCommandFeedback("cmd.near.feedback.list", TextUtil.join(players, Text.literal(", ")));
+        else senderPlayerData.sendCommandFeedback("cmd.near.feedback.list", TextUtil.join(players, Component.literal(", ")));
 
         return SINGLE_SUCCESS;
     }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/utility/NightCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/utility/NightCommand.java
index 2ee25751..390bb49c 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/utility/NightCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/utility/NightCommand.java
@@ -6,23 +6,23 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.world.ServerWorld;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.level.ServerLevel;
 
-public class NightCommand implements Command<ServerCommandSource> {
+public class NightCommand implements Command<CommandSourceStack> {
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        ServerCommandSource source = context.getSource();
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        CommandSourceStack source = context.getSource();
         PlayerData playerData = PlayerData.accessFromContextOrThrow(context);
-        ServerWorld world = source.getServer().getOverworld();
-        if (world.isNight()) {
+        ServerLevel world = source.getServer().overworld();
+        if (world.isDarkOutside()) {
             playerData.sendCommandFeedback("cmd.night.error.already_nighttime");
             return -1;
         }
-        long time = world.getTimeOfDay();
+        long time = world.getDayTime();
         long timeToNight = 13000L - time % 24000L;
 
-        world.setTimeOfDay(time + timeToNight);
+        world.setDayTime(time + timeToNight);
         playerData.sendCommandFeedback("cmd.night.feedback");
         return 1;
     }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/utility/RepairCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/utility/RepairCommand.java
index 0e74aa5d..4c1ced68 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/utility/RepairCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/utility/RepairCommand.java
@@ -7,24 +7,24 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.item.ItemStack;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.item.ItemStack;
 
-public class RepairCommand implements Command<ServerCommandSource> {
+public class RepairCommand implements Command<CommandSourceStack> {
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
         PlayerData senderPlayerData = PlayerData.accessFromContextOrThrow(context);
-        ServerPlayerEntity targetPlayer = CommandUtil.getCommandTargetPlayer(context);
+        ServerPlayer targetPlayer = CommandUtil.getCommandTargetPlayer(context);
 
-        ItemStack itemStack = targetPlayer.getMainHandStack();
+        ItemStack itemStack = targetPlayer.getMainHandItem();
 
         if (!itemStack.isDamaged()) {
             senderPlayerData.sendCommandError("cmd.repair.error.not_damaged");
             return 0;
         }
 
-        itemStack.setDamage(0);
+        itemStack.setDamageValue(0);
 
         senderPlayerData.sendCommandFeedback("cmd.repair.feedback");
 
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/utility/SuicideCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/utility/SuicideCommand.java
index 333a82fd..bfee9c80 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/utility/SuicideCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/utility/SuicideCommand.java
@@ -7,21 +7,21 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.level.ServerPlayer;
 
-public class SuicideCommand implements Command<ServerCommandSource> {
+public class SuicideCommand implements Command<CommandSourceStack> {
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        ServerPlayerEntity player = context.getSource().getPlayer();
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        ServerPlayer player = context.getSource().getPlayer();
         PlayerData playerData = ((ServerPlayerEntityAccess) player).ec$getPlayerData();
 
-        if (player.isDead()) {
+        if (player.isDeadOrDying()) {
             playerData.sendCommandError("cmd.suicide.error.already_dead");
             return 0;
         }
 
-        player.kill(player.getEntityWorld());
+        player.kill(player.level());
 
         return SINGLE_SUCCESS;
     }
diff --git a/src/main/java/com/fibermc/essentialcommands/commands/utility/TopCommand.java b/src/main/java/com/fibermc/essentialcommands/commands/utility/TopCommand.java
index 231f49a0..40db8747 100644
--- a/src/main/java/com/fibermc/essentialcommands/commands/utility/TopCommand.java
+++ b/src/main/java/com/fibermc/essentialcommands/commands/utility/TopCommand.java
@@ -10,22 +10,22 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Direction;
-import net.minecraft.world.World;
-import net.minecraft.world.chunk.Chunk;
-import net.minecraft.world.chunk.ChunkSection;
-
-public class TopCommand implements Command<ServerCommandSource> {
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.LevelChunkSection;
+
+public class TopCommand implements Command<CommandSourceStack> {
     @SuppressWarnings("checkstyle:LocalVariableName")
     @Override
-    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
-        ServerCommandSource source = context.getSource();
-        ServerPlayerEntity player = source.getPlayerOrThrow();
-        World world = source.getWorld();
-        BlockPos playerPos = player.getBlockPos();
+    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+        CommandSourceStack source = context.getSource();
+        ServerPlayer player = source.getPlayerOrException();
+        Level world = source.getLevel();
+        BlockPos playerPos = player.blockPosition();
 
         OptionalInt new_y;
         int new_x = playerPos.getX();
@@ -33,7 +33,7 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
 
         final BlockPos targetXZ = new BlockPos(new_x, 0, new_z);
 
-        Chunk chunk = world.getChunk(targetXZ);
+        ChunkAccess chunk = world.getChunk(targetXZ);
         new_y = getTop(chunk, new_x, new_z);
 
         if (new_y.isEmpty()) {
@@ -43,21 +43,21 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
         // Teleport the player
         PlayerTeleporter.requestTeleport(
             player,
-            new MinecraftLocation(world.getRegistryKey(), new_x, new_y.getAsInt(), new_z, player.getHeadYaw(), player.getPitch()),
+            new MinecraftLocation(world.dimension(), new_x, new_y.getAsInt(), new_z, player.getYHeadRot(), player.getXRot()),
             ECText.access(player).getText("cmd.top.location_name")
         );
 
         return 0;
     }
 
-    public static OptionalInt getTop(Chunk chunk, int x, int z) {
+    public static OptionalInt getTop(ChunkAccess chunk, int x, int z) {
         final int maxY = calculateMaxY(chunk);
-        final int bottomY = chunk.getBottomY();
+        final int bottomY = chunk.getMinY();
         if (maxY <= bottomY) {
             return OptionalInt.empty();
         }
 
-        final BlockPos.Mutable mutablePos = new BlockPos.Mutable(x, maxY, z);
+        final BlockPos.MutableBlockPos mutablePos = new BlockPos.MutableBlockPos(x, maxY, z);
         boolean isAir1 = chunk.getBlockState(mutablePos).isAir(); // Block at head level
         boolean isAir2 = chunk.getBlockState(mutablePos.move(Direction.DOWN)).isAir(); // Block at feet level
         boolean isAir3; // Block below feet
@@ -75,13 +75,13 @@ public static OptionalInt getTop(Chunk chunk, int x, int z) {
         return OptionalInt.empty();
     }
 
-    private static int calculateMaxY(Chunk chunk) {
-        final int maxY = chunk.getTopYInclusive();
-        ChunkSection[] sections = chunk.getSectionArray();
+    private static int calculateMaxY(ChunkAccess chunk) {
+        final int maxY = chunk.getMaxY();
+        LevelChunkSection[] sections = chunk.getSections();
         int maxSectionIndex = Math.min(sections.length - 1, maxY >> 4);
 
         for (int index = maxSectionIndex; index >= 0; --index) {
-            if (!sections[index].isEmpty()) {
+            if (!sections[index].hasOnlyAir()) {
                 return Math.min(index << 4 + 15, maxY);
             }
         }
diff --git a/src/main/java/com/fibermc/essentialcommands/config/EssentialCommandsConfig.java b/src/main/java/com/fibermc/essentialcommands/config/EssentialCommandsConfig.java
index ed500472..908542ed 100644
--- a/src/main/java/com/fibermc/essentialcommands/config/EssentialCommandsConfig.java
+++ b/src/main/java/com/fibermc/essentialcommands/config/EssentialCommandsConfig.java
@@ -6,7 +6,12 @@
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.Style;
+import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.level.Level;
 import com.fibermc.essentialcommands.ECPerms;
 import com.fibermc.essentialcommands.EssentialCommands;
 import com.fibermc.essentialcommands.ManagerLocator;
@@ -14,14 +19,6 @@
 import com.fibermc.essentialcommands.types.RespawnCondition;
 import com.fibermc.essentialcommands.types.RtpCenter;
 import org.jetbrains.annotations.NotNull;
-
-import net.minecraft.registry.RegistryKey;
-import net.minecraft.text.Style;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
-import net.minecraft.util.Identifier;
-import net.minecraft.world.World;
-
 import dev.jpcode.eccore.config.Config;
 import dev.jpcode.eccore.config.ConfigOption;
 import dev.jpcode.eccore.config.ConfigUtil;
@@ -41,7 +38,7 @@ public final class EssentialCommandsConfig extends Config<EssentialCommandsConfi
     @ConfigOption public final Option<Style> FORMATTING_DEFAULT =     new Option<>("formatting_default", parseStyle("gold"), ConfigUtil::parseStyle, ConfigUtil::serializeStyle);
     @ConfigOption public final Option<Style> FORMATTING_ACCENT =      new Option<>("formatting_accent", parseStyle("light_purple"), ConfigUtil::parseStyle, ConfigUtil::serializeStyle);
     @ConfigOption public final Option<Style> FORMATTING_ERROR =       new Option<>("formatting_error", parseStyle("red"), ConfigUtil::parseStyle, ConfigUtil::serializeStyle);
-    @ConfigOption public final Option<Text>  NICKNAME_PREFIX =        new Option<>("nickname_prefix", parseText("{\"text\":\"~\",\"color\":\"red\"}"), TextUtil::parseText, TextUtil::toJsonString);
+    @ConfigOption public final Option<Component>  NICKNAME_PREFIX =        new Option<>("nickname_prefix", parseText("{\"text\":\"~\",\"color\":\"red\"}"), TextUtil::parseText, TextUtil::toJsonString);
     @ConfigOption public final Option<Boolean> ENABLE_BACK =            new Option<>("enable_back", true, Boolean::parseBoolean);
     @ConfigOption public final Option<Boolean> ENABLE_HOME =            new Option<>("enable_home", true, Boolean::parseBoolean);
     @ConfigOption public final Option<Boolean> ENABLE_SPAWN =           new Option<>("enable_spawn", true, Boolean::parseBoolean);
@@ -94,13 +91,13 @@ public final class EssentialCommandsConfig extends Config<EssentialCommandsConfi
     @ConfigOption public final Option<Integer> RTP_MIN_RADIUS =         new Option<>("rtp_min_radius", RTP_RADIUS.getValue(), (String s) -> parseIntOrDefault(s, RTP_RADIUS.getValue()));
     @ConfigOption public final Option<Integer> RTP_COOLDOWN =           new Option<>("rtp_cooldown", 30, ConfigUtil::parseInt);
     @ConfigOption public final Option<Integer> RTP_MAX_ATTEMPTS =       new Option<>("rtp_max_attempts", 15, ConfigUtil::parseInt);
-    @ConfigOption public final Option<List<String>> RTP_ENABLED_WORLDS = new Option<>("rtp_enabled_worlds", List.of(World.OVERWORLD.getValue().getPath()), arrayParser(Object::toString));
+    @ConfigOption public final Option<List<String>> RTP_ENABLED_WORLDS = new Option<>("rtp_enabled_worlds", List.of(Level.OVERWORLD.identifier().getPath()), arrayParser(Object::toString));
     @ConfigOption public final Option<Boolean> BROADCAST_TO_OPS =       new Option<>("broadcast_to_ops", false, Boolean::parseBoolean);
     @ConfigOption public final Option<Boolean> NICK_REVEAL_ON_HOVER =   new Option<>("nick_reveal_on_hover", true, Boolean::parseBoolean);
     @ConfigOption public final Option<Boolean> GRANT_LOWEST_NUMERIC_BY_DEFAULT = new Option<>("grant_lowest_numeric_by_default", true, Boolean::parseBoolean);
     @ConfigOption public final Option<String> LANGUAGE = new Option<>("language", "en_us", String::toString);
     @ConfigOption public final Option<String> MOTD = new Option<>("motd", "<yellow>Welcome to our server <blue>%player:displayname%</blue>!\nPlease read the rules.</yellow>", String::toString);
-    @ConfigOption public final Option<Text> AFK_PREFIX = new Option<>("afk_prefix", Text.literal("[AFK] ").formatted(Formatting.GRAY), TextUtil::parseText, TextUtil::toJsonString);
+    @ConfigOption public final Option<Component> AFK_PREFIX = new Option<>("afk_prefix", Component.literal("[AFK] ").withStyle(ChatFormatting.GRAY), TextUtil::parseText, TextUtil::toJsonString);
     @ConfigOption public final Option<Boolean> INVULN_WHILE_AFK = new Option<>("invuln_while_afk", false, Boolean::parseBoolean);
     @ConfigOption public final Option<Boolean> AUTO_AFK_ENABLED = new Option<>("auto_afk_enabled", true,  Boolean::parseBoolean);
     @ConfigOption public final Option<Integer> AUTO_AFK_TICKS = new Option<>("auto_afk_time", durationToTicks(Duration.ofMinutes(15)), ConfigUtil::parseDurationToTicks, ConfigUtil::serializeTicksAsDuration);
@@ -133,24 +130,24 @@ public EssentialCommandsConfig(Path savePath, String displayName, String documen
 
         RTP_ENABLED_WORLDS.changeEvent.register(configuredWorldIdStrings -> {
             ManagerLocator.getInstance().runAndQueue("RTP_ENABLED_WORLDS", server -> {
-                var worldIds = server.getWorldRegistryKeys().stream()
-                    .map(RegistryKey::getValue)
+                var worldIds = server.levelKeys().stream()
+                    .map(ResourceKey::identifier)
                     .collect(Collectors.toSet());
 
                 EssentialCommands.LOGGER.info("Possible world ids: {}", String.join(",", worldIds.stream().map(Identifier::toString).toList()));
 
                 var configuredWorldIds = configuredWorldIdStrings.stream()
-                    .map(Identifier::of)
+                    .map(Identifier::parse)
                     .toList();
                 EssentialCommands.LOGGER.info("Configured `rtp_enabled_worlds` world ids: {}", String.join(",", configuredWorldIds.stream().map(Identifier::toString).toList()));
 
                 var validConfiguredWorldIds = configuredWorldIdStrings.stream()
-                    .map(Identifier::of)
+                    .map(Identifier::parse)
                     .filter(worldIds::contains)
                     .collect(Collectors.toSet());
 
                 var invalidConfiguredWorldIds = configuredWorldIdStrings.stream()
-                    .map(Identifier::of)
+                    .map(Identifier::parse)
                     .filter(v -> !worldIds.contains(v))
                     .toList();
 
@@ -161,8 +158,8 @@ public EssentialCommandsConfig(Path savePath, String displayName, String documen
                 }
 
                 this.validRtpWorldIds.clear();
-                server.getWorldRegistryKeys().stream()
-                    .filter(k -> validConfiguredWorldIds.contains(k.getValue()))
+                server.levelKeys().stream()
+                    .filter(k -> validConfiguredWorldIds.contains(k.identifier()))
                     .forEach(this.validRtpWorldIds::add);
                 EssentialCommands.refreshConfigSnapshot();
             });
@@ -178,9 +175,9 @@ public EssentialCommandsConfig(Path savePath, String displayName, String documen
         });
     }
 
-    private final HashSet<RegistryKey<World>> validRtpWorldIds = new HashSet<>();
+    private final HashSet<ResourceKey<Level>> validRtpWorldIds = new HashSet<>();
     @NotNull
-    public Set<RegistryKey<World>> getValidRtpWorldKeys() {
+    public Set<ResourceKey<Level>> getValidRtpWorldKeys() {
         return this.validRtpWorldIds;
     }
 
diff --git a/src/main/java/com/fibermc/essentialcommands/config/EssentialCommandsConfigSnapshot.java b/src/main/java/com/fibermc/essentialcommands/config/EssentialCommandsConfigSnapshot.java
index b920356a..49f3df9b 100644
--- a/src/main/java/com/fibermc/essentialcommands/config/EssentialCommandsConfigSnapshot.java
+++ b/src/main/java/com/fibermc/essentialcommands/config/EssentialCommandsConfigSnapshot.java
@@ -2,15 +2,12 @@
 
 import java.util.List;
 import java.util.Set;
-
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.Style;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.level.Level;
 import com.fibermc.essentialcommands.types.RespawnCondition;
 import com.fibermc.essentialcommands.types.RtpCenter;
-
-import net.minecraft.registry.RegistryKey;
-import net.minecraft.text.Style;
-import net.minecraft.text.Text;
-import net.minecraft.world.World;
-
 import dev.jpcode.eccore.config.expression.Expression;
 import dev.jpcode.eccore.util.TimeUtil;
 
@@ -20,7 +17,7 @@ public final class EssentialCommandsConfigSnapshot {
     public final Style FORMATTING_DEFAULT;
     public final Style FORMATTING_ACCENT;
     public final Style FORMATTING_ERROR;
-    public final Text NICKNAME_PREFIX;
+    public final Component NICKNAME_PREFIX;
     public final boolean ENABLE_BACK;
     public final boolean ENABLE_HOME;
     public final boolean ENABLE_SPAWN;
@@ -73,13 +70,13 @@ public final class EssentialCommandsConfigSnapshot {
     public final int RTP_MIN_RADIUS;
     public final int RTP_COOLDOWN;
     public final int RTP_MAX_ATTEMPTS;
-    public final Set<RegistryKey<World>> RTP_ENABLED_WORLDS;
+    public final Set<ResourceKey<Level>> RTP_ENABLED_WORLDS;
     public final boolean BROADCAST_TO_OPS;
     public final boolean NICK_REVEAL_ON_HOVER;
     public final boolean GRANT_LOWEST_NUMERIC_BY_DEFAULT;
     public final String LANGUAGE;
     public final String MOTD;
-    public final Text AFK_PREFIX;
+    public final Component AFK_PREFIX;
     public final boolean INVULN_WHILE_AFK;
     public final boolean AUTO_AFK_ENABLED;
     public final int AUTO_AFK_TICKS;
diff --git a/src/main/java/com/fibermc/essentialcommands/events/PlayerActCallback.java b/src/main/java/com/fibermc/essentialcommands/events/PlayerActCallback.java
index 04b2a4ca..d4ed0646 100644
--- a/src/main/java/com/fibermc/essentialcommands/events/PlayerActCallback.java
+++ b/src/main/java/com/fibermc/essentialcommands/events/PlayerActCallback.java
@@ -1,8 +1,8 @@
 package com.fibermc.essentialcommands.events;
 
-import net.minecraft.network.listener.ServerPlayPacketListener;
-import net.minecraft.network.packet.Packet;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ServerGamePacketListener;
 
 public interface PlayerActCallback {
-    void onPlayerAct(Packet<ServerPlayPacketListener> packet);
+    void onPlayerAct(Packet<ServerGamePacketListener> packet);
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/events/PlayerConnectCallback.java b/src/main/java/com/fibermc/essentialcommands/events/PlayerConnectCallback.java
index 038ef1cc..86bd2637 100644
--- a/src/main/java/com/fibermc/essentialcommands/events/PlayerConnectCallback.java
+++ b/src/main/java/com/fibermc/essentialcommands/events/PlayerConnectCallback.java
@@ -1,7 +1,7 @@
 package com.fibermc.essentialcommands.events;
 
-import net.minecraft.network.ClientConnection;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.network.Connection;
+import net.minecraft.server.level.ServerPlayer;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
@@ -15,5 +15,5 @@ public interface PlayerConnectCallback {
             }
         });
 
-    void onPlayerConnect(ClientConnection connection, ServerPlayerEntity player);
+    void onPlayerConnect(Connection connection, ServerPlayer player);
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/events/PlayerDamageCallback.java b/src/main/java/com/fibermc/essentialcommands/events/PlayerDamageCallback.java
index 00e35105..2924313e 100644
--- a/src/main/java/com/fibermc/essentialcommands/events/PlayerDamageCallback.java
+++ b/src/main/java/com/fibermc/essentialcommands/events/PlayerDamageCallback.java
@@ -1,7 +1,7 @@
 package com.fibermc.essentialcommands.events;
 
-import net.minecraft.entity.damage.DamageSource;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.damagesource.DamageSource;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
@@ -14,5 +14,5 @@ public interface PlayerDamageCallback {
             }
         });
 
-    void onPlayerDamaged(ServerPlayerEntity playerID, DamageSource damageSource);
+    void onPlayerDamaged(ServerPlayer playerID, DamageSource damageSource);
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/events/PlayerDeathCallback.java b/src/main/java/com/fibermc/essentialcommands/events/PlayerDeathCallback.java
index 6fe85c16..be84be51 100644
--- a/src/main/java/com/fibermc/essentialcommands/events/PlayerDeathCallback.java
+++ b/src/main/java/com/fibermc/essentialcommands/events/PlayerDeathCallback.java
@@ -1,7 +1,7 @@
 package com.fibermc.essentialcommands.events;
 
-import net.minecraft.entity.damage.DamageSource;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.damagesource.DamageSource;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
@@ -14,5 +14,5 @@ public interface PlayerDeathCallback {
             }
         });
 
-    void onDeath(ServerPlayerEntity playerEntity, DamageSource damageSource);
+    void onDeath(ServerPlayer playerEntity, DamageSource damageSource);
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/events/PlayerLeaveCallback.java b/src/main/java/com/fibermc/essentialcommands/events/PlayerLeaveCallback.java
index 41ebf690..d16ca0d9 100644
--- a/src/main/java/com/fibermc/essentialcommands/events/PlayerLeaveCallback.java
+++ b/src/main/java/com/fibermc/essentialcommands/events/PlayerLeaveCallback.java
@@ -1,6 +1,6 @@
 package com.fibermc.essentialcommands.events;
 
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.level.ServerPlayer;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
@@ -13,6 +13,6 @@ public interface PlayerLeaveCallback {
             }
     });
 
-    void onPlayerLeave(ServerPlayerEntity player);
+    void onPlayerLeave(ServerPlayer player);
 
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/events/PlayerRespawnCallback.java b/src/main/java/com/fibermc/essentialcommands/events/PlayerRespawnCallback.java
index e0befd8a..aab3b67a 100644
--- a/src/main/java/com/fibermc/essentialcommands/events/PlayerRespawnCallback.java
+++ b/src/main/java/com/fibermc/essentialcommands/events/PlayerRespawnCallback.java
@@ -1,6 +1,6 @@
 package com.fibermc.essentialcommands.events;
 
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.level.ServerPlayer;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
@@ -13,5 +13,5 @@ public interface PlayerRespawnCallback {
             }
         });
 
-    void onPlayerRespawn(ServerPlayerEntity oldPlayer, ServerPlayerEntity newPlayer);
+    void onPlayerRespawn(ServerPlayer oldPlayer, ServerPlayer newPlayer);
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/mixin/PlayerListS2CPacketActionMixin.java b/src/main/java/com/fibermc/essentialcommands/mixin/ClientboundPlayerInfoUpdatePacketActionMixin.java
similarity index 69%
rename from src/main/java/com/fibermc/essentialcommands/mixin/PlayerListS2CPacketActionMixin.java
rename to src/main/java/com/fibermc/essentialcommands/mixin/ClientboundPlayerInfoUpdatePacketActionMixin.java
index 8eb2ca49..b57cfb56 100644
--- a/src/main/java/com/fibermc/essentialcommands/mixin/PlayerListS2CPacketActionMixin.java
+++ b/src/main/java/com/fibermc/essentialcommands/mixin/ClientboundPlayerInfoUpdatePacketActionMixin.java
@@ -9,21 +9,21 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import net.minecraft.network.codec.PacketCodecs;
-import net.minecraft.network.packet.s2c.play.PlayerListS2CPacket;
+import net.minecraft.network.codec.ByteBufCodecs;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket;
 
 import static com.fibermc.essentialcommands.EssentialCommands.BACKING_CONFIG;
 
-@Mixin(PlayerListS2CPacket.Action.class)
-public class PlayerListS2CPacketActionMixin {
+@Mixin(ClientboundPlayerInfoUpdatePacket.Action.class)
+public class ClientboundPlayerInfoUpdatePacketActionMixin {
 
     @Mutable
     @Final
     @Shadow
-    PlayerListS2CPacket.Action.Writer writer;
+    ClientboundPlayerInfoUpdatePacket.Action.Writer writer;
 
     @Inject(method = "<init>", at = @At(value = "RETURN"))
-    public void ctor(String string, int i, PlayerListS2CPacket.Action.Reader reader, PlayerListS2CPacket.Action.Writer argWriter, CallbackInfo ci) {
+    public void ctor(String string, int i, ClientboundPlayerInfoUpdatePacket.Action.Reader reader, ClientboundPlayerInfoUpdatePacket.Action.Writer argWriter, CallbackInfo ci) {
         if (!"ADD_PLAYER".equals(string)) {
             return;
         }
@@ -42,9 +42,9 @@ public void ctor(String string, int i, PlayerListS2CPacket.Action.Reader reader,
                     return;
                 }
                 var displayName = playerData.getPlayer().getDisplayName();
-                var displayNameString = displayName.asTruncatedString(16);
-                buf.writeString(displayNameString, 16);
-                PacketCodecs.PROPERTY_MAP.encode(buf, entry.profile().properties());
+                var displayNameString = displayName.getString(16);
+                buf.writeUtf(displayNameString, 16);
+                ByteBufCodecs.GAME_PROFILE_PROPERTIES.encode(buf, entry.profile().properties());
             } else {
                 vanillaWriter.write(buf, entry);
             }
diff --git a/src/main/java/com/fibermc/essentialcommands/mixin/PersistentStateManagerInvoker.java b/src/main/java/com/fibermc/essentialcommands/mixin/DimensionDataStorageInvoker.java
similarity index 54%
rename from src/main/java/com/fibermc/essentialcommands/mixin/PersistentStateManagerInvoker.java
rename to src/main/java/com/fibermc/essentialcommands/mixin/DimensionDataStorageInvoker.java
index d01cabd8..903c2752 100644
--- a/src/main/java/com/fibermc/essentialcommands/mixin/PersistentStateManagerInvoker.java
+++ b/src/main/java/com/fibermc/essentialcommands/mixin/DimensionDataStorageInvoker.java
@@ -5,12 +5,12 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
-import net.minecraft.world.PersistentStateManager;
+import net.minecraft.world.level.storage.DimensionDataStorage;
 
-@Mixin(PersistentStateManager.class)
-public interface PersistentStateManagerInvoker {
+@Mixin(DimensionDataStorage.class)
+public interface DimensionDataStorageInvoker {
 
-    @Invoker("getFile")
+    @Invoker("getDataFile")
     Path invokeGetFile(String id);
 
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/mixin/LivingEntityMixin.java b/src/main/java/com/fibermc/essentialcommands/mixin/LivingEntityMixin.java
index 3f7bff84..9b1edcef 100644
--- a/src/main/java/com/fibermc/essentialcommands/mixin/LivingEntityMixin.java
+++ b/src/main/java/com/fibermc/essentialcommands/mixin/LivingEntityMixin.java
@@ -7,15 +7,15 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.LivingEntity;
 
 @Mixin(LivingEntity.class)
 public class LivingEntityMixin {
-    @Inject(method = "isSleepingInBed", at = @At("RETURN"), cancellable = true)
+    @Inject(method = "checkBedExists", at = @At("RETURN"), cancellable = true)
     public void modifyIsSleepingInBedReturn(CallbackInfoReturnable<Boolean> cir) {
         LivingEntity self = (LivingEntity)(Object)this;
-        if (!(self instanceof ServerPlayerEntity player)) {
+        if (!(self instanceof ServerPlayer player)) {
             return;
         }
 
@@ -25,10 +25,10 @@ public void modifyIsSleepingInBedReturn(CallbackInfoReturnable<Boolean> cir) {
         }
     }
 
-    @Inject(method = "wakeUp", at = @At("RETURN"))
+    @Inject(method = "stopSleeping", at = @At("RETURN"))
     public void modifyWakeUp(CallbackInfo ci) {
         LivingEntity self = (LivingEntity)(Object)this;
-        if (!(self instanceof ServerPlayerEntity player)) {
+        if (!(self instanceof ServerPlayer player)) {
             return;
         }
 
diff --git a/src/main/java/com/fibermc/essentialcommands/mixin/WorldSaveHandlerMixin.java b/src/main/java/com/fibermc/essentialcommands/mixin/PlayerDataStorageMixin.java
similarity index 63%
rename from src/main/java/com/fibermc/essentialcommands/mixin/WorldSaveHandlerMixin.java
rename to src/main/java/com/fibermc/essentialcommands/mixin/PlayerDataStorageMixin.java
index 421c51ee..6de77a21 100644
--- a/src/main/java/com/fibermc/essentialcommands/mixin/WorldSaveHandlerMixin.java
+++ b/src/main/java/com/fibermc/essentialcommands/mixin/PlayerDataStorageMixin.java
@@ -6,14 +6,14 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.world.PlayerSaveHandler;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.storage.PlayerDataStorage;
 
-@Mixin(PlayerSaveHandler.class)
-public class WorldSaveHandlerMixin {
+@Mixin(PlayerDataStorage.class)
+public class PlayerDataStorageMixin {
 
-    @Inject(method = "savePlayerData", at = @At("RETURN"))
-    public void onSavePlayerData(PlayerEntity player, CallbackInfo ci) {
+    @Inject(method = "save", at = @At("RETURN"))
+    public void onSavePlayerData(Player player, CallbackInfo ci) {
         ((ServerPlayerEntityAccess) player).ec$getPlayerData().save();
 //        System.out.printf("Saved PlayerData for player: %s\n", player.getName().getString());
     }
diff --git a/src/main/java/com/fibermc/essentialcommands/mixin/PlayerManagerMixin.java b/src/main/java/com/fibermc/essentialcommands/mixin/PlayerListMixin.java
similarity index 53%
rename from src/main/java/com/fibermc/essentialcommands/mixin/PlayerManagerMixin.java
rename to src/main/java/com/fibermc/essentialcommands/mixin/PlayerListMixin.java
index fab9a86b..2cb0405b 100644
--- a/src/main/java/com/fibermc/essentialcommands/mixin/PlayerManagerMixin.java
+++ b/src/main/java/com/fibermc/essentialcommands/mixin/PlayerListMixin.java
@@ -15,93 +15,93 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import net.minecraft.entity.Entity;
-import net.minecraft.network.ClientConnection;
-import net.minecraft.server.PlayerManager;
-import net.minecraft.server.network.ConnectedClientData;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.server.world.ServerWorld;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.TeleportTarget;
+import net.minecraft.network.Connection;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.network.CommonListenerCookie;
+import net.minecraft.server.players.PlayerList;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.portal.TeleportTransition;
+import net.minecraft.world.phys.Vec3;
 
-@Mixin(PlayerManager.class)
-public abstract class PlayerManagerMixin {
+@Mixin(PlayerList.class)
+public abstract class PlayerListMixin {
 
     @Inject(
-        method = "onPlayerConnect",
+        method = "placeNewPlayer",
         at = @At(
             value = "INVOKE",
             // We inject right after the vanilla player join message is sent. Mostly to ensure LuckPerms permissions are
             // loaded (for role styling in EC MOTD).
-            target = "Lnet/minecraft/server/PlayerManager;sendToAll(Lnet/minecraft/network/packet/Packet;)V"
+            target = "Lnet/minecraft/server/players/PlayerList;broadcastAll(Lnet/minecraft/network/protocol/Packet;)V"
         )
     )
-    public void onPlayerConnect(ClientConnection connection, ServerPlayerEntity player, ConnectedClientData clientData, CallbackInfo ci) {
+    public void onPlayerConnect(Connection connection, ServerPlayer player, CommonListenerCookie clientData, CallbackInfo ci) {
         PlayerConnectCallback.EVENT.invoker().onPlayerConnect(connection, player);
         // Just to be _super_ sure there is no incorrect persistance of this invuln.
         Pal.revokeAbility(player, VanillaAbilities.INVULNERABLE, ECAbilitySources.AFK_INVULN);
     }
 
     @Inject(method = "remove", at = @At("HEAD"))
-    public void onPlayerLeave(ServerPlayerEntity player, CallbackInfo callbackInfo) {
+    public void onPlayerLeave(ServerPlayer player, CallbackInfo callbackInfo) {
         PlayerLeaveCallback.EVENT.invoker().onPlayerLeave(player);
     }
 
     @SuppressWarnings("checkstyle:NoWhitespaceBefore")
-    @Inject(method = "respawnPlayer", at = @At(
+    @Inject(method = "respawn", at = @At(
         value = "INVOKE",
         // This target is near-immediately after the new ServerPlayerEntity is
         // created. This lets us update the EC PlayerData, sooner, might be
         // before the new ServerPlayerEntity is fully initialized.
-        target = "Lnet/minecraft/server/network/ServerPlayerEntity;copyFrom(Lnet/minecraft/server/network/ServerPlayerEntity;Z)V"
+        target = "Lnet/minecraft/server/level/ServerPlayer;restoreFrom(Lnet/minecraft/server/level/ServerPlayer;Z)V"
     ))
     public void onRespawnPlayer(
-        ServerPlayerEntity oldServerPlayerEntity, boolean alive, Entity.RemovalReason removalReason,
-        CallbackInfoReturnable<ServerPlayerEntity> cir,
-        @Local(ordinal = 1) ServerPlayerEntity serverPlayerEntity
+        ServerPlayer oldServerPlayerEntity, boolean alive, Entity.RemovalReason removalReason,
+        CallbackInfoReturnable<ServerPlayer> cir,
+        @Local(ordinal = 1) ServerPlayer serverPlayerEntity
     ) {
         PlayerDataManager.handlePlayerDataRespawnSync(oldServerPlayerEntity, serverPlayerEntity);
     }
 
-    @SuppressWarnings({"checkstyle:NoWhitespaceBefore", "checkstyle:MethodName"})
-    @Inject(method = "respawnPlayer", at = @At(
+    @SuppressWarnings({"checkstyle:NoWhitespaceBefore", "checkstyle:MethodName", "checkstyle:LineLength"})
+    @Inject(method = "respawn", at = @At(
         value = "INVOKE",
         // This target lets us modify respawn position and dimension (player maybe not _fully_ initialized, still)
-        target = "Lnet/minecraft/server/network/ServerPlayerEntity;<init>(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/server/world/ServerWorld;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/network/packet/c2s/common/SyncedClientOptions;)V"
+        target = "Lnet/minecraft/server/level/ServerPlayer;<init>(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/server/level/ServerLevel;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/server/level/ClientInformation;)V"
     ))
     public void onRespawnPlayer_forRespawnLocationOverwrite(
-        CallbackInfoReturnable<ServerPlayerEntity> cir
-        , @Local(ordinal = 0, argsOnly = true) ServerPlayerEntity oldServerPlayerEntity
-        , @Local(ordinal = 0) LocalRef<TeleportTarget> teleportTargetLocalRef
-        , @Local(ordinal = 0) LocalRef<ServerWorld> teleportTargetServerWorld
+        CallbackInfoReturnable<ServerPlayer> cir
+        , @Local(ordinal = 0, argsOnly = true) ServerPlayer oldServerPlayerEntity
+        , @Local(ordinal = 0) LocalRef<TeleportTransition> teleportTargetLocalRef
+        , @Local(ordinal = 0) LocalRef<ServerLevel> teleportTargetServerWorld
     ) {
         PlayerDataManager.handleRespawnAtEcSpawn(oldServerPlayerEntity, (spawnLoc) -> {
-            var targetWorld = oldServerPlayerEntity.getEntityWorld().getServer().getWorld(spawnLoc.dim());
+            var targetWorld = oldServerPlayerEntity.level().getServer().getLevel(spawnLoc.dim());
             teleportTargetServerWorld.set(targetWorld);
-            teleportTargetLocalRef.set(new TeleportTarget(
+            teleportTargetLocalRef.set(new TeleportTransition(
                 targetWorld,
                 spawnLoc.pos(),
-                Vec3d.ZERO,
+                Vec3.ZERO,
                 0,
                 0,
-                TeleportTarget.NO_OP
+                TeleportTransition.DO_NOTHING
             ));
         });
     }
 
     @SuppressWarnings({"checkstyle:NoWhitespaceBefore", "checkstyle:MethodName"})
-    @Inject(method = "respawnPlayer", at = @At(
+    @Inject(method = "respawn", at = @At(
         value = "INVOKE",
         // This target lets us modify respawn position
-        target = "Lnet/minecraft/server/world/ServerWorld;getLevelProperties()Lnet/minecraft/world/WorldProperties;"
+        target = "Lnet/minecraft/server/level/ServerLevel;getLevelData()Lnet/minecraft/world/level/storage/LevelData;"
     ))
     public void onRespawnPlayer_afterSetPosition(
-        CallbackInfoReturnable<ServerPlayerEntity> cir
-        , @Local(ordinal = 0, argsOnly = true) ServerPlayerEntity oldServerPlayerEntity
-        , @Local(ordinal = 1) ServerPlayerEntity serverPlayerEntity
+        CallbackInfoReturnable<ServerPlayer> cir
+        , @Local(ordinal = 0, argsOnly = true) ServerPlayer oldServerPlayerEntity
+        , @Local(ordinal = 1) ServerPlayer serverPlayerEntity
     ) {
         PlayerDataManager.handleRespawnAtEcSpawn(oldServerPlayerEntity, (spawnLoc) -> {
-            serverPlayerEntity.setServerWorld(serverPlayerEntity.getEntityWorld().getServer().getWorld(spawnLoc.dim()));
+            serverPlayerEntity.setServerLevel(serverPlayerEntity.level().getServer().getLevel(spawnLoc.dim()));
         });
         PlayerRespawnCallback.EVENT.invoker().onPlayerRespawn(oldServerPlayerEntity, serverPlayerEntity);
     }
diff --git a/src/main/java/com/fibermc/essentialcommands/mixin/PlayerEntityMixin.java b/src/main/java/com/fibermc/essentialcommands/mixin/PlayerMixin.java
similarity index 66%
rename from src/main/java/com/fibermc/essentialcommands/mixin/PlayerEntityMixin.java
rename to src/main/java/com/fibermc/essentialcommands/mixin/PlayerMixin.java
index e4b8078a..b92992ba 100644
--- a/src/main/java/com/fibermc/essentialcommands/mixin/PlayerEntityMixin.java
+++ b/src/main/java/com/fibermc/essentialcommands/mixin/PlayerMixin.java
@@ -8,19 +8,19 @@
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.scoreboard.Team;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.MutableText;
-import net.minecraft.text.Style;
-import net.minecraft.text.Text;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.network.chat.Style;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.scores.PlayerTeam;
 
 import static com.fibermc.essentialcommands.EssentialCommands.CONFIG;
 
-@Mixin(PlayerEntity.class)
-public abstract class PlayerEntityMixin extends LivingEntityMixin {
+@Mixin(Player.class)
+public abstract class PlayerMixin extends LivingEntityMixin {
     @Inject(method = "getDisplayName", at = @At("RETURN"))
-    public void onGetDisplayName(CallbackInfoReturnable<Text> cir) {
+    public void onGetDisplayName(CallbackInfoReturnable<Component> cir) {
 
     }
 
@@ -28,9 +28,9 @@ public void onGetDisplayName(CallbackInfoReturnable<Text> cir) {
         method = "getDisplayName",
         at = @At("STORE"))
     // these are just IDE errors, it works in game
-    public MutableText injected(MutableText teamDecoratedName) {
+    public MutableComponent injected(MutableComponent teamDecoratedName) {
         // Verify that this is a ServerPlayerEntity instance.
-        if (!ServerPlayerEntity.class.isAssignableFrom(this.getClass())) {
+        if (!ServerPlayer.class.isAssignableFrom(this.getClass())) {
             // I *think* this check is correct, but frankly am not sure.
             // Reflection & Mixins hurt my brain.
             return teamDecoratedName;
@@ -40,25 +40,25 @@ public MutableText injected(MutableText teamDecoratedName) {
         var name = getNicknameStyledName(teamDecoratedName, playerData);
 
         return playerData.isAfk()
-            ? Text.empty()
+            ? Component.empty()
                 .append(CONFIG.AFK_PREFIX)
                 .append(name)
             : name;
     }
 
-    private static MutableText getNicknameStyledName(MutableText teamDecoratedName, PlayerData playerData) {
+    private static MutableComponent getNicknameStyledName(MutableComponent teamDecoratedName, PlayerData playerData) {
         try {
             if (playerData.getNickname().isPresent()) {
-                MutableText nickname = playerData.getFullNickname();
+                MutableComponent nickname = playerData.getFullNickname();
                 // Re-add "whisper" click event unless the nickname has a click event set.
                 Style nicknameStyle = nickname.getStyle();
                 if (nicknameStyle.getClickEvent() == null) {
                     nickname.setStyle(nicknameStyle.withClickEvent(teamDecoratedName.getStyle().getClickEvent()));
                 }
                 // Send nickname (styled appropriately for player team) as return value for getDisplayName().
-                ServerPlayerEntity serverPlayerEntity = playerData.getPlayer();
-                return Team.decorateName(
-                    serverPlayerEntity.getScoreboardTeam(),
+                ServerPlayer serverPlayerEntity = playerData.getPlayer();
+                return PlayerTeam.formatNameForTeam(
+                    serverPlayerEntity.getTeam(),
                     nickname
                 );
             }
diff --git a/src/main/java/com/fibermc/essentialcommands/mixin/PrepareSpawnTaskMixin.java b/src/main/java/com/fibermc/essentialcommands/mixin/PrepareSpawnTaskMixin.java
index 12247208..0caeadd7 100644
--- a/src/main/java/com/fibermc/essentialcommands/mixin/PrepareSpawnTaskMixin.java
+++ b/src/main/java/com/fibermc/essentialcommands/mixin/PrepareSpawnTaskMixin.java
@@ -10,26 +10,27 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import net.minecraft.network.ClientConnection;
-import net.minecraft.server.network.ConnectedClientData;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.storage.ReadView;
-import net.minecraft.util.math.ChunkPos;
+import net.minecraft.network.Connection;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.network.CommonListenerCookie;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.storage.ValueInput;
 
-@Mixin(targets = "net.minecraft.server.network.PrepareSpawnTask$PlayerSpawn")
+@Mixin(targets = "net.minecraft.server.network.config.PrepareSpawnTask$Ready")
 public abstract class PrepareSpawnTaskMixin {
+    @SuppressWarnings({"checkstyle:MethodName"})
     @Inject(
-        method = "onReady",
+        method = "spawn",
         at = @At(
             value = "INVOKE",
-            target = "Lnet/minecraft/server/network/ServerPlayerEntity;refreshPositionAndAngles(Lnet/minecraft/util/math/Vec3d;FF)V"
+            target = "Lnet/minecraft/server/level/ServerPlayer;snapTo(Lnet/minecraft/world/phys/Vec3;FF)V"
         )
     )
     public void onReady_firstConnect_spawnPositionOverride(
-        ClientConnection connection, ConnectedClientData clientData, CallbackInfoReturnable<ServerPlayerEntity> cir,
+        Connection connection, CommonListenerCookie clientData, CallbackInfoReturnable<ServerPlayer> cir,
         @Local(ordinal = 0) ChunkPos chunkPos,
-        @Local(ordinal = 0) ServerPlayerEntity serverPlayerEntity,
-        @Local(ordinal = 0) Optional<ReadView> playerNbt
+        @Local(ordinal = 0) ServerPlayer serverPlayerEntity,
+        @Local(ordinal = 0) Optional<ValueInput> playerNbt
     ) {
         if (playerNbt.isPresent()) {
             // player data existed, definitely isn't first join
@@ -47,7 +48,7 @@ public void onReady_firstConnect_spawnPositionOverride(
         }
 
         var pos = location[0];
-        serverPlayerEntity.setServerWorld(serverPlayerEntity.getEntityWorld().getServer().getWorld(location[0].dim()));
-        serverPlayerEntity.refreshPositionAndAngles(pos.pos(), pos.headYaw(), pos.pitch());
+        serverPlayerEntity.setServerLevel(serverPlayerEntity.level().getServer().getLevel(location[0].dim()));
+        serverPlayerEntity.snapTo(pos.pos(), pos.headYaw(), pos.pitch());
     }
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/mixin/ServerGamePacketListenerImplMixin.java b/src/main/java/com/fibermc/essentialcommands/mixin/ServerGamePacketListenerImplMixin.java
new file mode 100644
index 00000000..fb73b42f
--- /dev/null
+++ b/src/main/java/com/fibermc/essentialcommands/mixin/ServerGamePacketListenerImplMixin.java
@@ -0,0 +1,53 @@
+package com.fibermc.essentialcommands.mixin;
+
+import com.fibermc.essentialcommands.access.ServerPlayerEntityAccess;
+import com.fibermc.essentialcommands.playerdata.PlayerData;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.*;
+import net.minecraft.server.network.ServerGamePacketListenerImpl;
+
+@Mixin(ServerGamePacketListenerImpl.class)
+public class ServerGamePacketListenerImplMixin {
+
+    @Unique
+    private PlayerData getPlayerData() {
+        var player = ((ServerGamePacketListenerImpl) (Object) this).player;
+        return ((ServerPlayerEntityAccess) player).ec$getPlayerData();
+    }
+
+    @Unique
+    private void invokeActEvent(Packet<ServerGamePacketListener> packet) {
+        getPlayerData().playerActEvent.invoker().onPlayerAct(packet);
+    }
+
+    @Inject(method = "handlePlayerAction", at = @At("RETURN"))
+    public void onPlayerAction(ServerboundPlayerActionPacket packet, CallbackInfo ci) {
+        invokeActEvent(packet);
+    }
+
+    @Inject(method = "handleUseItemOn", at = @At("RETURN"))
+    public void onPlayerInteractBlock(ServerboundUseItemOnPacket packet, CallbackInfo ci) {
+        invokeActEvent(packet);
+    }
+
+    @Inject(method = "handleUseItem", at = @At("RETURN"))
+    public void onPlayerInteractItem(ServerboundUseItemPacket packet, CallbackInfo ci) {
+        invokeActEvent(packet);
+    }
+
+    @Inject(method = "handlePaddleBoat", at = @At("RETURN"))
+    public void onBoatPaddleState(ServerboundPaddleBoatPacket packet, CallbackInfo ci) {
+        invokeActEvent(packet);
+    }
+
+    @Inject(method = "handleInteract", at = @At("RETURN"))
+    public void onPlayerInteractEntity(ServerboundInteractPacket packet, CallbackInfo ci) {
+        invokeActEvent(packet);
+    }
+}
diff --git a/src/main/java/com/fibermc/essentialcommands/mixin/ServerPlayNetworkHandlerMixin.java b/src/main/java/com/fibermc/essentialcommands/mixin/ServerPlayNetworkHandlerMixin.java
deleted file mode 100644
index 0fff4b45..00000000
--- a/src/main/java/com/fibermc/essentialcommands/mixin/ServerPlayNetworkHandlerMixin.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.fibermc.essentialcommands.mixin;
-
-import com.fibermc.essentialcommands.access.ServerPlayerEntityAccess;
-import com.fibermc.essentialcommands.playerdata.PlayerData;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.network.listener.ServerPlayPacketListener;
-import net.minecraft.network.packet.Packet;
-import net.minecraft.network.packet.c2s.play.*;
-import net.minecraft.server.network.ServerPlayNetworkHandler;
-
-@Mixin(ServerPlayNetworkHandler.class)
-public class ServerPlayNetworkHandlerMixin {
-
-    @Unique
-    private PlayerData getPlayerData() {
-        var player = ((ServerPlayNetworkHandler) (Object) this).player;
-        return ((ServerPlayerEntityAccess) player).ec$getPlayerData();
-    }
-
-    @Unique
-    private void invokeActEvent(Packet<ServerPlayPacketListener> packet) {
-        getPlayerData().playerActEvent.invoker().onPlayerAct(packet);
-    }
-
-    @Inject(method = "onPlayerAction", at = @At("RETURN"))
-    public void onPlayerAction(PlayerActionC2SPacket packet, CallbackInfo ci) {
-        invokeActEvent(packet);
-    }
-
-    @Inject(method = "onPlayerInteractBlock", at = @At("RETURN"))
-    public void onPlayerInteractBlock(PlayerInteractBlockC2SPacket packet, CallbackInfo ci) {
-        invokeActEvent(packet);
-    }
-
-    @Inject(method = "onPlayerInteractItem", at = @At("RETURN"))
-    public void onPlayerInteractItem(PlayerInteractItemC2SPacket packet, CallbackInfo ci) {
-        invokeActEvent(packet);
-    }
-
-    @Inject(method = "onBoatPaddleState", at = @At("RETURN"))
-    public void onBoatPaddleState(BoatPaddleStateC2SPacket packet, CallbackInfo ci) {
-        invokeActEvent(packet);
-    }
-
-    @Inject(method = "onPlayerInteractEntity", at = @At("RETURN"))
-    public void onPlayerInteractEntity(PlayerInteractEntityC2SPacket packet, CallbackInfo ci) {
-        invokeActEvent(packet);
-    }
-}
diff --git a/src/main/java/com/fibermc/essentialcommands/mixin/ServerPlayerEntityMixin.java b/src/main/java/com/fibermc/essentialcommands/mixin/ServerPlayerMixin.java
similarity index 62%
rename from src/main/java/com/fibermc/essentialcommands/mixin/ServerPlayerEntityMixin.java
rename to src/main/java/com/fibermc/essentialcommands/mixin/ServerPlayerMixin.java
index 3e5614f9..88ded6b0 100644
--- a/src/main/java/com/fibermc/essentialcommands/mixin/ServerPlayerEntityMixin.java
+++ b/src/main/java/com/fibermc/essentialcommands/mixin/ServerPlayerMixin.java
@@ -19,59 +19,60 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.damage.DamageSource;
-import net.minecraft.network.packet.s2c.play.PositionFlag;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.server.world.ServerWorld;
-import net.minecraft.text.Text;
-import net.minecraft.world.GameMode;
-import net.minecraft.world.TeleportTarget;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.Relative;
+import net.minecraft.world.level.GameType;
+import net.minecraft.world.level.portal.TeleportTransition;
 
 import static com.fibermc.essentialcommands.EssentialCommands.BACKING_CONFIG;
 import static com.fibermc.essentialcommands.EssentialCommands.CONFIG;
 
-@Mixin(ServerPlayerEntity.class)
-public abstract class ServerPlayerEntityMixin extends PlayerEntityMixin implements ServerPlayerEntityAccess {
+@SuppressWarnings({"checkstyle:IllegalIdentifierName"})
+@Mixin(ServerPlayer.class)
+public abstract class ServerPlayerMixin extends PlayerMixin implements ServerPlayerEntityAccess {
 
     @Shadow
-    public abstract GameMode getGameMode();
+    public abstract GameType gameMode();
 
     @Unique
     public QueuedTeleport ecQueuedTeleport;
 
-    @Inject(method = "onDeath", at = @At("HEAD"))
+    @Inject(method = "die", at = @At("HEAD"))
     public void onDeath(DamageSource damageSource, CallbackInfo callbackInfo) {
-        PlayerDeathCallback.EVENT.invoker().onDeath(((ServerPlayerEntity) (Object) this), damageSource);
+        PlayerDeathCallback.EVENT.invoker().onDeath(((ServerPlayer) (Object) this), damageSource);
     }
 
-    @Inject(method = "damage", at = @At("RETURN"))
-    public void onDamage(ServerWorld world, DamageSource damageSource, float amount, CallbackInfoReturnable<Boolean> cir) {
+    @Inject(method = "hurtServer", at = @At("RETURN"))
+    public void onDamage(ServerLevel world, DamageSource damageSource, float amount, CallbackInfoReturnable<Boolean> cir) {
         // If damage was actually applied...
         if (cir.getReturnValue()) {
             PlayerDamageCallback.EVENT.invoker().onPlayerDamaged(
-                ((ServerPlayerEntity) (Object) this),
+                ((ServerPlayer) (Object) this),
                 damageSource
             );
         }
     }
 
-    @Inject(method = "changeGameMode", at = @At("RETURN"))
-    public void onChangeGameMode(GameMode gameMode, CallbackInfoReturnable<Boolean> cir) {
+    @Inject(method = "setGameMode", at = @At("RETURN"))
+    public void onChangeGameMode(GameType gameMode, CallbackInfoReturnable<Boolean> cir) {
 //        ((ServerPlayerEntityAccess) this).getEcPlayerData().updatePlayer(((ServerPlayerEntity) (Object) this));
     }
 
-    @Inject(method = "teleportTo(Lnet/minecraft/world/TeleportTarget;)Lnet/minecraft/server/network/ServerPlayerEntity;", at = @At(
+    @Inject(method = "teleport(Lnet/minecraft/world/level/portal/TeleportTransition;)Lnet/minecraft/server/level/ServerPlayer;", at = @At(
         value = "INVOKE",
-        target = "Lnet/minecraft/server/PlayerManager;sendPlayerStatus(Lnet/minecraft/server/network/ServerPlayerEntity;)V"
+        target = "Lnet/minecraft/server/players/PlayerList;sendAllPlayerInfo(Lnet/minecraft/server/level/ServerPlayer;)V"
     ))
-    public void onTeleportBetweenWorlds(TeleportTarget teleportTarget, CallbackInfoReturnable<Entity> cir) {
+    public void onTeleportBetweenWorlds(TeleportTransition teleportTarget, CallbackInfoReturnable<Entity> cir) {
         var playerData = this.ec$getPlayerData();
-        playerData.updatePlayerEntity((ServerPlayerEntity) (Object) this);
+        playerData.updatePlayerEntity((ServerPlayer) (Object) this);
     }
 
-    @Inject(method = "worldChanged", at = @At(value = "RETURN"))
-    public void onWorldChanged(ServerWorld origin, CallbackInfo ci) {
+    @Inject(method = "triggerDimensionChangeTriggers", at = @At(value = "RETURN"))
+    public void onWorldChanged(ServerLevel origin, CallbackInfo ci) {
         var playerData = this.ec$getPlayerData();
         if (CONFIG.RECHECK_PLAYER_ABILITY_PERMISSIONS_ON_DIMENSION_CHANGE) {
             PlayerDataManager.getInstance().scheduleTask(playerData::clearAbilitiesWithoutPermisisons);
@@ -95,10 +96,10 @@ public void onWorldChanged(ServerWorld origin, CallbackInfo ci) {
         return prevQueuedTeleport;
     }
 
-    @Inject(method = "getPlayerListName", at = @At("RETURN"), cancellable = true)
-    public void getPlayerListName(CallbackInfoReturnable<Text> cir) {
+    @Inject(method = "getTabListDisplayName", at = @At("RETURN"), cancellable = true)
+    public void getPlayerListName(CallbackInfoReturnable<Component> cir) {
         if (EssentialCommandsConfig.getValueSafe(BACKING_CONFIG.NICKNAMES_IN_PLAYER_LIST, true)) {
-            cir.setReturnValue(((ServerPlayerEntity) (Object) this).getDisplayName());
+            cir.setReturnValue(((ServerPlayer) (Object) this).getDisplayName());
             cir.cancel();
         }
     }
@@ -112,9 +113,9 @@ public void getPlayerListName(CallbackInfoReturnable<Text> cir) {
             return ec$playerData;
         }
 
-        ServerPlayerEntity playerEntity = (ServerPlayerEntity) (Object) this;
+        ServerPlayer playerEntity = (ServerPlayer) (Object) this;
         EssentialCommands.LOGGER.info(String.format(
-            "[Essential Commands] Loading PlayerData for player with uuid '%s'.", playerEntity.getUuidAsString()));
+            "[Essential Commands] Loading PlayerData for player with uuid '%s'.", playerEntity.getStringUUID()));
         PlayerData playerData = PlayerDataFactory.create(playerEntity);
         ec$setPlayerData(playerData);
         return playerData;
@@ -134,9 +135,9 @@ public void getPlayerListName(CallbackInfoReturnable<Text> cir) {
             return ec$profile;
         }
 
-        ServerPlayerEntity playerEntity = (ServerPlayerEntity) (Object) this;
+        ServerPlayer playerEntity = (ServerPlayer) (Object) this;
         EssentialCommands.LOGGER.info(String.format(
-            "[Essential Commands] Loading PlayerProfile for player with uuid '%s'.", playerEntity.getUuidAsString()));
+            "[Essential Commands] Loading PlayerProfile for player with uuid '%s'.", playerEntity.getStringUUID()));
         PlayerProfile profile = PlayerProfileFactory.create(playerEntity);
         ec$setProfile(profile);
         return profile;
@@ -156,23 +157,23 @@ public void getPlayerListName(CallbackInfoReturnable<Text> cir) {
             return ec$ecText;
         }
 
-        return ec$ecText = ECText.forPlayer((ServerPlayerEntity) (Object) this);
+        return ec$ecText = ECText.forPlayer((ServerPlayer) (Object) this);
     }
 
     // Teleport hook (for /back)
-    @Inject(method = "teleport(Lnet/minecraft/server/world/ServerWorld;DDDLjava/util/Set;FFZ)Z", at = @At("HEAD"))
-    public void onTeleport(ServerWorld world, double destX, double destY, double destZ, Set<PositionFlag> flags, float yaw, float pitch, boolean resetCamera, CallbackInfoReturnable<Boolean> cir) {
-        if (getGameMode() != GameMode.SPECTATOR) {
-            this.ec$getPlayerData().setPreviousLocation(new MinecraftLocation((ServerPlayerEntity) (Object) this));
+    @Inject(method = "teleportTo(Lnet/minecraft/server/level/ServerLevel;DDDLjava/util/Set;FFZ)Z", at = @At("HEAD"))
+    public void onTeleport(ServerLevel world, double destX, double destY, double destZ, Set<Relative> flags, float yaw, float pitch, boolean resetCamera, CallbackInfoReturnable<Boolean> cir) {
+        if (gameMode() != GameType.SPECTATOR) {
+            this.ec$getPlayerData().setPreviousLocation(new MinecraftLocation((ServerPlayer) (Object) this));
         }
     }
 
-    @Inject(method = "enterCombat", at = @At("RETURN"))
+    @Inject(method = "onEnterCombat", at = @At("RETURN"))
     public void onEnterCombat(CallbackInfo ci) {
         ec$playerData.setInCombat(true);
     }
 
-    @Inject(method = "endCombat", at = @At("RETURN"))
+    @Inject(method = "onLeaveCombat", at = @At("RETURN"))
     public void onExitCombat(CallbackInfo ci) {
         ec$playerData.setInCombat(false);
     }
diff --git a/src/main/java/com/fibermc/essentialcommands/mixin/ServerScoreboardMixin.java b/src/main/java/com/fibermc/essentialcommands/mixin/ServerScoreboardMixin.java
index 093e13bc..1b441bef 100644
--- a/src/main/java/com/fibermc/essentialcommands/mixin/ServerScoreboardMixin.java
+++ b/src/main/java/com/fibermc/essentialcommands/mixin/ServerScoreboardMixin.java
@@ -7,14 +7,14 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import net.minecraft.scoreboard.ServerScoreboard;
-import net.minecraft.scoreboard.Team;
+import net.minecraft.server.ServerScoreboard;
+import net.minecraft.world.scores.PlayerTeam;
 
 @Mixin(ServerScoreboard.class)
 public class ServerScoreboardMixin {
 
-    @Inject(method = "addScoreHolderToTeam", at = @At("RETURN"))
-    public void onAddPlayerToTeam(String playerName, Team team, CallbackInfoReturnable<Boolean> cir) {
+    @Inject(method = "addPlayerToTeam", at = @At("RETURN"))
+    public void onAddPlayerToTeam(String playerName, PlayerTeam team, CallbackInfoReturnable<Boolean> cir) {
         try {
             PlayerDataManager.getInstance().markNicknameDirty(playerName);
         } catch (NullPointerException ignore) {
@@ -22,8 +22,8 @@ public void onAddPlayerToTeam(String playerName, Team team, CallbackInfoReturnab
         }
     }
 
-    @Inject(method = "removeScoreHolderFromTeam", at = @At("RETURN"))
-    public void onRemovePlayerFromTeam(String playerName, Team team, CallbackInfo ci) {
+    @Inject(method = "removePlayerFromTeam(Ljava/lang/String;Lnet/minecraft/world/scores/PlayerTeam;)V", at = @At("RETURN"))
+    public void onRemovePlayerFromTeam(String playerName, PlayerTeam team, CallbackInfo ci) {
         try {
             PlayerDataManager.getInstance().markNicknameDirty(playerName);
         } catch (NullPointerException ignore) {
@@ -31,19 +31,19 @@ public void onRemovePlayerFromTeam(String playerName, Team team, CallbackInfo ci
         }
     }
 
-    @Inject(method = "updateScoreboardTeam", at = @At("RETURN"))
-    public void onUpdateScoreboardTeam(Team team, CallbackInfo ci) {
+    @Inject(method = "onTeamChanged", at = @At("RETURN"))
+    public void onUpdateScoreboardTeam(PlayerTeam team, CallbackInfo ci) {
         var playerDataManager = PlayerDataManager.getInstance();
         if (playerDataManager != null) {
-            team.getPlayerList().forEach(playerDataManager::markNicknameDirty);
+            team.getPlayers().forEach(playerDataManager::markNicknameDirty);
         }
     }
 
-    @Inject(method = "updateRemovedTeam", at = @At("RETURN"))
-    public void onUpdateRemovedTeam(Team team, CallbackInfo ci) {
+    @Inject(method = "onTeamRemoved", at = @At("RETURN"))
+    public void onUpdateRemovedTeam(PlayerTeam team, CallbackInfo ci) {
         var playerDataManager = PlayerDataManager.getInstance();
         if (playerDataManager != null) {
-            team.getPlayerList().forEach(playerDataManager::markNicknameDirty);
+            team.getPlayers().forEach(playerDataManager::markNicknameDirty);
         }
     }
 
diff --git a/src/main/java/com/fibermc/essentialcommands/mixin/SleepManagerMixin.java b/src/main/java/com/fibermc/essentialcommands/mixin/SleepStatusMixin.java
similarity index 77%
rename from src/main/java/com/fibermc/essentialcommands/mixin/SleepManagerMixin.java
rename to src/main/java/com/fibermc/essentialcommands/mixin/SleepStatusMixin.java
index b5fd845d..a23dafde 100644
--- a/src/main/java/com/fibermc/essentialcommands/mixin/SleepManagerMixin.java
+++ b/src/main/java/com/fibermc/essentialcommands/mixin/SleepStatusMixin.java
@@ -11,31 +11,31 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.server.world.SleepManager;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.players.SleepStatus;
 
 import static com.fibermc.essentialcommands.EssentialCommands.CONFIG;
 
-@Mixin(SleepManager.class)
-public class SleepManagerMixin {
+@Mixin(SleepStatus.class)
+public class SleepStatusMixin {
 
     @Shadow
-    private int total;
+    private int activePlayers;
 
     @Inject(
         method = "update",
         at = @At(
             value = "INVOKE",
-            target = "Lnet/minecraft/server/network/ServerPlayerEntity;isSpectator()Z"
+            target = "Lnet/minecraft/server/level/ServerPlayer;isSpectator()Z"
         ),
         locals = LocalCapture.CAPTURE_FAILSOFT
     )
-    public void orIsAfk(List<ServerPlayerEntity> players,
+    public void orIsAfk(List<ServerPlayer> players,
                         CallbackInfoReturnable<Boolean> cir,
                         int i,
                         int j,
                         Iterator var4,
-                        ServerPlayerEntity serverPlayerEntity
+                        ServerPlayer serverPlayerEntity
     ) {
         if (CONFIG.ENABLE_AFK && CONFIG.AUTO_AFK_ENABLED) {
             var playerData = ((ServerPlayerEntityAccess) serverPlayerEntity).ec$getPlayerData();
@@ -43,7 +43,7 @@ public void orIsAfk(List<ServerPlayerEntity> players,
                 && !serverPlayerEntity.isSleeping() // if they're sleeping, toss the custom afk logic
                 && playerData.ticksSinceLastActionOrMove() > CONFIG.AUTO_AFK_TICKS
             ) {
-                --total;
+                --activePlayers;
             }
         }
     }
diff --git a/src/main/java/com/fibermc/essentialcommands/mixin/TeleportCommandMixin.java b/src/main/java/com/fibermc/essentialcommands/mixin/TeleportCommandMixin.java
index 9beac036..043b08c6 100644
--- a/src/main/java/com/fibermc/essentialcommands/mixin/TeleportCommandMixin.java
+++ b/src/main/java/com/fibermc/essentialcommands/mixin/TeleportCommandMixin.java
@@ -12,30 +12,30 @@
 
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.entity.Entity;
-import net.minecraft.network.packet.s2c.play.PositionFlag;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.command.TeleportCommand;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.server.world.ServerWorld;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.commands.TeleportCommand;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.Relative;
 
 @Mixin(value = TeleportCommand.class)
 public class TeleportCommandMixin {
 
-    @Inject(method = "teleport",
-        at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;teleport(Lnet/minecraft/server/world/ServerWorld;DDDLjava/util/Set;FFZ)Z")
+    @Inject(method = "performTeleport",
+        at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;teleportTo(Lnet/minecraft/server/level/ServerLevel;DDDLjava/util/Set;FFZ)Z")
     )
     private static void execute(
-        ServerCommandSource source,
+        CommandSourceStack source,
         Entity target,
-        ServerWorld world,
+        ServerLevel world,
         double x, double y, double z,
-        Set<PositionFlag> movementFlags,
+        Set<Relative> movementFlags,
         float yaw, float pitch,
         @Coerce Object facingLocation,
         CallbackInfo ci
     ) throws CommandSyntaxException {
-        if (target instanceof ServerPlayerEntity targetPlayer) {
+        if (target instanceof ServerPlayer targetPlayer) {
             // This cast is guaranteed to work because of where we inject.
             var targetPlayerData = ((ServerPlayerEntityAccess)target).ec$getPlayerData();
             if (!targetPlayer.isSpectator()) {
diff --git a/src/main/java/com/fibermc/essentialcommands/playerdata/IServerPlayerEntityData.java b/src/main/java/com/fibermc/essentialcommands/playerdata/IServerPlayerEntityData.java
index 12db9516..4050b5c1 100644
--- a/src/main/java/com/fibermc/essentialcommands/playerdata/IServerPlayerEntityData.java
+++ b/src/main/java/com/fibermc/essentialcommands/playerdata/IServerPlayerEntityData.java
@@ -1,9 +1,9 @@
 package com.fibermc.essentialcommands.playerdata;
 
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.level.ServerPlayer;
 
 public interface IServerPlayerEntityData {
-    ServerPlayerEntity getPlayer();
+    ServerPlayer getPlayer();
 
-    void updatePlayerEntity(ServerPlayerEntity newPlayerEntity);
+    void updatePlayerEntity(ServerPlayer newPlayerEntity);
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/playerdata/PlayerData.java b/src/main/java/com/fibermc/essentialcommands/playerdata/PlayerData.java
index 620c58a3..2367221f 100644
--- a/src/main/java/com/fibermc/essentialcommands/playerdata/PlayerData.java
+++ b/src/main/java/com/fibermc/essentialcommands/playerdata/PlayerData.java
@@ -34,19 +34,19 @@
 import com.mojang.serialization.Dynamic;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 
-import net.minecraft.entity.player.PlayerAbilities;
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.nbt.NbtElement;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtIo;
 import net.minecraft.nbt.NbtOps;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.HoverEvent;
-import net.minecraft.text.MutableText;
-import net.minecraft.text.Text;
-import net.minecraft.text.TextCodecs;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.PersistentState;
+import net.minecraft.nbt.Tag;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.ComponentSerialization;
+import net.minecraft.network.chat.HoverEvent;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.player.Abilities;
+import net.minecraft.world.level.saveddata.SavedData;
+import net.minecraft.world.phys.Vec3;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
@@ -56,10 +56,10 @@
 
 import static com.fibermc.essentialcommands.EssentialCommands.CONFIG;
 
-public class PlayerData extends PersistentState implements IServerPlayerEntityData, IFeedbackReceiver {
+public class PlayerData extends SavedData implements IServerPlayerEntityData, IFeedbackReceiver {
 
     // ServerPlayerEntity
-    private ServerPlayerEntity player;
+    private ServerPlayer player;
     private UUID pUuid;
     private File saveFile;
 
@@ -76,21 +76,21 @@ public class PlayerData extends PersistentState implements IServerPlayerEntityDa
     private int tpCooldown;
 
     // Nickname
-    private Text nickname;
-    private MutableText fullNickname;
+    private Component nickname;
+    private MutableComponent fullNickname;
 
     // RTP Cooldown
     private int timeUsedRtp;
 
     private boolean afk;
-    private Vec3d lastTickPos;
+    private Vec3 lastTickPos;
     private boolean isInCombat;
     private int lastActionTick;
     private int lastMovedTick;
     private boolean hasMovedThisTick;
     private boolean isSleepingFromCommand;
 
-    public PlayerData(ServerPlayerEntity player, File saveFile) {
+    public PlayerData(ServerPlayer player, File saveFile) {
         incomingTeleportRequests = new LinkedHashMap<>();
         homes = new NamedLocationStorage();
         initializeRuntimeState(player, saveFile);
@@ -123,7 +123,7 @@ private PlayerData() {
     public static PlayerData createWithData(
         Optional<NamedLocationStorage> homes,
         Optional<MinecraftLocation> previousLocation,
-        Optional<Text> nickname,
+        Optional<Component> nickname,
         long timeUsedRtpEpochMs,
         int tpCooldown
     ) {
@@ -144,12 +144,12 @@ public void initializeSaveFileField(File saveFile)
     }
 
     // Initialize runtime state after deserialization
-    public void initializeRuntimeState(ServerPlayerEntity player, File saveFile) {
+    public void initializeRuntimeState(ServerPlayer player, File saveFile) {
         initializeSaveFileField(saveFile);
         this.player = player;
-        this.lastTickPos = player.getEntityPos();
-        this.lastActionTick = player.getEntityWorld().getServer().getTicks();
-        this.pUuid = player.getUuid();
+        this.lastTickPos = player.position();
+        this.lastActionTick = player.level().getServer().getTickCount();
+        this.pUuid = player.getUUID();
 
         // Re-register events
         playerActEvent.register((packet) -> {
@@ -176,17 +176,17 @@ public void initializeRuntimeState(ServerPlayerEntity player, File saveFile) {
         updatePlayerEntity(player);
     }
 
-    private static final DataFixer _playerDataDataFixer = PlayerDataDataFixer.createDataFixer().build().fixer();
+    private static final DataFixer PLAYER_DATA_DATA_FIXER = PlayerDataDataFixer.createDataFixer().build().fixer();
     private static final String SCHEMA_VERSION_KEY = "_sv";
     private static final int SCHEMA_VERSION = 1;
 
-    public static NbtCompound fixData(NbtCompound nbt) {
+    public static CompoundTag fixData(CompoundTag nbt) {
         // Handle legacy "data" wrapper if present
         nbt = nbt.getCompound("data").orElse(nbt);
-        nbt = _playerDataDataFixer.update(
+        nbt = PLAYER_DATA_DATA_FIXER.update(
             PlayerDataDataFixer.TYPE,
-            new Dynamic<NbtElement>(NbtOps.INSTANCE, nbt),
-            nbt.getInt(SCHEMA_VERSION_KEY, 0),
+            new Dynamic<Tag>(NbtOps.INSTANCE, nbt),
+            nbt.getIntOr(SCHEMA_VERSION_KEY, 0),
             SCHEMA_VERSION
         ).getValue().asCompound().orElseThrow();
 
@@ -214,23 +214,23 @@ public TeleportRequest getIncomingTeleportRequest(UUID tpAsker) {
     }
 
     public void addIncomingTeleportRequest(TeleportRequest teleportRequest) {
-        this.incomingTeleportRequests.put(teleportRequest.getSenderPlayer().getUuid(), teleportRequest);
+        this.incomingTeleportRequests.put(teleportRequest.getSenderPlayer().getUUID(), teleportRequest);
     }
 
     public void removeIncomingTeleportRequest(UUID tpAsker) {
         this.incomingTeleportRequests.remove(tpAsker);
     }
 
-    public ServerPlayerEntity getPlayer() {
+    public ServerPlayer getPlayer() {
         return player;
     }
 
     // Homes
     public void addHome(String homeName, MinecraftLocation minecraftLocation) throws CommandSyntaxException {
-        int playerMaxHomes = ECPerms.getHighestNumericPermission(this.player.getCommandSource(), ECPerms.Registry.Group.home_limit_group);
+        int playerMaxHomes = ECPerms.getHighestNumericPermission(this.player.createCommandSourceStack(), ECPerms.Registry.Group.home_limit_group);
         if (this.homes.size() < playerMaxHomes) {
             homes.putCommand(homeName, minecraftLocation);
-            this.markDirty();
+            this.setDirty();
         } else {
             var ecText = ECText.access(this.player);
             var homeNameText = ecText.accent(homeName);
@@ -247,28 +247,28 @@ public boolean existsHome(String homeName) {
         return homes.containsKey(homeName);
     }
 
-    public void sendCommandFeedback(Text text) {
-        this.player.getCommandSource().sendFeedback(() -> text, CONFIG.BROADCAST_TO_OPS);
+    public void sendCommandFeedback(Component text) {
+        this.player.createCommandSourceStack().sendSuccess(() -> text, CONFIG.BROADCAST_TO_OPS);
     }
 
-    public void sendCommandFeedback(String messageKey, Text... args) {
+    public void sendCommandFeedback(String messageKey, Component... args) {
         sendCommandFeedback(ECText.access(this.player).getText(messageKey, TextFormatType.Default, args));
     }
 
-    public void sendCommandError(Text text) {
-        this.player.getCommandSource().sendError(text);
+    public void sendCommandError(Component text) {
+        this.player.createCommandSourceStack().sendFailure(text);
     }
 
-    public void sendCommandError(String messageKey, Text... args) {
+    public void sendCommandError(String messageKey, Component... args) {
         sendCommandError(ECText.access(this.player).getText(messageKey, TextFormatType.Error, args));
     }
 
-    public void sendMessage(String messageKey, Text... args) {
-        this.player.sendMessage(ECText.access(this.player).getText(messageKey, TextFormatType.Default, args));
+    public void sendMessage(String messageKey, Component... args) {
+        this.player.sendSystemMessage(ECText.access(this.player).getText(messageKey, TextFormatType.Default, args));
     }
 
-    public void sendError(String messageKey, Text... args) {
-        this.player.sendMessage(ECText.access(this.player).getText(messageKey, TextFormatType.Error, args));
+    public void sendError(String messageKey, Component... args) {
+        this.player.sendSystemMessage(ECText.access(this.player).getText(messageKey, TextFormatType.Error, args));
     }
 
     public Set<String> getHomeNames() {
@@ -305,7 +305,7 @@ public void setAfk(boolean afk) {
             }
 
             if (!EssentialCommands.VANISH_PRESENT || !VanishAPI.isVanished(player)) {
-                this.player.getEntityWorld().getServer().getPlayerManager().broadcast(
+                this.player.level().getServer().getPlayerList().broadcastSystemMessage(
                     ECText.getInstance().getText(
                         "player.afk.enter",
                         this.player.getDisplayName()),
@@ -323,7 +323,7 @@ public void setAfk(boolean afk) {
             Pal.revokeAbility(this.player, VanillaAbilities.INVULNERABLE, ECAbilitySources.AFK_INVULN);
 
             if (!EssentialCommands.VANISH_PRESENT || !VanishAPI.isVanished(player)) {
-                this.player.getEntityWorld().getServer().getPlayerManager().broadcast(
+                this.player.level().getServer().getPlayerList().broadcastSystemMessage(
                     ECText.getInstance().getText(
                         "player.afk.exit",
                         this.player.getDisplayName()),
@@ -339,8 +339,8 @@ public boolean isAfk() {
     }
 
     public void onTickEnd() {
-        var ticks = player.getEntityWorld().getServer().getTicks();
-        var currentPos = player.getEntityPos();
+        var ticks = player.level().getServer().getTickCount();
+        var currentPos = player.position();
         hasMovedThisTick = !this.lastTickPos.equals(currentPos);
         if (hasMovedThisTick) {
             lastMovedTick = ticks;
@@ -348,7 +348,7 @@ public void onTickEnd() {
 
         if (this.afk) {
             if (CONFIG.INVULN_WHILE_AFK) {
-                player.requestTeleport(lastTickPos.x, lastTickPos.y, lastTickPos.z);
+                player.teleportTo(lastTickPos.x, lastTickPos.y, lastTickPos.z);
             } else if (hasMovedThisTick) {
                 this.setAfk(false);
             }
@@ -360,10 +360,10 @@ public void onTickEnd() {
             this.setAfk(true);
         }
 
-        lastTickPos = player.getEntityPos();
+        lastTickPos = player.position();
     }
 
-    public Vec3d getLastTickPos() {
+    public Vec3 getLastTickPos() {
         return lastTickPos;
     }
 
@@ -380,7 +380,7 @@ public boolean hasMovedThisTick() {
     }
 
     public double distanceMovedThisTick() {
-        return this.lastTickPos.distanceTo(this.player.getEntityPos());
+        return this.lastTickPos.distanceTo(this.player.position());
     }
 
     public int getLastActionTick() {
@@ -388,11 +388,11 @@ public int getLastActionTick() {
     }
 
     public int ticksSinceLastActionOrMove() {
-        return player.getEntityWorld().getServer().getTicks() - Math.max(lastMovedTick, lastActionTick);
+        return player.level().getServer().getTickCount() - Math.max(lastMovedTick, lastActionTick);
     }
 
     public void updateLastActionTick() {
-        this.lastActionTick = player.getEntityWorld().getServer().getTicks();
+        this.lastActionTick = player.level().getServer().getTickCount();
     }
 
     public boolean isSleepingFromCommand() {
@@ -408,7 +408,7 @@ public void setIsSleepingFromCommand(boolean sleepingFromCommand) {
 
     public void setPreviousLocation(MinecraftLocation location) {
         this.previousLocation = location;
-        this.markDirty();
+        this.setDirty();
     }
 
     public MinecraftLocation getPreviousLocation() {
@@ -425,21 +425,21 @@ public MinecraftLocation getPreviousLocation() {
     public boolean removeHome(String homeName) {
         MinecraftLocation old = this.homes.remove(homeName);
         if (old != null) {
-            this.markDirty();
+            this.setDirty();
             return true;
         }
         return false;
     }
 
     @Override
-    public void updatePlayerEntity(ServerPlayerEntity serverPlayerEntity) {
+    public void updatePlayerEntity(ServerPlayer serverPlayerEntity) {
         boolean couldFly = VanillaAbilities.ALLOW_FLYING.getTracker(this.player).isGrantedBy(ECAbilitySources.FLY_COMMAND);
         this.player = serverPlayerEntity;
         setFlight(couldFly);
     }
 
     private void updateFlight() {
-        this.player.sendAbilitiesUpdate();
+        this.player.onUpdateAbilities();
     }
 
     public void setFlight(boolean canFly) {
@@ -447,7 +447,7 @@ public void setFlight(boolean canFly) {
     }
 
     public void setFlight(boolean canFly, boolean flyImmediately) {
-        PlayerAbilities abilities = this.player.getAbilities();
+        Abilities abilities = this.player.getAbilities();
         if (canFly) {
             Pal.grantAbility(this.player, VanillaAbilities.ALLOW_FLYING, ECAbilitySources.FLY_COMMAND);
             if (flyImmediately) {
@@ -487,19 +487,19 @@ public void setTpCooldown(int cooldown) {
         this.tpCooldown = cooldown;
     }
 
-    public Optional<MutableText> getNickname() {
+    public Optional<MutableComponent> getNickname() {
         return Optional.ofNullable(nickname != null ? nickname.copy() : null);
     }
 
-    public MutableText getFullNickname() {
+    public MutableComponent getFullNickname() {
         return fullNickname;
     }
 
-    public MutableText copyFullNickname() {
+    public MutableComponent copyFullNickname() {
         return fullNickname != null ? TextUtil.deepCopy(fullNickname) : null;
     }
 
-    public int setNickname(Text nickname) {
+    public int setNickname(Component nickname) {
         int resultCode = 0;
         // Reset nickname
         if (nickname == null) {
@@ -515,7 +515,7 @@ public int setNickname(Text nickname) {
                 return -2;
             }
             // Ensure player has permissions required to set the specified nickname
-            boolean hasRequiredPerms = NicknameTextUtil.checkPerms(nickname, this.player.getCommandSource());
+            boolean hasRequiredPerms = NicknameTextUtil.checkPerms(nickname, this.player.createCommandSourceStack());
             if (!hasRequiredPerms) {
                 EssentialCommands.LOGGER.info(
                     "{} attempted to set nickname to '{}', with insufficient permissions to do so.",
@@ -537,14 +537,14 @@ public int setNickname(Text nickname) {
 
         reloadFullNickname();
         PlayerDataManager.getInstance().markNicknameDirty(this);
-        this.markDirty();
+        this.setDirty();
         // Return codes based on fail/success
         //  ex: caused by profanity filter.
         return resultCode;
     }
 
     public void save() {
-        NbtCompound data = CODEC.encodeStart(NbtOps.INSTANCE, this)
+        CompoundTag data = CODEC.encodeStart(NbtOps.INSTANCE, this)
             .getOrThrow().asCompound().orElseThrow();
 
         try {
@@ -556,7 +556,7 @@ public void save() {
 
     public void setTimeUsedRtp(int i) {
         this.timeUsedRtp = i;
-        this.markDirty();
+        this.setDirty();
     }
 
     public int getTimeUsedRtp() {
@@ -564,8 +564,8 @@ public int getTimeUsedRtp() {
     }
 
     private void reloadFullNickname() {
-        MutableText baseName = Text.literal(this.getPlayer().getGameProfile().name());
-        MutableText tempFullNickname = Text.empty();
+        MutableComponent baseName = Component.literal(this.getPlayer().getGameProfile().name());
+        MutableComponent tempFullNickname = Component.empty();
         // Note: this doesn't ever display if nickname is null,
         //  because our mixin to getDisplayName does a null check on getNickname
         if (this.nickname != null) {
@@ -586,14 +586,14 @@ private void reloadFullNickname() {
         this.fullNickname = tempFullNickname;
     }
 
-    public static PlayerData access(@NotNull ServerPlayerEntity player) {
+    public static PlayerData access(@NotNull ServerPlayer player) {
         return ((ServerPlayerEntityAccess) player).ec$getPlayerData();
     }
 
-    public static PlayerData accessFromContextOrThrow(CommandContext<ServerCommandSource> context)
+    public static PlayerData accessFromContextOrThrow(CommandContext<CommandSourceStack> context)
         throws CommandSyntaxException
     {
-        return access(context.getSource().getPlayerOrThrow());
+        return access(context.getSource().getPlayerOrException());
     }
 
     public static final Codec<PlayerData> CODEC = RecordCodecBuilder.create(instance ->
@@ -609,7 +609,7 @@ public static PlayerData accessFromContextOrThrow(CommandContext<ServerCommandSo
                 .forGetter(pd -> Optional.ofNullable(pd.previousLocation)),
 
             // Nickname
-            TextCodecs.CODEC
+            ComponentSerialization.CODEC
                 .optionalFieldOf("nickname")
                 .forGetter(pd -> Optional.ofNullable(pd.nickname)),
 
diff --git a/src/main/java/com/fibermc/essentialcommands/playerdata/PlayerDataFactory.java b/src/main/java/com/fibermc/essentialcommands/playerdata/PlayerDataFactory.java
index 77386979..a2f0e138 100644
--- a/src/main/java/com/fibermc/essentialcommands/playerdata/PlayerDataFactory.java
+++ b/src/main/java/com/fibermc/essentialcommands/playerdata/PlayerDataFactory.java
@@ -11,17 +11,17 @@
 import com.fibermc.essentialcommands.util.FileUtil;
 import org.apache.logging.log4j.Level;
 
-import net.minecraft.nbt.NbtCompound;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtAccounter;
 import net.minecraft.nbt.NbtIo;
 import net.minecraft.nbt.NbtOps;
-import net.minecraft.nbt.NbtSizeTracker;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.level.ServerPlayer;
 
 public final class PlayerDataFactory {
     private PlayerDataFactory() {}
 
-    private static PlayerData create(ServerPlayerEntity player, File playerDataFile) {
+    private static PlayerData create(ServerPlayer player, File playerDataFile) {
         boolean fileExisted = false;
 
         try {
@@ -32,7 +32,7 @@ private static PlayerData create(ServerPlayerEntity player, File playerDataFile)
 
         if (fileExisted && playerDataFile.length() != 0) {
             try {
-                var tag = NbtIo.readCompressed(playerDataFile.toPath(), NbtSizeTracker.ofUnlimitedBytes());
+                var tag = NbtIo.readCompressed(playerDataFile.toPath(), NbtAccounter.unlimitedHeap());
 
                 tag = PlayerData.fixData(tag);
 
@@ -53,7 +53,7 @@ private static PlayerData create(ServerPlayerEntity player, File playerDataFile)
             }
         } else {
             PlayerData pData = new PlayerData(player, playerDataFile);
-            pData.markDirty();
+            pData.setDirty();
             pData.save();
             return pData;
         }
@@ -68,9 +68,9 @@ public static PlayerData create(NamedLocationStorage homes, File saveFile) {
         PlayerData playerData = null;
         if (Files.exists(saveFile.toPath()) && saveFile.length() != 0) {
             try {
-                NbtCompound tag = NbtIo.readCompressed(saveFile.toPath(), NbtSizeTracker.ofUnlimitedBytes());
+                CompoundTag tag = NbtIo.readCompressed(saveFile.toPath(), NbtAccounter.unlimitedHeap());
                 // Handle legacy "data" wrapper if present
-                NbtCompound dataTag = tag.getCompound("data").orElse(tag);
+                CompoundTag dataTag = tag.getCompound("data").orElse(tag);
 
                 playerData = PlayerData.CODEC.parse(
                     NbtOps.INSTANCE,
@@ -100,18 +100,18 @@ public static PlayerData create(NamedLocationStorage homes, File saveFile) {
             playerData = new PlayerData(saveFile);
         }
 
-        playerData.markDirty();
+        playerData.setDirty();
         return playerData;
     }
 
-    public static PlayerData create(ServerPlayerEntity player) {
+    public static PlayerData create(ServerPlayer player) {
         try {
             return create(player, getPlayerDataFile(player));
         } catch (IOException ex) {
             EssentialCommands.log(
                 Level.ERROR,
                 "Failed to create player data file for player with id '{}'. Player data may fail to save, or other unexpected behavior may occur.",
-                player.getUuidAsString());
+                player.getStringUUID());
             EssentialCommands.LOGGER.error(ex);
         }
         return new PlayerData(player, null);
@@ -121,9 +121,9 @@ public static Path getPlayerDataDirectoryPath(MinecraftServer server) throws IOE
         return FileUtil.getOrCreateWorldDirectory(server, "modplayerdata");
     }
 
-    private static File getPlayerDataFile(ServerPlayerEntity player) throws IOException {
-        return getPlayerDataDirectoryPath(player.getEntityWorld().getServer())
-            .resolve(player.getUuidAsString() + ".dat")
+    private static File getPlayerDataFile(ServerPlayer player) throws IOException {
+        return getPlayerDataDirectoryPath(player.level().getServer())
+            .resolve(player.getStringUUID() + ".dat")
             .toFile();
     }
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/playerdata/PlayerDataManager.java b/src/main/java/com/fibermc/essentialcommands/playerdata/PlayerDataManager.java
index 4fe82517..3d342294 100644
--- a/src/main/java/com/fibermc/essentialcommands/playerdata/PlayerDataManager.java
+++ b/src/main/java/com/fibermc/essentialcommands/playerdata/PlayerDataManager.java
@@ -18,13 +18,13 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import net.minecraft.entity.damage.DamageSource;
-import net.minecraft.network.ClientConnection;
-import net.minecraft.network.packet.s2c.play.PlayerListS2CPacket;
+import net.minecraft.network.Connection;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.PlayerManager;
-import net.minecraft.server.network.ServerPlayNetworkHandler;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.network.ServerGamePacketListenerImpl;
+import net.minecraft.server.players.PlayerList;
+import net.minecraft.world.damagesource.DamageSource;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
@@ -77,13 +77,13 @@ public static void init() {
                 (playerDataManager, server) -> {
                     for (PlayerDataManagerTickCallback event : listeners) {
                         event.onTick(playerDataManager, server);
-                        server.getOverworld().updateSleepingPlayers();
+                        server.overworld().updateSleepingPlayerList();
                     }
                 }
         );
 
     private static void handleSendMotdForGameJoin(
-        ServerPlayNetworkHandler handler,
+        ServerGamePacketListenerImpl handler,
         PacketSender sender,
         MinecraftServer server
     ) {
@@ -112,11 +112,11 @@ public void markNicknameDirty(String playerName) {
     public void queueNicknameUpdatesForAllPlayers() {
         scheduleTask("nickname-update", server -> {
             server
-                .getPlayerManager()
-                .sendToAll(
-                    new PlayerListS2CPacket(
+                .getPlayerList()
+                .broadcastAll(
+                    new ClientboundPlayerInfoUpdatePacket(
                         EnumSet.of(
-                            PlayerListS2CPacket.Action.UPDATE_DISPLAY_NAME
+                            ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME
                         ),
                         this.getAllPlayerData()
                             .stream()
@@ -130,27 +130,27 @@ public void queueNicknameUpdatesForAllPlayers() {
 
     public void tick(MinecraftServer server) {
         if (
-            CONFIG.NICKNAMES_IN_PLAYER_LIST && server.getTicks() % (20 * 5) == 0
+            CONFIG.NICKNAMES_IN_PLAYER_LIST && server.getTickCount() % (20 * 5) == 0
         ) {
             if (this.changedNicknames.size() + this.changedTeams.size() > 0) {
-                PlayerManager serverPlayerManager = server.getPlayerManager();
+                PlayerList serverPlayerManager = server.getPlayerList();
 
-                Set<ServerPlayerEntity> allChangedNicknamePlayers =
+                Set<ServerPlayer> allChangedNicknamePlayers =
                     Stream.concat(
                         changedNicknames.stream().map(PlayerData::getPlayer),
                         changedTeams
                             .stream()
-                            .map(serverPlayerManager::getPlayer)
+                            .map(serverPlayerManager::getPlayerByName)
                     )
                         .filter(Objects::nonNull)
                         .collect(Collectors.toSet());
 
                 server
-                    .getPlayerManager()
-                    .sendToAll(
-                        new PlayerListS2CPacket(
+                    .getPlayerList()
+                    .broadcastAll(
+                        new ClientboundPlayerInfoUpdatePacket(
                             EnumSet.of(
-                                PlayerListS2CPacket.Action.UPDATE_DISPLAY_NAME
+                                ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME
                             ),
                             allChangedNicknamePlayers
                         )
@@ -211,8 +211,8 @@ public void scheduleTask(
 
     // EVENTS
     private static void initializePlayerDataForConnect(
-        ClientConnection connection,
-        ServerPlayerEntity player
+        Connection connection,
+        ServerPlayer player
     ) {
         var playerAccess = ((ServerPlayerEntityAccess) player);
         PlayerData playerData = getInstance().loadPlayerData(player);
@@ -223,15 +223,15 @@ private static void initializePlayerDataForConnect(
     }
 
     private static void handleUnloadPlayerDataForLeave(
-        ServerPlayerEntity player
+        ServerPlayer player
     ) {
         // Auto-saving should be handled by WorldSaveHandlerMixin. (PlayerData saves when MC server saves players)
         getInstance().unloadPlayerData(player);
     }
 
     public static void handlePlayerDataRespawnSync(
-        ServerPlayerEntity oldPlayerEntity,
-        ServerPlayerEntity newPlayerEntity
+        ServerPlayer oldPlayerEntity,
+        ServerPlayer newPlayerEntity
     ) {
         var oldPlayerAccess = ((ServerPlayerEntityAccess) oldPlayerEntity);
         var newPlayerAccess = ((ServerPlayerEntityAccess) newPlayerEntity);
@@ -249,7 +249,7 @@ public static void handlePlayerDataRespawnSync(
      * @param oldPlayerEntity null if first spawn
      */
     public static void handleRespawnAtEcSpawn(
-        @Nullable ServerPlayerEntity oldPlayerEntity,
+        @Nullable ServerPlayer oldPlayerEntity,
         Consumer<MinecraftLocation> onOverwriteSpawn
     ) {
         var worldMgr = ManagerLocator.getInstance().getWorldDataManager();
@@ -264,18 +264,17 @@ public static void handleRespawnAtEcSpawn(
             new ExpressionEvaluationContext<>() {
                 private boolean isSameWorld() {
                     return (
-                        oldPlayerEntity == null ||
-                        oldPlayerEntity.getEntityWorld().getRegistryKey() ==
-                        spawnLoc.dim()
+                        oldPlayerEntity == null
+                        || oldPlayerEntity.level().dimension() == spawnLoc.dim()
                     );
                 }
 
                 private boolean hasNoBed() {
                     return (
-                        oldPlayerEntity == null ||
+                        oldPlayerEntity == null
                         // This is not perfect, but 'respawn' is horribly
                         // complex to navigate now
-                        oldPlayerEntity.getRespawn() == null
+                        || oldPlayerEntity.getRespawnConfig() == null
                     );
                 }
 
@@ -300,7 +299,7 @@ public boolean matches(RespawnCondition condition) {
     }
 
     private static void handleSetPreviousLocationForDeath(
-        ServerPlayerEntity playerEntity,
+        ServerPlayer playerEntity,
         DamageSource damageSource
     ) {
         PlayerData pData =
@@ -311,10 +310,10 @@ private static void handleSetPreviousLocationForDeath(
     }
 
     // SET / ADD
-    private PlayerData loadPlayerData(ServerPlayerEntity player) {
+    private PlayerData loadPlayerData(ServerPlayer player) {
         PlayerData playerData =
             ((ServerPlayerEntityAccess) player).ec$getPlayerData();
-        dataMap.put(player.getUuid(), playerData);
+        dataMap.put(player.getUUID(), playerData);
         return playerData;
     }
 
@@ -323,8 +322,8 @@ PlayerData getPlayerDataFromUUID(UUID playerID) {
     }
 
     // SAVE / LOAD
-    private void unloadPlayerData(ServerPlayerEntity player) {
-        this.dataMap.remove(player.getUuid());
+    private void unloadPlayerData(ServerPlayer player) {
+        this.dataMap.remove(player.getUUID());
     }
 
     public Collection<PlayerData> getAllPlayerData() {
diff --git a/src/main/java/com/fibermc/essentialcommands/playerdata/PlayerProfile.java b/src/main/java/com/fibermc/essentialcommands/playerdata/PlayerProfile.java
index 79430d7e..52c58f7c 100644
--- a/src/main/java/com/fibermc/essentialcommands/playerdata/PlayerProfile.java
+++ b/src/main/java/com/fibermc/essentialcommands/playerdata/PlayerProfile.java
@@ -18,23 +18,23 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.nbt.NbtCompound;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtIo;
-import net.minecraft.registry.RegistryWrapper;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.Style;
-import net.minecraft.world.PersistentState;
+import net.minecraft.network.chat.Style;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.level.saveddata.SavedData;
 
 import dev.jpcode.eccore.config.ConfigUtil;
 
-public class PlayerProfile extends PersistentState implements IServerPlayerEntityData, IStyleProvider {
+public class PlayerProfile extends SavedData implements IServerPlayerEntityData, IStyleProvider {
 
-    private ServerPlayerEntity player;
+    private ServerPlayer player;
     private final File saveFile;
     private ProfileOptions profileOptions;
 
-    public PlayerProfile(@NotNull ServerPlayerEntity player, File saveFile) {
+    public PlayerProfile(@NotNull ServerPlayer player, File saveFile) {
         this.player = player;
         this.saveFile = saveFile;
         this.profileOptions = new ProfileOptions();
@@ -102,9 +102,9 @@ private static final class StorageKey {
         static final String PRINT_TELEPORT_COORDINATES = "printTeleportCoordinates";
     }
 
-    public void fromNbt(NbtCompound tag) {
+    public void fromNbt(CompoundTag tag) {
         // `data` was the main obj key in old mc PersistentState schema
-        NbtCompound dataTag = tag.getCompound("data").orElse(tag);
+        CompoundTag dataTag = tag.getCompound("data").orElse(tag);
         this.profileOptions = new ProfileOptions();
 
         this.profileOptions.formattingDefault = dataTag.getString(StorageKey.FORMATTING_DEAULT)
@@ -119,7 +119,7 @@ public void fromNbt(NbtCompound tag) {
         this.profileOptions.printTeleportCoordinates = dataTag.getBoolean(StorageKey.PRINT_TELEPORT_COORDINATES);
     }
 
-    public NbtCompound writeNbt(NbtCompound tag, RegistryWrapper.WrapperLookup wrapperLookup) {
+    public CompoundTag writeNbt(CompoundTag tag, HolderLookup.Provider wrapperLookup) {
         this.profileOptions.formattingDefault
             .ifPresent(style -> tag.putString(StorageKey.FORMATTING_DEAULT, ConfigUtil.serializeStyle(style)));
 
@@ -135,8 +135,8 @@ public NbtCompound writeNbt(NbtCompound tag, RegistryWrapper.WrapperLookup wrapp
         return tag;
     }
 
-    public void save(RegistryWrapper.WrapperLookup wrapperLookup) {
-        NbtCompound data = this.writeNbt(new NbtCompound(), wrapperLookup);
+    public void save(HolderLookup.Provider wrapperLookup) {
+        CompoundTag data = this.writeNbt(new CompoundTag(), wrapperLookup);
 
         try {
             NbtIo.writeCompressed(data, this.saveFile.toPath());
@@ -146,22 +146,22 @@ public void save(RegistryWrapper.WrapperLookup wrapperLookup) {
     }
 
     @Override
-    public ServerPlayerEntity getPlayer() {
+    public ServerPlayer getPlayer() {
         return player;
     }
 
     @Override
-    public void updatePlayerEntity(ServerPlayerEntity newPlayerEntity) {
+    public void updatePlayerEntity(ServerPlayer newPlayerEntity) {
         this.player = newPlayerEntity;
     }
 
-    public static PlayerProfile access(@NotNull ServerPlayerEntity player) {
+    public static PlayerProfile access(@NotNull ServerPlayer player) {
         return ((ServerPlayerEntityAccess) player).ec$getProfile();
     }
 
-    public static PlayerProfile accessFromContextOrThrow(CommandContext<ServerCommandSource> context)
+    public static PlayerProfile accessFromContextOrThrow(CommandContext<CommandSourceStack> context)
         throws CommandSyntaxException
     {
-        return access(context.getSource().getPlayerOrThrow());
+        return access(context.getSource().getPlayerOrException());
     }
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/playerdata/PlayerProfileFactory.java b/src/main/java/com/fibermc/essentialcommands/playerdata/PlayerProfileFactory.java
index 6ba28c67..55b1e4d6 100644
--- a/src/main/java/com/fibermc/essentialcommands/playerdata/PlayerProfileFactory.java
+++ b/src/main/java/com/fibermc/essentialcommands/playerdata/PlayerProfileFactory.java
@@ -8,14 +8,14 @@
 import com.fibermc.essentialcommands.util.FileUtil;
 import org.apache.logging.log4j.Level;
 
+import net.minecraft.nbt.NbtAccounter;
 import net.minecraft.nbt.NbtIo;
-import net.minecraft.nbt.NbtSizeTracker;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.level.ServerPlayer;
 
 public final class PlayerProfileFactory {
     private PlayerProfileFactory() {}
 
-    private static PlayerProfile create(ServerPlayerEntity player, File playerDataFile) {
+    private static PlayerProfile create(ServerPlayer player, File playerDataFile) {
         PlayerProfile pData = new PlayerProfile(player, playerDataFile);
 
         boolean fileExisted = false;
@@ -28,7 +28,7 @@ private static PlayerProfile create(ServerPlayerEntity player, File playerDataFi
 
         if (fileExisted && playerDataFile.length() != 0) {
             try {
-                pData.fromNbt(NbtIo.readCompressed(playerDataFile.toPath(), NbtSizeTracker.ofUnlimitedBytes()));
+                pData.fromNbt(NbtIo.readCompressed(playerDataFile.toPath(), NbtAccounter.unlimitedHeap()));
             } catch (IOException e) {
                 EssentialCommands.log(
                     Level.WARN,
@@ -36,29 +36,29 @@ private static PlayerProfile create(ServerPlayerEntity player, File playerDataFi
                 e.printStackTrace();
             }
         } else {
-            pData.markDirty();
-            pData.save(Objects.requireNonNull(player.getEntityWorld().getServer()).getRegistryManager());
+            pData.setDirty();
+            pData.save(Objects.requireNonNull(player.level().getServer()).registryAccess());
         }
 
         return pData;
     }
 
-    public static PlayerProfile create(ServerPlayerEntity player) {
+    public static PlayerProfile create(ServerPlayer player) {
         try {
             return create(player, getPlayerProfileFile(player));
         } catch (IOException ex) {
             EssentialCommands.log(
                 Level.ERROR,
                 "Failed to create player profile file for player with id '{}'. Player profile may fail to save, or other unexpected behavior may occur.",
-                player.getUuidAsString());
+                player.getStringUUID());
             EssentialCommands.LOGGER.error(ex);
         }
         return new PlayerProfile(player, null);
     }
 
-    private static File getPlayerProfileFile(ServerPlayerEntity player) throws IOException {
-        return FileUtil.getOrCreateWorldDirectory(player.getEntityWorld().getServer(), "ec_player_profiles")
-            .resolve(player.getUuidAsString() + ".dat")
+    private static File getPlayerProfileFile(ServerPlayer player) throws IOException {
+        return FileUtil.getOrCreateWorldDirectory(player.level().getServer(), "ec_player_profiles")
+            .resolve(player.getStringUUID() + ".dat")
             .toFile();
     }
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/screen/AnvilCommandScreenHandler.java b/src/main/java/com/fibermc/essentialcommands/screen/AnvilCommandScreenHandler.java
index 1d79eeff..1d80e6ab 100644
--- a/src/main/java/com/fibermc/essentialcommands/screen/AnvilCommandScreenHandler.java
+++ b/src/main/java/com/fibermc/essentialcommands/screen/AnvilCommandScreenHandler.java
@@ -1,17 +1,17 @@
 package com.fibermc.essentialcommands.screen;
 
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.screen.AnvilScreenHandler;
-import net.minecraft.screen.ScreenHandlerContext;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.AnvilMenu;
+import net.minecraft.world.inventory.ContainerLevelAccess;
 
-public class AnvilCommandScreenHandler extends AnvilScreenHandler {
-    public AnvilCommandScreenHandler(int syncId, PlayerInventory playerInventory, ScreenHandlerContext context) {
+public class AnvilCommandScreenHandler extends AnvilMenu {
+    public AnvilCommandScreenHandler(int syncId, Inventory playerInventory, ContainerLevelAccess context) {
         super(syncId, playerInventory, context);
     }
 
     @Override
-    public boolean canUse(PlayerEntity player) {
+    public boolean stillValid(Player player) {
         return true;
     }
 
diff --git a/src/main/java/com/fibermc/essentialcommands/screen/CraftingCommandScreenHandler.java b/src/main/java/com/fibermc/essentialcommands/screen/CraftingCommandScreenHandler.java
index 8dbcd10e..20cbd479 100644
--- a/src/main/java/com/fibermc/essentialcommands/screen/CraftingCommandScreenHandler.java
+++ b/src/main/java/com/fibermc/essentialcommands/screen/CraftingCommandScreenHandler.java
@@ -1,17 +1,17 @@
 package com.fibermc.essentialcommands.screen;
 
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.screen.CraftingScreenHandler;
-import net.minecraft.screen.ScreenHandlerContext;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.ContainerLevelAccess;
+import net.minecraft.world.inventory.CraftingMenu;
 
-public class CraftingCommandScreenHandler extends CraftingScreenHandler {
-    public CraftingCommandScreenHandler(int syncId, PlayerInventory playerInventory, ScreenHandlerContext context) {
+public class CraftingCommandScreenHandler extends CraftingMenu {
+    public CraftingCommandScreenHandler(int syncId, Inventory playerInventory, ContainerLevelAccess context) {
         super(syncId, playerInventory, context);
     }
 
     @Override
-    public boolean canUse(PlayerEntity player) {
+    public boolean stillValid(Player player) {
         return true;
     }
 
diff --git a/src/main/java/com/fibermc/essentialcommands/screen/GrindstoneCommandScreenHandler.java b/src/main/java/com/fibermc/essentialcommands/screen/GrindstoneCommandScreenHandler.java
index 3f41fe7b..5a4a4b38 100644
--- a/src/main/java/com/fibermc/essentialcommands/screen/GrindstoneCommandScreenHandler.java
+++ b/src/main/java/com/fibermc/essentialcommands/screen/GrindstoneCommandScreenHandler.java
@@ -1,17 +1,17 @@
 package com.fibermc.essentialcommands.screen;
 
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.screen.GrindstoneScreenHandler;
-import net.minecraft.screen.ScreenHandlerContext;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.ContainerLevelAccess;
+import net.minecraft.world.inventory.GrindstoneMenu;
 
-public class GrindstoneCommandScreenHandler extends GrindstoneScreenHandler {
-    public GrindstoneCommandScreenHandler(int syncId, PlayerInventory playerInventory, ScreenHandlerContext context) {
+public class GrindstoneCommandScreenHandler extends GrindstoneMenu {
+    public GrindstoneCommandScreenHandler(int syncId, Inventory playerInventory, ContainerLevelAccess context) {
         super(syncId, playerInventory, context);
     }
 
     @Override
-    public boolean canUse(PlayerEntity player) {
+    public boolean stillValid(Player player) {
         return true;
     }
 
diff --git a/src/main/java/com/fibermc/essentialcommands/screen/StonecutterCommandScreenHandler.java b/src/main/java/com/fibermc/essentialcommands/screen/StonecutterCommandScreenHandler.java
index d82c4c3e..7321c956 100644
--- a/src/main/java/com/fibermc/essentialcommands/screen/StonecutterCommandScreenHandler.java
+++ b/src/main/java/com/fibermc/essentialcommands/screen/StonecutterCommandScreenHandler.java
@@ -1,17 +1,17 @@
 package com.fibermc.essentialcommands.screen;
 
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.screen.ScreenHandlerContext;
-import net.minecraft.screen.StonecutterScreenHandler;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.ContainerLevelAccess;
+import net.minecraft.world.inventory.StonecutterMenu;
 
-public class StonecutterCommandScreenHandler extends StonecutterScreenHandler {
-    public StonecutterCommandScreenHandler(int syncId, PlayerInventory playerInventory, ScreenHandlerContext context) {
+public class StonecutterCommandScreenHandler extends StonecutterMenu {
+    public StonecutterCommandScreenHandler(int syncId, Inventory playerInventory, ContainerLevelAccess context) {
         super(syncId, playerInventory, context);
     }
 
     @Override
-    public boolean canUse(PlayerEntity player) {
+    public boolean stillValid(Player player) {
         return true;
     }
 
diff --git a/src/main/java/com/fibermc/essentialcommands/teleportation/PlayerTeleporter.java b/src/main/java/com/fibermc/essentialcommands/teleportation/PlayerTeleporter.java
index 020e45c6..9a56e07a 100644
--- a/src/main/java/com/fibermc/essentialcommands/teleportation/PlayerTeleporter.java
+++ b/src/main/java/com/fibermc/essentialcommands/teleportation/PlayerTeleporter.java
@@ -8,27 +8,25 @@
 import com.fibermc.essentialcommands.access.ServerPlayerEntityAccess;
 import com.fibermc.essentialcommands.playerdata.PlayerData;
 import com.fibermc.essentialcommands.types.MinecraftLocation;
-
-import net.minecraft.command.permission.Permission;
-import net.minecraft.command.permission.PermissionLevel;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityType;
-import net.minecraft.entity.SpawnReason;
-import net.minecraft.entity.passive.TameableEntity;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.server.world.ServerWorld;
-import net.minecraft.storage.NbtReadView;
-import net.minecraft.storage.NbtWriteView;
-import net.minecraft.text.MutableText;
-import net.minecraft.text.Text;
-import net.minecraft.util.ErrorReporter;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Box;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.core.BlockPos;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.permissions.Permission;
+import net.minecraft.server.permissions.PermissionLevel;
+import net.minecraft.util.ProblemReporter;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntitySpawnReason;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.TamableAnimal;
+import net.minecraft.world.level.storage.TagValueInput;
+import net.minecraft.world.level.storage.TagValueOutput;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.Vec3;
 
 import dev.jpcode.eccore.util.TextUtil;
 
@@ -36,16 +34,16 @@
 
 public final class PlayerTeleporter {
     private static final Logger LOGGER = LogManager.getLogger("PlayerTeleporter");
-    private static ErrorReporter errorReporter = new ErrorReporter.Impl();
+    private static ProblemReporter errorReporter = new ProblemReporter.Collector();
 
     private PlayerTeleporter() {}
 
-    public static void requestTeleport(PlayerData pData, MinecraftLocation dest, MutableText destName) {
+    public static void requestTeleport(PlayerData pData, MinecraftLocation dest, MutableComponent destName) {
         requestTeleport(new QueuedLocationTeleport(pData, dest, destName));
     }
 
     public static void requestTeleport(QueuedTeleport queuedTeleport) {
-        ServerPlayerEntity player = queuedTeleport.getPlayerData().getPlayer();
+        ServerPlayer player = queuedTeleport.getPlayerData().getPlayer();
 //        if (pData.getTpCooldown() < 0 || player.getEntityWorld().getServer().getPlayerManager().isOperator(player.getGameProfile())) {
 //            //send TP request to tpManager
 //        }
@@ -56,7 +54,7 @@ public static void requestTeleport(QueuedTeleport queuedTeleport) {
         }
     }
 
-    public static void requestTeleport(ServerPlayerEntity playerEntity, MinecraftLocation dest, MutableText destName) {
+    public static void requestTeleport(ServerPlayer playerEntity, MinecraftLocation dest, MutableComponent destName) {
         requestTeleport(((ServerPlayerEntityAccess) playerEntity).ec$getPlayerData(), dest, destName);
     }
 
@@ -65,14 +63,14 @@ public static void teleport(QueuedTeleport queuedTeleport) {
         teleport(queuedTeleport.getPlayerData(), queuedTeleport.getDest(), queuedTeleport.getDestName());
     }
 
-    public static void teleport(PlayerData pData, MinecraftLocation dest, MutableText destName) { //forceTeleport
-        ServerPlayerEntity player = pData.getPlayer();
+    public static void teleport(PlayerData pData, MinecraftLocation dest, MutableComponent destName) { //forceTeleport
+        ServerPlayer player = pData.getPlayer();
 
         // If teleporting between dimensions is disabled and player doesn't have TP rules override
         if (!CONFIG.ALLOW_TELEPORT_BETWEEN_DIMENSIONS
             && !playerHasTpRulesBypass(player, ECPerms.Registry.bypass_allow_teleport_between_dimensions)) {
             // If this teleport is between dimensions
-            if (dest.dim() != player.getEntityWorld().getRegistryKey()) {
+            if (dest.dim() != player.level().dimension()) {
                 pData.sendError("teleport.error.interdimensional_teleport_disabled");
                 return;
             }
@@ -88,21 +86,21 @@ public static void teleport(PlayerData pData, MinecraftLocation dest, MutableTex
      * @param dest the destination location for the teleportation
      * @param destName the name of the destination to be displayed in messages
      */
-    private static void execTeleport(ServerPlayerEntity playerEntity, MinecraftLocation dest, MutableText destName) {
-        var playerServer = playerEntity.getEntityWorld().getServer();
-        var targetWorld = playerServer.getWorld(dest.dim());
+    private static void execTeleport(ServerPlayer playerEntity, MinecraftLocation dest, MutableComponent destName) {
+        var playerServer = playerEntity.level().getServer();
+        var targetWorld = playerServer.getLevel(dest.dim());
 
         if (targetWorld == null) {
             throw new NullPointerException(String.format("Could not find teleport target world, '%s'", dest.dim()));
         }
 
-        BlockPos playerPos = playerEntity.getBlockPos();
-        Vec3d targetVec = new Vec3d(dest.pos().x, dest.pos().y, dest.pos().z);
+        BlockPos playerPos = playerEntity.blockPosition();
+        Vec3 targetVec = new Vec3(dest.pos().x, dest.pos().y, dest.pos().z);
 
-        playerEntity.teleport(targetWorld, targetVec.x, targetVec.y, targetVec.z, Set.of(), dest.headYaw(), dest.pitch(), false);
+        playerEntity.teleportTo(targetWorld, targetVec.x, targetVec.y, targetVec.z, Set.of(), dest.headYaw(), dest.pitch(), false);
 
         if (CONFIG.TELEPORT_FOLLOWERS) {
-            List<TameableEntity> pets = detectTamedPets(playerEntity, playerPos);
+            List<TamableAnimal> pets = detectTamedPets(playerEntity, playerPos);
             teleportTamedEntities(pets, targetWorld, targetVec, playerEntity);
         }
 
@@ -116,20 +114,20 @@ private static void execTeleport(ServerPlayerEntity playerEntity, MinecraftLocat
      * @param playerPos the position of the player
      * @return a list of tamed pets that belong to the player and are not sitting
      */
-    private static List<TameableEntity> detectTamedPets(ServerPlayerEntity playerEntity, BlockPos playerPos) {
+    private static List<TamableAnimal> detectTamedPets(ServerPlayer playerEntity, BlockPos playerPos) {
         double radius = Math.max(CONFIG.TELEPORT_FOLLOWERS_RADIUS, 0);
-        ServerWorld playerWorld = (ServerWorld) playerEntity.getEntityWorld();
+        ServerLevel playerWorld = (ServerLevel) playerEntity.level();
 
-        return playerWorld.getEntitiesByClass(TameableEntity.class, new Box(playerPos).expand(radius), pet -> {
-            boolean isTamed = pet.isTamed();
+        return playerWorld.getEntitiesOfClass(TamableAnimal.class, new AABB(playerPos).inflate(radius), pet -> {
+            boolean isTamed = pet.isTame();
             var petOwner = pet.getOwner();
             if (petOwner == null) {
-                LOGGER.warn("failed to find owner for pet with id '{}', name '{}'", pet.getUuid(), pet.getDisplayName().getString());
+                LOGGER.warn("failed to find owner for pet with id '{}', name '{}'", pet.getUUID(), pet.getDisplayName().getString());
                 return false;
             }
-            UUID ownerUuid = petOwner.getUuid();
-            boolean isSameOwner = ownerUuid != null && ownerUuid.equals(playerEntity.getUuid());
-            boolean isSitting = pet.isSitting();
+            UUID ownerUuid = petOwner.getUUID();
+            boolean isSameOwner = ownerUuid != null && ownerUuid.equals(playerEntity.getUUID());
+            boolean isSitting = pet.isOrderedToSit();
 
             return isTamed && isSameOwner && !isSitting;
         });
@@ -143,15 +141,15 @@ private static List<TameableEntity> detectTamedPets(ServerPlayerEntity playerEnt
      * @param targetVec the position where the entities will be teleported
      * @param playerEntity the player entity who owns the tamed entities
      */
-    private static void teleportTamedEntities(List<TameableEntity> pets, ServerWorld targetWorld, Vec3d targetVec, ServerPlayerEntity playerEntity) {
-        for (TameableEntity pet : pets) {
-            if (pet.getEntityWorld() != targetWorld) {
+    private static void teleportTamedEntities(List<TamableAnimal> pets, ServerLevel targetWorld, Vec3 targetVec, ServerPlayer playerEntity) {
+        for (TamableAnimal pet : pets) {
+            if (pet.level() != targetWorld) {
                 if (!transferEntityToWorld(pet, targetWorld, targetVec, playerEntity)) {
-                    LOGGER.warn("Failed to transfer pet {} ({}) to {}", pet.getType().getTranslationKey(), pet.getUuid(), targetWorld.getRegistryKey().getValue());
+                    LOGGER.warn("Failed to transfer pet {} ({}) to {}", pet.getType().getDescriptionId(), pet.getUUID(), targetWorld.dimension().identifier());
                 }
             } else {
                 targetWorld.getChunk((int) targetVec.x >> 4, (int) targetVec.z >> 4);
-                pet.teleport(targetVec.x, targetVec.y + 0.5, targetVec.z, false);
+                pet.randomTeleport(targetVec.x, targetVec.y + 0.5, targetVec.z, false);
             }
         }
     }
@@ -165,25 +163,25 @@ private static void teleportTamedEntities(List<TameableEntity> pets, ServerWorld
      * @param playerEntity the player entity who owns the tamed entity
      * @return true if the entity was successfully transferred, false otherwise
      */
-    private static boolean transferEntityToWorld(TameableEntity pet, ServerWorld targetWorld, Vec3d targetVec, ServerPlayerEntity playerEntity) {
-        NbtWriteView entityData = NbtWriteView.create(errorReporter);
+    private static boolean transferEntityToWorld(TamableAnimal pet, ServerLevel targetWorld, Vec3 targetVec, ServerPlayer playerEntity) {
+        TagValueOutput entityData = TagValueOutput.createWithoutContext(errorReporter);
 //        entityData.
-        pet.saveSelfData(entityData); // Store full entity data
+        pet.saveAsPassenger(entityData); // Store full entity data
 
-        var entityDataReadView = NbtReadView.create(errorReporter, targetWorld.getRegistryManager(), entityData.getNbt());
-        Entity newPet = EntityType.loadEntityWithPassengers(entityDataReadView, targetWorld, SpawnReason.COMMAND, (e) -> {
-            e.setPos(targetVec.x, targetVec.y, targetVec.z);
+        var entityDataReadView = TagValueInput.create(errorReporter, targetWorld.registryAccess(), entityData.buildResult());
+        Entity newPet = EntityType.loadEntityRecursive(entityDataReadView, targetWorld, EntitySpawnReason.COMMAND, (e) -> {
+            e.setPosRaw(targetVec.x, targetVec.y, targetVec.z);
             return e;
         });
 
-        if (newPet instanceof TameableEntity newTamedPet) {
-            newTamedPet.setTamed(true, true);
+        if (newPet instanceof TamableAnimal newTamedPet) {
+            newTamedPet.setTame(true, true);
             newTamedPet.setOwner(playerEntity);
-            targetWorld.spawnEntity(newTamedPet);
+            targetWorld.addFreshEntity(newTamedPet);
 
             // sanity check to make sure the entity has spawned
             if (newTamedPet.isRemoved()) {
-                LOGGER.error("Failed to spawn pet {} ({}) in {}", newTamedPet.getType().getTranslationKey(), newTamedPet.getUuid(), targetWorld.getRegistryKey().getValue());
+                LOGGER.error("Failed to spawn pet {} ({}) in {}", newTamedPet.getType().getDescriptionId(), newTamedPet.getUUID(), targetWorld.dimension().identifier());
                 return false;
             }
 
@@ -191,7 +189,7 @@ private static boolean transferEntityToWorld(TameableEntity pet, ServerWorld tar
             return true;
         } else {
             // Failed to create entity from NBT
-            LOGGER.error("Failed to create entity from NBT for pet ({})!", pet.getUuid());
+            LOGGER.error("Failed to create entity from NBT for pet ({})!", pet.getUUID());
             return false;
         }
     }
@@ -203,24 +201,24 @@ private static boolean transferEntityToWorld(TameableEntity pet, ServerWorld tar
      * @param destName the name of the destination to be displayed in the message
      * @param dest the destination location for the teleportation
      */
-    private static void sendTeleportMessage(ServerPlayerEntity playerEntity, MutableText destName, MinecraftLocation dest) {
+    private static void sendTeleportMessage(ServerPlayer playerEntity, MutableComponent destName, MinecraftLocation dest) {
         var playerAccess = ((ServerPlayerEntityAccess) playerEntity);
         var playerProfile = playerAccess.ec$getProfile();
         playerAccess.ec$getPlayerData().sendMessage(
             "teleport.done",
             playerProfile.shouldPrintTeleportCoordinates().orElse(CONFIG.PRINT_TELEPORT_COORDINATES)
                 ? TextUtil.join(
-                new Text[]{destName, dest.toText(playerProfile)},
-                Text.literal(" ")
+                new Component[]{destName, dest.toText(playerProfile)},
+                Component.literal(" ")
             )
                 : destName
         );
     }
 
-    static boolean playerHasTpRulesBypass(ServerPlayerEntity player, String permission) {
+    static boolean playerHasTpRulesBypass(ServerPlayer player, String permission) {
         return (
-            (player.getPermissions().hasPermission(new Permission.Level(PermissionLevel.OWNERS)) && CONFIG.OPS_BYPASS_TELEPORT_RULES)
-                || ECPerms.check(player.getCommandSource(), permission, 5)
+            (player.permissions().hasPermission(new Permission.HasCommandLevel(PermissionLevel.OWNERS)) && CONFIG.OPS_BYPASS_TELEPORT_RULES)
+                || ECPerms.check(player.createCommandSourceStack(), permission, 5)
         );
     }
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/teleportation/QueuedLocationTeleport.java b/src/main/java/com/fibermc/essentialcommands/teleportation/QueuedLocationTeleport.java
index 8811d05b..82944ed5 100644
--- a/src/main/java/com/fibermc/essentialcommands/teleportation/QueuedLocationTeleport.java
+++ b/src/main/java/com/fibermc/essentialcommands/teleportation/QueuedLocationTeleport.java
@@ -3,18 +3,18 @@
 import com.fibermc.essentialcommands.playerdata.PlayerData;
 import com.fibermc.essentialcommands.types.MinecraftLocation;
 
-import net.minecraft.text.MutableText;
+import net.minecraft.network.chat.MutableComponent;
 
 public class QueuedLocationTeleport extends QueuedTeleport {
 
     private final MinecraftLocation dest;
 
-    public QueuedLocationTeleport(PlayerData playerData, MinecraftLocation dest, MutableText destName) {
+    public QueuedLocationTeleport(PlayerData playerData, MinecraftLocation dest, MutableComponent destName) {
         super(playerData, destName);
         this.dest = dest;
     }
 
-    public QueuedLocationTeleport(PlayerData playerData, MinecraftLocation dest, MutableText destName, int delay) {
+    public QueuedLocationTeleport(PlayerData playerData, MinecraftLocation dest, MutableComponent destName, int delay) {
         super(playerData, destName, delay);
         this.dest = dest;
     }
diff --git a/src/main/java/com/fibermc/essentialcommands/teleportation/QueuedPlayerTeleport.java b/src/main/java/com/fibermc/essentialcommands/teleportation/QueuedPlayerTeleport.java
index 71863874..2af389a2 100644
--- a/src/main/java/com/fibermc/essentialcommands/teleportation/QueuedPlayerTeleport.java
+++ b/src/main/java/com/fibermc/essentialcommands/teleportation/QueuedPlayerTeleport.java
@@ -4,24 +4,24 @@
 import com.fibermc.essentialcommands.playerdata.PlayerData;
 import com.fibermc.essentialcommands.types.MinecraftLocation;
 
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.Text;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
 
 public class QueuedPlayerTeleport extends QueuedTeleport {
 
-    private final ServerPlayerEntity targetPlayer;
+    private final ServerPlayer targetPlayer;
 
-    public QueuedPlayerTeleport(PlayerData playerData, ServerPlayerEntity targetPlayer, Text destName) {
+    public QueuedPlayerTeleport(PlayerData playerData, ServerPlayer targetPlayer, Component destName) {
         super(playerData, destName);
         this.targetPlayer = targetPlayer;
     }
 
-    public QueuedPlayerTeleport(PlayerData playerData, ServerPlayerEntity targetPlayer, Text destName, int delay) {
+    public QueuedPlayerTeleport(PlayerData playerData, ServerPlayer targetPlayer, Component destName, int delay) {
         super(playerData, destName, delay);
         this.targetPlayer = targetPlayer;
     }
 
-    public QueuedPlayerTeleport(ServerPlayerEntity teleportingPlayer, ServerPlayerEntity destinationPlayer) {
+    public QueuedPlayerTeleport(ServerPlayer teleportingPlayer, ServerPlayer destinationPlayer) {
         super(((ServerPlayerEntityAccess) teleportingPlayer).ec$getPlayerData(), destinationPlayer.getDisplayName());
         this.targetPlayer = destinationPlayer;
     }
diff --git a/src/main/java/com/fibermc/essentialcommands/teleportation/QueuedTeleport.java b/src/main/java/com/fibermc/essentialcommands/teleportation/QueuedTeleport.java
index a64b716e..1d8a2bce 100644
--- a/src/main/java/com/fibermc/essentialcommands/teleportation/QueuedTeleport.java
+++ b/src/main/java/com/fibermc/essentialcommands/teleportation/QueuedTeleport.java
@@ -4,10 +4,10 @@
 import com.fibermc.essentialcommands.playerdata.PlayerData;
 import com.fibermc.essentialcommands.types.MinecraftLocation;
 
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.text.MutableText;
-import net.minecraft.text.Text;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.phys.Vec3;
 
 import static com.fibermc.essentialcommands.EssentialCommands.CONFIG;
 
@@ -15,21 +15,21 @@ public abstract class QueuedTeleport {
 
     private int ticksRemaining;
     private final PlayerData playerData;
-    private final Text destName;
-    public final Vec3d initialPosition;
+    private final Component destName;
+    public final Vec3 initialPosition;
 
-    public QueuedTeleport(PlayerData playerData, Text destName) {
+    public QueuedTeleport(PlayerData playerData, Component destName) {
         this.playerData = playerData;
         this.destName = destName;
         this.ticksRemaining = CONFIG.TELEPORT_DELAY_TICKS;
-        this.initialPosition = playerData.getPlayer().getEntityPos();
+        this.initialPosition = playerData.getPlayer().position();
     }
 
-    public QueuedTeleport(PlayerData playerData, Text destName, int delay) {
+    public QueuedTeleport(PlayerData playerData, Component destName, int delay) {
         this.playerData = playerData;
         this.destName = destName;
         this.ticksRemaining = delay;
-        this.initialPosition = playerData.getPlayer().getEntityPos();
+        this.initialPosition = playerData.getPlayer().position();
     }
 
     public int getTicksRemaining() {
@@ -42,8 +42,8 @@ public void tick(MinecraftServer server) {
 
     public abstract MinecraftLocation getDest();
 
-    public MutableText getDestName() {
-        return (MutableText) destName;
+    public MutableComponent getDestName() {
+        return (MutableComponent) destName;
     }
 
     public PlayerData getPlayerData() {
diff --git a/src/main/java/com/fibermc/essentialcommands/teleportation/TeleportManager.java b/src/main/java/com/fibermc/essentialcommands/teleportation/TeleportManager.java
index b0abeae1..7a143aea 100644
--- a/src/main/java/com/fibermc/essentialcommands/teleportation/TeleportManager.java
+++ b/src/main/java/com/fibermc/essentialcommands/teleportation/TeleportManager.java
@@ -11,10 +11,10 @@
 import com.fibermc.essentialcommands.text.TextFormatType;
 import com.fibermc.essentialcommands.types.MinecraftLocation;
 
-import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.MutableText;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.damagesource.DamageSource;
 
 import dev.jpcode.eccore.util.TimeUtil;
 
@@ -43,7 +43,7 @@ public static TeleportManager getInstance() {
 
     public static void init() {
         getInstance();
-        PlayerDamageCallback.EVENT.register((ServerPlayerEntity playerEntity, DamageSource source) -> instance.onPlayerDamaged(playerEntity, source));
+        PlayerDamageCallback.EVENT.register((ServerPlayer playerEntity, DamageSource source) -> instance.onPlayerDamaged(playerEntity, source));
         PlayerDataManager.TICK_EVENT.register(((playerDataManager, server) -> instance.tick(server)));
     }
 
@@ -88,7 +88,7 @@ public void tick(MinecraftServer server) {
             var playerData = queuedTeleport.getPlayerData();
             if (shouldInterruptTeleportOnMove
                 && playerData.hasMovedThisTick()
-                && playerData.getPlayer().getEntityPos().distanceTo(queuedTeleport.initialPosition) > maxMoveBeforeInterrupt
+                && playerData.getPlayer().position().distanceTo(queuedTeleport.initialPosition) > maxMoveBeforeInterrupt
                 && !PlayerTeleporter.playerHasTpRulesBypass(playerData.getPlayer(), ECPerms.Registry.bypass_teleport_interrupt_on_move)
             ) {
                 playerData.sendError("teleport.interrupted.moved");
@@ -103,7 +103,7 @@ public void tick(MinecraftServer server) {
         }
     }
 
-    public void onPlayerDamaged(ServerPlayerEntity playerEntity, DamageSource damageSource) {
+    public void onPlayerDamaged(ServerPlayer playerEntity, DamageSource damageSource) {
         if (!CONFIG.TELEPORT_INTERRUPT_ON_DAMAGED) {
             return;
         }
@@ -112,14 +112,14 @@ public void onPlayerDamaged(ServerPlayerEntity playerEntity, DamageSource damage
             && !PlayerTeleporter.playerHasTpRulesBypass(playerEntity, ECPerms.Registry.bypass_teleport_interrupt_on_damaged)
         ) {
             playerAccess.ec$endQueuedTeleport();
-            queuedTeleportMap.remove(playerEntity.getUuid());
+            queuedTeleportMap.remove(playerEntity.getUUID());
             playerAccess.ec$getPlayerData().sendError("teleport.interrupted.damage");
         }
     }
 
     public void startTpRequest(
-        ServerPlayerEntity requestSender,
-        ServerPlayerEntity targetPlayer,
+        ServerPlayer requestSender,
+        ServerPlayer targetPlayer,
         TeleportRequest.Type requestType
     )
     {
@@ -132,7 +132,7 @@ public void startTpRequest(
         activeTeleportRequests.add(teleportRequest);
     }
 
-    public void startTpCooldown(ServerPlayerEntity player) {
+    public void startTpCooldown(ServerPlayer player) {
         final int teleportCooldownTicks = (int) (CONFIG.TELEPORT_COOLDOWN * TimeUtil.TPS);
         var playerData = PlayerData.access(player);
 
@@ -141,7 +141,7 @@ public void startTpCooldown(ServerPlayerEntity player) {
     }
 
     // Generally, you should use PlayerTeleporter.requestTeleport instead of calling the queueTeleport methods directly.
-    void queueTeleport(ServerPlayerEntity player, MinecraftLocation dest, MutableText destName) {
+    void queueTeleport(ServerPlayer player, MinecraftLocation dest, MutableComponent destName) {
         queueTeleport(new QueuedLocationTeleport(PlayerData.access(player), dest, destName));
     }
 
@@ -150,7 +150,7 @@ void queueTeleport(QueuedTeleport queuedTeleport) {
         var playerAccess = ((ServerPlayerEntityAccess) playerData.getPlayer());
 
         QueuedTeleport prevValue = queuedTeleportMap.put(
-            queuedTeleport.getPlayerData().getPlayer().getUuid(),
+            queuedTeleport.getPlayerData().getPlayer().getUUID(),
             queuedTeleport
         );
         if (prevValue != null) {
@@ -158,8 +158,8 @@ void queueTeleport(QueuedTeleport queuedTeleport) {
             var styleUpdater = profile.nonOverwritingColorUpdater(TextFormatType.Accent);
             prevValue.getPlayerData().sendMessage(
                 "teleport.request.canceled_by_new",
-                prevValue.getDestName().styled(styleUpdater),
-                queuedTeleport.getDestName().styled(styleUpdater)
+                prevValue.getDestName().withStyle(styleUpdater),
+                queuedTeleport.getDestName().withStyle(styleUpdater)
             );
         }
 
diff --git a/src/main/java/com/fibermc/essentialcommands/teleportation/TeleportRequest.java b/src/main/java/com/fibermc/essentialcommands/teleportation/TeleportRequest.java
index dc2c58f2..d3e35a89 100644
--- a/src/main/java/com/fibermc/essentialcommands/teleportation/TeleportRequest.java
+++ b/src/main/java/com/fibermc/essentialcommands/teleportation/TeleportRequest.java
@@ -4,15 +4,15 @@
 import com.fibermc.essentialcommands.access.ServerPlayerEntityAccess;
 import com.fibermc.essentialcommands.playerdata.PlayerData;
 
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.level.ServerPlayer;
 
 public class TeleportRequest {
 
-    public ServerPlayerEntity getSenderPlayer() {
+    public ServerPlayer getSenderPlayer() {
         return senderPlayer.getPlayer();
     }
 
-    public ServerPlayerEntity getTargetPlayer() {
+    public ServerPlayer getTargetPlayer() {
         return targetPlayer.getPlayer();
     }
 
@@ -35,15 +35,15 @@ public enum Type {
     private boolean isEnded = false;
     private int ageTicks = 0;
 
-    public TeleportRequest(ServerPlayerEntity senderPlayer, ServerPlayerEntity targetPlayer, Type requestType) {
+    public TeleportRequest(ServerPlayer senderPlayer, ServerPlayer targetPlayer, Type requestType) {
         this.type = requestType;
         this.senderPlayer = ((ServerPlayerEntityAccess) senderPlayer).ec$getPlayerData();
         this.targetPlayer = ((ServerPlayerEntityAccess) targetPlayer).ec$getPlayerData();
     }
 
     public void queue() {
-        ServerPlayerEntity teleportee;
-        ServerPlayerEntity tpDestination;
+        ServerPlayer teleportee;
+        ServerPlayer tpDestination;
 
         if (type == Type.TPA_HERE) {
             tpDestination = senderPlayer.getPlayer();
@@ -70,7 +70,7 @@ public int getAgeTicks() {
     public void end() {
         var targetPlayerData = this.getTargetPlayerData();
         if (targetPlayerData != null) {
-            targetPlayerData.removeIncomingTeleportRequest(this.getSenderPlayer().getUuid());
+            targetPlayerData.removeIncomingTeleportRequest(this.getSenderPlayer().getUUID());
             this.getSenderPlayerData().removeSentTeleportRequest(this);
         }
         isEnded = true;
diff --git a/src/main/java/com/fibermc/essentialcommands/text/ChatConfirmationPrompt.java b/src/main/java/com/fibermc/essentialcommands/text/ChatConfirmationPrompt.java
index d9ff4198..b89de563 100644
--- a/src/main/java/com/fibermc/essentialcommands/text/ChatConfirmationPrompt.java
+++ b/src/main/java/com/fibermc/essentialcommands/text/ChatConfirmationPrompt.java
@@ -6,24 +6,24 @@
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.tree.CommandNode;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.ClickEvent;
-import net.minecraft.text.MutableText;
-import net.minecraft.text.Text;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.chat.ClickEvent;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.server.level.ServerPlayer;
 
 import dev.jpcode.eccore.util.TextUtil;
 
 public final class ChatConfirmationPrompt {
 
-    private final ServerPlayerEntity player;
-    private final MutableText text;
+    private final ServerPlayer player;
+    private final MutableComponent text;
 
-    public ChatConfirmationPrompt(CommandContext<ServerCommandSource> context,
-                                  CommandNode<ServerCommandSource> confirmCommand,
-                                  CommandNode<ServerCommandSource> denyCommand,
-                                  MutableText confirmText,
-                                  MutableText denyText) throws CommandSyntaxException {
+    public ChatConfirmationPrompt(CommandContext<CommandSourceStack> context,
+                                  CommandNode<CommandSourceStack> confirmCommand,
+                                  CommandNode<CommandSourceStack> denyCommand,
+                                  MutableComponent confirmText,
+                                  MutableComponent denyText) throws CommandSyntaxException {
         this(
             context.getSource().getPlayer(),
             CommandUtil.getCommandString(context.getSource(), confirmCommand),
@@ -33,14 +33,14 @@ public ChatConfirmationPrompt(CommandContext<ServerCommandSource> context,
         );
     }
 
-    public ChatConfirmationPrompt(ServerPlayerEntity player,
+    public ChatConfirmationPrompt(ServerPlayer player,
                                   String confirmCommandStr,
                                   String denyCommandStr,
-                                  MutableText confirmText,
-                                  MutableText denyText) {
+                                  MutableComponent confirmText,
+                                  MutableComponent denyText) {
         this.player = player;
         this.text = TextUtil.spaceBetween(
-            new Text[]{
+            new Component[]{
                 confirmText.setStyle(
                     confirmText.getStyle().withClickEvent(new ClickEvent.RunCommand(
                         confirmCommandStr))),
@@ -53,20 +53,20 @@ public ChatConfirmationPrompt(ServerPlayerEntity player,
         );
     }
 
-    public ChatConfirmationPrompt(ServerPlayerEntity player,
+    public ChatConfirmationPrompt(ServerPlayer player,
                                   String commandStr,
-                                  MutableText text) {
+                                  MutableComponent text) {
         this.player = player;
-        this.text = Text.literal(" ".repeat(15)).append(
+        this.text = Component.literal(" ".repeat(15)).append(
             text.setStyle(text.getStyle().withClickEvent(
                 new ClickEvent.RunCommand(commandStr))));
     }
 
     public void send() {
-        this.player.sendMessage(this.text);
+        this.player.sendSystemMessage(this.text);
     }
 
-    public MutableText getText() {
+    public MutableComponent getText() {
         return this.text;
     }
 
diff --git a/src/main/java/com/fibermc/essentialcommands/text/ECText.java b/src/main/java/com/fibermc/essentialcommands/text/ECText.java
index 339cfa7d..1cf63969 100644
--- a/src/main/java/com/fibermc/essentialcommands/text/ECText.java
+++ b/src/main/java/com/fibermc/essentialcommands/text/ECText.java
@@ -21,13 +21,13 @@
 import eu.pb4.placeholders.api.PlaceholderContext;
 import org.jetbrains.annotations.Nullable;
 
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.MutableText;
-import net.minecraft.text.OrderedText;
-import net.minecraft.text.StringVisitable;
-import net.minecraft.text.Text;
-import net.minecraft.util.JsonHelper;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.util.FormattedCharSequence;
+import net.minecraft.util.GsonHelper;
 
 import static com.fibermc.essentialcommands.EssentialCommands.*;
 
@@ -99,7 +99,7 @@ public static void load(InputStream inputStream, BiConsumer<String, String> entr
         for (var stringJsonElementEntry : jsonObject.entrySet()) {
             var key = stringJsonElementEntry.getKey();
             var value = stringJsonElementEntry.getValue();
-            String string = TOKEN_PATTERN.matcher(JsonHelper.asString(value, key)).replaceAll("%$1s");
+            String string = TOKEN_PATTERN.matcher(GsonHelper.convertToString(value, key)).replaceAll("%$1s");
             entryConsumer.accept(key, string);
         }
     }
@@ -110,36 +110,36 @@ public static ECText getInstance() {
 
     public abstract String getString(String key);
 
-    public abstract MutableText getText(String key, Text... args);
+    public abstract MutableComponent getText(String key, Component... args);
 
-    public abstract MutableText getText(String key, TextFormatType textFormatType, Text... args);
+    public abstract MutableComponent getText(String key, TextFormatType textFormatType, Component... args);
 
     //    public abstract MutableText getText(String key, Object... args);
-    public abstract MutableText getText(String key, TextFormatType textFormatType, IStyleProvider styleProvider, Text... args);
+    public abstract MutableComponent getText(String key, TextFormatType textFormatType, IStyleProvider styleProvider, Component... args);
 
     public abstract boolean hasTranslation(String key);
 
     public abstract boolean isRightToLeft();
 
-    public abstract OrderedText reorder(StringVisitable text);
+    public abstract FormattedCharSequence reorder(FormattedText text);
 
-    public MutableText literal(String str) {
-        return Text.literal(str).setStyle(CONFIG.FORMATTING_DEFAULT);
+    public MutableComponent literal(String str) {
+        return Component.literal(str).setStyle(CONFIG.FORMATTING_DEFAULT);
     }
 
-    public MutableText accent(String str) {
-        return Text.literal(str).setStyle(CONFIG.FORMATTING_ACCENT);
+    public MutableComponent accent(String str) {
+        return Component.literal(str).setStyle(CONFIG.FORMATTING_ACCENT);
     }
 
-    public MutableText error(String str) {
-        return Text.literal(str).setStyle(CONFIG.FORMATTING_ERROR);
+    public MutableComponent error(String str) {
+        return Component.literal(str).setStyle(CONFIG.FORMATTING_ERROR);
     }
 
-    public List<OrderedText> reorder(List<StringVisitable> texts) {
+    public List<FormattedCharSequence> reorder(List<FormattedText> texts) {
         return texts.stream().map(this::reorder).collect(ImmutableList.toImmutableList());
     }
 
-    public static ECText forPlayer(ServerPlayerEntity player) {
+    public static ECText forPlayer(ServerPlayer player) {
         return new PlayerECTextImpl(
             ECText.getInstance().stringMap,
             ParserContext.of(PlaceholderContext.KEY, PlaceholderContext.of(player)),
@@ -147,7 +147,7 @@ public static ECText forPlayer(ServerPlayerEntity player) {
         );
     }
 
-    public static ECText access(@Nullable ServerPlayerEntity player) {
+    public static ECText access(@Nullable ServerPlayer player) {
         return player == null ? ECText.getInstance() : ((ServerPlayerEntityAccess) player).ec$getEcText();
     }
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/text/ECTextImpl.java b/src/main/java/com/fibermc/essentialcommands/text/ECTextImpl.java
index caf6ce31..30b73566 100644
--- a/src/main/java/com/fibermc/essentialcommands/text/ECTextImpl.java
+++ b/src/main/java/com/fibermc/essentialcommands/text/ECTextImpl.java
@@ -12,9 +12,11 @@
 import eu.pb4.placeholders.api.parsers.TagLikeParser;
 import org.jetbrains.annotations.Nullable;
 
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.*;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.text.*;
-import net.minecraft.util.Formatting;
+import net.minecraft.util.FormattedCharSequence;
+import net.minecraft.util.StringDecomposer;
 
 public class ECTextImpl extends ECText {
     private final ParserContext parserContext;
@@ -41,38 +43,38 @@ public String getString(String key) {
     }
 
     // Literals
-    public MutableText getTextLiteral(String key, TextFormatType textFormatType) {
+    public MutableComponent getTextLiteral(String key, TextFormatType textFormatType) {
         return getTextLiteral(key, textFormatType, null);
     }
 
-    public MutableText getTextLiteral(
+    public MutableComponent getTextLiteral(
         String key,
         TextFormatType textFormatType,
         @Nullable IStyleProvider styleProvider)
     {
-        return Text.literal(getString(key))
+        return Component.literal(getString(key))
             .setStyle(styleProvider == null
                 ? textFormatType.getStyle()
                 : styleProvider.getStyle(textFormatType));
     }
 
     // Interpolated
-    public MutableText getText(String key, Text... args) {
+    public MutableComponent getText(String key, Component... args) {
         return getTextInternal(key, TextFormatType.Default, null, args);
     }
 
-    public MutableText getText(String key, TextFormatType textFormatType, Text... args) {
+    public MutableComponent getText(String key, TextFormatType textFormatType, Component... args) {
         return getTextInternal(key, textFormatType, null, args);
     }
 
-    public MutableText getText(String key, TextFormatType textFormatType, IStyleProvider styleProvider, Text... args) {
+    public MutableComponent getText(String key, TextFormatType textFormatType, IStyleProvider styleProvider, Component... args) {
         return getTextInternal(key, textFormatType, styleProvider, args);
     }
 
     private NodeParser parserForContext(
         TextFormatType textFormatType,
         @Nullable IStyleProvider styleProvider,
-        List<MutableText> args)
+        List<MutableComponent> args)
     {
         return TagLikeParser.of(
             TagLikeParser.PLACEHOLDER_USER,
@@ -106,17 +108,17 @@ private NodeParser parserForContext(
         );
     }
 
-    private static int hashText(Text text) {
-        return Objects.hash(text.getContent(), text.getStyle());
+    private static int hashText(Component text) {
+        return Objects.hash(text.getContents(), text.getStyle());
     }
 
-    public MutableText getTextInternal(
+    public MutableComponent getTextInternal(
         String key,
         TextFormatType textFormatType,
         @Nullable IStyleProvider styleProvider,
-        Text... args)
+        Component... args)
     {
-        var argsList = Arrays.stream(args).map(Text::copy).toList();
+        var argsList = Arrays.stream(args).map(Component::copy).toList();
         var argsHashes = argsList.stream()
             .map(ECTextImpl::hashText)
             .collect(Collectors.toCollection(HashSet::new));
@@ -145,23 +147,23 @@ public MutableText getTextInternal(
     }
 
     interface TextVisitor {
-        MutableText accept(Text text);
+        MutableComponent accept(Component text);
     }
 
-    private static final Style DEFAULT_ARGUMENT_STYLE = Style.EMPTY.withColor(Formatting.WHITE);
+    private static final Style DEFAULT_ARGUMENT_STYLE = Style.EMPTY.withColor(ChatFormatting.WHITE);
 
-    TextVisitor defaultStylesVisitor(Function<Text, @Nullable Style> defaultStyleProvider) {
+    TextVisitor defaultStylesVisitor(Function<Component, @Nullable Style> defaultStyleProvider) {
         return text -> {
-            MutableText txt = text.copy();
+            MutableComponent txt = text.copy();
             var defaultStyleForText = defaultStyleProvider.apply(txt);
             if (defaultStyleForText != null) {
-                txt.setStyle(txt.getStyle().withParent(defaultStyleForText));
+                txt.setStyle(txt.getStyle().applyTo(defaultStyleForText));
             }
             return txt;
         };
     }
 
-    MutableText visitText(Text root, TextVisitor textVisitor, Predicate<Text> shouldStopAfter) {
+    MutableComponent visitText(Component root, TextVisitor textVisitor, Predicate<Component> shouldStopAfter) {
         var txt = textVisitor.accept(root);
         if (shouldStopAfter.test(root)) {
             return txt;
@@ -182,12 +184,12 @@ public boolean isRightToLeft() {
         return false;
     }
 
-    public OrderedText reorder(StringVisitable text) {
+    public FormattedCharSequence reorder(FormattedText text) {
         return (visitor) ->
             text.visit((style, string) ->
-                TextVisitFactory.visitFormatted(string, style, visitor)
+                StringDecomposer.iterateFormatted(string, style, visitor)
                     ? Optional.empty()
-                    : StringVisitable.TERMINATE_VISIT, Style.EMPTY).isPresent();
+                    : FormattedText.STOP_ITERATION, Style.EMPTY).isPresent();
     }
 
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/text/PlayerECTextImpl.java b/src/main/java/com/fibermc/essentialcommands/text/PlayerECTextImpl.java
index 728a2705..873bcf65 100644
--- a/src/main/java/com/fibermc/essentialcommands/text/PlayerECTextImpl.java
+++ b/src/main/java/com/fibermc/essentialcommands/text/PlayerECTextImpl.java
@@ -5,8 +5,8 @@
 import com.fibermc.essentialcommands.types.IStyleProvider;
 import eu.pb4.placeholders.api.ParserContext;
 
-import net.minecraft.text.MutableText;
-import net.minecraft.text.Text;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
 
 public class PlayerECTextImpl extends ECTextImpl {
     private final IStyleProvider styleProvider;
@@ -17,32 +17,32 @@ public PlayerECTextImpl(Map<String, String> stringMap, ParserContext parserConte
     }
 
     @Override
-    public MutableText getTextLiteral(String key, TextFormatType textFormatType) {
+    public MutableComponent getTextLiteral(String key, TextFormatType textFormatType) {
         return getTextLiteral(key, textFormatType, this.styleProvider);
     }
 
     @Override
-    public MutableText getText(String key, Text... args) {
+    public MutableComponent getText(String key, Component... args) {
         return getTextInternal(key, TextFormatType.Default, this.styleProvider, args);
     }
 
     @Override
-    public MutableText getText(String key, TextFormatType textFormatType, Text... args) {
+    public MutableComponent getText(String key, TextFormatType textFormatType, Component... args) {
         return getTextInternal(key, textFormatType, this.styleProvider, args);
     }
 
     @Override
-    public MutableText literal(String str) {
-        return Text.literal(str).setStyle(this.styleProvider.getStyle(TextFormatType.Default));
+    public MutableComponent literal(String str) {
+        return Component.literal(str).setStyle(this.styleProvider.getStyle(TextFormatType.Default));
     }
 
     @Override
-    public MutableText accent(String str) {
-        return Text.literal(str).setStyle(this.styleProvider.getStyle(TextFormatType.Accent));
+    public MutableComponent accent(String str) {
+        return Component.literal(str).setStyle(this.styleProvider.getStyle(TextFormatType.Accent));
     }
 
     @Override
-    public MutableText error(String str) {
-        return Text.literal(str).setStyle(this.styleProvider.getStyle(TextFormatType.Error));
+    public MutableComponent error(String str) {
+        return Component.literal(str).setStyle(this.styleProvider.getStyle(TextFormatType.Error));
     }
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/text/StringToTextParser.java b/src/main/java/com/fibermc/essentialcommands/text/StringToTextParser.java
index c3a661e3..961f5b67 100644
--- a/src/main/java/com/fibermc/essentialcommands/text/StringToTextParser.java
+++ b/src/main/java/com/fibermc/essentialcommands/text/StringToTextParser.java
@@ -1,9 +1,9 @@
 package com.fibermc.essentialcommands.text;
 
-import net.minecraft.text.Text;
+import net.minecraft.network.chat.Component;
 
 @FunctionalInterface
 public interface StringToTextParser {
 
-    Text parseText(String str);
+    Component parseText(String str);
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/text/TextFormatType.java b/src/main/java/com/fibermc/essentialcommands/text/TextFormatType.java
index 0d7b7a6a..4bf22bc5 100644
--- a/src/main/java/com/fibermc/essentialcommands/text/TextFormatType.java
+++ b/src/main/java/com/fibermc/essentialcommands/text/TextFormatType.java
@@ -2,7 +2,7 @@
 
 import java.util.function.UnaryOperator;
 
-import net.minecraft.text.Style;
+import net.minecraft.network.chat.Style;
 
 import dev.jpcode.eccore.config.Option;
 
diff --git a/src/main/java/com/fibermc/essentialcommands/types/ECPlaceholderApiCompat.java b/src/main/java/com/fibermc/essentialcommands/types/ECPlaceholderApiCompat.java
index 187f75dc..34f6b2ea 100644
--- a/src/main/java/com/fibermc/essentialcommands/types/ECPlaceholderApiCompat.java
+++ b/src/main/java/com/fibermc/essentialcommands/types/ECPlaceholderApiCompat.java
@@ -5,32 +5,32 @@
 import eu.pb4.placeholders.api.node.parent.ParentNode;
 import eu.pb4.placeholders.impl.GeneralUtils;
 
-import net.minecraft.text.MutableText;
-import net.minecraft.text.Text;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
 
 @SuppressWarnings("UnstableApiUsage")
 public final class ECPlaceholderApiCompat {
     private ECPlaceholderApiCompat() {}
 
-    private static Text getText(TextNode node, ParserContext context) {
+    private static Component getText(TextNode node, ParserContext context) {
         return node instanceof ParentNode
             ? ECPlaceholderApiCompat.toText((ParentNode) node, context)
             : node.toText(context, true);
     }
 
-    public static Text toText(ParentNode node, ParserContext context) {
+    public static Component toText(ParentNode node, ParserContext context) {
         var children = node.getChildren();
         if (children.length == 0) {
-            return Text.empty();
+            return Component.empty();
         } else if (children.length == 1 && children[0] != null) {
             var out = getText(children[0], context);
             if (GeneralUtils.isEmpty(out)) {
                 return out;
             }
 
-            return out.copy().fillStyle(out.getStyle());
+            return out.copy().withStyle(out.getStyle());
         } else {
-            MutableText base = Text.empty();
+            MutableComponent base = Component.empty();
 
             for (TextNode child : children) {
                 if (child != null) {
diff --git a/src/main/java/com/fibermc/essentialcommands/types/IStyleProvider.java b/src/main/java/com/fibermc/essentialcommands/types/IStyleProvider.java
index f5cf2fa1..2462ae52 100644
--- a/src/main/java/com/fibermc/essentialcommands/types/IStyleProvider.java
+++ b/src/main/java/com/fibermc/essentialcommands/types/IStyleProvider.java
@@ -6,7 +6,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import net.minecraft.text.Style;
+import net.minecraft.network.chat.Style;
 
 public interface IStyleProvider {
     @Nullable Style getFormattingDefault();
diff --git a/src/main/java/com/fibermc/essentialcommands/types/MinecraftLocation.java b/src/main/java/com/fibermc/essentialcommands/types/MinecraftLocation.java
index eeb4cba6..65539e6d 100644
--- a/src/main/java/com/fibermc/essentialcommands/types/MinecraftLocation.java
+++ b/src/main/java/com/fibermc/essentialcommands/types/MinecraftLocation.java
@@ -6,70 +6,70 @@
 
 import com.mojang.serialization.Codec;
 
-import net.minecraft.nbt.NbtCompound;
+import net.minecraft.core.Vec3i;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
-import net.minecraft.registry.RegistryKey;
-import net.minecraft.registry.RegistryKeys;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.MutableText;
-import net.minecraft.text.Text;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.math.Vec3i;
-import net.minecraft.world.World;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.Vec3;
 
 public class MinecraftLocation {
     public static final Codec<MinecraftLocation> CODEC = Codecs.MINECRAFT_LOCATION;
 
-    private Vec3d pos;
+    private Vec3 pos;
     private float pitch;
     private float headYaw;
-    private RegistryKey<World> dim;
+    private ResourceKey<Level> dim;
 
     protected MinecraftLocation() {}
 
-    public MinecraftLocation(RegistryKey<World> dim, double x, double y, double z) {
+    public MinecraftLocation(ResourceKey<Level> dim, double x, double y, double z) {
         this.dim = dim;
-        this.pos = new Vec3d(x, y, z);
+        this.pos = new Vec3(x, y, z);
         this.pitch = 0f;
         this.headYaw = 0f;
         //todo world.getPersistentStateManager().
     }
 
-    public MinecraftLocation(RegistryKey<World> dim, double x, double y, double z, float headYaw, float pitch) {
+    public MinecraftLocation(ResourceKey<Level> dim, double x, double y, double z, float headYaw, float pitch) {
         this.dim = dim;
-        this.pos = new Vec3d(x, y, z);
+        this.pos = new Vec3(x, y, z);
         this.headYaw = headYaw;
         this.pitch = pitch;
     }
 
-    public MinecraftLocation(RegistryKey<World> dim, Vec3i vec3i, float headYaw, float pitch) {
+    public MinecraftLocation(ResourceKey<Level> dim, Vec3i vec3i, float headYaw, float pitch) {
         this.dim = dim;
-        this.pos = Vec3d.ofCenter(vec3i);
+        this.pos = Vec3.atCenterOf(vec3i);
         this.headYaw = headYaw;
         this.pitch = pitch;
     }
 
-    public MinecraftLocation(RegistryKey<World> dim, Vec3d pos, float headYaw, float pitch) {
+    public MinecraftLocation(ResourceKey<Level> dim, Vec3 pos, float headYaw, float pitch) {
         this.dim = dim;
         this.pos = pos;
         this.headYaw = headYaw;
         this.pitch = pitch;
     }
 
-    public MinecraftLocation(ServerPlayerEntity player) {
-        this.dim = player.getEntityWorld().getRegistryKey();
-        this.pos = Vec3d.ZERO.add(player.getEntityPos());
-        this.headYaw = player.getHeadYaw();
-        this.pitch = player.getPitch();
+    public MinecraftLocation(ServerPlayer player) {
+        this.dim = player.level().dimension();
+        this.pos = Vec3.ZERO.add(player.position());
+        this.headYaw = player.getYHeadRot();
+        this.pitch = player.getXRot();
     }
 
-    public MinecraftLocation(NbtCompound tag) {
-        this.dim = RegistryKey.of(
-            RegistryKeys.WORLD,
+    public MinecraftLocation(CompoundTag tag) {
+        this.dim = ResourceKey.create(
+            Registries.DIMENSION,
             Identifier.tryParse(tag.getString("WorldRegistryKey").orElseThrow())
         );
-        this.pos = new Vec3d(
+        this.pos = new Vec3(
             tag.getDouble("x").orElseThrow(),
             tag.getDouble("y").orElseThrow(),
             tag.getDouble("z").orElseThrow()
@@ -78,32 +78,32 @@ public MinecraftLocation(NbtCompound tag) {
         this.pitch = tag.getFloat("pitch").orElse(0f);
     }
 
-    public NbtCompound asNbt() {
-        return this.writeNbt(new NbtCompound());
+    public CompoundTag asNbt() {
+        return this.writeNbt(new CompoundTag());
     }
 
-    public static MinecraftLocation fromNbt(NbtCompound tag) {
+    public static MinecraftLocation fromNbt(CompoundTag tag) {
         return CODEC.parse(NbtOps.INSTANCE, tag)
             .getOrThrow();
     }
 
-    public NbtCompound writeNbt(NbtCompound tag) {
+    public CompoundTag writeNbt(CompoundTag tag) {
         return CODEC.encodeStart(NbtOps.INSTANCE, this)
             .getOrThrow()
             .asCompound()
             .orElseThrow();
     }
 
-    protected MutableText toLiteralTextSimple() {
-        return Text.literal(String.format("(%.1f, %.1f, %.1f)", pos().x, pos().y, pos().z));
+    protected MutableComponent toLiteralTextSimple() {
+        return Component.literal(String.format("(%.1f, %.1f, %.1f)", pos().x, pos().y, pos().z));
     }
 
-    public Text toText(PlayerProfile playerProfile) {
+    public Component toText(PlayerProfile playerProfile) {
         return toLiteralTextSimple()
             .setStyle(playerProfile.getStyle(TextFormatType.Accent));
     }
 
-    public Vec3d pos() {
+    public Vec3 pos() {
         return pos;
     }
 
@@ -131,7 +131,7 @@ public double z() {
         return pos.z;
     }
 
-    public RegistryKey<World> dim() {
+    public ResourceKey<Level> dim() {
         return dim;
     }
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/types/NamedLocationStorage.java b/src/main/java/com/fibermc/essentialcommands/types/NamedLocationStorage.java
index 396d5aca..6c387b80 100644
--- a/src/main/java/com/fibermc/essentialcommands/types/NamedLocationStorage.java
+++ b/src/main/java/com/fibermc/essentialcommands/types/NamedLocationStorage.java
@@ -10,23 +10,23 @@
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.serialization.Codec;
 
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.nbt.NbtElement;
-import net.minecraft.nbt.NbtList;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.NbtOps;
-import net.minecraft.text.Text;
+import net.minecraft.nbt.Tag;
+import net.minecraft.network.chat.Component;
 
 public class NamedLocationStorage extends HashMap<String, NamedMinecraftLocation> implements NbtSerializable {
     public static final Codec<NamedLocationStorage> CODEC = Codecs.NAMED_LOCATION_STORAGE;
 
     public NamedLocationStorage() {}
 
-    public NamedLocationStorage(NbtCompound nbt) {
+    public NamedLocationStorage(CompoundTag nbt) {
         this();
         loadNbt(nbt);
     }
 
-    public static NamedLocationStorage fromNbt(NbtCompound nbt) {
+    public static NamedLocationStorage fromNbt(CompoundTag nbt) {
         // Try codec first
         var result = CODEC.parse(NbtOps.INSTANCE, nbt);
         if (result.isSuccess()) {
@@ -39,7 +39,7 @@ public static NamedLocationStorage fromNbt(NbtCompound nbt) {
         return storage;
     }
 
-    public NbtCompound writeNbt(NbtCompound nbt) {
+    public CompoundTag writeNbt(CompoundTag nbt) {
         return CODEC.encode(this, NbtOps.INSTANCE, nbt)
             .getOrThrow()
             .asCompound()
@@ -48,14 +48,15 @@ public NbtCompound writeNbt(NbtCompound nbt) {
 
     /**
      * Legacy NBT loading method - supports both old list format and compound format
+     *
      * @param nbt NbtCompound or NbtList. (NbtList is deprecated)
      */
-    private void loadNbt(NbtElement nbt) {
-        if (nbt.getType() == 9) {
+    private void loadNbt(Tag nbt) {
+        if (nbt.getId() == 9) {
             // Legacy format - NbtList
-            NbtList homesNbtList = (NbtList) nbt;
-            for (NbtElement t : homesNbtList) {
-                NbtCompound homeTag = (NbtCompound) t;
+            ListTag homesNbtList = (ListTag) nbt;
+            for (Tag t : homesNbtList) {
+                CompoundTag homeTag = (CompoundTag) t;
                 homeTag.getString("homeName").ifPresent((homeName) -> {
                     var location = MinecraftLocation.fromNbt(homeTag);
                     super.put(homeName, new NamedMinecraftLocation(location, homeName));
@@ -63,8 +64,8 @@ private void loadNbt(NbtElement nbt) {
             }
         } else {
             // Legacy compound format
-            NbtCompound nbtCompound = (NbtCompound) nbt;
-            nbtCompound.getKeys().forEach((key) -> {
+            CompoundTag nbtCompound = (CompoundTag) nbt;
+            nbtCompound.keySet().forEach((key) -> {
                 var location = NamedMinecraftLocation.fromNbt(nbtCompound.getCompound(key).orElseThrow());
                 if (!key.equals(location.getName())) {
                     throw new RuntimeException("Home key '%s' did not match home name '%s'".formatted(key, location.getName()));
@@ -83,7 +84,7 @@ private MinecraftLocation putCommand(String name, NamedMinecraftLocation locatio
             return super.put(name, location);
         } else {
             throw CommandUtil.createSimpleException(
-                ECText.getInstance().getText("cmd.home.set.error.exists", TextFormatType.Error, Text.literal(name)));
+                ECText.getInstance().getText("cmd.home.set.error.exists", TextFormatType.Error, Component.literal(name)));
         }
     }
 
diff --git a/src/main/java/com/fibermc/essentialcommands/types/NamedMinecraftLocation.java b/src/main/java/com/fibermc/essentialcommands/types/NamedMinecraftLocation.java
index 2617110b..5351b845 100644
--- a/src/main/java/com/fibermc/essentialcommands/types/NamedMinecraftLocation.java
+++ b/src/main/java/com/fibermc/essentialcommands/types/NamedMinecraftLocation.java
@@ -6,11 +6,11 @@
 
 import com.mojang.serialization.Codec;
 
-import net.minecraft.nbt.NbtCompound;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
-import net.minecraft.registry.RegistryKey;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.World;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.Vec3;
 
 public class NamedMinecraftLocation extends MinecraftLocation {
     public static final Codec<NamedMinecraftLocation> CODEC = Codecs.NAMED_MINECRAFT_LOCATION;
@@ -33,7 +33,7 @@ public NamedMinecraftLocation(MinecraftLocation location, String name) {
     }
 
     public NamedMinecraftLocation(
-        RegistryKey<World> dim,
+        ResourceKey<Level> dim,
         double x,
         double y,
         double z,
@@ -46,8 +46,8 @@ public NamedMinecraftLocation(
     }
 
     public NamedMinecraftLocation(
-        RegistryKey<World> dim,
-        Vec3d pos,
+        ResourceKey<Level> dim,
+        Vec3 pos,
         float headYaw,
         float pitch,
         String name
@@ -56,12 +56,12 @@ public NamedMinecraftLocation(
         this.name = name;
     }
 
-    public static NamedMinecraftLocation fromNbt(NbtCompound tag) {
+    public static NamedMinecraftLocation fromNbt(CompoundTag tag) {
         return CODEC.parse(NbtOps.INSTANCE, tag)
             .getOrThrow();
     }
 
-    public NbtCompound writeNbt(NbtCompound tag) {
+    public CompoundTag writeNbt(CompoundTag tag) {
         return CODEC.encodeStart(NbtOps.INSTANCE, this)
             .getOrThrow()
             .asCompound()
diff --git a/src/main/java/com/fibermc/essentialcommands/types/NbtSerializable.java b/src/main/java/com/fibermc/essentialcommands/types/NbtSerializable.java
index a60e78b8..779dfe7c 100644
--- a/src/main/java/com/fibermc/essentialcommands/types/NbtSerializable.java
+++ b/src/main/java/com/fibermc/essentialcommands/types/NbtSerializable.java
@@ -1,8 +1,8 @@
 package com.fibermc.essentialcommands.types;
 
-import net.minecraft.nbt.NbtCompound;
+import net.minecraft.nbt.CompoundTag;
 
 public interface NbtSerializable {
 
-    NbtCompound writeNbt(NbtCompound tag);
+    CompoundTag writeNbt(CompoundTag tag);
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/types/ProfileOptionFromContextSetter.java b/src/main/java/com/fibermc/essentialcommands/types/ProfileOptionFromContextSetter.java
index 731417c1..053da1fe 100644
--- a/src/main/java/com/fibermc/essentialcommands/types/ProfileOptionFromContextSetter.java
+++ b/src/main/java/com/fibermc/essentialcommands/types/ProfileOptionFromContextSetter.java
@@ -4,9 +4,9 @@
 
 import com.mojang.brigadier.context.CommandContext;
 
-import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.commands.CommandSourceStack;
 
 @FunctionalInterface
 public interface ProfileOptionFromContextSetter<T> {
-    void setValue(CommandContext<ServerCommandSource> context, String name, PlayerProfile profile);
+    void setValue(CommandContext<CommandSourceStack> context, String name, PlayerProfile profile);
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/types/WarpLocation.java b/src/main/java/com/fibermc/essentialcommands/types/WarpLocation.java
index f3f3163d..0e8c793f 100644
--- a/src/main/java/com/fibermc/essentialcommands/types/WarpLocation.java
+++ b/src/main/java/com/fibermc/essentialcommands/types/WarpLocation.java
@@ -7,11 +7,11 @@
 
 import com.mojang.serialization.Codec;
 
-import net.minecraft.nbt.NbtCompound;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
-import net.minecraft.registry.RegistryKey;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.world.World;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.level.Level;
 
 public class WarpLocation extends NamedMinecraftLocation {
     public static final Codec<WarpLocation> CODEC = Codecs.WARP_LOCATION;
@@ -33,7 +33,7 @@ public WarpLocation(MinecraftLocation location, String permissionString, String
     }
 
     public WarpLocation(
-        RegistryKey<World> dim,
+        ResourceKey<Level> dim,
         double x,
         double y,
         double z,
@@ -46,7 +46,7 @@ public WarpLocation(
         this.permissionString = permissionString.orElse(null);
     }
 
-    public static WarpLocation fromNbt(NbtCompound tag) {
+    public static WarpLocation fromNbt(CompoundTag tag) {
         var result = CODEC.parse(NbtOps.INSTANCE, tag);
 
         if (result.isSuccess()) {
@@ -62,12 +62,12 @@ public static WarpLocation setName(WarpLocation value, String key) {
     }
 
     @Override
-    public NbtCompound asNbt() {
-        return this.writeNbt(new NbtCompound());
+    public CompoundTag asNbt() {
+        return this.writeNbt(new CompoundTag());
     }
 
     @Override
-    public NbtCompound writeNbt(NbtCompound tag) {
+    public CompoundTag writeNbt(CompoundTag tag) {
         return CODEC.encodeStart(NbtOps.INSTANCE, this)
             .getOrThrow()
             .asCompound()
@@ -78,9 +78,9 @@ public String getPermissionString() {
         return permissionString;
     }
 
-    public boolean hasPermission(ServerPlayerEntity player) {
+    public boolean hasPermission(ServerPlayer player) {
         return permissionString == null || ECPerms.check(
-            player.getCommandSource(),
+            player.createCommandSourceStack(),
             String.format("%s.%s", ECPerms.Registry.warp_tp_named, permissionString));
     }
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/types/WarpStorage.java b/src/main/java/com/fibermc/essentialcommands/types/WarpStorage.java
index 11dcba94..481836a2 100644
--- a/src/main/java/com/fibermc/essentialcommands/types/WarpStorage.java
+++ b/src/main/java/com/fibermc/essentialcommands/types/WarpStorage.java
@@ -11,23 +11,24 @@
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.serialization.Codec;
 
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.nbt.NbtElement;
-import net.minecraft.nbt.NbtList;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.NbtOps;
-import net.minecraft.text.Text;
+import net.minecraft.nbt.Tag;
+import net.minecraft.network.chat.Component;
 
 public class WarpStorage extends HashMap<String, WarpLocation> implements NbtSerializable {
+    @SuppressWarnings({"checkstyle:StaticVariableName"})
     public static Codec<WarpStorage> CODEC = Codecs.WARP_STORAGE;
 
     public WarpStorage() {}
 
-    public WarpStorage(NbtCompound nbt) {
+    public WarpStorage(CompoundTag nbt) {
         this();
         loadNbt(nbt);
     }
 
-    public static WarpStorage fromNbt(NbtCompound nbt) {
+    public static WarpStorage fromNbt(CompoundTag nbt) {
         // Try codec first
         var result = CODEC.parse(NbtOps.INSTANCE, nbt);
         if (result.isSuccess()) {
@@ -40,7 +41,7 @@ public static WarpStorage fromNbt(NbtCompound nbt) {
         return storage;
     }
 
-    public NbtCompound writeNbt(NbtCompound nbt) {
+    public CompoundTag writeNbt(CompoundTag nbt) {
         return CODEC.encode(this, NbtOps.INSTANCE, nbt)
             .getOrThrow()
             .asCompound()
@@ -50,12 +51,12 @@ public NbtCompound writeNbt(NbtCompound nbt) {
     /**
      * @param nbt NbtCompound or NbtList. (Latter is deprecated)
      */
-    private void loadNbt(NbtElement nbt) {
-        if (nbt.getType() == 9) {
+    private void loadNbt(Tag nbt) {
+        if (nbt.getId() == 9) {
             // Legacy format
-            NbtList homesNbtList = (NbtList) nbt;
-            for (NbtElement t : homesNbtList) {
-                NbtCompound homeTag = (NbtCompound) t;
+            ListTag homesNbtList = (ListTag) nbt;
+            for (Tag t : homesNbtList) {
+                CompoundTag homeTag = (CompoundTag) t;
                 String name = homeTag.getString("homeName").orElseThrow();
                 var location = MinecraftLocation.fromNbt(homeTag);
                 super.put(
@@ -70,8 +71,8 @@ private void loadNbt(NbtElement nbt) {
                 );
             }
         } else {
-            NbtCompound nbtCompound = (NbtCompound) nbt;
-            nbtCompound.getKeys().forEach((key) -> {
+            CompoundTag nbtCompound = (CompoundTag) nbt;
+            nbtCompound.keySet().forEach((key) -> {
                 var location = WarpLocation.fromNbt(nbtCompound.getCompound(key).orElseThrow());
                 if (!key.equals(location.getName())) {
                     throw new RuntimeException("Warp key '%s' did not match home name '%s'".formatted(key, location.getName()));
@@ -87,7 +88,7 @@ public WarpLocation putCommand(String name, WarpLocation location) throws Comman
             return super.put(name, location);
         } else {
             throw CommandUtil.createSimpleException(
-                ECText.getInstance().getText("cmd.warp.set.error.exists", TextFormatType.Error, Text.literal(name)));
+                ECText.getInstance().getText("cmd.warp.set.error.exists", TextFormatType.Error, Component.literal(name)));
         }
     }
 
diff --git a/src/main/java/com/fibermc/essentialcommands/util/EssentialsConvertor.java b/src/main/java/com/fibermc/essentialcommands/util/EssentialsConvertor.java
index 14bcec79..36e96b8e 100644
--- a/src/main/java/com/fibermc/essentialcommands/util/EssentialsConvertor.java
+++ b/src/main/java/com/fibermc/essentialcommands/util/EssentialsConvertor.java
@@ -16,12 +16,12 @@
 import com.mojang.authlib.GameProfile;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import net.minecraft.network.packet.c2s.common.SyncedClientOptions;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.PlayerConfigEntry;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.server.world.ServerWorld;
-import net.minecraft.world.World;
+import net.minecraft.server.level.ClientInformation;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.players.NameAndId;
+import net.minecraft.world.level.Level;
 
 import static com.fibermc.essentialcommands.EssentialCommands.LOGGER;
 
@@ -59,7 +59,7 @@ private static List<File> getAllFile(File dirFile) {
     //  are some good ideas here that might be worth carrying over
     @SuppressWarnings("UnreachableCode") // for some reason IDEA 2024.1 hates casting and grays out everything after (L94)
     public static void homeConvert(MinecraftServer server) {
-        var nameToIdCache = server.getApiServices().nameToIdCache();
+        var nameToIdCache = server.services().nameToIdCache();
         File oldUsersDataDictionary = OLD_USERDATA_PATH.toFile();
         if (!oldUsersDataDictionary.exists() || oldUsersDataDictionary.isFile()) {
             oldUsersDataDictionary.mkdirs();
@@ -69,11 +69,11 @@ public static void homeConvert(MinecraftServer server) {
         if (oldUserDataFiles.size() > 0) {
             LOGGER.info("Found the old home file(s), converting!");
 
-            Map<String, ServerWorld> worldMap = new HashMap<>();
+            Map<String, ServerLevel> worldMap = new HashMap<>();
             int counter = 0;
 
-            for (ServerWorld world : server.getWorlds()) {
-                worldMap.put(world.getRegistryKey().getValue().toString(), world);
+            for (ServerLevel world : server.getAllLevels()) {
+                worldMap.put(world.dimension().identifier().toString(), world);
             }
 
             for (File oldUserDataFile : oldUserDataFiles) {
@@ -84,14 +84,14 @@ public static void homeConvert(MinecraftServer server) {
 
                         if (data.containsKey("homes")) {
                             String playerName = (String) data.get("last-account-name");
-                            Optional<PlayerConfigEntry> playerCache = nameToIdCache.findByName(playerName);
+                            Optional<NameAndId> playerCache = nameToIdCache.get(playerName);
 
                             GameProfile playerProfile = new GameProfile(UUID.fromString(oldUserDataFile.getName().replaceAll(".yml", "").replaceAll(".yaml", "")), playerName);
 
                             Map<String, Map<String, Object>> homesMap = (Map<String, Map<String, Object>>) data.get("homes");
                             for (Map.Entry<String, Map<String, Object>> entry : homesMap.entrySet()) {
-                                ServerWorld world = worldMap.get(COMPARISON_TABLE.get((String) entry.getValue().get("world-name")));
-                                ServerPlayerEntity player = new ServerPlayerEntity(server, world, playerProfile, SyncedClientOptions.createDefault());
+                                ServerLevel world = worldMap.get(COMPARISON_TABLE.get((String) entry.getValue().get("world-name")));
+                                ServerPlayer player = new ServerPlayer(server, world, playerProfile, ClientInformation.createDefault());
 
                                 PlayerData playerData = ((ServerPlayerEntityAccess) player).ec$getPlayerData();
 
@@ -102,7 +102,7 @@ public static void homeConvert(MinecraftServer server) {
                                 float pitch = (float) ((double) entry.getValue().get("pitch"));
                                 String homeName = entry.getKey();
 
-                                playerData.addHome(homeName, new MinecraftLocation(world.getRegistryKey(), x, y, z, yaw, pitch));
+                                playerData.addHome(homeName, new MinecraftLocation(world.dimension(), x, y, z, yaw, pitch));
                                 playerData.save();
 
                                 oldUserDataFile.renameTo(new File(oldUsersDataDictionary, oldUserDataFile.getName() + ".converted"));
@@ -138,11 +138,11 @@ public static void warpConvert(MinecraftServer server, File essentialsXWarpsDire
         LOGGER.info("Found {} old warp file(s), converting!", oldWarpFiles.size());
 
         WorldDataManager worldDataManager = ManagerLocator.getInstance().getWorldDataManager();
-        Map<String, World> worldMap = new HashMap<>();
+        Map<String, Level> worldMap = new HashMap<>();
         Map<String, MinecraftLocation> locationMap = new HashMap<>();
 
-        for (World world : server.getWorlds()) {
-            worldMap.put(world.getRegistryKey().getValue().toString(), world);
+        for (Level world : server.getAllLevels()) {
+            worldMap.put(world.dimension().identifier().toString(), world);
         }
 
         for (File oldWarpFile : oldWarpFiles) {
@@ -159,7 +159,7 @@ public static void warpConvert(MinecraftServer server, File essentialsXWarpsDire
                     locationMap.put(
                         warpName,
                         new MinecraftLocation(
-                            worldMap.get(COMPARISON_TABLE.get(worldName)).getRegistryKey(),
+                            worldMap.get(COMPARISON_TABLE.get(worldName)).dimension(),
                             x, y, z, yaw, pitch));
                 }
             } catch (Exception e) {
diff --git a/src/main/java/com/fibermc/essentialcommands/util/EssentialsXParser.java b/src/main/java/com/fibermc/essentialcommands/util/EssentialsXParser.java
index 80ce51f3..48f4aee8 100644
--- a/src/main/java/com/fibermc/essentialcommands/util/EssentialsXParser.java
+++ b/src/main/java/com/fibermc/essentialcommands/util/EssentialsXParser.java
@@ -8,7 +8,7 @@
 import java.nio.file.Path;
 import java.util.*;
 
-import com.fibermc.essentialcommands.mixin.PersistentStateManagerInvoker;
+import com.fibermc.essentialcommands.mixin.DimensionDataStorageInvoker;
 import com.fibermc.essentialcommands.playerdata.PlayerData;
 import com.fibermc.essentialcommands.playerdata.PlayerDataFactory;
 import com.fibermc.essentialcommands.types.NamedLocationStorage;
@@ -16,9 +16,8 @@
 import org.apache.logging.log4j.Level;
 import org.yaml.snakeyaml.Yaml;
 
-import net.minecraft.registry.RegistryKey;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.World;
 
 import static com.fibermc.essentialcommands.EssentialCommands.LOGGER;
 
@@ -27,7 +26,7 @@ private EssentialsXParser() {}
 
     public static NamedLocationStorage parsePlayerHomes(
         File yamlSource,
-        Map<UUID, RegistryKey<World>> uuidRegistryKeyMap
+        Map<UUID, ResourceKey<net.minecraft.world.level.Level>> uuidRegistryKeyMap
     ) {
         NamedLocationStorage homes = new NamedLocationStorage();
         String yamlStr = null;
@@ -49,15 +48,15 @@ public static NamedLocationStorage parsePlayerHomes(
         homesMap.forEach((String name, Map<String, Object> locData) -> {
             var worldIdentifier = (String) locData.get("world");
             UUID worldUuid = null;
-            RegistryKey<World> worldRegistryKey;
+            ResourceKey<net.minecraft.world.level.Level> worldRegistryKey;
             try {
                 worldUuid = UUID.fromString(worldIdentifier);
                 worldRegistryKey = uuidRegistryKeyMap.get(worldUuid);
             } catch (Exception ign) {
                 worldRegistryKey = switch (worldIdentifier) {
-                    case "world" -> World.OVERWORLD;
-                    case "world_nether" -> World.NETHER;
-                    case "world_the_end" -> World.END;
+                    case "world" -> net.minecraft.world.level.Level.OVERWORLD;
+                    case "world_nether" -> net.minecraft.world.level.Level.NETHER;
+                    case "world_the_end" -> net.minecraft.world.level.Level.END;
                     default -> null;
                 };
             }
@@ -68,23 +67,23 @@ public static NamedLocationStorage parsePlayerHomes(
                     worldRegistryKey = switch (worldName) {
                         case "world" -> {
                             if (worldUuid != null) {
-                                uuidRegistryKeyMap.putIfAbsent(worldUuid, World.OVERWORLD);
+                                uuidRegistryKeyMap.putIfAbsent(worldUuid, net.minecraft.world.level.Level.OVERWORLD);
                             }
-                            yield World.OVERWORLD;
+                            yield net.minecraft.world.level.Level.OVERWORLD;
                         }
                         case "world_nether" -> {
                             if (worldUuid != null) {
-                                uuidRegistryKeyMap.putIfAbsent(worldUuid, World.NETHER);
+                                uuidRegistryKeyMap.putIfAbsent(worldUuid, net.minecraft.world.level.Level.NETHER);
                             }
-                            yield World.NETHER;
+                            yield net.minecraft.world.level.Level.NETHER;
                         }
                         case "world_the_end" -> {
                             if (worldUuid != null) {
-                                uuidRegistryKeyMap.putIfAbsent(worldUuid, World.END);
+                                uuidRegistryKeyMap.putIfAbsent(worldUuid, net.minecraft.world.level.Level.END);
                             }
-                            yield World.END;
+                            yield net.minecraft.world.level.Level.END;
                         }
-                        default -> World.OVERWORLD;
+                        default -> net.minecraft.world.level.Level.OVERWORLD;
                     };
                 }
             }
@@ -105,14 +104,14 @@ public static NamedLocationStorage parsePlayerHomes(
         return homes;
     }
 
-    public static Map<UUID, RegistryKey<World>> getWorldUids(MinecraftServer server) {
+    public static Map<UUID, ResourceKey<net.minecraft.world.level.Level>> getWorldUids(MinecraftServer server) {
 
-        Map<UUID, RegistryKey<World>> uuidRegistryKeyMap = new LinkedHashMap<>();
-        server.getWorlds().forEach(world -> {
+        Map<UUID, ResourceKey<net.minecraft.world.level.Level>> uuidRegistryKeyMap = new LinkedHashMap<>();
+        server.getAllLevels().forEach(world -> {
             // This is dumb. We're taking fabric/vanilla's ideas of these worlds to look for the
             // bukkit/spigot/paper UID. Instead, we should be reading those mods' config files to
             // find the correct directory. Rn this will essentially (heh) always be wrong.
-            var persistentStateManager = ((PersistentStateManagerInvoker) world.getPersistentStateManager());
+            var persistentStateManager = ((DimensionDataStorageInvoker) world.getDataStorage());
             File uidFile = persistentStateManager.invokeGetFile("uid").toFile();
             if (!uidFile.exists()) {
                 uidFile = persistentStateManager.invokeGetFile("../uid").toFile();
@@ -124,15 +123,15 @@ public static Map<UUID, RegistryKey<World>> getWorldUids(MinecraftServer server)
                 LOGGER.info(String.format("File: %s, UUID: %s", uidFile.getPath(), UUID.nameUUIDFromBytes(uuidBytes)));
                 uuidRegistryKeyMap.put(
                     UUID.nameUUIDFromBytes(uuidBytes),
-                    world.getRegistryKey()
+                    world.dimension()
                 );
             } catch (IOException e) {
                 LOGGER.log(
                     Level.WARN,
                     String.format(
                         "World, %s, did not have a valid uid.dat file. EssentialsX homes set in this dim will likely be remapped to %s.",
-                        world.getRegistryKey().getValue().toString(),
-                        World.OVERWORLD.getValue().toString()
+                        world.dimension().identifier().toString(),
+                        net.minecraft.world.level.Level.OVERWORLD.identifier().toString()
                     )
                 );
             }
diff --git a/src/main/java/com/fibermc/essentialcommands/util/FileUtil.java b/src/main/java/com/fibermc/essentialcommands/util/FileUtil.java
index 837cbfa6..fd7216d5 100644
--- a/src/main/java/com/fibermc/essentialcommands/util/FileUtil.java
+++ b/src/main/java/com/fibermc/essentialcommands/util/FileUtil.java
@@ -11,7 +11,7 @@
 import org.apache.logging.log4j.Level;
 
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.WorldSavePath;
+import net.minecraft.world.level.storage.LevelResource;
 
 public final class FileUtil {
     private FileUtil() {}
@@ -19,7 +19,7 @@ private FileUtil() {}
     public static Path getOrCreateWorldDirectory(MinecraftServer server, String subdir) throws IOException {
         Path dataDirectoryPath;
         try {
-            dataDirectoryPath = Files.createDirectories(server.getSavePath(WorldSavePath.ROOT).resolve(subdir));
+            dataDirectoryPath = Files.createDirectories(server.getWorldPath(LevelResource.ROOT).resolve(subdir));
         } catch (NullPointerException e) {
             dataDirectoryPath = Files.createDirectories(Paths.get("./world/%s".formatted(subdir)));
             EssentialCommands.log(Level.WARN, "Session save path could not be found. Defaulting to ./world/{}", subdir);
diff --git a/src/main/java/com/fibermc/essentialcommands/util/NicknameTextUtil.java b/src/main/java/com/fibermc/essentialcommands/util/NicknameTextUtil.java
index d36378dd..53fb6b4b 100644
--- a/src/main/java/com/fibermc/essentialcommands/util/NicknameTextUtil.java
+++ b/src/main/java/com/fibermc/essentialcommands/util/NicknameTextUtil.java
@@ -2,10 +2,10 @@
 
 import com.fibermc.essentialcommands.ECPerms;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.text.Style;
-import net.minecraft.text.Text;
-import net.minecraft.util.Identifier;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.Style;
+import net.minecraft.resources.Identifier;
 
 public final class NicknameTextUtil {
     private NicknameTextUtil() {}
@@ -16,7 +16,7 @@ private static final class NickPerms {
         public final boolean hover;
         public final boolean click;
 
-        private NickPerms(ServerCommandSource source) {
+        private NickPerms(CommandSourceStack source) {
             this.color = ECPerms.check(source, ECPerms.Registry.nickname_style_color);
             this.fancy = ECPerms.check(source, ECPerms.Registry.nickname_style_fancy);
             this.hover = ECPerms.check(source, ECPerms.Registry.nickname_style_hover);
@@ -30,7 +30,7 @@ public static boolean areAllTrue(boolean... array) {
     }
 
     // Returns true if they have the permissions for this nickname
-    private static boolean hasPermissionForTextFragment(Text text, NickPerms sourcePerms) {
+    private static boolean hasPermissionForTextFragment(Component text, NickPerms sourcePerms) {
         Style style = text.getStyle();
         // If the nickname has no click event, return true
         // if it DOES have a clickEvent, return true if they have the clickEvent permission...
@@ -42,18 +42,18 @@ private static boolean hasPermissionForTextFragment(Text text, NickPerms sourceP
                     || style.isObfuscated()
                     || style.isStrikethrough()
                     || style.isUnderlined())
-                || !style.getFont().equals(Identifier.of("minecraft:default"))),
+                || !style.getFont().equals(Identifier.parse("minecraft:default"))),
             (sourcePerms.click || (style.getClickEvent() == null)),
             (sourcePerms.hover || (style.getHoverEvent() == null))
         );
     }
 
-    public static boolean checkPerms(Text parentText, NickPerms sourcePerms) {
+    public static boolean checkPerms(Component parentText, NickPerms sourcePerms) {
         if (parentText == null) {
             return true;
         }
         boolean hasRequiredPerms = hasPermissionForTextFragment(parentText, sourcePerms);
-        for (Text text : parentText.getSiblings()) {
+        for (Component text : parentText.getSiblings()) {
             if (!checkPerms(text, sourcePerms)) {
                 hasRequiredPerms = false;
                 break;
@@ -67,7 +67,7 @@ public static boolean checkPerms(Text parentText, NickPerms sourcePerms) {
         return hasRequiredPerms;
     }
 
-    public static boolean checkPerms(Text parentText, ServerCommandSource source) {
+    public static boolean checkPerms(Component parentText, CommandSourceStack source) {
         return checkPerms(parentText, new NickPerms(source));
     }
 }
diff --git a/src/main/java/com/fibermc/essentialcommands/util/PlayerUtilities.java b/src/main/java/com/fibermc/essentialcommands/util/PlayerUtilities.java
index e18a8515..0ee1ba70 100644
--- a/src/main/java/com/fibermc/essentialcommands/util/PlayerUtilities.java
+++ b/src/main/java/com/fibermc/essentialcommands/util/PlayerUtilities.java
@@ -2,32 +2,32 @@
 
 import java.util.List;
 
-import net.minecraft.entity.mob.HostileEntity;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.util.math.Box;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.monster.Monster;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.Vec3;
 
 public final class PlayerUtilities {
     private PlayerUtilities() {}
 
-    public static boolean isNearAngryMonsters(ServerPlayerEntity player) {
-        var world = player.getEntityWorld();
-        var pos = player.getBlockPos();
+    public static boolean isNearAngryMonsters(ServerPlayer player) {
+        var world = player.level();
+        var pos = player.blockPosition();
         double boxHorizontalSize = 8.0;
         double boxHeight = 5.0;
-        Vec3d vec3d = Vec3d.ofBottomCenter(pos);
-        List<HostileEntity> list = world
-            .getEntitiesByClass(
-                HostileEntity.class,
-                new Box(
-                    vec3d.getX() - boxHorizontalSize,
-                    vec3d.getY() - boxHeight,
-                    vec3d.getZ() - boxHorizontalSize,
-                    vec3d.getX() + boxHorizontalSize,
-                    vec3d.getY() + boxHeight,
-                    vec3d.getZ() + boxHorizontalSize
+        Vec3 vec3d = Vec3.atBottomCenterOf(pos);
+        List<Monster> list = world
+            .getEntitiesOfClass(
+                Monster.class,
+                new AABB(
+                    vec3d.x() - boxHorizontalSize,
+                    vec3d.y() - boxHeight,
+                    vec3d.z() - boxHorizontalSize,
+                    vec3d.x() + boxHorizontalSize,
+                    vec3d.y() + boxHeight,
+                    vec3d.z() + boxHorizontalSize
                 ),
-                (entity) -> entity.isAngryAt(world, player)
+                (entity) -> entity.isPreventingPlayerRest(world, player)
             );
 
         return !list.isEmpty();
diff --git a/src/main/resources/essential_commands.mixins.json b/src/main/resources/essential_commands.mixins.json
index 3f70c4ab..21d014cc 100644
--- a/src/main/resources/essential_commands.mixins.json
+++ b/src/main/resources/essential_commands.mixins.json
@@ -4,17 +4,17 @@
   "compatibilityLevel": "JAVA_17",
   "mixins": [
     "LivingEntityMixin",
-    "PersistentStateManagerInvoker",
-    "PlayerEntityMixin",
-    "PlayerListS2CPacketActionMixin",
-    "PlayerManagerMixin",
+    "DimensionDataStorageInvoker",
+    "PlayerMixin",
+    "ClientboundPlayerInfoUpdatePacketActionMixin",
+    "PlayerListMixin",
     "PrepareSpawnTaskMixin",
-    "ServerPlayerEntityMixin",
-    "ServerPlayNetworkHandlerMixin",
+    "ServerPlayerMixin",
+    "ServerGamePacketListenerImplMixin",
     "ServerScoreboardMixin",
-    "SleepManagerMixin",
+    "SleepStatusMixin",
     "TeleportCommandMixin",
-    "WorldSaveHandlerMixin"
+    "PlayerDataStorageMixin"
   ],
   "client": [
   ],
diff --git a/src/test/java/com/fibermc/essentialcommands/ECTextTests.java b/src/test/java/com/fibermc/essentialcommands/ECTextTests.java
index dd0f93cb..dcf5c47b 100644
--- a/src/test/java/com/fibermc/essentialcommands/ECTextTests.java
+++ b/src/test/java/com/fibermc/essentialcommands/ECTextTests.java
@@ -8,11 +8,11 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
-import net.minecraft.Bootstrap;
+import net.minecraft.server.Bootstrap;
 import net.minecraft.SharedConstants;
-import net.minecraft.registry.Registries;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.network.chat.Component;
+import net.minecraft.ChatFormatting;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -21,9 +21,9 @@ public class ECTextTests {
     private static ECText ecText;
 
     static {
-        SharedConstants.createGameVersion();
-        Bootstrap.initialize();
-        Registries.bootstrap();
+        SharedConstants.tryDetectVersion();
+        Bootstrap.bootStrap();
+        BuiltInRegistries.bootStrap();
     }
 
     @BeforeAll
@@ -40,10 +40,10 @@ public static void setup() {
     @DisplayName("getTextInternal - no interpolation")
     void getTextInternal_FormatsCorrectly()
     {
-        var expected = Text.literal("enabled").setStyle(TextFormatType.Default.getStyle());
+        var expected = Component.literal("enabled").setStyle(TextFormatType.Default.getStyle());
         var enabledText = ecText.getText("generic.enabled");
 
-        assertEquals(expected.getContent(), enabledText.getContent());
+        assertEquals(expected.getContents(), enabledText.getContents());
         assertEquals(expected.getStyle(), enabledText.getStyle());
     }
 
@@ -51,15 +51,15 @@ void getTextInternal_FormatsCorrectly()
     @DisplayName("getTextInternal - two interpolated tokens")
     void getTextInternal_TwoInterpolatedTokens_FormatsCorrectly()
     {
-        var playerNameText = Text.literal("Steve").formatted(Formatting.AQUA);
+        var playerNameText = Component.literal("Steve").withStyle(ChatFormatting.AQUA);
         var defaultStyle = TextFormatType.Default.getStyle();
         var accentStyle = TextFormatType.Accent.getStyle();
-        var expectedMessage = Text.empty()
-            .append(Text.literal("Flight ").setStyle(defaultStyle))
-            .append(Text.literal("enabled").setStyle(accentStyle))
-            .append(Text.literal(" for ").setStyle(defaultStyle))
+        var expectedMessage = Component.empty()
+            .append(Component.literal("Flight ").setStyle(defaultStyle))
+            .append(Component.literal("enabled").setStyle(accentStyle))
+            .append(Component.literal(" for ").setStyle(defaultStyle))
             .append(playerNameText)
-            .append(Text.literal(".").setStyle(defaultStyle));
+            .append(Component.literal(".").setStyle(defaultStyle));
 
         var enabledText = ecText.getText("generic.enabled").setStyle(accentStyle);
 
@@ -86,13 +86,13 @@ void getTextInternal_TwoInterpolatedTokens_FormatsCorrectly()
     @DisplayName("getTextInternal - first token interpolated")
     void getTextInternal_FirstTokenInterpolated_FormatsCorrectly()
     {
-        var playerNameText = Text.empty()
-            .append(Text.literal("[UnstyledPrefix] "))
-            .append(Text.literal("Steve").formatted(Formatting.AQUA));
+        var playerNameText = Component.empty()
+            .append(Component.literal("[UnstyledPrefix] "))
+            .append(Component.literal("Steve").withStyle(ChatFormatting.AQUA));
         var defaultStyle = TextFormatType.Default.getStyle();
-        var expectedMessage = Text.empty()
+        var expectedMessage = Component.empty()
             .append(playerNameText)
-            .append(Text.literal(" is now AFK.").setStyle(defaultStyle));
+            .append(Component.literal(" is now AFK.").setStyle(defaultStyle));
 
         var actualMessage = ecText.getText("player.afk.enter", playerNameText);