fix(block): 解决下落方块的各种问题

bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BukkitBlockManager.java

@@ -76,7 +76,6 @@ public final class BukkitBlockManager extends AbstractBlockManager {
     private List<Key> blockRegisterOrder = new ObjectArrayList<>();
     // Event listeners
     private BlockEventListener blockEventListener;
-    private FallingBlockRemoveListener fallingBlockRemoveListener;
     // cached tag packet
     private Object cachedUpdateTagsPacket;
 
@@ -101,7 +100,6 @@ public final class BukkitBlockManager extends AbstractBlockManager {
         if (enableNoteBlocks) {
             this.recordVanillaNoteBlocks();
         }
-        this.fallingBlockRemoveListener = VersionHelper.isOrAbove1_20_3() ? new FallingBlockRemoveListener() : null;
         this.stateId2ImmutableBlockStates = new ImmutableBlockState[this.customBlockCount];
         Arrays.fill(this.stateId2ImmutableBlockStates, EmptyBlock.INSTANCE.defaultState());
         this.resetPacketConsumers();
@@ -123,9 +121,6 @@ public final class BukkitBlockManager extends AbstractBlockManager {
     @Override
     public void delayedInit() {
         Bukkit.getPluginManager().registerEvents(this.blockEventListener, this.plugin.javaPlugin());
-        if (this.fallingBlockRemoveListener != null) {
-            Bukkit.getPluginManager().registerEvents(this.fallingBlockRemoveListener, this.plugin.javaPlugin());
-        }
     }
 
     @Override
@@ -145,7 +140,6 @@ public final class BukkitBlockManager extends AbstractBlockManager {
     public void disable() {
         this.unload();
         HandlerList.unregisterAll(this.blockEventListener);
-        if (this.fallingBlockRemoveListener != null) HandlerList.unregisterAll(this.fallingBlockRemoveListener);
     }
 
     @Override

bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/FallingBlockRemoveListener.java

@@ -1,51 +0,0 @@
-package net.momirealms.craftengine.bukkit.block;
-
-import net.momirealms.craftengine.bukkit.plugin.reflection.bukkit.CraftBukkitReflections;
-import net.momirealms.craftengine.bukkit.plugin.reflection.minecraft.CoreReflections;
-import net.momirealms.craftengine.bukkit.util.BlockStateUtils;
-import net.momirealms.craftengine.bukkit.world.BukkitWorld;
-import net.momirealms.craftengine.core.block.ImmutableBlockState;
-import net.momirealms.craftengine.core.item.Item;
-import net.momirealms.craftengine.core.plugin.CraftEngine;
-import net.momirealms.craftengine.core.plugin.context.ContextHolder;
-import net.momirealms.craftengine.core.plugin.context.parameter.DirectContextParameters;
-import net.momirealms.craftengine.core.world.WorldPosition;
-import org.bukkit.entity.FallingBlock;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-
-import java.util.Optional;
-
-@SuppressWarnings("DuplicatedCode")
-public final class FallingBlockRemoveListener implements Listener {
-
-    @EventHandler
-    public void onFallingBlockBreak(org.bukkit.event.entity.EntityRemoveEvent event) {
-        if (event.getCause() == org.bukkit.event.entity.EntityRemoveEvent.Cause.DROP && event.getEntity() instanceof FallingBlock fallingBlock) {
-            try {
-                Object fallingBlockEntity = CraftBukkitReflections.field$CraftEntity$entity.get(fallingBlock);
-                boolean cancelDrop = (boolean) CoreReflections.field$FallingBlockEntity$cancelDrop.get(fallingBlockEntity);
-                if (cancelDrop) return;
-                Object blockState = CoreReflections.field$FallingBlockEntity$blockState.get(fallingBlockEntity);
-                Optional<ImmutableBlockState> optionalCustomState = BlockStateUtils.getOptionalCustomBlockState(blockState);
-                if (optionalCustomState.isEmpty()) return;
-                ImmutableBlockState customState = optionalCustomState.get();
-                net.momirealms.craftengine.core.world.World world = new BukkitWorld(fallingBlock.getWorld());
-                WorldPosition position = new WorldPosition(world, CoreReflections.field$Entity$xo.getDouble(fallingBlockEntity), CoreReflections.field$Entity$yo.getDouble(fallingBlockEntity), CoreReflections.field$Entity$zo.getDouble(fallingBlockEntity));
-                ContextHolder.Builder builder = ContextHolder.builder()
-                        .withParameter(DirectContextParameters.FALLING_BLOCK, true)
-                        .withParameter(DirectContextParameters.POSITION, position);
-                for (Item<Object> item : customState.getDrops(builder, world, null)) {
-                    world.dropItemNaturally(position, item);
-                }
-                Object entityData = CoreReflections.field$Entity$entityData.get(fallingBlockEntity);
-                boolean isSilent = (boolean) CoreReflections.method$SynchedEntityData$get.invoke(entityData, CoreReflections.instance$Entity$DATA_SILENT);
-                if (!isSilent) {
-                    world.playBlockSound(position, customState.settings().sounds().destroySound());
-                }
-            } catch (ReflectiveOperationException e) {
-                CraftEngine.instance().logger().warn("Failed to handle EntityRemoveEvent", e);
-            }
-        }
-    }
-}

bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/behavior/FallingBlockBehavior.java

@@ -14,7 +14,6 @@ import net.momirealms.craftengine.core.item.Item;
 import net.momirealms.craftengine.core.plugin.context.ContextHolder;
 import net.momirealms.craftengine.core.plugin.context.parameter.DirectContextParameters;
 import net.momirealms.craftengine.core.util.ResourceConfigUtils;
-import net.momirealms.craftengine.core.util.VersionHelper;
 import net.momirealms.craftengine.core.world.Vec3d;
 import net.momirealms.craftengine.core.world.WorldPosition;
 
@@ -67,7 +66,7 @@ public class FallingBlockBehavior extends BukkitBlockBehavior {
             return;
         }
         Object blockState = args[0];
-        Object fallingBlockEntity = CoreReflections.method$FallingBlockEntity$fall.invoke(null, world, blockPos, blockState);
+        Object fallingBlockEntity = FastNMS.INSTANCE.createInjectedFallingBlockEntity(world, blockPos, blockState);
         if (this.hurtAmount > 0 && this.maxHurt > 0) {
             CoreReflections.method$FallingBlockEntity$setHurtsEntities.invoke(fallingBlockEntity, this.hurtAmount, this.maxHurt);
         }
@@ -76,8 +75,6 @@ public class FallingBlockBehavior extends BukkitBlockBehavior {
     @SuppressWarnings("DuplicatedCode")
     @Override
     public void onBrokenAfterFall(Object thisBlock, Object[] args) throws Exception {
-        // Use EntityRemoveEvent for 1.20.3+
-        if (VersionHelper.isOrAbove1_20_3()) return;
         Object level = args[0];
         Object fallingBlockEntity = args[2];
         boolean cancelDrop = (boolean) CoreReflections.field$FallingBlockEntity$cancelDrop.get(fallingBlockEntity);

gradle.properties

@@ -50,7 +50,7 @@ byte_buddy_version=1.17.5
 ahocorasick_version=0.6.3
 snake_yaml_version=2.5
 anti_grief_version=0.20
-nms_helper_version=1.0.83
+nms_helper_version=1.0.84
 evalex_version=3.5.0
 reactive_streams_version=1.0.4
 amazon_awssdk_version=2.33.1