这样设计应该不错，但还是差点

2025-12-31 04:46:37 +00:00 · 2025-05-02 19:24:25 +08:00
parent 6bdd3dccde
commit 6a64097b72
40 changed files with 292 additions and 142 deletions
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/BukkitAdaptors.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/BukkitAdaptors.java
@@ -4,7 +4,7 @@ import net.momirealms.craftengine.bukkit.entity.BukkitEntity;
 import net.momirealms.craftengine.bukkit.plugin.BukkitCraftEngine;
 import net.momirealms.craftengine.bukkit.plugin.user.BukkitServerPlayer;
 import net.momirealms.craftengine.bukkit.world.BukkitWorld;
-import net.momirealms.craftengine.bukkit.world.BukkitWorldBlock;
+import net.momirealms.craftengine.bukkit.world.BukkitBlockInWorld;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
@@ -26,7 +26,7 @@ public final class BukkitAdaptors {
        return new BukkitEntity(entity);
    }

-    public static BukkitWorldBlock adapt(final Block block) {
-        return new BukkitWorldBlock(block);
+    public static BukkitBlockInWorld adapt(final Block block) {
+        return new BukkitBlockInWorld(block);
    }
 }
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/AxeItemBehavior.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/AxeItemBehavior.java
@@ -4,7 +4,7 @@ import net.momirealms.craftengine.bukkit.api.CraftEngineBlocks;
 import net.momirealms.craftengine.bukkit.block.BukkitBlockManager;
 import net.momirealms.craftengine.bukkit.block.behavior.StrippableBlockBehavior;
 import net.momirealms.craftengine.bukkit.util.*;
-import net.momirealms.craftengine.bukkit.world.BukkitWorldBlock;
+import net.momirealms.craftengine.bukkit.world.BukkitBlockInWorld;
 import net.momirealms.craftengine.core.block.CustomBlock;
 import net.momirealms.craftengine.core.block.ImmutableBlockState;
 import net.momirealms.craftengine.core.block.UpdateOption;
@@ -43,7 +43,7 @@ public class AxeItemBehavior extends ItemBehavior {
    @SuppressWarnings("unchecked")
    @Override
    public InteractionResult useOnBlock(UseOnContext context) {
-        BukkitWorldBlock clicked = (BukkitWorldBlock) context.getLevel().getBlockAt(context.getClickedPos());
+        BukkitBlockInWorld clicked = (BukkitBlockInWorld) context.getLevel().getBlockAt(context.getClickedPos());
        Block block = clicked.block();
        ImmutableBlockState state = BukkitBlockManager.instance().getImmutableBlockState(BlockStateUtils.blockDataToId(block.getBlockData()));
        if (state == null || state.isEmpty()) return InteractionResult.PASS;
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/BoneMealItemBehavior.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/BoneMealItemBehavior.java
@@ -8,7 +8,7 @@ import net.momirealms.craftengine.bukkit.nms.FastNMS;
 import net.momirealms.craftengine.bukkit.util.BlockStateUtils;
 import net.momirealms.craftengine.bukkit.util.LocationUtils;
 import net.momirealms.craftengine.bukkit.util.Reflections;
-import net.momirealms.craftengine.bukkit.world.BukkitWorldBlock;
+import net.momirealms.craftengine.bukkit.world.BukkitBlockInWorld;
 import net.momirealms.craftengine.core.block.ImmutableBlockState;
 import net.momirealms.craftengine.core.entity.player.InteractionResult;
 import net.momirealms.craftengine.core.item.behavior.ItemBehavior;
@@ -32,7 +32,7 @@ public class BoneMealItemBehavior extends ItemBehavior {
            return InteractionResult.PASS;
        }

-        BukkitWorldBlock clicked = (BukkitWorldBlock) context.getLevel().getBlockAt(context.getClickedPos());
+        BukkitBlockInWorld clicked = (BukkitBlockInWorld) context.getLevel().getBlockAt(context.getClickedPos());
        Block block = clicked.block();
        ImmutableBlockState state = BukkitBlockManager.instance().getImmutableBlockState(BlockStateUtils.blockDataToId(block.getBlockData()));
        if (state == null || state.isEmpty()) return InteractionResult.PASS;
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/BucketItemBehavior.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/BucketItemBehavior.java
@@ -4,7 +4,7 @@ import net.momirealms.craftengine.bukkit.api.CraftEngineBlocks;
 import net.momirealms.craftengine.bukkit.block.BukkitBlockManager;
 import net.momirealms.craftengine.bukkit.plugin.BukkitCraftEngine;
 import net.momirealms.craftengine.bukkit.util.BlockStateUtils;
-import net.momirealms.craftengine.bukkit.world.BukkitWorldBlock;
+import net.momirealms.craftengine.bukkit.world.BukkitBlockInWorld;
 import net.momirealms.craftengine.core.block.CustomBlock;
 import net.momirealms.craftengine.core.block.ImmutableBlockState;
 import net.momirealms.craftengine.core.block.UpdateOption;
@@ -35,7 +35,7 @@ public class BucketItemBehavior extends ItemBehavior {
    @Override
    public InteractionResult useOnBlock(UseOnContext context) {
        if (context.getPlayer().isAdventureMode()) return InteractionResult.PASS;
-        BukkitWorldBlock clicked = (BukkitWorldBlock) context.getLevel().getBlockAt(context.getClickedPos());
+        BukkitBlockInWorld clicked = (BukkitBlockInWorld) context.getLevel().getBlockAt(context.getClickedPos());
        Block block = clicked.block();
        ImmutableBlockState state = BukkitBlockManager.instance().getImmutableBlockState(BlockStateUtils.blockDataToId(block.getBlockData()));
        if (state == null || state.isEmpty()) return InteractionResult.PASS;
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/WaterBucketItemBehavior.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/WaterBucketItemBehavior.java
@@ -4,7 +4,7 @@ import net.momirealms.craftengine.bukkit.api.CraftEngineBlocks;
 import net.momirealms.craftengine.bukkit.block.BukkitBlockManager;
 import net.momirealms.craftengine.bukkit.plugin.BukkitCraftEngine;
 import net.momirealms.craftengine.bukkit.util.BlockStateUtils;
-import net.momirealms.craftengine.bukkit.world.BukkitWorldBlock;
+import net.momirealms.craftengine.bukkit.world.BukkitBlockInWorld;
 import net.momirealms.craftengine.core.block.CustomBlock;
 import net.momirealms.craftengine.core.block.ImmutableBlockState;
 import net.momirealms.craftengine.core.block.UpdateOption;
@@ -33,7 +33,7 @@ public class WaterBucketItemBehavior extends ItemBehavior {
    public InteractionResult useOnBlock(UseOnContext context) {
        if (context.getPlayer().isAdventureMode()) return InteractionResult.PASS;
        BlockPos pos = context.getClickedPos();
-        BukkitWorldBlock clicked = (BukkitWorldBlock) context.getLevel().getBlockAt(pos);
+        BukkitBlockInWorld clicked = (BukkitBlockInWorld) context.getLevel().getBlockAt(pos);
        Block block = clicked.block();
        ImmutableBlockState state = BukkitBlockManager.instance().getImmutableBlockState(BlockStateUtils.blockDataToId(block.getBlockData()));
        if (state == null || state.isEmpty()) return InteractionResult.PASS;
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/world/BukkitBlockInWorld.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/world/BukkitBlockInWorld.java
@@ -12,25 +12,26 @@ import net.momirealms.craftengine.core.item.CustomItem;
 import net.momirealms.craftengine.core.item.Item;
 import net.momirealms.craftengine.core.item.context.BlockPlaceContext;
 import net.momirealms.craftengine.core.plugin.CraftEngine;
+import net.momirealms.craftengine.core.plugin.text.minimessage.NamedArgumentTag;
 import net.momirealms.craftengine.core.util.Key;
-import net.momirealms.craftengine.core.world.WorldBlock;
+import net.momirealms.craftengine.core.world.BlockInWorld;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.inventory.ItemStack;

 import java.util.Optional;

-public class BukkitWorldBlock implements WorldBlock {
+public class BukkitBlockInWorld implements BlockInWorld {
    private final Block block;

-    public BukkitWorldBlock(Block block) {
+    public BukkitBlockInWorld(Block block) {
        this.block = block;
    }

    @SuppressWarnings("unchecked")
    @Override
    public boolean canBeReplaced(BlockPlaceContext context) {
-        ImmutableBlockState customState = BukkitBlockManager.instance().getImmutableBlockState(BlockStateUtils.blockDataToId(block.getBlockData()));
+        ImmutableBlockState customState = BukkitBlockManager.instance().getImmutableBlockState(BlockStateUtils.blockDataToId(this.block.getBlockData()));
        if (customState != null && !customState.isEmpty()) {
            Key clickedBlockId = customState.owner().value().id();
            Item<ItemStack> item = (Item<ItemStack>) context.getPlayer().getItemInHand(context.getHand());
@@ -45,14 +46,14 @@ public class BukkitWorldBlock implements WorldBlock {
                }
            }
        }
-        return block.isReplaceable();
+        return this.block.isReplaceable();
    }

    @Override
    public boolean isWaterSource(BlockPlaceContext blockPlaceContext) {
        try {
-            Location location = block.getLocation();
-            Object serverLevel = FastNMS.INSTANCE.field$CraftWorld$ServerLevel(block.getWorld());
+            Location location = this.block.getLocation();
+            Object serverLevel = FastNMS.INSTANCE.field$CraftWorld$ServerLevel(this.block.getWorld());
            Object fluidData = Reflections.method$Level$getFluidState.invoke(serverLevel, LocationUtils.toBlockPos(location.getBlockX(), location.getBlockY(), location.getBlockZ()));
            if (fluidData == null) return false;
            return Reflections.method$FluidState$getType.invoke(fluidData) == Reflections.instance$Fluids$WATER;
@@ -62,6 +63,21 @@ public class BukkitWorldBlock implements WorldBlock {
        }
    }

+    @Override
+    public int x() {
+        return this.block.getX();
+    }
+
+    @Override
+    public int y() {
+        return this.block.getY();
+    }
+
+    @Override
+    public int z() {
+        return this.block.getZ();
+    }
+
    public Block block() {
        return block;
    }
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/world/BukkitWorld.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/world/BukkitWorld.java
@@ -8,7 +8,7 @@ import net.momirealms.craftengine.core.util.Key;
 import net.momirealms.craftengine.core.util.VersionHelper;
 import net.momirealms.craftengine.core.world.Vec3d;
 import net.momirealms.craftengine.core.world.World;
-import net.momirealms.craftengine.core.world.WorldBlock;
+import net.momirealms.craftengine.core.world.BlockInWorld;
 import net.momirealms.craftengine.core.world.WorldHeight;
 import org.bukkit.Location;
 import org.bukkit.SoundCategory;
@@ -51,8 +51,8 @@ public class BukkitWorld implements World {
    }

    @Override
-    public WorldBlock getBlockAt(int x, int y, int z) {
-        return new BukkitWorldBlock(platformWorld().getBlockAt(x, y, z));
+    public BlockInWorld getBlockAt(int x, int y, int z) {
+        return new BukkitBlockInWorld(platformWorld().getBlockAt(x, y, z));
    }

    @Override