From 41eb02602c8a6d5899b3e375572ee9990a5a752b Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Mon, 26 Feb 2018 08:08:00 +1000 Subject: % Made all GTNH recipes use cheaper circuits for all recipes I add. % Recipe tweaks. % Tried to fluorite ore not having correct recipe outputs during ore processing. (This is still broken due to an invalid output) $ Fixed old fluorite ore not having a valid shapeless recipe. $ Fixed all custom ores trying to register static textures. $ Fixed plugin loading system not registering plugins, I think? $ Fixed missing texture for Nitro Fix. --- .../gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java index d544f9f545..cd1e372fe2 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java @@ -48,10 +48,15 @@ public class RecipeGen_Ore implements Runnable{ } if (material.getComposites().size() >= 1 && material.getComposites().get(1) != null){ bonusB = material.getComposites().get(1).getStackMaterial(); - } - else if (material.getComposites().get(0) != null){ - bonusB = material.getComposites().get(0).getStackMaterial(); - } + } + else if (material.getComposites().size() >= 1 && material.getComposites().get(1) == null){ + if (material.getComposites().get(0) != null){ + bonusB = material.getComposites().get(0).getStackMaterial(); + } + else { + bonusB = ELEMENT.getInstance().CHROMIUM; + } + } else { //Ultra Bonus bonusB = ELEMENT.getInstance().GALLIUM; @@ -65,6 +70,9 @@ public class RecipeGen_Ore implements Runnable{ } } + if (bonusA == null || bonusB == null) { + return; + } /** * Macerate */ -- cgit