From ef31e6daa81e97749393c488b6b7095ead0014af Mon Sep 17 00:00:00 2001 From: Kosma Moczek Date: Thu, 2 Dec 2021 20:55:43 +0100 Subject: [PATCH] fabric-1.18: rename BlockEvents.EVENT -> BlockEvents.BLOCK_EVENT --- .../src/main/java/org/dynmap/fabric_1_18/DynmapPlugin.java | 2 +- .../main/java/org/dynmap/fabric_1_18/event/BlockEvents.java | 3 ++- .../java/org/dynmap/fabric_1_18/mixin/WorldChunkMixin.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/DynmapPlugin.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/DynmapPlugin.java index 9cdc46bf..e5982678 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/DynmapPlugin.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/DynmapPlugin.java @@ -753,7 +753,7 @@ public class DynmapPlugin { ServerChunkEvents.CHUNK_LOAD.register((world, chunk) -> worldTracker.handleChunkLoad(world, chunk)); ServerChunkEvents.CHUNK_UNLOAD.register((world, chunk) -> worldTracker.handleChunkUnload(world, chunk)); ChunkDataEvents.SAVE.register((world, chunk) -> worldTracker.handleChunkDataSave(world, chunk)); - BlockEvents.EVENT.register((world, pos) -> worldTracker.handleBlockEvent(world, pos)); + BlockEvents.BLOCK_EVENT.register((world, pos) -> worldTracker.handleBlockEvent(world, pos)); } // Prime the known full chunks if (onchunkgenerate && (server.getWorlds() != null)) { diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/BlockEvents.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/BlockEvents.java index f50c1cb9..b64b600b 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/BlockEvents.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/BlockEvents.java @@ -9,7 +9,7 @@ public class BlockEvents { private BlockEvents() { } - public static Event EVENT = EventFactory.createArrayBacked(BlockCallback.class, + public static Event BLOCK_EVENT = EventFactory.createArrayBacked(BlockCallback.class, (listeners) -> (world, pos) -> { for (BlockCallback callback : listeners) { callback.onBlockEvent(world, pos); @@ -17,6 +17,7 @@ public class BlockEvents { } ); + @FunctionalInterface public interface BlockCallback { void onBlockEvent(World world, BlockPos pos); } diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/WorldChunkMixin.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/WorldChunkMixin.java index b59ce04d..56044930 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/WorldChunkMixin.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/WorldChunkMixin.java @@ -19,7 +19,7 @@ public abstract class WorldChunkMixin { @Inject(method = "setBlockState", at = @At("RETURN")) public void setBlockState(BlockPos pos, BlockState state, boolean moved, CallbackInfoReturnable info) { if (info.getReturnValue() != null) { - BlockEvents.EVENT.invoker().onBlockEvent(this.getWorld(), pos); + BlockEvents.BLOCK_EVENT.invoker().onBlockEvent(this.getWorld(), pos); } } }