diff options
Diffstat (limited to 'src')
21 files changed, 43 insertions, 3 deletions
diff --git a/src/Java/gregtech/api/enums/TAE.java b/src/Java/gregtech/api/enums/TAE.java index 40811a141c..e3c59f209f 100644 --- a/src/Java/gregtech/api/enums/TAE.java +++ b/src/Java/gregtech/api/enums/TAE.java @@ -14,7 +14,7 @@ public class TAE { public static boolean hookGtTextures() { ITexture[] textureArrayDump = Textures.BlockIcons.CASING_BLOCKS; - GT_RenderedTexture[] newTextureArray = new GT_RenderedTexture[1024]; + ITexture[] newTextureArray = new ITexture[1024]; gtTexturesArrayStartOrigin = textureArrayDump.length; System.arraycopy(textureArrayDump, 0, newTextureArray, 0, textureArrayDump.length); Textures.BlockIcons.CASING_BLOCKS = newTextureArray; 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; + } } diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/800.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/800.png Binary files differnew file mode 100644 index 0000000000..e10815677a --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/800.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/801.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/801.png Binary files differnew file mode 100644 index 0000000000..661cd14817 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/801.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/802.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/802.png Binary files differnew file mode 100644 index 0000000000..6c64b90877 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/802.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/803.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/803.png Binary files differnew file mode 100644 index 0000000000..ec3c0358a1 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/803.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/804.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/804.png Binary files differnew file mode 100644 index 0000000000..daace0f92a --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/804.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/805.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/805.png Binary files differnew file mode 100644 index 0000000000..f5d5a1bc39 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/805.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/806.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/806.png Binary files differnew file mode 100644 index 0000000000..d6ff394c66 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/806.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/807.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/807.png Binary files differnew file mode 100644 index 0000000000..9f03d572b7 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/807.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/808.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/808.png Binary files differnew file mode 100644 index 0000000000..548784db2a --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/808.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/810.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/810.png Binary files differnew file mode 100644 index 0000000000..6f403c14f5 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/810.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/811.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/811.png Binary files differnew file mode 100644 index 0000000000..6614c152a6 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/811.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/812.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/812.png Binary files differnew file mode 100644 index 0000000000..98c4b4f2b7 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/812.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/813.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/813.png Binary files differnew file mode 100644 index 0000000000..7da7ab1e69 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/813.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/814.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/814.png Binary files differnew file mode 100644 index 0000000000..56da7e8d0d --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/814.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/815.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/815.png Binary files differnew file mode 100644 index 0000000000..cffad53f13 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/815.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/816.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/816.png Binary files differnew file mode 100644 index 0000000000..6c9c006044 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/816.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/817.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/817.png Binary files differnew file mode 100644 index 0000000000..ee1c87e1b1 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/817.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/818.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/818.png Binary files differnew file mode 100644 index 0000000000..6f8d8bdde5 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/818.png |
