aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2017-07-11 12:51:32 +1000
committerAlkalus <draknyte1@hotmail.com>2017-07-11 12:51:32 +1000
commitc7ea41a649e5de02d95d5bb78a52a6426a75bd6c (patch)
tree55eaffc4d8aa920d7debcba95a394b566f1e3d26 /src/Java/gtPlusPlus/xmod/gregtech
parentdf6ae148fc4572662d76b0cd4a65bbf0acdda983 (diff)
downloadGT5-Unofficial-c7ea41a649e5de02d95d5bb78a52a6426a75bd6c.tar.gz
GT5-Unofficial-c7ea41a649e5de02d95d5bb78a52a6426a75bd6c.tar.bz2
GT5-Unofficial-c7ea41a649e5de02d95d5bb78a52a6426a75bd6c.zip
+ Pre .09.28 Circuits added, missing recipes though.
> This will be a config option to avoid a requirement of remerging it back into Gregtech itself. > Although the new circuits will exist and have recipes, updating from a pre .09.28 world to .28+ will allow automation to continue working. > New circuits produced will have correct oredict and will continue being used in recipes.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java5
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java39
2 files changed, 42 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index dc53b32700..1af45115f7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -173,7 +173,10 @@ public enum GregtechItemList implements GregtechItemContainer {
Pollution_Creator,
//Basically is an automatic Cauldron
- SimpleDustWasher
+ SimpleDustWasher,
+
+ //Old Style Circuits
+ Circuit_Board_Basic, Circuit_Board_Advanced, Circuit_Board_Elite, Circuit_Parts_Crystal_Chip_Elite, Circuit_Parts_Crystal_Chip_Master, Circuit_Parts_Advanced, Circuit_Parts_Wiring_Basic, Circuit_Parts_Wiring_Advanced, Circuit_Parts_Wiring_Elite, Empty_Board_Basic, Empty_Board_Elite
;
public static final GregtechItemList[]
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index 3eea107170..2deeaefca9 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -7,8 +7,11 @@ import gregtech.api.enums.*;
import gregtech.api.interfaces.ITexture;
import gregtech.api.objects.*;
import gregtech.api.util.GT_FoodStat;
+import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.common.covers.*;
+import gregtech.common.items.behaviors.Behaviour_DataOrb;
+import gregtech.common.items.behaviors.Behaviour_DataStick;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.item.ItemUtils;
@@ -148,7 +151,6 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
}
}
-
//Extruder Shape
GregtechItemList.Shape_Extruder_WindmillShaft.set(this.addItem(tLastID = 40, "Extruder Shape (Shaft)", "Extruder Shape for making Windmill Shafts", new Object[0]));
@@ -237,4 +239,39 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
return true;
}
+
+ private boolean registerOldCircuits(){
+ //Enable Old Circuits
+ GregtechItemList.Circuit_Primitive.set(addItem(800, "NAND Chip", "A very simple Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Primitive)}));
+ GregtechItemList.Circuit_Basic.set(addItem(801, "Basic Electronic Circuit", "A basic Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Basic)}));
+ GregtechItemList.Circuit_Good.set(addItem(802, "Good Electronic Circuit", "A good Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Good)}));
+ GregtechItemList.Circuit_Advanced.set(addItem(803, "Advanced Circuit", "An advanced Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Advanced)}));
+ GregtechItemList.Circuit_Data.set(addItem(804, "Data Storage Circuit", "A Data Storage Chip", new Object[]{OrePrefixes.circuit.get(Materials.Data)}));
+ GregtechItemList.Circuit_Elite.set(addItem(805, "Data Control Circuit", "A Processor", new Object[]{OrePrefixes.circuit.get(Materials.Elite)}));
+
+ GregtechItemList.Circuit_Master.set(addItem(806, "Energy Flow Circuit", "A High Voltage Processor", new Object[]{OrePrefixes.circuit.get(Materials.Master)}));
+
+ GregtechItemList.Tool_DataOrb.set(addItem(807, "Data Orbv[GT++]", "A High Capacity Data Storage", new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION, new Behaviour_DataOrb()}));
+ GregtechItemList.Circuit_Ultimate.set(GregtechItemList.Tool_DataOrb.get(1L, new Object[0]));
+ GT_ModHandler.addShapelessCraftingRecipe(GregtechItemList.Tool_DataOrb.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{GregtechItemList.Tool_DataOrb.get(1L, new Object[0])});
+
+ GregtechItemList.Tool_DataStick.set(addItem(808, "Data Stick [GT++]", "A Low Capacity Data Storage", new Object[]{OrePrefixes.circuit.get(Materials.Data), SubTag.NO_UNIFICATION, new Behaviour_DataStick()}));
+ GT_ModHandler.addShapelessCraftingRecipe(GregtechItemList.Tool_DataStick.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{GregtechItemList.Tool_DataStick.get(1L, new Object[0])});
+
+
+ GregtechItemList.Circuit_Board_Basic.set(addItem(810, "Basic Circuit Board", "A basic Board", new Object[0]));
+ GregtechItemList.Circuit_Board_Advanced.set(addItem(811, "Advanced Circuit Board", "An advanced Board", new Object[0]));
+ GregtechItemList.Circuit_Board_Elite.set(addItem(812, "Processor Board", "A Processor Board", new Object[0]));
+ GregtechItemList.Circuit_Parts_Crystal_Chip_Elite.set(addItem(813, "Engraved Crystal Chip", "Needed for Circuits", new Object[0]));
+ GregtechItemList.Circuit_Parts_Crystal_Chip_Master.set(addItem(814, "Engraved Lapotron Chip", "Needed for Circuits", new Object[0]));
+ GregtechItemList.Circuit_Parts_Advanced.set(addItem(815, "Advanced Circuit Parts", "Advanced Circuit Parts", new Object[0]));
+ GregtechItemList.Circuit_Parts_Wiring_Basic.set(addItem(816, "Etched Medium Voltage Wiring", "Part of Circuit Boards", new Object[0]));
+ GregtechItemList.Circuit_Parts_Wiring_Advanced.set(addItem(817, "Etched High Voltage Wiring", "Part of Circuit Boards", new Object[0]));
+ GregtechItemList.Circuit_Parts_Wiring_Elite.set(addItem(818, "Etched Extreme Voltage Wiring", "Part of Circuit Boards", new Object[0]));
+ GregtechItemList.Empty_Board_Basic.set(addItem(819, "Empty Circuit Board", "A Board Part", new Object[0]));
+ GregtechItemList.Empty_Board_Elite.set(addItem(820, "Empty Processor Board", "A Processor Board Part", new Object[0]));
+
+
+ return true;
+ }
}