diff --git a/src/main/java/org/betterx/bclib/recipes/BCLRecipeManager.java b/src/main/java/org/betterx/bclib/recipes/BCLRecipeManager.java index 20a5e799..afdcd5d7 100644 --- a/src/main/java/org/betterx/bclib/recipes/BCLRecipeManager.java +++ b/src/main/java/org/betterx/bclib/recipes/BCLRecipeManager.java @@ -1,16 +1,12 @@ package org.betterx.bclib.recipes; -import org.betterx.bclib.api.v2.advancement.AdvancementManager; import org.betterx.bclib.util.CollectionsUtil; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.Container; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.TieredItem; -import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.RecipeType; @@ -87,25 +83,26 @@ public class BCLRecipeManager { T recipe, boolean isTool ) { - AdvancementManager.Builder b = AdvancementManager.Builder.createRecipe( - recipe, - isTool - ? AdvancementManager.AdvancementType.RECIPE_TOOL - : AdvancementManager.AdvancementType.RECIPE_DECORATIONS - ); - - int ct = 0; - for (Ingredient ingredient : recipe.getIngredients()) { - for (ItemStack stack : ingredient.getItems()) { - if (stack.is(Items.AIR)) continue; - - final String name = "has_" + ct++; - Item item = stack.getItem(); - b.addInventoryChangedCriterion(name, item); - } - } - - return b.buildAndRegister(); + return recipe.getId(); +// AdvancementManager.Builder b = AdvancementManager.Builder.createRecipe( +// recipe, +// isTool +// ? AdvancementManager.AdvancementType.RECIPE_TOOL +// : AdvancementManager.AdvancementType.RECIPE_DECORATIONS +// ); +// +// int ct = 0; +// for (Ingredient ingredient : recipe.getIngredients()) { +// for (ItemStack stack : ingredient.getItems()) { +// if (stack.is(Items.AIR)) continue; +// +// final String name = "has_" + ct++; +// Item item = stack.getItem(); +// b.addInventoryChangedCriterion(name, item); +// } +// } +// +// return b.buildAndRegister(); } public static > T getRecipe(RecipeType type, ResourceLocation id) { diff --git a/src/main/java/org/betterx/bclib/recipes/FurnaceRecipe.java b/src/main/java/org/betterx/bclib/recipes/FurnaceRecipe.java index 7980fcd3..28947a05 100644 --- a/src/main/java/org/betterx/bclib/recipes/FurnaceRecipe.java +++ b/src/main/java/org/betterx/bclib/recipes/FurnaceRecipe.java @@ -99,7 +99,6 @@ public class FurnaceRecipe extends AbstractAdvancementRecipe { time / 2 ); BCLRecipeManager.addRecipe(RecipeType.BLASTING, recipe2); - registerAdvancement(recipe2); } if (campfire) { @@ -113,7 +112,6 @@ public class FurnaceRecipe extends AbstractAdvancementRecipe { ); BCLRecipeManager.addRecipe(RecipeType.CAMPFIRE_COOKING, recipe2); - registerAdvancement(recipe2); } if (smoker) { @@ -127,7 +125,6 @@ public class FurnaceRecipe extends AbstractAdvancementRecipe { ); BCLRecipeManager.addRecipe(RecipeType.SMOKING, recipe2); - registerAdvancement(recipe2); } } }