Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-26 10:29:20 +00:00
Code Issues Releases Activity

向锻造配方添加visual-result支持

Browse Source
This commit is contained in:
XiaoMoMi
2025-10-15 04:16:15 +08:00
parent 864273dadf
commit 39dab8ef52
17 changed files with 168 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/net/momirealms/craftengine/core/item/ItemManager.java
View File

@@ -11,7 +11,6 @@ import net.momirealms.craftengine.core.pack.model.ModernItemModel;
import net.momirealms.craftengine.core.pack.model.generation.ModelGenerator;
import net.momirealms.craftengine.core.plugin.Manageable;
import net.momirealms.craftengine.core.plugin.config.ConfigParser;
import net.momirealms.craftengine.core.util.FriendlyByteBuf;
import net.momirealms.craftengine.core.util.Key;
import net.momirealms.craftengine.core.util.UniqueKey;
import org.incendo.cloud.suggestion.Suggestion;

7
core/src/main/java/net/momirealms/craftengine/core/item/recipe/AbstractedFixedResultRecipe.java
View File

@@ -5,7 +5,7 @@ import net.momirealms.craftengine.core.item.recipe.input.RecipeInput;
import net.momirealms.craftengine.core.item.recipe.result.CustomRecipeResult;
import net.momirealms.craftengine.core.util.Key;
public abstract class AbstractedFixedResultRecipe<T> extends AbstractRecipe<T> {
public abstract class AbstractedFixedResultRecipe<T> extends AbstractRecipe<T> implements FixedResultRecipe<T> {
protected CustomRecipeResult<T> result;
public AbstractedFixedResultRecipe(Key id, boolean showNotification, CustomRecipeResult<T> result) {
@@ -13,10 +13,7 @@ public abstract class AbstractedFixedResultRecipe<T> extends AbstractRecipe<T> {
this.result = result;
}
public T result(ItemBuildContext context) {
return this.result.buildItemStack(context);
}
@Override
public CustomRecipeResult<T> result() {
return this.result;
}

2
core/src/main/java/net/momirealms/craftengine/core/item/recipe/ConditionalRecipe.java
View File

@@ -2,7 +2,7 @@ package net.momirealms.craftengine.core.item.recipe;
import net.momirealms.craftengine.core.plugin.context.PlayerOptionalContext;
public interface ConditionalRecipe {
public interface ConditionalRecipe<T> extends Recipe<T> {
boolean canUse(final PlayerOptionalContext context);
}

36
core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomCraftingTableRecipe.java
View File

@@ -1,8 +1,5 @@
package net.momirealms.craftengine.core.item.recipe;
import net.momirealms.craftengine.core.item.Item;
import net.momirealms.craftengine.core.item.ItemBuildContext;
import net.momirealms.craftengine.core.item.recipe.input.RecipeInput;
import net.momirealms.craftengine.core.item.recipe.result.CustomRecipeResult;
import net.momirealms.craftengine.core.plugin.context.Condition;
import net.momirealms.craftengine.core.plugin.context.PlayerOptionalContext;
@@ -10,7 +7,8 @@ import net.momirealms.craftengine.core.plugin.context.function.Function;
import net.momirealms.craftengine.core.util.Key;
import org.jetbrains.annotations.Nullable;
public abstract class CustomCraftingTableRecipe<T> extends AbstractGroupedRecipe<T> implements ConditionalRecipe {
public abstract class CustomCraftingTableRecipe<T> extends AbstractGroupedRecipe<T>
implements ConditionalRecipe<T>, VisualResultRecipe<T>, FunctionalRecipe<T> {
protected final CraftingRecipeCategory category;
private final CustomRecipeResult<T> visualResult;
private final Function<PlayerOptionalContext>[] craftingFunctions;
@@ -38,7 +36,7 @@ public abstract class CustomCraftingTableRecipe<T> extends AbstractGroupedRecipe
}
public CraftingRecipeCategory category() {
return category;
return this.category;
}
@Override
@@ -46,31 +44,13 @@ public abstract class CustomCraftingTableRecipe<T> extends AbstractGroupedRecipe
return RecipeType.CRAFTING;
}
@Override
public CustomRecipeResult<T> visualResult() {
return visualResult;
return this.visualResult;
}
public boolean hasVisualResult() {
return visualResult != null;
}
public T assembleVisual(RecipeInput input, ItemBuildContext context) {
if (this.visualResult != null) {
return this.visualResult.buildItemStack(context);
} else {
throw new IllegalStateException("No visual result available");
}
}
public Item<T> buildVisualOrActualResult(ItemBuildContext context) {
if (this.visualResult != null) {
return this.visualResult.buildItem(context);
} else {
return super.result.buildItem(context);
}
}
public Function<PlayerOptionalContext>[] craftingFunctions() {
return craftingFunctions;
@Override
public Function<PlayerOptionalContext>[] functions() {
return this.craftingFunctions;
}
}

26
core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomSmithingTransformRecipe.java
View File

@@ -9,6 +9,7 @@ import net.momirealms.craftengine.core.item.recipe.result.CustomRecipeResult;
import net.momirealms.craftengine.core.plugin.CraftEngine;
import net.momirealms.craftengine.core.plugin.context.Condition;
import net.momirealms.craftengine.core.plugin.context.PlayerOptionalContext;
import net.momirealms.craftengine.core.plugin.context.function.Function;
import net.momirealms.craftengine.core.plugin.locale.LocalizedResourceConfigException;
import net.momirealms.craftengine.core.registry.BuiltInRegistries;
import net.momirealms.craftengine.core.registry.Registries;
@@ -22,7 +23,8 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
public class CustomSmithingTransformRecipe<T> extends AbstractedFixedResultRecipe<T> implements ConditionalRecipe {
public class CustomSmithingTransformRecipe<T> extends AbstractedFixedResultRecipe<T>
implements ConditionalRecipe<T>, VisualResultRecipe<T>, FunctionalRecipe<T> {
public static final Serializer<?> SERIALIZER = new Serializer<>();
private final Ingredient<T> base;
private final Ingredient<T> template;
@@ -30,6 +32,8 @@ public class CustomSmithingTransformRecipe<T> extends AbstractedFixedResultRecip
private final boolean mergeComponents;
private final List<ItemDataProcessor> processors;
private final Condition<PlayerOptionalContext> condition;
private final Function<PlayerOptionalContext>[] smithingFunctions;
private final CustomRecipeResult<T> visualResult;
public CustomSmithingTransformRecipe(Key id,
boolean showNotification,
@@ -37,8 +41,10 @@ public class CustomSmithingTransformRecipe<T> extends AbstractedFixedResultRecip
@NotNull Ingredient<T> base,
@Nullable Ingredient<T> addition,
CustomRecipeResult<T> result,
@Nullable CustomRecipeResult<T> visualResult,
List<ItemDataProcessor> processors,
boolean mergeComponents,
Function<PlayerOptionalContext>[] smithingFunctions,
Condition<PlayerOptionalContext> condition
) {
super(id, showNotification, result);
@@ -48,6 +54,18 @@ public class CustomSmithingTransformRecipe<T> extends AbstractedFixedResultRecip
this.processors = processors;
this.mergeComponents = mergeComponents;
this.condition = condition;
this.smithingFunctions = smithingFunctions;
this.visualResult = visualResult;
}
@Override
public Function<PlayerOptionalContext>[] functions() {
return this.smithingFunctions;
}
@Override
public @Nullable CustomRecipeResult<T> visualResult() {
return this.visualResult;
}
@Override
@@ -150,9 +168,10 @@ public class CustomSmithingTransformRecipe<T> extends AbstractedFixedResultRecip
ResourceConfigUtils.requireNonNullOrThrow(toIngredient(base), "warning.config.recipe.smithing_transform.missing_base"),
toIngredient(addition),
parseResult(arguments),
parseVisualResult(arguments),
ItemDataProcessors.fromMapList(processors),
mergeComponents,
conditions(arguments)
functions(arguments), conditions(arguments)
);
}
@@ -166,8 +185,9 @@ public class CustomSmithingTransformRecipe<T> extends AbstractedFixedResultRecip
toIngredient(VANILLA_RECIPE_HELPER.singleIngredient(json.get("addition"))),
parseResult(VANILLA_RECIPE_HELPER.smithingResult(json.getAsJsonObject("result"))),
null,
null,
true,
null
null, null
);
}
}

14
core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomSmithingTrimRecipe.java
View File

@@ -8,6 +8,7 @@ import net.momirealms.craftengine.core.item.recipe.input.SmithingInput;
import net.momirealms.craftengine.core.plugin.CraftEngine;
import net.momirealms.craftengine.core.plugin.context.Condition;
import net.momirealms.craftengine.core.plugin.context.PlayerOptionalContext;
import net.momirealms.craftengine.core.plugin.context.function.Function;
import net.momirealms.craftengine.core.util.Key;
import net.momirealms.craftengine.core.util.MiscUtils;
import net.momirealms.craftengine.core.util.ResourceConfigUtils;
@@ -20,7 +21,8 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
public class CustomSmithingTrimRecipe<T> extends AbstractRecipe<T> implements ConditionalRecipe {
public class CustomSmithingTrimRecipe<T> extends AbstractRecipe<T>
implements ConditionalRecipe<T>, FunctionalRecipe<T> {
public static final Serializer<?> SERIALIZER = new Serializer<>();
private final Ingredient<T> base;
private final Ingredient<T> template;
@@ -29,6 +31,7 @@ public class CustomSmithingTrimRecipe<T> extends AbstractRecipe<T> implements Co
private final Key pattern;
@Nullable
private final Condition<PlayerOptionalContext> condition;
private final Function<PlayerOptionalContext>[] smithingFunctions;
public CustomSmithingTrimRecipe(@NotNull Key id,
boolean showNotification,
@@ -36,6 +39,7 @@ public class CustomSmithingTrimRecipe<T> extends AbstractRecipe<T> implements Co
@NotNull Ingredient<T> base,
@NotNull Ingredient<T> addition,
@Nullable Key pattern,
Function<PlayerOptionalContext>[] smithingFunctions,
@Nullable Condition<PlayerOptionalContext> condition
) {
super(id, showNotification);
@@ -44,11 +48,17 @@ public class CustomSmithingTrimRecipe<T> extends AbstractRecipe<T> implements Co
this.addition = addition;
this.pattern = pattern;
this.condition = condition;
this.smithingFunctions = smithingFunctions;
if (pattern == null && VersionHelper.isOrAbove1_21_5()) {
throw new IllegalStateException("SmithingTrimRecipe cannot have a null pattern on 1.21.5 and above.");
}
}
@Override
public Function<PlayerOptionalContext>[] functions() {
return this.smithingFunctions;
}
@Override
public boolean canUse(PlayerOptionalContext context) {
if (this.condition != null) return this.condition.test(context);
@@ -135,6 +145,7 @@ public class CustomSmithingTrimRecipe<T> extends AbstractRecipe<T> implements Co
ResourceConfigUtils.requireNonNullOrThrow(toIngredient(base), "warning.config.recipe.smithing_trim.missing_base"),
ResourceConfigUtils.requireNonNullOrThrow(toIngredient(addition), "warning.config.recipe.smithing_trim.missing_addition"),
pattern,
functions(arguments),
conditions(arguments)
);
}
@@ -147,6 +158,7 @@ public class CustomSmithingTrimRecipe<T> extends AbstractRecipe<T> implements Co
Objects.requireNonNull(toIngredient(VANILLA_RECIPE_HELPER.singleIngredient(json.get("base")))),
Objects.requireNonNull(toIngredient(VANILLA_RECIPE_HELPER.singleIngredient(json.get("addition")))),
VersionHelper.isOrAbove1_21_5() ? Key.of(json.get("pattern").getAsString()) : null,
null,
null
);
}

13
core/src/main/java/net/momirealms/craftengine/core/item/recipe/FixedResultRecipe.java Normal file
View File

@@ -0,0 +1,13 @@
package net.momirealms.craftengine.core.item.recipe;
import net.momirealms.craftengine.core.item.ItemBuildContext;
import net.momirealms.craftengine.core.item.recipe.result.CustomRecipeResult;
public interface FixedResultRecipe<T> extends Recipe<T> {
CustomRecipeResult<T> result();
default T result(ItemBuildContext context) {
return this.result().buildItemStack(context);
}
}

10
core/src/main/java/net/momirealms/craftengine/core/item/recipe/FunctionalRecipe.java Normal file
View File

@@ -0,0 +1,10 @@
package net.momirealms.craftengine.core.item.recipe;
import net.momirealms.craftengine.core.plugin.context.PlayerOptionalContext;
import net.momirealms.craftengine.core.plugin.context.function.Function;
public interface FunctionalRecipe<T> extends Recipe<T> {
Function<PlayerOptionalContext>[] functions();
}

33
core/src/main/java/net/momirealms/craftengine/core/item/recipe/VisualResultRecipe.java Normal file
View File

@@ -0,0 +1,33 @@
package net.momirealms.craftengine.core.item.recipe;
import net.momirealms.craftengine.core.item.Item;
import net.momirealms.craftengine.core.item.ItemBuildContext;
import net.momirealms.craftengine.core.item.recipe.input.RecipeInput;
import net.momirealms.craftengine.core.item.recipe.result.CustomRecipeResult;
import org.jetbrains.annotations.Nullable;
public interface VisualResultRecipe<T> extends FixedResultRecipe<T> {
@Nullable
CustomRecipeResult<T> visualResult();
default boolean hasVisualResult() {
return visualResult() != null;
}
default T assembleVisual(RecipeInput input, ItemBuildContext context) {
CustomRecipeResult<T> result = visualResult();
if (result != null) {
return result.buildItemStack(context);
}
return null;
}
default Item<T> buildVisualOrActualResult(ItemBuildContext context) {
CustomRecipeResult<T> visualResult = visualResult();
if (visualResult != null) {
return visualResult.buildItem(context);
} else {
return this.result().buildItem(context);
}
}
}

1
core/src/main/java/net/momirealms/craftengine/core/item/recipe/network/legacy/LegacyShapedRecipe.java
View File

@@ -2,7 +2,6 @@ package net.momirealms.craftengine.core.item.recipe.network.legacy;
import net.momirealms.craftengine.core.item.Item;
import net.momirealms.craftengine.core.item.recipe.CraftingRecipeCategory;
import net.momirealms.craftengine.core.plugin.CraftEngine;
import net.momirealms.craftengine.core.util.FriendlyByteBuf;
import net.momirealms.craftengine.core.util.VersionHelper;
import org.jetbrains.annotations.ApiStatus;

1
core/src/main/java/net/momirealms/craftengine/core/item/recipe/network/legacy/LegacyShapelessRecipe.java
View File

@@ -2,7 +2,6 @@ package net.momirealms.craftengine.core.item.recipe.network.legacy;
import net.momirealms.craftengine.core.item.Item;
import net.momirealms.craftengine.core.item.recipe.CraftingRecipeCategory;
import net.momirealms.craftengine.core.plugin.CraftEngine;
import net.momirealms.craftengine.core.util.FriendlyByteBuf;
import org.jetbrains.annotations.ApiStatus;

1
core/src/main/java/net/momirealms/craftengine/core/item/recipe/network/legacy/LegacySmithingTransformRecipe.java
View File

@@ -1,7 +1,6 @@
package net.momirealms.craftengine.core.item.recipe.network.legacy;
import net.momirealms.craftengine.core.item.Item;
import net.momirealms.craftengine.core.plugin.CraftEngine;
import net.momirealms.craftengine.core.util.FriendlyByteBuf;
import org.jetbrains.annotations.ApiStatus;