diff --git a/fabric-1.20.6/build.gradle b/fabric-1.20.6/build.gradle
index eeb71c88..eea83fed 100644
--- a/fabric-1.20.6/build.gradle
+++ b/fabric-1.20.6/build.gradle
@@ -12,7 +12,7 @@ eclipse {
     }
 }
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(21) // Need this here so eclipse task generates correctly.
 
 configurations {
     shadow
diff --git a/fabric-1.20.6/gradle.properties b/fabric-1.20.6/gradle.properties
index 2b665a9a..c0365ab5 100644
--- a/fabric-1.20.6/gradle.properties
+++ b/fabric-1.20.6/gradle.properties
@@ -1,4 +1,4 @@
-minecraft_version=1.20.4
-yarn_mappings=1.20.4+build.1
-loader_version=0.15.2
-fabric_version=0.91.2+1.20.4
+minecraft_version=1.20.6
+yarn_mappings=1.20.6+build.1
+loader_version=0.15.11
+fabric_version=0.98.0+1.20.6
diff --git a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricWorld.java b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricWorld.java
index 0093aacd..00c60811 100644
--- a/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricWorld.java
+++ b/fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/FabricWorld.java
@@ -96,9 +96,10 @@ public class FabricWorld extends DynmapWorld {
     @Override
     public DynmapLocation getSpawnLocation() {
         if (world != null) {
-            spawnloc.x = world.getLevelProperties().getSpawnX();
-            spawnloc.y = world.getLevelProperties().getSpawnY();
-            spawnloc.z = world.getLevelProperties().getSpawnZ();
+            BlockPos spawnPos = world.getLevelProperties().getSpawnPos();
+            spawnloc.x = spawnPos.getX();
+            spawnloc.y = spawnPos.getY();
+            spawnloc.z = spawnPos.getZ();
             spawnloc.world = this.getName();
         }
         return spawnloc;
diff --git a/fabric-1.20.6/src/main/resources/fabric.mod.json b/fabric-1.20.6/src/main/resources/fabric.mod.json
index 73ef1146..ea83e0e6 100644
--- a/fabric-1.20.6/src/main/resources/fabric.mod.json
+++ b/fabric-1.20.6/src/main/resources/fabric.mod.json
@@ -27,8 +27,8 @@
   "accessWidener" : "dynmap.accesswidener",
 
   "depends": {
-    "fabricloader": ">=0.15.2",
-    "fabric": ">=0.91.0",
-    "minecraft": ["1.20.3", "1.20.4"]
+    "fabricloader": ">=0.15.11",
+    "fabric": ">=0.98.0",
+    "minecraft": ["1.20.5", "1.20.6"]
   }
 }