aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2017-07-14 15:26:03 +1000
committerAlkalus <draknyte1@hotmail.com>2017-07-14 15:26:03 +1000
commit6c0f9cf07a7f21dd598e4b583ef1b2c1617c4edd (patch)
tree58d6ed25b96f6200ec77342b360583e2b7836472 /src/Java/gtPlusPlus/xmod/gregtech
parentfe885b60b590785212b0f417c60c56914d111c51 (diff)
downloadGT5-Unofficial-6c0f9cf07a7f21dd598e4b583ef1b2c1617c4edd.tar.gz
GT5-Unofficial-6c0f9cf07a7f21dd598e4b583ef1b2c1617c4edd.tar.bz2
GT5-Unofficial-6c0f9cf07a7f21dd598e4b583ef1b2c1617c4edd.zip
$ Fixed Circuit loading order.
$ Fixed recipes that loaded prior to the GT circuits changes, which had them using non-craftable GT circuits. $ Disabled the Bronze workbench entirely, which was causing dupe issues. TBA.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java105
1 files changed, 2 insertions, 103 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index fb6aa9991d..1468e97f85 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -247,6 +247,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
private boolean registerOldCircuits(){
//Enable Old Circuits
+ Utils.LOG_INFO("[Old Feature - Circuits] Enabling Pre-5.09.28 Circuits and Data Storage.");
GregtechItemList.Old_Circuit_Primitive.set(this.addItem(200, "NAND Chip", "A very simple Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Primitive)}));
GregtechItemList.Old_Circuit_Basic.set(this.addItem(201, "Basic Electronic Circuit", "A basic Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Basic)}));
@@ -274,109 +275,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
GregtechItemList.Old_Circuit_Parts_Wiring_Elite.set(this.addItem(218, "Etched Extreme Voltage Wiring", "Part of Circuit Boards", new Object[0]));
GregtechItemList.Old_Empty_Board_Basic.set(this.addItem(219, "Empty Circuit Board", "A Board Part", new Object[0]));
GregtechItemList.Old_Empty_Board_Elite.set(this.addItem(220, "Empty Processor Board", "A Processor Board Part", new Object[0]));
-
- //Add the old recipes.
- new RECIPES_Old_Circuits();
- Utils.LOG_INFO("[Old Feature] Enabling Pre 5.09.28 circuits & recipes.");
-
- Boolean isNEILoaded = Loader.isModLoaded("NotEnoughItems");
- if (isNEILoaded){
- String[] CircuitToHide = {
- "Circuit_Board_Basic",
- "Circuit_Board_Advanced",
- "Circuit_Board_Elite",
- "Circuit_Parts_Advanced",
- "Circuit_Parts_Wiring_Basic",
- "Circuit_Parts_Wiring_Advanced",
- "Circuit_Parts_Wiring_Elite",
- "Circuit_Parts_Crystal_Chip_Elite",
- "Circuit_Parts_Crystal_Chip_Master",
- "Circuit_Primitive",
- "Circuit_Basic",
- "Circuit_Integrated_Good",
- "Circuit_Good",
- "Circuit_Advanced",
- "Circuit_Data",
- "Circuit_Elite",
- "Circuit_Master",
- "Circuit_Ultimate",
- "Circuit_Board_Coated",
- "Circuit_Board_Phenolic",
- "Circuit_Board_Epoxy",
- "Circuit_Board_Fiberglass",
- "Circuit_Board_Multifiberglass",
- "Circuit_Board_Wetware",
- "Circuit_Parts_Resistor",
- "Circuit_Parts_ResistorSMD",
- "Circuit_Parts_Glass_Tube",
- "Circuit_Parts_Vacuum_Tube",
- "Circuit_Parts_Coil",
- "Circuit_Parts_Diode",
- "Circuit_Parts_DiodeSMD",
- "Circuit_Parts_Transistor",
- "Circuit_Parts_TransistorSMD",
- "Circuit_Parts_Capacitor",
- "Circuit_Parts_CapacitorSMD",
- "Circuit_Silicon_Ingot",
- "Circuit_Silicon_Ingot2",
- "Circuit_Silicon_Ingot3",
- "Circuit_Silicon_Wafer",
- "Circuit_Silicon_Wafer2",
- "Circuit_Silicon_Wafer3",
- "Circuit_Wafer_ILC",
- "Circuit_Chip_ILC",
- "Circuit_Wafer_Ram",
- "Circuit_Chip_Ram",
- "Circuit_Wafer_NAND",
- "Circuit_Chip_NAND",
- "Circuit_Wafer_NOR",
- "Circuit_Chip_NOR",
- "Circuit_Wafer_CPU",
- "Circuit_Chip_CPU",
- "Circuit_Wafer_SoC",
- "Circuit_Chip_SoC",
- "Circuit_Wafer_SoC2",
- "Circuit_Chip_SoC2",
- "Circuit_Wafer_PIC",
- "Circuit_Chip_PIC",
- "Circuit_Wafer_HPIC",
- "Circuit_Chip_HPIC",
- "Circuit_Wafer_NanoCPU",
- "Circuit_Chip_NanoCPU",
- "Circuit_Wafer_QuantumCPU",
- "Circuit_Chip_QuantumCPU",
- "Circuit_Chip_CrystalCPU",
- "Circuit_Chip_CrystalSoC",
- "Circuit_Chip_NeuroCPU",
- "Circuit_Chip_Stemcell",
- "Circuit_Processor",
- "Circuit_Computer",
- "Circuit_Nanoprocessor",
- "Circuit_Nanocomputer",
- "Circuit_Elitenanocomputer",
- "Circuit_Quantumprocessor",
- "Circuit_Quantumcomputer",
- "Circuit_Masterquantumcomputer",
- "Circuit_Quantummainframe",
- "Circuit_Crystalprocessor",
- "Circuit_Crystalcomputer",
- "Circuit_Ultimatecrystalcomputer",
- "Circuit_Crystalmainframe",
- "Circuit_Neuroprocessor",
- "Circuit_Wetwarecomputer",
- "Circuit_Wetwaresupercomputer",
- "Circuit_Wetwaremainframe",
- "Circuit_Parts_RawCrystalChip"
- };
-
- for (String component : CircuitToHide){
- API.hideItem(ItemList.valueOf(component).get(1L, new Object[0]));
- }
-
-
- RECIPES_Old_Circuits.removeNewCircuits();
- }
-
+
return true;
}
}