From 2950b7224debd671769e0b7aafbc7c197bf3d531 Mon Sep 17 00:00:00 2001 From: XiaoMoMi <972454774@qq.com> Date: Tue, 7 Oct 2025 03:25:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=A4=E4=B8=AA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/behavior/LiquidCollisionBlockItemBehavior.java | 8 ++------ core/build.gradle.kts | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/LiquidCollisionBlockItemBehavior.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/LiquidCollisionBlockItemBehavior.java index 11a852cac..76482c0c5 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/LiquidCollisionBlockItemBehavior.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/LiquidCollisionBlockItemBehavior.java @@ -13,6 +13,7 @@ import net.momirealms.craftengine.core.item.behavior.ItemBehavior; import net.momirealms.craftengine.core.item.behavior.ItemBehaviorFactory; import net.momirealms.craftengine.core.item.context.UseOnContext; import net.momirealms.craftengine.core.pack.Pack; +import net.momirealms.craftengine.core.pack.PendingConfigSection; import net.momirealms.craftengine.core.plugin.CraftEngine; import net.momirealms.craftengine.core.plugin.locale.LocalizedResourceConfigException; import net.momirealms.craftengine.core.util.Direction; @@ -77,12 +78,7 @@ public class LiquidCollisionBlockItemBehavior extends BlockItemBehavior { } int offset = ResourceConfigUtils.getAsInt(arguments.getOrDefault("y-offset", 1), "y-offset"); if (id instanceof Map map) { - if (map.containsKey(key.toString())) { - // 防呆 - BukkitBlockManager.instance().blockParser().parseSection(pack, path, node, key, MiscUtils.castToMap(map.get(key.toString()), false)); - } else { - BukkitBlockManager.instance().blockParser().parseSection(pack, path, node, key, MiscUtils.castToMap(map, false)); - } + addPendingSection(pack, path, node, key, map); return new LiquidCollisionBlockItemBehavior(key, offset); } else { return new LiquidCollisionBlockItemBehavior(Key.of(id.toString()), offset); diff --git a/core/build.gradle.kts b/core/build.gradle.kts index a597ad742..9efbbf559 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -21,7 +21,7 @@ dependencies { implementation("net.momirealms:sparrow-nbt-codec:${rootProject.properties["sparrow_nbt_version"]}") implementation("net.momirealms:sparrow-nbt-legacy-codec:${rootProject.properties["sparrow_nbt_version"]}") // S3 - implementation("net.momirealms:craft-engine-s3:0.6") + implementation("net.momirealms:craft-engine-s3:0.7") // Util compileOnly("net.momirealms:sparrow-util:${rootProject.properties["sparrow_util_version"]}") // Adventure From 2571fb776e7a774672101a6830b76309268aae6f Mon Sep 17 00:00:00 2001 From: XiaoMoMi <972454774@qq.com> Date: Tue, 7 Oct 2025 04:06:01 +0800 Subject: [PATCH 2/2] Update palm_tree.yml --- .../default/configuration/blocks/palm_tree.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/palm_tree.yml b/common-files/src/main/resources/resources/default/configuration/blocks/palm_tree.yml index 1e2e8afd7..00799b195 100644 --- a/common-files/src/main/resources/resources/default/configuration/blocks/palm_tree.yml +++ b/common-files/src/main/resources/resources/default/configuration/blocks/palm_tree.yml @@ -193,11 +193,6 @@ items: parent: minecraft:block/cross textures: cross: minecraft:block/custom/palm_sapling - variants: - stage=0: - appearance: default - stage=1: - appearance: default default:palm_leaves: material: oak_leaves data: @@ -230,8 +225,6 @@ items: states: template: default:block_state/leaves arguments: - default_state: oak_leaves[distance=1,persistent=false,waterlogged=false] - waterlogged_state: oak_leaves[distance=1,persistent=false,waterlogged=true] model_path: minecraft:block/custom/palm_leaves texture_path: minecraft:block/custom/palm_leaves default:palm_trapdoor: @@ -622,8 +615,7 @@ blocks#fence: - minecraft:wooden_fences behavior: type: fence_block - self-tag: fences - connectable-tag: wooden_fences + connectable-block-tag: minecraft:wooden_fences can-leash: true states: template: default:block_state/fence