MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes for backward compat

Browse source
This commit is contained in:
Frank 2022-08-01 18:51:18 +02:00
parent 35c023692c
commit db62a19cc5
2 changed files with 20 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/main/java/org/betterx/bclib/recipes/BCLRecipeManager.java
View file

@ -1,16 +1,12 @@
package org.betterx.bclib.recipes; package org.betterx.bclib.recipes;
import org.betterx.bclib.api.v2.advancement.AdvancementManager;
import org.betterx.bclib.util.CollectionsUtil; import org.betterx.bclib.util.CollectionsUtil;
import net.minecraft.core.Registry; import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.Container; 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.Items;
import net.minecraft.world.item.TieredItem; 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.Recipe;
import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.RecipeSerializer;
import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.item.crafting.RecipeType;
@ -87,25 +83,26 @@ public class BCLRecipeManager {
T recipe, T recipe,
boolean isTool boolean isTool
) { ) {
AdvancementManager.Builder b = AdvancementManager.Builder.createRecipe( return recipe.getId();
recipe, // AdvancementManager.Builder b = AdvancementManager.Builder.createRecipe(
isTool // recipe,
? AdvancementManager.AdvancementType.RECIPE_TOOL // isTool
: AdvancementManager.AdvancementType.RECIPE_DECORATIONS // ? AdvancementManager.AdvancementType.RECIPE_TOOL
); // : AdvancementManager.AdvancementType.RECIPE_DECORATIONS
// );
int ct = 0; //
for (Ingredient ingredient : recipe.getIngredients()) { // int ct = 0;
for (ItemStack stack : ingredient.getItems()) { // for (Ingredient ingredient : recipe.getIngredients()) {
if (stack.is(Items.AIR)) continue; // for (ItemStack stack : ingredient.getItems()) {
// if (stack.is(Items.AIR)) continue;
final String name = "has_" + ct++; //
Item item = stack.getItem(); // final String name = "has_" + ct++;
b.addInventoryChangedCriterion(name, item); // Item item = stack.getItem();
} // b.addInventoryChangedCriterion(name, item);
} // }
// }
return b.buildAndRegister(); //
// return b.buildAndRegister();
} }
public static <C extends Container, T extends Recipe<C>> T getRecipe(RecipeType<T> type, ResourceLocation id) { public static <C extends Container, T extends Recipe<C>> T getRecipe(RecipeType<T> type, ResourceLocation id) {

3
src/main/java/org/betterx/bclib/recipes/FurnaceRecipe.java
View file

@ -99,7 +99,6 @@ public class FurnaceRecipe extends AbstractAdvancementRecipe {
time / 2 time / 2
); );
BCLRecipeManager.addRecipe(RecipeType.BLASTING, recipe2); BCLRecipeManager.addRecipe(RecipeType.BLASTING, recipe2);
registerAdvancement(recipe2);
} }
if (campfire) { if (campfire) {
@ -113,7 +112,6 @@ public class FurnaceRecipe extends AbstractAdvancementRecipe {
); );
BCLRecipeManager.addRecipe(RecipeType.CAMPFIRE_COOKING, recipe2); BCLRecipeManager.addRecipe(RecipeType.CAMPFIRE_COOKING, recipe2);
registerAdvancement(recipe2);
} }
if (smoker) { if (smoker) {
@ -127,7 +125,6 @@ public class FurnaceRecipe extends AbstractAdvancementRecipe {
); );
BCLRecipeManager.addRecipe(RecipeType.SMOKING, recipe2); BCLRecipeManager.addRecipe(RecipeType.SMOKING, recipe2);
registerAdvancement(recipe2);
} }
} }
} }