Merge pull request #13 from PowerNukkitX/master

tunikakeks · web-flow · commit 4d321df9bc7c · 2025-07-26T21:21:41.000+02:00
pnx
diff --git a/src/main/java/cn/nukkit/block/Block.java b/src/main/java/cn/nukkit/block/Block.java
@@ -381,17 +381,19 @@ public boolean canBeReplaced() {
     public boolean hasFreeSpaceAbove() {
         Block above = this.up();
 
-        if (above.isAir()) {
+        if (above instanceof BlockSlab slab) {
+            return slab.isOnTop();
+        }
+
+        if (above.isTransparent()) {
             return true;
         }
 
         AxisAlignedBB box = above.getCollisionBoundingBox();
         if (box != null) {
             double minY = box.getMinY();
             double relativeMinY = minY - above.getY();
-            boolean allowed = relativeMinY >= 0.5;
-
-            return allowed;
+            return relativeMinY >= 0.5;
         }
 
         return false;
@@ -593,10 +595,48 @@ public BlockState getBlockState() {
         return blockstate;
     }
 
+    /**
+     * @deprecated Use {@link #hasTag(String)} instead.
+     */
+    @Deprecated
     public boolean is(final String blockTag) {
         return BlockTags.getTagSet(this.getId()).contains(blockTag);
     }
 
+    /**
+     * @return if block has a string tag
+     */
+    public boolean hasTag(final String blockTag) {
+        CustomBlockDefinition def = getCustomDefinition();
+        if (def != null) {
+            CompoundTag nbt = def.nbt();
+            if (nbt.contains("blockTags")) {
+                ListTag<StringTag> tagList = nbt.getList("blockTags", StringTag.class);
+                return tagList.getAll().contains(new StringTag(blockTag));
+            }
+        }
+
+        return BlockTags.getTagSet(this.getId()).contains(blockTag);
+    }
+
+    /**
+     * @return list of tags for the block
+     */
+    public String[] getTags() {
+        CustomBlockDefinition def = getCustomDefinition();
+        if (def != null) {
+            CompoundTag nbt = def.nbt();
+            if (nbt.contains("blockTags")) {
+                ListTag<StringTag> tagList = nbt.getList("blockTags", StringTag.class);
+                return tagList.getAll().stream()
+                    .map(tag -> tag.data)
+                    .toArray(String[]::new);
+            }
+        }
+
+        return BlockTags.getTagSet(this.getId()).toArray(new String[0]);
+    }
+
     public <DATATYPE, PROPERTY extends BlockPropertyType<DATATYPE>> DATATYPE getPropertyValue(PROPERTY p) {
         return blockstate.getPropertyValue(p);
     }
diff --git a/src/main/java/cn/nukkit/block/BlockChest.java b/src/main/java/cn/nukkit/block/BlockChest.java
@@ -211,15 +211,28 @@ public boolean onBreak(Item item) {
 
     @Override
     public boolean onActivate(@NotNull Item item, Player player, BlockFace blockFace, float fx, float fy, float fz) {
-        if(isNotActivate(player)) return false;
+        if (isNotActivate(player)) return false;
         Item itemInHand = player.getInventory().getItemInHand();
         if (player.isSneaking() && !(itemInHand.isTool() || itemInHand.isNull())) return false;
 
+        // Check itself if can be opened
         if (!this.hasFreeSpaceAbove()) {
             return false;
         }
 
         BlockEntityChest chest = getOrCreateBlockEntity();
+
+        // If paired, check if the pair can be opened
+        if (chest.isPaired()) {
+            BlockEntityChest pair = chest.getPair();
+            if (pair != null) {
+                Block pairedBlock = pair.getBlock();
+                if (!pairedBlock.hasFreeSpaceAbove()) {
+                    return false;
+                }
+            }
+        }
+
         if (chest.namedTag.contains("Lock") && chest.namedTag.get("Lock") instanceof StringTag
                 && !chest.namedTag.getString("Lock").equals(item.getCustomName())) {
             return false;
diff --git a/src/main/java/cn/nukkit/inventory/fake/FakeInventory.java b/src/main/java/cn/nukkit/inventory/fake/FakeInventory.java
@@ -29,13 +29,15 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Consumer;
 
 public class FakeInventory extends BaseInventory implements InputInventory {
     private final Map<Integer, ItemHandler> handlers = new HashMap<>();
     private final FakeBlock fakeBlock;
     private final FakeInventoryType fakeInventoryType;
     private String title;
     private ItemHandler defaultItemHandler;
+    private Consumer<Player> onCloseHandler;
 
     public FakeInventory(FakeInventoryType fakeInventoryType) {
         this(fakeInventoryType, fakeInventoryType.name());
@@ -135,6 +137,10 @@ public void onClose(Player player) {
         }, 5);
         super.onClose(player);
         player.setFakeInventoryOpen(false);
+
+        if (this.onCloseHandler != null) {
+            this.onCloseHandler.accept(player);
+        }
     }
 
     public String getTitle() {
@@ -153,6 +159,10 @@ public void setDefaultItemHandler(ItemHandler defaultItemHandler) {
         this.defaultItemHandler = defaultItemHandler;
     }
 
+    public void setOnCloseHandler(Consumer<Player> onCloseHandler) {
+        this.onCloseHandler = onCloseHandler;
+    }
+
     @ApiStatus.Internal
     public void handle(ItemStackRequestActionEvent event) {
         ItemStackRequestAction action = event.getAction();
diff --git a/src/main/java/cn/nukkit/item/customitem/CustomItemDefinition.java b/src/main/java/cn/nukkit/item/customitem/CustomItemDefinition.java
@@ -327,17 +327,19 @@ public SimpleBuilder useModifiers(float movementModifier, float useDuration) {
         */
         public SimpleBuilder blockPlacer(String blockId, String... useOn) {
             ListTag<CompoundTag> useOnList = new ListTag<>();
-            for (String s : useOn) {
-                useOnList.add(new CompoundTag()
+            if (useOn != null && useOn.length > 0) {
+                for (String s : useOn) {
+                    useOnList.add(new CompoundTag()
                         .putString("name", s)
                         .putCompound("states", new CompoundTag())
                         .putString("tags", ""));
+                }
             }
 
             CompoundTag blockPlacer = new CompoundTag()
-                    .putString("block", blockId)
-                    .putBoolean("canUseBlockAsIcon", true)
-                    .putList("use_on", useOnList);
+                .putString("block", blockId)
+                .putBoolean("canUseBlockAsIcon", true)
+                .putList("use_on", useOnList);
 
             CompoundTag components = nbt.getCompound("components");
             if (!nbt.contains("components")) {
@@ -373,7 +375,7 @@ protected CustomItemDefinition calculateID() {
             CompoundTag components = nbt.getCompound("components");
             CompoundTag itemProps = ensureItemProperties();
 
-            if (texture != null && !texture.isBlank() && !components.contains("minecraft:block_placer")) {
+            if (texture != null && !texture.isBlank()) {
                 itemProps.putCompound("minecraft:icon", new CompoundTag()
                         .putCompound("textures", new CompoundTag().putString("default", texture)));
             }
@@ -851,6 +853,32 @@ private EdibleBuilder(ItemCustomFood item) {
         }
     }
 
+    public record BlockPlacerData(String blockId, List<String> useOn) {}
+    @Nullable
+    public BlockPlacerData getBlockPlacerData() {
+        CompoundTag components = nbt.getCompound("components");
+        if (!components.contains("minecraft:block_placer")) {
+            return null;
+        }
+
+        CompoundTag placer = components.getCompound("minecraft:block_placer");
+        String blockId = placer.getString("block");
+        List<String> useOnList = new ArrayList<>();
+
+        ListTag<CompoundTag> useOnTag = placer.getList("use_on", CompoundTag.class);
+        if (useOnTag != null && useOnTag.size() > 0) {
+            for (int i = 0; i < useOnTag.size(); i++) {
+                CompoundTag entry = useOnTag.get(i);
+                String useOnName = entry.getString("name");
+                if (!useOnName.isEmpty()) {
+                useOnList.add(useOnName);
+                }
+            }
+        }
+
+        return new BlockPlacerData(blockId, useOnList);
+    }
+
     // HELPER FUNCTION TO TROUBLESHOOTING THE ITEM NBT FORMAT
     public CompoundTag getNbt() {
         return this.nbt;
diff --git a/src/main/java/cn/nukkit/item/customitem/ItemCustom.java b/src/main/java/cn/nukkit/item/customitem/ItemCustom.java
@@ -1,12 +1,14 @@
 package cn.nukkit.item.customitem;
 
+import cn.nukkit.block.Block;
 import cn.nukkit.item.Item;
+import cn.nukkit.item.customitem.CustomItemDefinition.BlockPlacerData;
+
+import javax.annotation.Nullable;
 import org.jetbrains.annotations.NotNull;
 
 
 /**
- * 继承这个类实现自定义物品,重写{@link Item}中的方法控制方块属性
- * <p>
  * Inherit this class to implement a custom item, override the methods in the {@link Item} to control the feature of the item.
  *
  * @author lt_name
@@ -17,8 +19,6 @@ public ItemCustom(@NotNull String id) {
     }
 
     /**
-     * 该方法设置自定义物品的定义
-     * <p>
      * This method sets the definition of custom item
      */
     public abstract CustomItemDefinition getDefinition();
@@ -27,4 +27,10 @@ public ItemCustom(@NotNull String id) {
     public ItemCustom clone() {
         return (ItemCustom) super.clone();
     }
+
+    @Nullable
+    public Block getBlockPlacerTargetBlock() {
+        BlockPlacerData data = this.getDefinition().getBlockPlacerData();
+        return data != null ? Block.get(data.blockId()) : null;
+    }
 }
diff --git a/src/main/java/cn/nukkit/level/Level.java b/src/main/java/cn/nukkit/level/Level.java
@@ -36,6 +36,7 @@
 import cn.nukkit.inventory.BlockInventoryHolder;
 import cn.nukkit.item.Item;
 import cn.nukkit.item.ItemBucket;
+import cn.nukkit.item.customitem.ItemCustom;
 import cn.nukkit.item.enchantment.Enchantment;
 import cn.nukkit.level.format.ChunkSection;
 import cn.nukkit.level.format.ChunkState;
@@ -2814,33 +2815,42 @@ public Item useItemOn(Vector3 vector, Item item, BlockFace face, UseItemData dat
 
     private Block beforePlaceBlock(Item item, BlockFace face, float fx, float fy, float fz, Player player, boolean playSound, Block block, Block target) {
         Block hand;
+
         if (item.canBePlaced()) {
             hand = item.getBlock();
             hand.position(block);
+        } else if (item instanceof ItemCustom customItem) {
+            Block blockToPlace = customItem.getBlockPlacerTargetBlock();
+            if (blockToPlace == null || blockToPlace.isAir()) return null;
+            hand = blockToPlace;
+            hand.position(block);
         } else {
             return null;
         }
-        if (
-                !(block.canBeReplaced() ||
-                        (hand instanceof BlockSlab && hand.getId().equals(block.getId())) ||
-                        hand instanceof BlockCandle//Special for candles
-                )
-        ) {
+
+        // Check for valid placement conditions
+        if (!(block.canBeReplaced() ||
+            (hand instanceof BlockSlab && hand.getId().equals(block.getId())) ||
+            hand instanceof BlockCandle)) {
             return null;
         }
 
-        //处理放置梯子,我们应该提前给hand设置方向,这样后面计算是否碰撞实体才准确
+        // To place the ladder, we should set the direction of the hand in advance so that the calculation of whether it
+        // collides with the entity can be accurate.
         if (hand instanceof BlockLadder) {
             if (target instanceof BlockLadder) {
                 hand.setPropertyValue(CommonBlockProperties.FACING_DIRECTION, face.getOpposite().getIndex());
-            } else hand.setPropertyValue(CommonBlockProperties.FACING_DIRECTION, face.getIndex());
+            } else {
+                hand.setPropertyValue(CommonBlockProperties.FACING_DIRECTION, face.getIndex());
+            }
         }
 
-        //cause bug (eg: frog_spawn) (and I don't know what this is for)
+        // cause bug (eg: frog_spawn) (and I don't know what this is for)
         if (!(hand instanceof BlockFrogSpawn) && target.canBeReplaced()) {
             block = target;
             hand.position(block);
         }
+
         return hand;
     }
 
