From 22b258f38405d888b71465ab69336a7034e1456b Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sat, 6 Jul 2019 00:55:18 +0200 Subject: [PATCH] add changes --- build.properties | 4 ++-- .../client/nei/NEIBloodOrbShapedHandler.java | 22 +++++++++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/build.properties b/build.properties index f080330a..6e56753f 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ # -#Mon Jun 27 18:00:04 CEST 2016 +#Sat Jul 06 00:15:21 CEST 2019 mod_name=BloodMagic forge_version=10.13.4.1492-1.7.10 ccc_version=1.0.7.47 @@ -12,4 +12,4 @@ mod_version=1.3.3 minetweaker_version=Dev-1.7.10-3.0.9B chisel_version=2.9.2.8 mc_version=1.7.10 -build_number=24 +build_number=29 diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapedHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapedHandler.java index 98e2b782..fa6da63c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapedHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapedHandler.java @@ -2,8 +2,11 @@ package WayofTime.alchemicalWizardry.client.nei; import java.awt.Rectangle; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import codechicken.nei.ItemList; +import codechicken.nei.recipe.TemplateRecipeHandler; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; @@ -15,6 +18,8 @@ import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.ShapedRecipeHandler; +import static WayofTime.alchemicalWizardry.client.nei.NEIConfig.bloodOrbs; + /** * NEI Blood Orb Shaped Recipe Handler by joshie * */ @@ -38,12 +43,12 @@ public class NEIBloodOrbShapedHandler extends ShapedRecipeHandler { ingredients.add(stack); } else if (o instanceof Integer) { ArrayList orbs = new ArrayList(); - for (Item item : NEIConfig.bloodOrbs) { + for (Item item : bloodOrbs) { if (((IBloodOrb) item).getOrbLevel() >= (Integer) o) { orbs.add(new ItemStack(item)); } } - + if (orbs.isEmpty()) throw new RuntimeException("Invalid blood orb level " + o.toString() + " with recepie: " + Arrays.asList(items).toString() + " and existing orbs are: " + bloodOrbs); PositionedStack stack = new PositionedStack(orbs, 25 + x * 18, 6 + y * 18, false); stack.setMaxSize(1); ingredients.add(stack); @@ -138,5 +143,18 @@ public class NEIBloodOrbShapedHandler extends ShapedRecipeHandler { @Override public String getRecipeName() { return StatCollector.translateToLocal("bm.string.crafting.orb.shaped"); + } + @Override + public TemplateRecipeHandler newInstance() { + for (ItemStack item : ItemList.items) { + if (item != null && item.getItem() instanceof IBloodOrb) { + bloodOrbs.add(item.getItem()); + } + } + + return super.newInstance(); + + } + }