From b8fb2d1201f3f370c9a357ea161e334c95617a53 Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Wed, 17 Sep 2025 20:24:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B2=99=E5=8F=91=E7=9A=84?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=BD=A2=E7=8A=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/default/configuration/blocks/sofa.yml | 1 + .../core/item/recipe/AbstractRecipeSerializer.java | 6 +++--- .../core/item/recipe/CustomCraftingTableRecipe.java | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/sofa.yml b/common-files/src/main/resources/resources/default/configuration/blocks/sofa.yml index 1f4a86917..131392513 100644 --- a/common-files/src/main/resources/resources/default/configuration/blocks/sofa.yml +++ b/common-files/src/main/resources/resources/default/configuration/blocks/sofa.yml @@ -23,6 +23,7 @@ items: is-redstone-conductor: false push-reaction: block instrument: bass + support-shape: cobweb sounds: break: minecraft:block.wood.break fall: minecraft:block.wood.fall diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/AbstractRecipeSerializer.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/AbstractRecipeSerializer.java index a95d06e39..43dd6dfc5 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/AbstractRecipeSerializer.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/AbstractRecipeSerializer.java @@ -39,9 +39,9 @@ public abstract class AbstractRecipeSerializer> implement } protected Condition conditions(Map arguments) { - Object functions = ResourceConfigUtils.get(arguments, "conditions", "condition"); - if (functions == null) return null; - List> conditionList = ResourceConfigUtils.parseConfigAsList(functions, EventConditions::fromMap); + Object conditions = ResourceConfigUtils.get(arguments, "conditions", "condition"); + if (conditions == null) return null; + List> conditionList = ResourceConfigUtils.parseConfigAsList(conditions, EventConditions::fromMap); if (conditionList.isEmpty()) return null; if (conditionList.size() == 1) return conditionList.getFirst(); return new AllOfCondition<>(conditionList); diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomCraftingTableRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomCraftingTableRecipe.java index 9445e2472..13783dabc 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomCraftingTableRecipe.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomCraftingTableRecipe.java @@ -31,7 +31,6 @@ public abstract class CustomCraftingTableRecipe extends AbstractGroupedRecipe this.craftingCondition = craftingCondition; } - @Override public boolean canUse(PlayerOptionalContext context) { if (this.craftingCondition == null) return true;