From 8b8d6ddb9ec487028c58c6f678aec93682dcb027 Mon Sep 17 00:00:00 2001
From: chris <github@onechris.mozmail.com>
Date: Thu, 8 Jun 2023 16:15:08 +0200
Subject: [PATCH] Geyser-Fabric: bump to 1.20 (#3824)

* add accesswidener, bump to 1.20

* address review

* yeet AW, use level() instead

* update modrinth version

pls work
---
 bootstrap/fabric/build.gradle.kts                           | 4 ++--
 .../platform/fabric/world/GeyserFabricWorldManager.java     | 6 +++---
 bootstrap/fabric/src/main/resources/fabric.mod.json         | 4 ++--
 gradle/libs.versions.toml                                   | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bootstrap/fabric/build.gradle.kts b/bootstrap/fabric/build.gradle.kts
index e85c2f809..86b5b2a6b 100644
--- a/bootstrap/fabric/build.gradle.kts
+++ b/bootstrap/fabric/build.gradle.kts
@@ -104,11 +104,11 @@ modrinth {
     syncBodyFrom.set(rootProject.file("README.md").readText())
 
     uploadFile.set(tasks.getByPath("remapJar"))
-    gameVersions.addAll("1.19", "1.19.1", "1.19.2", "1.19.3", "1.19.4")
+    gameVersions.addAll("1.20")
 
     loaders.add("fabric")
 
     dependencies {
         required.project("fabric-api")
     }
-}
\ No newline at end of file
+}
diff --git a/bootstrap/fabric/src/main/java/org/geysermc/geyser/platform/fabric/world/GeyserFabricWorldManager.java b/bootstrap/fabric/src/main/java/org/geysermc/geyser/platform/fabric/world/GeyserFabricWorldManager.java
index 454a9167e..9cd01f993 100644
--- a/bootstrap/fabric/src/main/java/org/geysermc/geyser/platform/fabric/world/GeyserFabricWorldManager.java
+++ b/bootstrap/fabric/src/main/java/org/geysermc/geyser/platform/fabric/world/GeyserFabricWorldManager.java
@@ -72,7 +72,7 @@ public class GeyserFabricWorldManager extends GeyserWorldManager {
                 return;
             }
 
-            LevelChunk chunk = player.getLevel().getChunk(x, z);
+            LevelChunk chunk = player.level().getChunk(x, z);
             final int chunkBlockX = x << 4;
             final int chunkBlockZ = z << 4;
             for (int i = 0; i < blockEntityInfos.size(); i++) {
@@ -92,7 +92,7 @@ public class GeyserFabricWorldManager extends GeyserWorldManager {
                 return;
             }
 
-            BlockEntity blockEntity = player.level.getBlockEntity(new BlockPos(x, y, z));
+            BlockEntity blockEntity = player.level().getBlockEntity(new BlockPos(x, y, z));
             sendLecternData(session, blockEntity, false);
         });
     }
@@ -166,7 +166,7 @@ public class GeyserFabricWorldManager extends GeyserWorldManager {
 
             BlockPos pos = new BlockPos(x, y, z);
             // Don't create a new block entity if invalid
-            BlockEntity blockEntity = player.level.getChunkAt(pos).getBlockEntity(pos);
+            BlockEntity blockEntity = player.level().getChunkAt(pos).getBlockEntity(pos);
             if (blockEntity instanceof BannerBlockEntity banner) {
                 // Potentially exposes other NBT data? But we need to get the NBT data for the banner patterns *and*
                 // the banner might have a custom name, both of which a Java client knows and caches
diff --git a/bootstrap/fabric/src/main/resources/fabric.mod.json b/bootstrap/fabric/src/main/resources/fabric.mod.json
index 98a410950..4c442017a 100644
--- a/bootstrap/fabric/src/main/resources/fabric.mod.json
+++ b/bootstrap/fabric/src/main/resources/fabric.mod.json
@@ -23,9 +23,9 @@
     "geyser-fabric.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.14.8",
+    "fabricloader": ">=0.14.21",
     "fabric": "*",
-    "minecraft": ">=1.19",
+    "minecraft": ">=1.20",
     "fabric-permissions-api-v0": "*"
   }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f0ff72923..50fc70854 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -28,9 +28,9 @@ commodore = "2.2"
 bungeecord = "a7c6ede"
 velocity = "3.0.0"
 sponge = "8.0.0"
-fabric-minecraft = "1.19.1"
-fabric-loader = "0.14.8"
-fabric-api = "0.58.5+1.19.1"
+fabric-minecraft = "1.20"
+fabric-loader = "0.14.21"
+fabric-api = "0.83.0+1.20"
 
 [libraries]
 base-api = { group = "org.geysermc.api", name = "base-api", version.ref = "base-api" }