diff options
author | Martin Robertz <dream-master@gmx.net> | 2020-04-24 21:17:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-24 21:17:15 +0200 |
commit | 4b97e5c6f598b3bf2674b7bec4ad295b27338126 (patch) | |
tree | e773ddc6bc570b8674748cb82396df76968ada59 /src | |
parent | 8aa9a48f1f66ed2751427923eaf5bf644c76a836 (diff) | |
parent | 232ba7f3d17640d703df5193da5462a2afd2ecd8 (diff) | |
download | GT5-Unofficial-4b97e5c6f598b3bf2674b7bec4ad295b27338126.tar.gz GT5-Unofficial-4b97e5c6f598b3bf2674b7bec4ad295b27338126.tar.bz2 GT5-Unofficial-4b97e5c6f598b3bf2674b7bec4ad295b27338126.zip |
Merge pull request #270 from GTNewHorizons/advanced-smd-chips
Advanced smd chips
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/gregtech/api/enums/ItemList.java | 4 | ||||
-rw-r--r-- | src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java | 5 | ||||
-rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 4 | ||||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/24.png | bin | 0 -> 3996 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/25.png | bin | 0 -> 3881 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/26.png | bin | 0 -> 4043 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/27.png | bin | 0 -> 4084 bytes |
7 files changed, 10 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 9e415b17dc..9b9c03f365 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -1604,6 +1604,7 @@ public enum ItemList implements IItemContainer { Circuit_Parts_Resistor, Circuit_Parts_ResistorSMD, + Circuit_Parts_ResistorASMD, Circuit_Parts_Glass_Tube, Circuit_Parts_Reinforced_Glass_Tube, Circuit_Parts_Vacuum_Tube, @@ -1611,10 +1612,13 @@ public enum ItemList implements IItemContainer { Circuit_Parts_Coil, Circuit_Parts_Diode, Circuit_Parts_DiodeSMD, + Circuit_Parts_DiodeASMD, Circuit_Parts_Transistor, Circuit_Parts_TransistorSMD, + Circuit_Parts_TransistorASMD, Circuit_Parts_Capacitor, Circuit_Parts_CapacitorSMD, + Circuit_Parts_CapacitorASMD, Circuit_Parts_GlassFiber, Circuit_Parts_PetriDish, 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 682f04bf57..f0cb4024d5 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 @@ -58,7 +58,10 @@ public class GT_MetaGenerated_Item_03 ItemList.Circuit_Parts_GlassFiber.set(addItem(tLastID = 21, "Glass Fiber", Materials.BorosilicateGlass.mChemicalFormula, o)); ItemList.Circuit_Parts_PetriDish.set(addItem(tLastID = 22, "Petri Dish", "For cultivating cells", o)); ItemList.Circuit_Parts_Reinforced_Glass_Tube.set(addItem(tLastID = 23, "Reinforced Glass Tube", "", o)); -// + ItemList.Circuit_Parts_ResistorASMD.set(addItem(tLastID = 24, "Advanced SMD Resistor", "Advanced Electronic Component", o)); + ItemList.Circuit_Parts_DiodeASMD.set(addItem(tLastID = 25, "Advanced SMD Diode", "Advanced Electronic Component", o)); + ItemList.Circuit_Parts_TransistorASMD.set(addItem(tLastID = 26, "Advanced SMD Transistor", "Advanced Electronic Component", o)); + ItemList.Circuit_Parts_CapacitorASMD.set(addItem(tLastID = 27, "Advanced SMD Capacitor", "Advanced Electronic Component", o)); /** * ICs diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index f0325b65c5..31c6c57c43 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -2689,7 +2689,7 @@ public class GT_MachineRecipeLoader implements Runnable { ItemList.Field_Generator_LuV.get(2), ItemList.Circuit_Wafer_SoC2.get(64), ItemList.Circuit_Wafer_SoC2.get(64), - ItemList.Circuit_Parts_DiodeSMD.get(8), + ItemList.Circuit_Parts_DiodeASMD.get(8), GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 32)}, new FluidStack[]{ Materials.SolderingAlloy.getMolten(2880), new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000)}, @@ -2705,7 +2705,7 @@ public class GT_MachineRecipeLoader implements Runnable { ItemList.Field_Generator_ZPM.get(2), ItemList.Circuit_Wafer_HPIC.get(64), ItemList.Circuit_Wafer_HPIC.get(64), - ItemList.Circuit_Parts_DiodeSMD.get(16), + ItemList.Circuit_Parts_DiodeASMD.get(16), GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 32),}, new FluidStack[]{ Materials.SolderingAlloy.getMolten(2880), diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/24.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/24.png Binary files differnew file mode 100644 index 0000000000..cf6e98f0e0 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/24.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/25.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/25.png Binary files differnew file mode 100644 index 0000000000..fadaf89d62 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/25.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/26.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/26.png Binary files differnew file mode 100644 index 0000000000..6c1b5bcb8d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/26.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/27.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/27.png Binary files differnew file mode 100644 index 0000000000..c5dedac4b5 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/27.png |