diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2018-05-13 01:03:38 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-05-13 01:41:31 +1000 |
| commit | cc960c4aa3697b9f47f1ca050511f5d2a94e63f2 (patch) | |
| tree | e8848ffc6149675dcb91ef401065010d1fc17569 /src/Java/gtPlusPlus/core/recipe | |
| parent | 74cbb7d6c9dd8b2cf3d856d9483b464dbdd3a4e1 (diff) | |
| download | GT5-Unofficial-cc960c4aa3697b9f47f1ca050511f5d2a94e63f2.tar.gz GT5-Unofficial-cc960c4aa3697b9f47f1ca050511f5d2a94e63f2.tar.bz2 GT5-Unofficial-cc960c4aa3697b9f47f1ca050511f5d2a94e63f2.zip | |
+ Added Turbine Animations.
$ Fixed Large Auto-Assembler Name.
$ Possible fix for #239.
$ Other Bug Fixes.
$ Fixed Old School Circuits breaking Integrated Circuit Recipes.
% Made Adv. EBF. Use new casing textures.
% Streamlined Old School Circuit function call locations to a single handler.
% Cleaned up ASM Logging.
Diffstat (limited to 'src/Java/gtPlusPlus/core/recipe')
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java | 12 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/common/CI.java | 4 |
2 files changed, 5 insertions, 11 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java index ddce7aec5b..dbdf6b1437 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java @@ -97,7 +97,6 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { } public static boolean handleCircuits(){ - hideCircuitsNEI(); addCircuitRecipes(); removeNewCircuits(); @@ -120,10 +119,7 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { boolean newVersion = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && Utils.getGregtechSubVersion() >= 30; setItemList(ItemList.Circuit_Primitive, GregtechItemList.Old_Circuit_Primitive); - setItemList(ItemList.Circuit_Basic, GregtechItemList.Old_Circuit_Basic); - if (newVersion) { - setItemList(ItemList.valueOf("Circuit_Integrated_Good"), GregtechItemList.Old_Circuit_Good); //New - } + setItemList(ItemList.Circuit_Basic, GregtechItemList.Old_Circuit_Basic); setItemList(ItemList.Circuit_Good, GregtechItemList.Old_Circuit_Good); setItemList(ItemList.Circuit_Advanced, GregtechItemList.Old_Circuit_Advanced); //ItemList.Circuit_Data, GregtechItemList.Old_Circuit_Data); @@ -141,7 +137,7 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { } //Good if (newVersion) { - setItemList(ItemList.valueOf("Circuit_Integrated"), GregtechItemList.Old_Circuit_Good); + setItemList(ItemList.valueOf("Circuit_Integrated_Good"), GregtechItemList.Old_Circuit_Good); //New } //Advanced if (newVersion) { @@ -310,7 +306,7 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { //remove a few recipes - GT_ModHandler.removeRecipeByOutput(ItemUtils.simpleMetaStack("gregtech:gt.metaitem.03:32070", 32070, 1)); + /*GT_ModHandler.removeRecipeByOutput(ItemUtils.simpleMetaStack("gregtech:gt.metaitem.03:32070", 32070, 1)); GT_ModHandler.removeRecipeByOutput(ItemUtils.simpleMetaStack("gregtech:gt.metaitem.03:32069", 32069, 1)); if (LoadedMods.Extra_Utils){ ItemStack EQU = ItemUtils.simpleMetaStack("ExtraUtilities:enderQuarryUpgrade", 0, 1); @@ -345,7 +341,7 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { 80*20, 2); } - } + }*/ return true; } diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java index 1f06c5befb..7ad7820985 100644 --- a/src/Java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java @@ -179,9 +179,7 @@ public class CI { public static ItemStack explosiveITNT; public static void preInit(){ - //Put these here, because we need them for everything. - new MetaGeneratedGregtechItems(); - + //Tiered Components component_Plate = new String[]{ getTieredComponent(OrePrefixes.plate, 0), |