From d848a592905e4c48dff5f811d4a47ff420ecb2db Mon Sep 17 00:00:00 2001 From: jhqwqmc <2110242767@qq.com> Date: Wed, 18 Jun 2025 03:52:31 +0800 Subject: [PATCH] =?UTF-8?q?feat(bukkit):=20=E4=B8=80=E4=BA=9B=E6=94=B9?= =?UTF-8?q?=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../block/behavior/StackableBlockBehavior.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/behavior/StackableBlockBehavior.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/behavior/StackableBlockBehavior.java index 161ffc81b..65bf10e1a 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/behavior/StackableBlockBehavior.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/behavior/StackableBlockBehavior.java @@ -27,12 +27,12 @@ import java.util.Set; public class StackableBlockBehavior extends BukkitBlockBehavior { public static final Factory FACTORY = new Factory(); private final Property amountProperty; - private final Set allowItems; + private final Set items; - public StackableBlockBehavior(CustomBlock block,Property amountProperty, Set allowItems) { + public StackableBlockBehavior(CustomBlock block,Property amountProperty, Set items) { super(block); this.amountProperty = amountProperty; - this.allowItems = allowItems; + this.items = items; } @Override @@ -46,7 +46,7 @@ public class StackableBlockBehavior extends BukkitBlockBehavior { if (item == null) { return InteractionResult.PASS; } - if (this.allowItems.contains(item.id()) && state.get(this.amountProperty) < this.amountProperty.possibleValues().getLast()) { + if (this.items.contains(item.id()) && state.get(this.amountProperty) < this.amountProperty.possibleValues().getLast()) { ImmutableBlockState nextStage = state.cycle(this.amountProperty); World world = context.getLevel(); BlockPos pos = context.getClickedPos(); @@ -66,14 +66,14 @@ public class StackableBlockBehavior extends BukkitBlockBehavior { @SuppressWarnings("unchecked") public BlockBehavior create(CustomBlock block, Map arguments) { Property amount = (Property) ResourceConfigUtils.requireNonNullOrThrow(block.getProperty("amount"), "warning.config.block.behavior.stackable.missing_amount"); - Set allowItems = new HashSet<>(); - if (arguments.get("allow-items") instanceof List list) { + Set items = new HashSet<>(); + if (arguments.get("items") instanceof List list) { for (Object obj : list) { if (obj == null) continue; - allowItems.add(Key.of(obj.toString())); + items.add(Key.of(obj.toString())); } } - return new StackableBlockBehavior(block, amount, allowItems); + return new StackableBlockBehavior(block, amount, items); } } }