diff options
Diffstat (limited to 'src/main')
14 files changed, 11 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index f7795746f7..d0173627c0 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -678,7 +678,7 @@ public enum ItemList implements IItemContainer { Circuit_Parts_Resistor, Circuit_Parts_ResistorSMD, Circuit_Parts_Glass_Tube, Circuit_Parts_Reinforced_Glass_Tube, Circuit_Parts_Vacuum_Tube, NandChip, Circuit_Parts_Coil, Circuit_Parts_Diode, Circuit_Parts_DiodeSMD, Circuit_Parts_Transistor, Circuit_Parts_TransistorSMD, Circuit_Parts_Capacitor, Circuit_Parts_CapacitorSMD, Circuit_Parts_GlassFiber, Circuit_Parts_PetriDish, 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_Simple_SoC, Circuit_Chip_Simple_SoC, - Circuit_Wafer_HPIC, Circuit_Wafer_UHPIC, Circuit_Chip_HPIC, Circuit_Chip_UHPIC, Circuit_Wafer_NanoCPU, Circuit_Chip_NanoCPU, Circuit_Wafer_QuantumCPU, Circuit_Chip_QuantumCPU, + Circuit_Wafer_HPIC, Circuit_Wafer_UHPIC, Circuit_Chip_HPIC, Circuit_Chip_UHPIC, Circuit_Chip_ULPIC, Circuit_Chip_LPIC, Circuit_Wafer_ULPIC, Circuit_Wafer_LPIC, Circuit_Wafer_NanoCPU, Circuit_Chip_NanoCPU, Circuit_Wafer_QuantumCPU, Circuit_Chip_QuantumCPU, Circuit_Chip_CrystalCPU, Circuit_Chip_CrystalSoC, Circuit_Chip_CrystalSoC2, Circuit_Chip_NeuroCPU, Circuit_Chip_BioCPU, Circuit_Chip_Stemcell, Circuit_Parts_RawCrystalParts, Circuit_Chip_Biocell, Tube_Wires, Circuit_Microprocessor, Circuit_Processor, Circuit_Computer, Circuit_Nanoprocessor, Circuit_Nanocomputer, Circuit_Elitenanocomputer, Circuit_Quantumprocessor, Circuit_Quantumcomputer, Circuit_Masterquantumcomputer, diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java index 38a03591a9..23d51247e7 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java @@ -124,7 +124,12 @@ public class GT_MetaGenerated_Item_03 ItemList.Circuit_Wafer_Simple_SoC.set(addItem(tLastID = 60, "Simple SoC Wafer", "Raw Primitive Circuit", o));
ItemList.Circuit_Chip_Simple_SoC.set(addItem(tLastID = 61, "Simple SoC", "Simple System on a Chip", o));
- /**
+
+ ItemList.Circuit_Wafer_ULPIC.set(addItem(tLastID = 62, "ULVPIC Wafer", "Raw Circuit", o));
+ ItemList.Circuit_Chip_ULPIC.set(addItem(tLastID = 63, "Ultra Low Power IC", "Ultra Low Power Circuit", o));
+
+ ItemList.Circuit_Wafer_LPIC.set(addItem(tLastID = 64, "LPIC Wafer", "Raw Circuit", o));
+ ItemList.Circuit_Chip_LPIC.set(addItem(tLastID = 65, "Low Power IC", "Low Power Circuit", o));/**
* Engraved Crystal Chip
* Engraved Lapotron Chip
* Crystal CPU
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java index 1ee9ef370e..c2907311eb 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java @@ -37,6 +37,8 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg case "craftingLensYellow": GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 14), 2000, 1920); GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 14), 2000, 1920); + GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer.get(1, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Wafer_LPIC.get(1, new Object[0]), 800, 120,false); + GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer2.get(1, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Wafer_LPIC.get(4, new Object[0]), 600, 480,true); GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer3.get(1, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Wafer_SoC.get(1, new Object[0]), 900, 1920,true); break; case "craftingLensOrange": @@ -61,6 +63,8 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg case "craftingLensGreen": GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Parts_Crystal_Chip_Elite.get(1L, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Chip_CrystalCPU.get(1, new Object[0]), 600, 10000,true); GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Chip_CrystalSoC.get(1L, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Chip_CrystalSoC2.get(1, new Object[0]), 1200, 80000,true); + GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer.get(1, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Wafer_ULPIC.get(2, new Object[0]), 600, 32,false); + GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer2.get(1, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemList.Circuit_Wafer_ULPIC.get(8, new Object[0]), 600, 120,false); break; case "craftingLensWhite": GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 19), 2000, 1920); diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/50.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/50.png Binary files differindex 0ccd45871b..d74a351f47 100644 --- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/50.png +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/50.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/51.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/51.png Binary files differindex 8a91f91e74..b05e1570b6 100644 --- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/51.png +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/51.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/52.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/52.png Binary files differindex cf0360a77c..09727fafeb 100644 --- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/52.png +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/52.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/53.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/53.png Binary files differindex 4d146a95c5..7c94c7bdf0 100644 --- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/53.png +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/53.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/58.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/58.png Binary files differindex d74a351f47..45d2111075 100644 --- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/58.png +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/58.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/59.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/59.png Binary files differindex b05e1570b6..14ca7821d5 100644 --- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/59.png +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/59.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/60.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/60.png Binary files differindex 16640c03dc..57185d40bf 100644 --- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/60.png +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/60.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/62.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/62.png Binary files differnew file mode 100644 index 0000000000..0ccd45871b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/62.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/54.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/63.png Binary files differindex d9791e2687..8a91f91e74 100644 --- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/54.png +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/63.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/64.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/64.png Binary files differnew file mode 100644 index 0000000000..cf0360a77c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/64.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/65.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/65.png Binary files differnew file mode 100644 index 0000000000..4d146a95c5 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/65.png |
