diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 51ae013..c1fbd55 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -13,7 +13,7 @@
   },
   "depends": {
     "fabricloader": ">=0.10.0",
-    "minecraft": ["1.8.x", "1.14.x", "1.15.x", "1.16.x", "1.17.x", "1.18.x", "1.19.x"],
+    "minecraft": ["1.8.x", "1.14.4", "1.15.2", "~1.16.4", "1.17.1", "1.18.2", "~1.19.1"],
     "viaversion": ">=4.0.0"
   },
   "environment": "*",
diff --git a/viafabric-mc18/build.gradle.kts b/viafabric-mc18/build.gradle.kts
index 93cb816..ee8b648 100644
--- a/viafabric-mc18/build.gradle.kts
+++ b/viafabric-mc18/build.gradle.kts
@@ -1,8 +1,8 @@
 dependencies {
     minecraft("com.mojang:minecraft:1.8.9")
-    mappings("net.fabricmc:yarn:1.8.9+build.202112162000:v2")
+    mappings("net.legacyfabric:yarn:1.8.9+build.388:v2")
 
-    modImplementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:1.4.2+1.8.9")
+    modImplementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:1.7.1+1.8.9")
     modImplementation("io.github.boogiemonster1o1:rewoven-modmenu:1.0.0+1.8.9") {
         isTransitive = false
     }
@@ -13,5 +13,5 @@ dependencies {
 }
 
 loom {
-    intermediaryUrl.set("https://maven.legacyfabric.net/net/fabricmc/intermediary/%1\$s/intermediary-%1\$s-v2.jar")
+    intermediaryUrl.set("https://maven.legacyfabric.net/net/legacyfabric/intermediary/%1\$s/intermediary-%1\$s-v2.jar")
 }
diff --git a/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/commands/NMSCommandSender.java b/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/commands/NMSCommandSender.java
index 56bd75b..006440f 100644
--- a/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/commands/NMSCommandSender.java
+++ b/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/commands/NMSCommandSender.java
@@ -37,7 +37,7 @@ public class NMSCommandSender implements ViaCommandSender {
     @Override
     public String getName() {
         if (source instanceof Entity) {
-            return source.getName().asString();
+            return source.method_6344().asString();
         }
         return "?";
     }
diff --git a/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/platform/FabricPlatform.java b/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/platform/FabricPlatform.java
index 9e13298..e8a6910 100644
--- a/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/platform/FabricPlatform.java
+++ b/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/platform/FabricPlatform.java
@@ -13,8 +13,8 @@ import io.netty.channel.EventLoop;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
 
 import java.util.UUID;
diff --git a/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/providers/VRHandItemProvider.java b/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/providers/VRHandItemProvider.java
index fab2923..d7509c3 100644
--- a/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/providers/VRHandItemProvider.java
+++ b/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/providers/VRHandItemProvider.java
@@ -10,7 +10,7 @@ import net.fabricmc.api.Environment;
 import net.legacyfabric.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.legacyfabric.fabric.api.event.lifecycle.v1.ServerTickEvents;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.entity.player.ClientPlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.server.MinecraftServer;