diff --git a/build.gradle b/build.gradle index bdf1d80..3a04e2e 100644 --- a/build.gradle +++ b/build.gradle @@ -48,3 +48,10 @@ subprojects { p -> } } } + +def buildAndGather = tasks.register('buildAndGather') { + group = 'build' + description = 'Build all version subprojects and collect their mod jars into build/libs.' + dependsOn collectJars + subprojects.each { p -> dependsOn("${p.path}:build") } +} diff --git a/src/main/java/cn/ussshenzhou/notenoughbandwidth/mixin/ClientChunkLightRecomputeMixin.java b/src/main/java/cn/ussshenzhou/notenoughbandwidth/mixin/ClientChunkLightRecomputeMixin.java index 5b42bbd..ce8f4c0 100644 --- a/src/main/java/cn/ussshenzhou/notenoughbandwidth/mixin/ClientChunkLightRecomputeMixin.java +++ b/src/main/java/cn/ussshenzhou/notenoughbandwidth/mixin/ClientChunkLightRecomputeMixin.java @@ -17,7 +17,7 @@ public class ClientChunkLightRecomputeMixin { @Inject(method = "applyLightData", at = @At("TAIL")) - //#if MC>=12002 + //#if MC>=12102 private void nebRecomputeStrippedLight(int x, int z, ClientboundLightUpdatePacketData lightData, boolean trustEdges, CallbackInfo ci) { //#else //$$ private void nebRecomputeStrippedLight(int x, int z, ClientboundLightUpdatePacketData lightData, CallbackInfo ci) { diff --git a/src/main/java/cn/ussshenzhou/notenoughbandwidth/mixin/ClientPlayNetworkHandlerInvoker.java b/src/main/java/cn/ussshenzhou/notenoughbandwidth/mixin/ClientPlayNetworkHandlerInvoker.java index c207b41..7bfe90f 100644 --- a/src/main/java/cn/ussshenzhou/notenoughbandwidth/mixin/ClientPlayNetworkHandlerInvoker.java +++ b/src/main/java/cn/ussshenzhou/notenoughbandwidth/mixin/ClientPlayNetworkHandlerInvoker.java @@ -17,7 +17,7 @@ public interface ClientPlayNetworkHandlerInvoker { @Invoker("updateLevelChunk") void nebLoadChunk(int x, int z, ClientboundLevelChunkPacketData chunkData); - //#if MC>=12002 + //#if MC>=12102 @Invoker("applyLightData") void nebReadLightData(int x, int z, ClientboundLightUpdatePacketData lightData, boolean bl); //#else diff --git a/src/main/java/cn/ussshenzhou/notenoughbandwidth/network/ModNetworking.java b/src/main/java/cn/ussshenzhou/notenoughbandwidth/network/ModNetworking.java index 8bff4dc..579c3b7 100644 --- a/src/main/java/cn/ussshenzhou/notenoughbandwidth/network/ModNetworking.java +++ b/src/main/java/cn/ussshenzhou/notenoughbandwidth/network/ModNetworking.java @@ -228,7 +228,11 @@ public static void registerClient() { if (world != null) { // 26.1: ClientLevel.enqueueChunkUpdate is gone; just run on the client thread. net.minecraft.client.Minecraft.getInstance().execute(() -> { + //#if MC>=12102 invoker.nebReadLightData(x, z, lightData, false); + //#else + //$$ invoker.nebReadLightData(x, z, lightData); + //#endif var worldChunk = world.getChunkSource().getChunkNow(x, z); if (worldChunk != null) { invoker.nebScheduleRenderChunk(worldChunk, x, z);