From ef7ea3a7c75753613de45adc649a0e136dcb45e4 Mon Sep 17 00:00:00 2001 From: Smileycorp Date: Mon, 20 Jan 2020 20:31:33 +0000 Subject: [PATCH 1/2] Fixed FusionFurnaceRecipeWrapper to read metadata and nbt previously I incorrectly asumed the recipie wrapper ingredients were stored as ItemStacks, however even being stored as FusionMaterial instances, a fix to read nbt and metadata is pretty straightforward. --- .../modsupport/jei/FusionFurnaceRecipeWrapper.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/alexndr/plugins/Fusion/modsupport/jei/FusionFurnaceRecipeWrapper.java b/src/main/java/alexndr/plugins/Fusion/modsupport/jei/FusionFurnaceRecipeWrapper.java index 3108b30e..ebdde0bc 100644 --- a/src/main/java/alexndr/plugins/Fusion/modsupport/jei/FusionFurnaceRecipeWrapper.java +++ b/src/main/java/alexndr/plugins/Fusion/modsupport/jei/FusionFurnaceRecipeWrapper.java @@ -26,22 +26,19 @@ public FusionFurnaceRecipeWrapper(IJeiHelpers jeiHelpers, RecipeEntry recipe) this.catalyst = stackHelper.toItemStackList(recipe.catalyst.getOre()); } else { - this.catalyst = stackHelper.toItemStackList(new ItemStack(recipe.catalyst.getItem(), - recipe.catalyst.getAmount())); + this.catalyst = new ArrayList(recipe.catalyst.itemsList()); } if (recipe.input1 instanceof DictMaterial) { this.input1 = stackHelper.toItemStackList(recipe.input1.getOre()); } else { - this.input1 = stackHelper.toItemStackList(new ItemStack(recipe.input1.getItem(), - recipe.input1.getAmount())); + this.input1 = new ArrayList(recipe.catalyst.itemsList()); } if (recipe.input2 instanceof DictMaterial) { this.input2 = stackHelper.toItemStackList(recipe.input2.getOre()); } else { - this.input2 = stackHelper.toItemStackList(new ItemStack(recipe.input2.getItem(), - recipe.input2.getAmount())); + this.input2 = new ArrayList(recipe.catalyst.itemsList()); } } // end ctor From c8c8e73b2cff645f18291067241016434876c717 Mon Sep 17 00:00:00 2001 From: Smileycorp Date: Mon, 20 Jan 2020 21:19:04 +0000 Subject: [PATCH 2/2] fixed a mistake with the recipe reading --- .../Fusion/modsupport/jei/FusionFurnaceRecipeWrapper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/alexndr/plugins/Fusion/modsupport/jei/FusionFurnaceRecipeWrapper.java b/src/main/java/alexndr/plugins/Fusion/modsupport/jei/FusionFurnaceRecipeWrapper.java index ebdde0bc..78172d6a 100644 --- a/src/main/java/alexndr/plugins/Fusion/modsupport/jei/FusionFurnaceRecipeWrapper.java +++ b/src/main/java/alexndr/plugins/Fusion/modsupport/jei/FusionFurnaceRecipeWrapper.java @@ -32,13 +32,13 @@ public FusionFurnaceRecipeWrapper(IJeiHelpers jeiHelpers, RecipeEntry recipe) this.input1 = stackHelper.toItemStackList(recipe.input1.getOre()); } else { - this.input1 = new ArrayList(recipe.catalyst.itemsList()); + this.input1 = new ArrayList(recipe.input1.itemsList()); } if (recipe.input2 instanceof DictMaterial) { this.input2 = stackHelper.toItemStackList(recipe.input2.getOre()); } else { - this.input2 = new ArrayList(recipe.catalyst.itemsList()); + this.input2 = new ArrayList(recipe.input2.itemsList()); } } // end ctor