diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 5f855132..83851921 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -652,11 +652,12 @@ public enum ItemList implements IItemContainer { ModularElectric1Helmet, ModularElectric1Chestplate, ModularElectric1Leggings, ModularElectric1Boots, ModularElectric2Helmet, ModularElectric2Chestplate, ModularElectric2Leggings, ModularElectric2Boots, Block_Powderbarrel, GelledToluene, FluidRegulator_LV, FluidRegulator_MV, FluidRegulator_HV, FluidRegulator_EV, FluidRegulator_IV, FluidRegulator_LuV, FluidRegulator_ZPM, FluidRegulator_UV, FluidFilter, CuringOven, Machine_Multi_Assemblyline, Machine_Multi_DieselEngine, QuantumEye, QuantumStar, Gravistar, Block_SSFUEL, Block_MSSFUEL, SFMixture, MSFMixture, Depleted_Naquadah_1, Depleted_Naquadah_2, Depleted_Naquadah_4, NaquadahCell_1, NaquadahCell_2, NaquadahCell_4, Hatch_AutoMaintenance, - Machine_Multi_Cleanroom, Circuit_Board_Coated, Circuit_Board_Coated_Basic, Circuit_Board_Phenolic, Circuit_Board_Phenolic_Good, Circuit_Board_Phenolic_Electronic, Circuit_Board_Epoxy, Circuit_Board_Epoxy_Advanced, Circuit_Board_Fiberglass, Circuit_Board_Fiberglass_Advanced, Circuit_Board_Multifiberglass, Circuit_Board_Wetware, + Machine_Multi_Cleanroom, Circuit_Board_Coated, Circuit_Board_Coated_Basic, Circuit_Board_Phenolic, Circuit_Board_Phenolic_Good, Circuit_Board_Phenolic_Electronic, Circuit_Board_Epoxy, Circuit_Board_Epoxy_Advanced, Circuit_Board_Fiberglass, Circuit_Board_Fiberglass_Advanced, Circuit_Board_Multifiberglass_Elite, Circuit_Board_Multifiberglass, Circuit_Board_Wetware, Circuit_Board_Wetware_Extreme, 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_Wafer_HPIC, Circuit_Chip_HPIC, Circuit_Wafer_NanoCPU, Circuit_Chip_NanoCPU, Circuit_Wafer_QuantumCPU, Circuit_Chip_QuantumCPU, + Etched_Low_Voltage_Wirering, Etched_Medium_Voltage_Wirering, Etched_High_Voltage_Wirering, Etched_Extreme_Voltage_Wirering, Etched_Insane_Voltage_Wirering, Etched_LuV_Voltage_Wirering, Etched_Zpm_Voltage_Wirering, Etched_UV_Voltage_Wirering, 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_Crystalmainframe, Circuit_Neuroprocessor, Circuit_Wetwarecomputer, Circuit_Wetwaresupercomputer, Circuit_Wetwaremainframe, Circuit_Parts_RawCrystalChip, 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 b2d2c58b..8664b7e6 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 @@ -166,6 +166,17 @@ public class GT_MetaGenerated_Item_03 ItemList.Circuit_Board_Phenolic_Electronic.set(addItem(tLastID = 102, "Electronic Circuit Board", "A electronic Circuit Board", o)); ItemList.Circuit_Board_Epoxy_Advanced.set(addItem(tLastID = 103, "Advanced Circuit Board", "A advanced Circuit Board", o)); ItemList.Circuit_Board_Fiberglass_Advanced.set(addItem(tLastID = 104, "More Advanced Circuit Board", "A more advanced Circuit Board", o)); + ItemList.Circuit_Board_Multifiberglass_Elite.set(addItem(tLastID = 105, "Elite Circuit Board", "A elite Circuit Board", o)); + ItemList.Circuit_Board_Wetware_Extreme.set(addItem(tLastID = 106, "Extreme Wetware Lifesupport Circuit Board", "The Board that keeps life", o)); + + ItemList.Etched_Low_Voltage_Wirering.set(addItem(tLastID = 110, "Etched Low Voltage Wirering", "For basic Circuit", o)); + ItemList.Etched_Medium_Voltage_Wirering.set(addItem(tLastID = 111, "Etched Medium Voltage Wirering", "For good Circuit", o)); + ItemList.Etched_High_Voltage_Wirering.set(addItem(tLastID = 112, "Etched High Voltage Wirering", "For advanced Circuit", o)); + ItemList.Etched_Extreme_Voltage_Wirering.set(addItem(tLastID = 113, "Etched Extreme Voltage Wirering", "For data Circuit", o)); + ItemList.Etched_Insane_Voltage_Wirering.set(addItem(tLastID = 114, "Etched Insane Voltage Wirering", "For elite Circuit", o)); + ItemList.Etched_LuV_Voltage_Wirering.set(addItem(tLastID = 115, "Etched LuV Voltage Wirering", "For master Circuit", o)); + ItemList.Etched_Zpm_Voltage_Wirering.set(addItem(tLastID = 116, "Etched Zpm Voltage Wirering", "For ultimate Circuit", o)); + ItemList.Etched_UV_Voltage_Wirering.set(addItem(tLastID = 117, "Etched UV Voltage Wirering", "For superconductor Circuit", o)); } public boolean doesShowInCreative(OrePrefixes aPrefix, Materials aMaterial, boolean aDoShowAllItems) { diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index f021f37e..a5c24b0b 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -479,9 +479,10 @@ public class GT_MachineRecipeLoader implements Runnable { GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Board_Phenolic_Electronic.get(1, o), new Object[]{"TDT", "RCR", "TDT", 'C', ItemList.Circuit_Board_Phenolic_Good.get(3, o), 'R', ItemList.Circuit_Parts_Resistor.get(1, o), 'D', ItemList.Circuit_Parts_Diode.get(1, o), 'T', ItemList.Circuit_Parts_Vacuum_Tube.get(1, o)}); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Epoxid, 1), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, 8), Materials.SulfuricAcid.getFluid(500), null, ItemList.Circuit_Board_Epoxy.get(1, o), 500, 30); GT_Values.RA.addChemicalRecipe(ItemList.Circuit_Board_Epoxy.get(1, o), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.AnnealedCopper, 8), new FluidStack(ItemList.sIron3Chloride, 500), null, ItemList.Circuit_Board_Epoxy_Advanced.get(1, o), 1200, 30); - GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 16), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 16), Materials.Electrum.getMolten(16), null, ItemList.Circuit_Board_Fiberglass.get(16, o), null, 200, 480, 2600); + GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 32), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 16), Materials.Electrum.getMolten(1152), null, ItemList.Circuit_Board_Fiberglass.get(16, o), null, 200, 480, 2600); GT_Values.RA.addChemicalRecipe(ItemList.Circuit_Board_Epoxy.get(1, o), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 16), new FluidStack(ItemList.sIron3Chloride, 1500), null, ItemList.Circuit_Board_Fiberglass_Advanced.get(1, o), 1800, 30); - GT_Values.RA.addChemicalRecipe(ItemList.Circuit_Board_Fiberglass.get(1, o), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 16), Materials.SulfuricAcid.getFluid(250), null, ItemList.Circuit_Board_Multifiberglass.get(1, o), 100, 480); + GT_Values.RA.addChemicalRecipe(ItemList.Circuit_Board_Fiberglass.get(2, o), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 32), Materials.SulfuricAcid.getFluid(500), null, ItemList.Circuit_Board_Multifiberglass.get(1, o), 200, 480); + GT_Values.RA.addChemicalRecipe(ItemList.Circuit_Board_Multifiberglass.get(1, o), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Platinum, 32), new FluidStack(ItemList.sIron3Chloride, 3000), null, ItemList.Circuit_Board_Multifiberglass_Elite.get(1, o), 2400, 120); GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Board_Wetware.get(1, o), new Object[]{"DLD", "PBP", "TPT", 'T', GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1), 'L', ItemList.Electric_Pump_LV.get(1, o), 'P', GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Silicone, 1), 'D', ItemList.Bottle_Dragon_Blood.get(1, o), 'B', ItemList.Circuit_Board_Multifiberglass.get(1, o)}); GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Parts_Resistor.get(1, o), new Object[]{"RPR", "FCF", " P ", 'F', OrePrefixes.wireGt01.get(Materials.Copper), 'P', OrePrefixes.wireFine.get(Materials.Copper), 'C', OrePrefixes.dust.get(Materials.Coal), 'R', ItemList.IC2_Resin.get(1, o)}); diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/105.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/105.png new file mode 100644 index 00000000..577d9a49 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/105.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/106.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/106.png new file mode 100644 index 00000000..80d15f4d Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/106.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/110.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/110.png new file mode 100644 index 00000000..82b075c2 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/110.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/716.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/111.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/716.png rename to src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/111.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/717.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/112.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/717.png rename to src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/112.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/718.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/113.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/718.png rename to src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/113.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/114.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/114.png new file mode 100644 index 00000000..34ca5c7c Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/114.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/115.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/115.png new file mode 100644 index 00000000..43fe41cd Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/115.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/116.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/116.png new file mode 100644 index 00000000..dc43da44 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/116.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/117.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/117.png new file mode 100644 index 00000000..d02eceb9 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/117.png differ