Skip to content

Commit d19a519

Browse files
committed
Use CraftTweakerMC#getIngredient to get an Ingredient from the IIngredient.
Fixes #3
1 parent e89694c commit d19a519

1 file changed

Lines changed: 1 addition & 22 deletions

File tree

src/main/java/com/blakebr0/extendedcrafting/compat/crafttweaker/CraftTweakerUtils.java

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
import crafttweaker.api.data.IData;
44
import crafttweaker.api.item.IIngredient;
5-
import crafttweaker.api.item.IItemStack;
65
import crafttweaker.api.minecraft.CraftTweakerMC;
7-
import net.minecraft.item.ItemStack;
86
import net.minecraft.item.crafting.Ingredient;
97
import net.minecraft.nbt.NBTBase;
108
import net.minecraft.util.NonNullList;
@@ -36,26 +34,7 @@ public static NonNullList<Ingredient> toIngredients(IIngredient... ingredients)
3634

3735
@Nonnull
3836
public static Ingredient toIngredient(@Nullable IIngredient ingredient) {
39-
return ingredient == null ? Ingredient.EMPTY : new CTIngredientWrapper(ingredient);
37+
return CraftTweakerMC.getIngredient(ingredient);
4038
}
4139

42-
private static class CTIngredientWrapper extends Ingredient {
43-
44-
private final IIngredient ingredient;
45-
46-
private CTIngredientWrapper(IIngredient ingredient) {
47-
super(CraftTweakerMC.getItemStacks(ingredient.getItemArray()));
48-
this.ingredient = ingredient;
49-
}
50-
51-
@Override
52-
public boolean apply(@Nullable ItemStack stack) {
53-
if(stack == null) {
54-
return ingredient.matches((IItemStack) null);
55-
}
56-
stack = stack.copy();
57-
stack.setCount(ingredient.getAmount());
58-
return ingredient.matches(CraftTweakerMC.getIItemStack(stack));
59-
}
60-
}
6140
}

0 commit comments

Comments
 (0)