From fe885b60b590785212b0f417c60c56914d111c51 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Fri, 14 Jul 2017 14:33:28 +1000 Subject: $ Fixed a order of operation bug, where recipe removal of new circuits wouldn't occur, as the variables it checked to see if the option was enabled were loaded after the recipe map edit. + Attempted to override the list of GT circuits with my own, to prevent NEI clutter. --- .../core/recipe/RECIPES_Old_Circuits.java | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'src/Java/gtPlusPlus/core') diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java index bf5f6dfdd8..b284ecac7e 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java @@ -73,6 +73,32 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { + return true; + } + + public static boolean removeNewCircuits(){ + + ItemList.Circuit_Primitive.set(GregtechItemList.Old_Circuit_Primitive.get(1)); + ItemList.Circuit_Basic.set(GregtechItemList.Old_Circuit_Basic.get(1)); + ItemList.Circuit_Integrated_Good.set(GregtechItemList.Old_Circuit_Good.get(1)); + ItemList.Circuit_Good.set(GregtechItemList.Old_Circuit_Good.get(1)); + ItemList.Circuit_Advanced.set(GregtechItemList.Old_Circuit_Advanced.get(1)); + ItemList.Circuit_Data.set(GregtechItemList.Old_Circuit_Data.get(1)); + ItemList.Circuit_Elite.set(GregtechItemList.Old_Circuit_Elite.get(1)); + ItemList.Circuit_Master.set(GregtechItemList.Old_Circuit_Master.get(1)); + ItemList.Circuit_Ultimate.set(GregtechItemList.Old_Circuit_Ultimate.get(1)); + + + ItemList.Circuit_Board_Basic.set(GregtechItemList.Old_Circuit_Board_Basic.get(1)); + ItemList.Circuit_Board_Advanced.set(GregtechItemList.Old_Circuit_Board_Advanced.get(1)); + ItemList.Circuit_Board_Elite.set(GregtechItemList.Old_Circuit_Board_Elite.get(1)); + ItemList.Circuit_Parts_Advanced.set(GregtechItemList.Old_Circuit_Parts_Advanced.get(1)); + ItemList.Circuit_Parts_Wiring_Basic.set(GregtechItemList.Old_Circuit_Parts_Wiring_Basic.get(1)); + ItemList.Circuit_Parts_Wiring_Advanced.set(GregtechItemList.Old_Circuit_Parts_Wiring_Advanced.get(1)); + ItemList.Circuit_Parts_Wiring_Elite.set(GregtechItemList.Old_Circuit_Parts_Wiring_Elite.get(1)); + ItemList.Circuit_Parts_Crystal_Chip_Elite.set(GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite.get(1)); + ItemList.Circuit_Parts_Crystal_Chip_Master.set(GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master.get(1)); + return true; } -- cgit