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

refactor recipes

Browse Source
This commit is contained in:
XiaoMoMi
2025-03-19 03:29:08 +08:00
parent 5fb238f090
commit 4653adc43c
26 changed files with 424 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/BukkitRecipeManager.java
View File

@@ -55,7 +55,20 @@ public class BukkitRecipeManager implements RecipeManager<ItemStack> {
static {
BUKKIT_RECIPE_FACTORIES.put(RecipeTypes.SMITHING_TRANSFORM, (key, recipe) -> {
CustomSmithingTransformRecipe<ItemStack> ceRecipe = (CustomSmithingTransformRecipe<ItemStack>) recipe;
SmithingTransformRecipe transformRecipe = new SmithingTransformRecipe(
key, ceRecipe.result(ItemBuildContext.EMPTY),
ingredientToBukkitRecipeChoice(ceRecipe.template()),
ingredientToBukkitRecipeChoice(ceRecipe.base()),
ingredientToBukkitRecipeChoice(ceRecipe.addition()),
false
);
try {
Object craftRecipe = Reflections.method$CraftSmithingTransformRecipe$fromBukkitRecipe.invoke(null, transformRecipe);
Reflections.method$CraftRecipe$addToCraftingManager.invoke(craftRecipe);
} catch (Exception e) {
CraftEngine.instance().logger().warn("Failed to convert smithing transform recipe", e);
}
});
BUKKIT_RECIPE_FACTORIES.put(RecipeTypes.SHAPED, (key, recipe) -> {
CustomShapedRecipe<ItemStack> ceRecipe = (CustomShapedRecipe<ItemStack>) recipe;
@@ -68,7 +81,7 @@ public class BukkitRecipeManager implements RecipeManager<ItemStack> {
}
shapedRecipe.shape(ceRecipe.pattern().pattern());
for (Map.Entry<Character, Ingredient<ItemStack>> entry : ceRecipe.pattern().ingredients().entrySet()) {
shapedRecipe.setIngredient(entry.getKey(), new RecipeChoice.MaterialChoice(ingredientToBukkitMaterials(entry.getValue())));
shapedRecipe.setIngredient(entry.getKey(), ingredientToBukkitRecipeChoice(entry.getValue()));
}
try {
Object craftRecipe = Reflections.method$CraftShapedRecipe$fromBukkitRecipe.invoke(null, shapedRecipe);
@@ -88,7 +101,7 @@ public class BukkitRecipeManager implements RecipeManager<ItemStack> {
shapelessRecipe.setCategory(CraftingBookCategory.valueOf(Objects.requireNonNull(ceRecipe.category()).name()));
}
for (Ingredient<ItemStack> ingredient : ceRecipe.ingredientsInUse()) {
shapelessRecipe.addIngredient(new RecipeChoice.MaterialChoice(ingredientToBukkitMaterials(ingredient)));
shapelessRecipe.addIngredient(ingredientToBukkitRecipeChoice(ingredient));
}
try {
Object craftRecipe = Reflections.method$CraftShapelessRecipe$fromBukkitRecipe.invoke(null, shapelessRecipe);
@@ -102,7 +115,7 @@ public class BukkitRecipeManager implements RecipeManager<ItemStack> {
CustomSmeltingRecipe<ItemStack> ceRecipe = (CustomSmeltingRecipe<ItemStack>) recipe;
FurnaceRecipe furnaceRecipe = new FurnaceRecipe(
key, ceRecipe.result(ItemBuildContext.EMPTY),
new RecipeChoice.MaterialChoice(ingredientToBukkitMaterials(ceRecipe.ingredient())),
ingredientToBukkitRecipeChoice(ceRecipe.ingredient()),
ceRecipe.experience(), ceRecipe.cookingTime()
);
if (ceRecipe.group() != null) {
@@ -123,7 +136,7 @@ public class BukkitRecipeManager implements RecipeManager<ItemStack> {
CustomSmokingRecipe<ItemStack> ceRecipe = (CustomSmokingRecipe<ItemStack>) recipe;
SmokingRecipe smokingRecipe = new SmokingRecipe(
key, ceRecipe.result(ItemBuildContext.EMPTY),
new RecipeChoice.MaterialChoice(ingredientToBukkitMaterials(ceRecipe.ingredient())),
ingredientToBukkitRecipeChoice(ceRecipe.ingredient()),
ceRecipe.experience(), ceRecipe.cookingTime()
);
if (ceRecipe.group() != null) {
@@ -144,7 +157,7 @@ public class BukkitRecipeManager implements RecipeManager<ItemStack> {
CustomBlastingRecipe<ItemStack> ceRecipe = (CustomBlastingRecipe<ItemStack>) recipe;
BlastingRecipe blastingRecipe = new BlastingRecipe(
key, ceRecipe.result(ItemBuildContext.EMPTY),
new RecipeChoice.MaterialChoice(ingredientToBukkitMaterials(ceRecipe.ingredient())),
ingredientToBukkitRecipeChoice(ceRecipe.ingredient()),
ceRecipe.experience(), ceRecipe.cookingTime()
);
if (ceRecipe.group() != null) {
@@ -165,7 +178,7 @@ public class BukkitRecipeManager implements RecipeManager<ItemStack> {
CustomCampfireRecipe<ItemStack> ceRecipe = (CustomCampfireRecipe<ItemStack>) recipe;
CampfireRecipe campfireRecipe = new CampfireRecipe(
key, ceRecipe.result(ItemBuildContext.EMPTY),
new RecipeChoice.MaterialChoice(ingredientToBukkitMaterials(ceRecipe.ingredient())),
ingredientToBukkitRecipeChoice(ceRecipe.ingredient()),
ceRecipe.experience(), ceRecipe.cookingTime()
);
if (ceRecipe.group() != null) {
@@ -495,6 +508,10 @@ public class BukkitRecipeManager implements RecipeManager<ItemStack> {
VanillaStoneCuttingRecipe recipe = this.recipeReader.readStoneCutting(jsonObject);
handleDataPackStoneCuttingRecipe(id, recipe);
}
case "minecraft:smithing_transform" -> {
VanillaSmithingTransformRecipe recipe = this.recipeReader.readSmithingTransform(jsonObject);
handleDataPackSmithingTransform(id, recipe, (injectLogics::add));
}
}
}
}
@@ -520,6 +537,29 @@ public class BukkitRecipeManager implements RecipeManager<ItemStack> {
return future;
}
private boolean readVanillaIngredients(boolean hasCustomItemInTag, List<String> ingredients, Consumer<Material> materialConsumer, Consumer<Holder<Key>> holderConsumer) {
for (String item : ingredients) {
if (item.charAt(0) == '#') {
Key tag = Key.from(item.substring(1));
for (Material material : tagToMaterials(tag)) {
materialConsumer.accept(material);
}
if (!hasCustomItemInTag) {
if (!plugin.itemManager().tagToCustomItems(tag).isEmpty()) {
hasCustomItemInTag = true;
}
}
for (Holder<Key> holder : plugin.itemManager().tagToItems(tag)) {
holderConsumer.accept(holder);
}
} else {
materialConsumer.accept(MaterialUtils.getMaterial(item));
holderConsumer.accept(BuiltInRegistries.OPTIMIZED_ITEM_ID.get(Key.from(item)).orElseThrow());
}
}
return hasCustomItemInTag;
}
private void handleDataPackShapelessRecipe(Key id, VanillaShapelessRecipe recipe, Consumer<Runnable> callback) {
NamespacedKey key = new NamespacedKey(id.namespace(), id.value());
ItemStack result = createResultStack(recipe.result());
@@ -669,22 +709,7 @@ public class BukkitRecipeManager implements RecipeManager<ItemStack> {
Set<Material> materials = new HashSet<>();
Set<Holder<Key>> holders = new HashSet<>();
boolean hasCustomItemInTag = false;
for (String item : recipe.ingredient()) {
if (item.charAt(0) == '#') {
Key tag = Key.from(item.substring(1));
materials.addAll(tagToMaterials(tag));
if (!hasCustomItemInTag) {
if (!plugin.itemManager().tagToCustomItems(tag).isEmpty()) {
hasCustomItemInTag = true;
}
}
holders.addAll(plugin.itemManager().tagToItems(tag));
} else {
materials.add(MaterialUtils.getMaterial(item));
holders.add(BuiltInRegistries.OPTIMIZED_ITEM_ID.get(Key.from(item)).orElseThrow());
}
}
boolean hasCustomItemInTag = readVanillaIngredients(false, recipe.ingredient(), materials::add, holders::add);
org.bukkit.inventory.CookingRecipe<?> cookingRecipe = constructor1.apply(key, result, new RecipeChoice.MaterialChoice(new ArrayList<>(materials)), recipe.experience(), recipe.cookingTime());
if (recipe.group() != null) {
cookingRecipe.setGroup(recipe.group());
@@ -717,6 +742,52 @@ public class BukkitRecipeManager implements RecipeManager<ItemStack> {
this.addInternalRecipe(id, ceRecipe);
}
private void handleDataPackSmithingTransform(Key id, VanillaSmithingTransformRecipe recipe, Consumer<Runnable> callback) {
NamespacedKey key = new NamespacedKey(id.namespace(), id.value());
ItemStack result = createResultStack(recipe.result());
boolean hasCustomItemInTag;
Set<Material> additionMaterials = new HashSet<>();
Set<Holder<Key>> additionHolders = new HashSet<>();
hasCustomItemInTag = readVanillaIngredients(false, recipe.addition(), additionMaterials::add, additionHolders::add);
Set<Material> templateMaterials = new HashSet<>();
Set<Holder<Key>> templateHolders = new HashSet<>();
hasCustomItemInTag = readVanillaIngredients(hasCustomItemInTag, recipe.template(), templateMaterials::add, templateHolders::add);
Set<Material> baseMaterials = new HashSet<>();
Set<Holder<Key>> baseHolders = new HashSet<>();
hasCustomItemInTag = readVanillaIngredients(hasCustomItemInTag, recipe.base(), baseMaterials::add, baseHolders::add);
CustomSmithingTransformRecipe<ItemStack> ceRecipe = new CustomSmithingTransformRecipe<>(
id,
Ingredient.of(baseHolders),
Ingredient.of(templateHolders),
Ingredient.of(additionHolders),
new CustomRecipeResult<>(new CloneableConstantItem(recipe.result().isCustom() ? Key.of("!internal:custom") : Key.of(recipe.result().id()), result), recipe.result().count())
);
SmithingTransformRecipe transformRecipe = new SmithingTransformRecipe(key, result,
new RecipeChoice.MaterialChoice(new ArrayList<>(templateMaterials)),
new RecipeChoice.MaterialChoice(new ArrayList<>(baseMaterials)),
new RecipeChoice.MaterialChoice(new ArrayList<>(additionMaterials)),
true
);
if (hasCustomItemInTag) {
callback.accept(() -> {
try {
unregisterRecipe(key);
Reflections.method$CraftRecipe$addToCraftingManager.invoke(Reflections.method$CraftSmithingTransformRecipe$fromBukkitRecipe.invoke(null, transformRecipe));
} catch (Exception e) {
CraftEngine.instance().logger().warn("Failed to convert smelting recipe", e);
}
});
this.injectedDataPackRecipes.add(key);
}
this.addInternalRecipe(id, ceRecipe);
}
private List<Material> tagToMaterials(Key tag) {
Set<Material> materials = new HashSet<>();
List<Holder<Key>> holders = this.plugin.itemManager().tagToVanillaItems(tag);
@@ -766,12 +837,16 @@ public class BukkitRecipeManager implements RecipeManager<ItemStack> {
return Key.of(prefix, fileName);
}
private static List<Material> ingredientToBukkitMaterials(Ingredient<ItemStack> ingredient) {
Set<Material> materials = new HashSet<>();
for (Holder<Key> holder : ingredient.items()) {
materials.add(getMaterialById(holder.value()));
private static RecipeChoice ingredientToBukkitRecipeChoice(Ingredient<ItemStack> ingredient) {
if (ingredient == null) {
return EmptyRecipeChoice.INSTANCE;
} else {
Set<Material> materials = new HashSet<>();
for (Holder<Key> holder : ingredient.items()) {
materials.add(getMaterialById(holder.value()));
}
return new RecipeChoice.MaterialChoice(new ArrayList<>(materials));
}
return new ArrayList<>(materials);
}
private static Material getMaterialById(Key key) {

35
bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/EmptyRecipeChoice.java Normal file
View File

@@ -0,0 +1,35 @@
package net.momirealms.craftengine.bukkit.item.recipe;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.RecipeChoice;
import org.jetbrains.annotations.NotNull;
record EmptyRecipeChoice() implements RecipeChoice {
static final RecipeChoice INSTANCE = new EmptyRecipeChoice();
@Override
@NotNull
public ItemStack getItemStack() {
throw new UnsupportedOperationException("This is an empty RecipeChoice");
}
@SuppressWarnings("MethodDoesntCallSuperMethod")
@Override
@NotNull
public RecipeChoice clone() {
return this;
}
@Override
public boolean test(final @NotNull ItemStack itemStack) {
return false;
}
@Override
@NotNull
public RecipeChoice validate(final boolean allowEmptyRecipes) {
if (allowEmptyRecipes) return this;
throw new IllegalArgumentException("empty RecipeChoice isn't allowed here");
}
}

8
bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/RecipeEventListener.java
View File

@@ -838,5 +838,13 @@ public class RecipeEventListener implements Listener {
SmithingInventory inventory = event.getInventory();
if (!(inventory.getRecipe() instanceof SmithingTransformRecipe recipe)) return;
Key recipeId = Key.of(recipe.getKey().namespace(), recipe.getKey().value());
boolean isCustom = this.recipeManager.isCustomRecipe(recipeId);
// Maybe it's recipe from other plugins, then we ignore it
if (!isCustom) {
return;
}
}
}

12
bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/Reflections.java
View File

@@ -4125,6 +4125,18 @@ public class Reflections {
)
);
public static final Class<?> clazz$CraftSmithingTransformRecipe = requireNonNull(
ReflectionUtils.getClazz(
BukkitReflectionUtils.assembleCBClass("inventory.CraftSmithingTransformRecipe")
)
);
public static final Method method$CraftSmithingTransformRecipe$fromBukkitRecipe = requireNonNull(
ReflectionUtils.getStaticMethod(
clazz$CraftSmithingTransformRecipe, clazz$CraftSmithingTransformRecipe, SmithingTransformRecipe.class
)
);
public static final Class<?> clazz$FeatureFlagSet = requireNonNull(
ReflectionUtils.getClazz(
BukkitReflectionUtils.assembleMCClass("world.flag.FeatureFlagSet")