From cac97b5127fcfb25f030034c18df33f47a493b26 Mon Sep 17 00:00:00 2001 From: gnembon <41132274+gnembon@users.noreply.github.com> Date: Wed, 3 May 2023 22:09:14 +0200 Subject: [PATCH] 23w18a --- gradle.properties | 4 ++-- .../mixins/LayerLightEngine_scarpetChunkCreationMixin.java | 4 ++-- .../LayerLightSectionStorage_scarpetChunkCreationMixin.java | 2 +- .../mixins/ServerPlayerGameMode_scarpetEventsMixin.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index ef25f0aa..cce20ec6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,10 +3,10 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check https://fabricmc.net/develop/ - minecraft_version=23w17a + minecraft_version=23w18a loader_version=0.14.19 jsr305_version=3.0.2 - fabric_version=0.79.1+1.20 + fabric_version=0.80.1+1.20 # Mod Properties mod_version = 1.4.106 diff --git a/src/main/java/carpet/mixins/LayerLightEngine_scarpetChunkCreationMixin.java b/src/main/java/carpet/mixins/LayerLightEngine_scarpetChunkCreationMixin.java index 9093cc3f..7b86b7b7 100644 --- a/src/main/java/carpet/mixins/LayerLightEngine_scarpetChunkCreationMixin.java +++ b/src/main/java/carpet/mixins/LayerLightEngine_scarpetChunkCreationMixin.java @@ -18,7 +18,7 @@ public abstract class LayerLightEngine_scarpetChunkCreationMixin implements Ligh @Final protected LayerLightSectionStorage storage; - @Shadow protected abstract void clearQueuedSectionBlocks(final long l); + //@Shadow protected abstract void clearQueuedSectionBlocks(final long l); @Override public void removeLightData(final long pos) @@ -40,6 +40,6 @@ public abstract class LayerLightEngine_scarpetChunkCreationMixin implements Ligh @Override public void clearQueuedSectionBlocksPublicAccess(long sectionPos) { - clearQueuedSectionBlocks(sectionPos); + //clearQueuedSectionBlocks(sectionPos); } } diff --git a/src/main/java/carpet/mixins/LayerLightSectionStorage_scarpetChunkCreationMixin.java b/src/main/java/carpet/mixins/LayerLightSectionStorage_scarpetChunkCreationMixin.java index cc65e2bb..72d793cd 100644 --- a/src/main/java/carpet/mixins/LayerLightSectionStorage_scarpetChunkCreationMixin.java +++ b/src/main/java/carpet/mixins/LayerLightSectionStorage_scarpetChunkCreationMixin.java @@ -82,7 +82,7 @@ public abstract class LayerLightSectionStorage_scarpetChunkCreationMixin impleme if (this.storingLightForSection(sectionPos)) { - ((Lighting_scarpetChunkCreationInterface)lightProvider).clearQueuedSectionBlocksPublicAccess(sectionPos); + //((Lighting_scarpetChunkCreationInterface)lightProvider).clearQueuedSectionBlocksPublicAccess(sectionPos); if (this.changedSections.add(sectionPos)) this.updatingSectionData.copyDataLayer(sectionPos); diff --git a/src/main/java/carpet/mixins/ServerPlayerGameMode_scarpetEventsMixin.java b/src/main/java/carpet/mixins/ServerPlayerGameMode_scarpetEventsMixin.java index 91eb674f..163d34ce 100644 --- a/src/main/java/carpet/mixins/ServerPlayerGameMode_scarpetEventsMixin.java +++ b/src/main/java/carpet/mixins/ServerPlayerGameMode_scarpetEventsMixin.java @@ -54,7 +54,7 @@ public class ServerPlayerGameMode_scarpetEventsMixin implements ServerPlayerInte @Inject(method = "useItemOn", at = @At( value = "INVOKE", - target = "Lnet/minecraft/advancements/critereon/ItemInteractWithBlockTrigger;trigger(Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/item/ItemStack;)V", + target = "Lnet/minecraft/advancements/critereon/ItemUsedOnLocationTrigger;trigger(Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/item/ItemStack;)V", shift = At.Shift.BEFORE )) private void onBlockActivated(ServerPlayer serverPlayerEntity, Level world, ItemStack stack, InteractionHand hand, BlockHitResult hitResult, CallbackInfoReturnable cir)