From 32e5f03520e52deadb512281e3a3ab370b36aeec Mon Sep 17 00:00:00 2001 From: Christopher Bohn Date: Wed, 24 Apr 2024 01:27:22 -0700 Subject: [PATCH] Update Fabric to 1.20.5 --- fabric/build.gradle.kts | 8 ++++---- .../popcraft/chunky/mixin/ServerChunkManagerMixin.java | 4 ++-- .../java/org/popcraft/chunky/platform/FabricWorld.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts index 49006de2..9b7eabb6 100644 --- a/fabric/build.gradle.kts +++ b/fabric/build.gradle.kts @@ -5,10 +5,10 @@ plugins { val shade: Configuration by configurations.creating dependencies { - minecraft(group = "com.mojang", name = "minecraft", version = "1.20") - mappings(group = "net.fabricmc", name = "yarn", version = "1.20+build.1", classifier = "v2") - modImplementation(group = "net.fabricmc", name = "fabric-loader", version = "0.14.21") - modImplementation(group = "net.fabricmc.fabric-api", name = "fabric-api", version = "0.83.0+1.20") + minecraft(group = "com.mojang", name = "minecraft", version = "1.20.5") + mappings(group = "net.fabricmc", name = "yarn", version = "1.20.5+build.1", classifier = "v2") + modImplementation(group = "net.fabricmc", name = "fabric-loader", version = "0.15.10") + modImplementation(group = "net.fabricmc.fabric-api", name = "fabric-api", version = "0.97.6+1.20.5") modCompileOnly(group = "me.lucko", name = "fabric-permissions-api", version = "0.2-SNAPSHOT") implementation(project(":chunky-common")) shade(project(":chunky-common")) diff --git a/fabric/src/main/java/org/popcraft/chunky/mixin/ServerChunkManagerMixin.java b/fabric/src/main/java/org/popcraft/chunky/mixin/ServerChunkManagerMixin.java index da536c26..29f8ac7b 100644 --- a/fabric/src/main/java/org/popcraft/chunky/mixin/ServerChunkManagerMixin.java +++ b/fabric/src/main/java/org/popcraft/chunky/mixin/ServerChunkManagerMixin.java @@ -6,7 +6,7 @@ @Mixin(ServerChunkManager.class) public interface ServerChunkManagerMixin { - @Invoker("tick") + @Invoker("updateChunks") @SuppressWarnings({"UnusedReturnValue", "UnnecessaryInterfaceModifier"}) - public boolean invokeTick(); + public boolean invokeUpdateChunks(); } diff --git a/fabric/src/main/java/org/popcraft/chunky/platform/FabricWorld.java b/fabric/src/main/java/org/popcraft/chunky/platform/FabricWorld.java index a29a0f15..44f5149a 100644 --- a/fabric/src/main/java/org/popcraft/chunky/platform/FabricWorld.java +++ b/fabric/src/main/java/org/popcraft/chunky/platform/FabricWorld.java @@ -106,7 +106,7 @@ public CompletableFuture getChunkAtAsync(final int x, final int z) { if (TICKING_LOAD_DURATION > 0) { serverChunkManager.addTicket(CHUNKY_TICKING, chunkPos, 1, Unit.INSTANCE); } - ((ServerChunkManagerMixin) serverChunkManager).invokeTick(); + ((ServerChunkManagerMixin) serverChunkManager).invokeUpdateChunks(); final ThreadedAnvilChunkStorage threadedAnvilChunkStorage = serverChunkManager.threadedAnvilChunkStorage; final ThreadedAnvilChunkStorageMixin threadedAnvilChunkStorageMixin = (ThreadedAnvilChunkStorageMixin) threadedAnvilChunkStorage; final ChunkHolder chunkHolder = threadedAnvilChunkStorageMixin.invokeGetChunkHolder(chunkPos.toLong());