diff --git a/gradle.properties b/gradle.properties index af8da8d..88402b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx2G org.gradle.daemon=false # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.20.1 -yarn_mappings=1.20.1+build.2 -loader_version=0.14.21 +minecraft_version=1.20.2 +yarn_mappings=1.20.2+build.4 +loader_version=0.14.23 # Mod Properties mod_version=1.0.0 maven_group=ca.spottedleaf.moonrise diff --git a/src/main/java/ca/spottedleaf/moonrise/mixin/keep_alive_client/ServerGamePacketListenerImplMixin.java b/src/main/java/ca/spottedleaf/moonrise/mixin/keep_alive_client/ServerGamePacketListenerImplMixin.java index a53c097..d5fd774 100644 --- a/src/main/java/ca/spottedleaf/moonrise/mixin/keep_alive_client/ServerGamePacketListenerImplMixin.java +++ b/src/main/java/ca/spottedleaf/moonrise/mixin/keep_alive_client/ServerGamePacketListenerImplMixin.java @@ -10,7 +10,11 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(ServerGamePacketListenerImpl.class) -public abstract class ServerGamePacketListenerImplMixin implements ServerPlayerConnection, TickablePacketListener, ServerGamePacketListener { +public abstract class ServerGamePacketListenerImplMixin extends net.minecraft.server.network.ServerCommonPacketListenerImpl implements ServerGamePacketListener, ServerPlayerConnection, TickablePacketListener { + + public ServerGamePacketListenerImplMixin(net.minecraft.server.MinecraftServer minecraftServer, net.minecraft.network.Connection connection, net.minecraft.server.network.CommonListenerCookie commonListenerCookie) { + super(minecraftServer, connection, commonListenerCookie); + } /** * @reason Testing the explosion patch resulted in me being kicked for keepalive timeout as netty was unable to @@ -26,7 +30,7 @@ public abstract class ServerGamePacketListenerImplMixin implements ServerPlayerC ) private void refuseSPKick(final ServerGamePacketListenerImpl instance, final Component component) { if (Component.translatable("disconnect.timeout").equals(component) && - instance.isSingleplayerOwner()) { + ((ServerGamePacketListenerImplMixin)(Object)instance).isSingleplayerOwner()) { return; } diff --git a/src/main/java/ca/spottedleaf/moonrise/mixin/starlight/multiplayer/ClientPacketListenerMixin.java b/src/main/java/ca/spottedleaf/moonrise/mixin/starlight/multiplayer/ClientPacketListenerMixin.java index 8df44d5..49a9e72 100644 --- a/src/main/java/ca/spottedleaf/moonrise/mixin/starlight/multiplayer/ClientPacketListenerMixin.java +++ b/src/main/java/ca/spottedleaf/moonrise/mixin/starlight/multiplayer/ClientPacketListenerMixin.java @@ -90,7 +90,7 @@ public abstract class ClientPacketListenerMixin implements ClientGamePacketListe ) ) private void unloadLightDataHook(final ClientPacketListener instance, final ClientboundForgetLevelChunkPacket clientboundForgetLevelChunkPacket) { - ((StarLightLightingProvider)this.level.getChunkSource().getLightEngine()).clientRemoveLightData(new ChunkPos(clientboundForgetLevelChunkPacket.getX(), clientboundForgetLevelChunkPacket.getZ())); + ((StarLightLightingProvider)this.level.getChunkSource().getLightEngine()).clientRemoveLightData(new ChunkPos(clientboundForgetLevelChunkPacket.pos().x, clientboundForgetLevelChunkPacket.pos().z)); } /** @@ -121,14 +121,14 @@ public abstract class ClientPacketListenerMixin implements ClientGamePacketListe private void postChunkLoadHook(final ClientboundLevelChunkWithLightPacket clientboundLevelChunkWithLightPacket, final CallbackInfo ci) { final int chunkX = clientboundLevelChunkWithLightPacket.getX(); final int chunkZ = clientboundLevelChunkWithLightPacket.getZ(); - final LevelChunk chunk = (LevelChunk)this.level.getChunk(chunkX, chunkZ, ChunkStatus.FULL, false); + final LevelChunk chunk = this.level.getChunkSource().getChunk(chunkX, chunkZ, ChunkStatus.FULL, false); if (chunk == null) { // failed to load return; } // load in light data from packet immediately this.applyLightData(chunkX, chunkZ, clientboundLevelChunkWithLightPacket.getLightData()); - ((StarLightLightingProvider) this.level.getChunkSource().getLightEngine()).clientChunkLoad(new ChunkPos(chunkX, chunkZ), chunk); + ((StarLightLightingProvider)this.level.getChunkSource().getLightEngine()).clientChunkLoad(new ChunkPos(chunkX, chunkZ), chunk); // we need this for the update chunk status call, so that it can tell starlight what sections are empty and such this.enableChunkLight(chunk, chunkX, chunkZ); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 71de15f..504e941 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -28,6 +28,6 @@ "accessWidener" : "moonrise.accesswidener", "depends": { "fabricloader": ">=0.14.19", - "minecraft": "1.20.*" + "minecraft": "1.20.2" } }