From 1d60c5b89bc842cf971d962b2217c27ac4bb6801 Mon Sep 17 00:00:00 2001 From: trinsdar <30245301+Trinsdar@users.noreply.github.com> Date: Tue, 8 Aug 2023 19:10:14 -0400 Subject: [PATCH] added circuit recipes up to extreme circuits in hard mode --- .../muramasa/gregtech/data/GregTechData.java | 11 ++++--- .../muramasa/gregtech/data/GregTechTags.java | 1 + .../datagen/GregTechItemTagProvider.java | 1 + .../gregtech/loader/items/Circuitry.java | 29 +++++++++++++++--- .../item/basic/circuits/mainframe.png | Bin 0 -> 4051 bytes .../basic/circuits/nanoprocessor_assembly.png | Bin 0 -> 358 bytes .../item/basic/circuits/workstation.png | Bin 0 -> 315 bytes 7 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 common/src/main/resources/assets/gti/textures/item/basic/circuits/mainframe.png create mode 100644 common/src/main/resources/assets/gti/textures/item/basic/circuits/nanoprocessor_assembly.png create mode 100644 common/src/main/resources/assets/gti/textures/item/basic/circuits/workstation.png diff --git a/common/src/main/java/muramasa/gregtech/data/GregTechData.java b/common/src/main/java/muramasa/gregtech/data/GregTechData.java index 54f2ba5a3c..1b95d2cce6 100644 --- a/common/src/main/java/muramasa/gregtech/data/GregTechData.java +++ b/common/src/main/java/muramasa/gregtech/data/GregTechData.java @@ -180,13 +180,16 @@ public static void init(Side side) { public static ItemBasic IntegratedProcessor = new ItemBasic<>(GTIRef.ID, "integrated_processor", "circuits/").tip("A Good Circuit"); public static ItemBasic CircuitAdv = new ItemBasic<>(GTIRef.ID, "advanced_circuit", "circuits/").tip("An advanced Circuit"); public static ItemBasic ProcessorAssembly = new ItemBasic<>(GTIRef.ID, "processor_assembly", "circuits/").tip("An advanced Circuit"); - public static ItemBasic NanoProcessor = new ItemBasic<>(GTIRef.ID, "nanoprocessor", "circuits/").tip("A Nanoprocessor"); + public static ItemBasic NanoProcessor = new ItemBasic<>(GTIRef.ID, "nanoprocessor", "circuits/").tip("An advanced Circuit"); + public static ItemBasic Workstation = new ItemBasic<>(GTIRef.ID, "workstation", "circuits/").tip("An extreme Circuit"); + public static ItemBasic QuantumProcessor = new ItemBasic<>(GTIRef.ID, "quantumprocessor", "circuits/").tip("An extreme Circuit"); + public static ItemBasic NanoprocessorAssembly = new ItemBasic<>(GTIRef.ID, "nanoprocessor_assembly", "circuits/").tip("An extreme Circuit"); + public static ItemBasic Mainframe = new ItemBasic<>(GTIRef.ID, "mainframe", "circuits/").tip("An elite circuit"); + public static ItemBasic QuantumProcessorAssembly = new ItemBasic<>(GTIRef.ID, "quantumprocessor_assembly", "circuits/").tip("An elite circuit"); + public static ItemBasic CrystalProcessor = new ItemBasic<>(GTIRef.ID, "crystal_processor", "circuits/").tip("An elite Circuit"); public static ItemBasic CircuitDataStorage = new ItemBasic<>(GTIRef.ID, "data_storage_circuit", "circuits/"); public static ItemBasic CircuitDataControl = new ItemBasic<>(GTIRef.ID, "data_control_circuit", "circuits/"); - - - public static ItemBasic QuantumProcessor = new ItemBasic<>(GTIRef.ID, "quantumprocessor", "circuits/").tip("A Quantumprocessor"); public static ItemBasic CircuitEnergyFlow = new ItemBasic<>(GTIRef.ID, "energy_flow_circuit", "circuits/").tip("A High Voltage Processor"); public static ItemBasic CircuitWetware = new ItemBasic<>(GTIRef.ID, "wetware_circuit", "circuits/").tip("You feel like it's watching you"); public static ItemBasic DataOrb = new ItemBasic<>(GTIRef.ID, "data_orb", "circuits/"); diff --git a/common/src/main/java/muramasa/gregtech/data/GregTechTags.java b/common/src/main/java/muramasa/gregtech/data/GregTechTags.java index 3a06817576..67f897a37a 100644 --- a/common/src/main/java/muramasa/gregtech/data/GregTechTags.java +++ b/common/src/main/java/muramasa/gregtech/data/GregTechTags.java @@ -28,6 +28,7 @@ public class GregTechTags { public static TagKey RESISTORS = TagUtils.getItemTag(new ResourceLocation(GTIRef.ID, "resistors")); public static TagKey CAPACITORS = TagUtils.getItemTag(new ResourceLocation(GTIRef.ID, "capacitors")); public static TagKey TRANSISTORS = TagUtils.getItemTag(new ResourceLocation(GTIRef.ID, "transistors")); + public static TagKey DIODES = TagUtils.getItemTag(new ResourceLocation(GTIRef.ID, "diodes")); public static TagKey getTag(String id){ return TagUtils.getForgelikeItemTag(id); diff --git a/common/src/main/java/muramasa/gregtech/datagen/GregTechItemTagProvider.java b/common/src/main/java/muramasa/gregtech/datagen/GregTechItemTagProvider.java index 17e380b321..fff4b2ebf5 100644 --- a/common/src/main/java/muramasa/gregtech/datagen/GregTechItemTagProvider.java +++ b/common/src/main/java/muramasa/gregtech/datagen/GregTechItemTagProvider.java @@ -38,6 +38,7 @@ protected void processTags(String domain) { this.tag(RESISTORS).add(Resistor, SMDResistor); this.tag(CAPACITORS).add(Capacitor, SMDCapacitor); this.tag(TRANSISTORS).add(Transistor, SMDTransistor); + this.tag(DIODES).add(Diode, SMDDiode); this.tag(GEM.getMaterialTag(Amethyst)).remove(Items.AMETHYST_SHARD); this.tag(PLATES_IRON_ALUMINIUM).addTag(PLATE.getMaterialTag(Iron)).addTag(PLATE.getMaterialTag(WroughtIron)).addTag(PLATE.getMaterialTag(Aluminium)); this.tag(DUST_LAPIS_LAZURITE).addTag(DUST.getMaterialTag(Lapis)).addTag(DUST.getMaterialTag(Lazurite)); diff --git a/common/src/main/java/muramasa/gregtech/loader/items/Circuitry.java b/common/src/main/java/muramasa/gregtech/loader/items/Circuitry.java index f1f10fe04e..515a695ac3 100644 --- a/common/src/main/java/muramasa/gregtech/loader/items/Circuitry.java +++ b/common/src/main/java/muramasa/gregtech/loader/items/Circuitry.java @@ -122,6 +122,10 @@ private static void bloodyCircuits(Consumer output, AntimatterRe .put('T', WIRE_FINE.getMaterialTag(Tin)) .put('W', DUST_TINY.getMaterialTag(Gallium)) .put('G', ForgeCTags.GLASS_PANES).build(), "BG ", "TWT", "BG "); + provider.addStackRecipe(output, GTIRef.ID, "", "small_coils", "has_wrench", provider.hasSafeItem(WRENCH.getTag()), new ItemStack(SmallCoil, 2), + ImmutableMap.of('W', WIRE_FINE.getMaterialTag(Copper), 'B', BOLT.getMaterialTag(Steel)), "WWW", "WBW", "WWW"); + provider.addStackRecipe(output, GTIRef.ID, "small_coil_1", "small_coils", "has_wrench", provider.hasSafeItem(WRENCH.getTag()), new ItemStack(SmallCoil, 4), + ImmutableMap.of('W', WIRE_FINE.getMaterialTag(Copper), 'B', BOLT.getMaterialTag(NickelZincFerrite)), "WWW", "WBW", "WWW"); } private static void circuits(Consumer output, AntimatterRecipeProvider provider){ @@ -328,6 +332,10 @@ private static void bloodyCircuitParts(){ ASSEMBLING.RB().ii(FOIL.getMaterialIngredient(SiliconeRubber, 4), FOIL.getMaterialIngredient(Tantalum, 1)).fi(Polyethylene.getLiquid(L / 4)).io(new ItemStack(SMDCapacitor,32)).add("smd_capacitor_tantalum_rubber",60, 120); ASSEMBLING.RB().ii(FOIL.getMaterialIngredient(SiliconeRubber, 4), FOIL.getMaterialIngredient(Aluminium, 1)).fi(Polyethylene.getLiquid(L / 4)).io(new ItemStack(SMDCapacitor,16)).add("smd_capacitor_aluminium_rubber",60, 120); ASSEMBLING.RB().ii(WIRE_FINE.getMaterialIngredient(AnnealedCopper, 4), DUST_SMALL.getMaterialIngredient(Gallium, 1)).fi(Polyethylene.getLiquid(L * 2)).io(new ItemStack(Diode, 16)).add("diode", 400, 48); + ASSEMBLING.RB().ii(WIRE_FINE.getMaterialIngredient(Copper, 8), BOLT.getMaterialIngredient(Steel, 1)).io(new ItemStack(SmallCoil, 2)).add("small_coil_1", 80, 8); + ASSEMBLING.RB().ii(WIRE_FINE.getMaterialIngredient(Copper, 8), BOLT.getMaterialIngredient(NickelZincFerrite, 1)).io(new ItemStack(SmallCoil, 4)).add("small_coil_2", 80, 8); + ASSEMBLING.RB().ii(WIRE_FINE.getMaterialIngredient(AnnealedCopper, 8), BOLT.getMaterialIngredient(Steel, 1)).io(new ItemStack(SmallCoil, 2)).add("small_coil_3", 80, 8); + ASSEMBLING.RB().ii(WIRE_FINE.getMaterialIngredient(AnnealedCopper, 8), BOLT.getMaterialIngredient(NickelZincFerrite, 1)).io(new ItemStack(SmallCoil, 4)).add("small_coil_4", 80, 8); } private static void bloodyCircuits() { @@ -380,11 +388,22 @@ private static void bloodyCircuits() { .io(new ItemStack(NanoProcessor)) .fi(material.getLiquid(base * 4)).add("nano_processor_soc_using_" + material.getId(), 300, 8192); - //Quantum - ASSEMBLING.RB().ii(of(GregTechData.CircuitBoardFiber, 1), of(GregTechData.Resistor, 4),of(GregTechData.Transistor, 4), - of(GregTechData.Capacitor, 4),of(AntimatterMaterialTypes.WIRE_FINE.get(Platinum), 2)) - .io(new ItemStack(GregTechData.QuantumProcessor,1)) - .fi(material.getLiquid(base * 4)).add("quantum_processor_circuit_using_" + material.getId(),20*20, 2048); + //Extreme + CIRCUIT_ASSEMBLING.RB().ii(of(CircuitBoardPlastic, 2), of(ProcessorAssembly, 3), of(DIODES, 4), + of(RandomAccessMemoryChip, 4), WIRE_FINE.getMaterialIngredient(Electrum, 6)) + .io(new ItemStack(Workstation)) + .fi(material.getLiquid(base * 8)).add("workstation_using_" + material.getId(), 400, 90); + CIRCUIT_ASSEMBLING.RB().ii(of(CircuitBoardEpoxy), of(NanoProcessor, 2), of(SmallCoil, 4), of(SMDCapacitor, 4), + of(RandomAccessMemoryChip, 4), WIRE_FINE.getMaterialIngredient(Electrum, 6)) + .io(new ItemStack(NanoprocessorAssembly)) + .fi(material.getLiquid(base * 8)).add("nanoprocessor_assembly_using_" + material.getId(), 400, 600); + CIRCUIT_ASSEMBLING.RB().ii(of(CircuitBoardFiber), of(QBitProcessingUnit), of(NanoCpu), of(SMDCapacitor, 2), + of(SMDTransistor, 2), WIRE_FINE.getMaterialIngredient(Platinum, 2)) + .io(new ItemStack(QuantumProcessor)) + .fi(material.getLiquid(base * 8)).add("quantum_processor_using_" + material.getId(), 200, 2400); + CIRCUIT_ASSEMBLING.RB().ii(of(CircuitBoardEpoxy), of(ASoC, 1), WIRE_FINE.getMaterialIngredient(Platinum, 2)) + .io(new ItemStack(QuantumProcessor)) + .fi(material.getLiquid(base * 4)).add("nano_processor_soc_using_" + material.getId(), 50, 8192); //Energy Flow ASSEMBLING.RB().ii(of(GregTechData.CircuitBoardMultiFiber, 1), of(GregTechData.Resistor, 8),of(GregTechData.Transistor, 8), of(GregTechData.Capacitor, 8),of(AntimatterMaterialTypes.WIRE_FINE.get(NiobiumTitanium), 4)) diff --git a/common/src/main/resources/assets/gti/textures/item/basic/circuits/mainframe.png b/common/src/main/resources/assets/gti/textures/item/basic/circuits/mainframe.png new file mode 100644 index 0000000000000000000000000000000000000000..7bdb5c7ac04b23016d936c686e141864bfb78afd GIT binary patch literal 4051 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 FV1l`~n0o*K literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/gti/textures/item/basic/circuits/nanoprocessor_assembly.png b/common/src/main/resources/assets/gti/textures/item/basic/circuits/nanoprocessor_assembly.png new file mode 100644 index 0000000000000000000000000000000000000000..13274dc9fb07a9540438206ec073470d22b4c852 GIT binary patch literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggQCK(1bIS--qcA(H_PZ!4!i_>c-Z|pkcAkenIqS54A z(OI)=?E)JN_!W1Gd#YYbDxcc%%S+mkV~KaFp#uB928EW08Jy2uRUQAQvA5-an?FCc zJt$E^%w$T(1eH$a2mf;a=v-r1VtqP6V!}Hehfw}D#@i;zmh;1Uw3S#LL|hqaYQH7? zseSt@@>*ri%)fG1T^S!pCC~Y<{bb|b?7h41Gs`iYDs@?MAv1SL%vndd+n<&_4_Y_v z;Bk!yCS32FDsvRA_gFH=h2*v_leCFhn90WPoHMJjNH)1=@#R|{JEt4(DBR#{oOZME zU)s?pZ!X?nllSW6&DEAG*8JXg|CQzI@_h`7igTiJ=4bi=z0ct3>gTe~DWM4fpTUq4 literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/gti/textures/item/basic/circuits/workstation.png b/common/src/main/resources/assets/gti/textures/item/basic/circuits/workstation.png new file mode 100644 index 0000000000000000000000000000000000000000..daace0f92a6fe6465b9e6e9f04fa3b98963c58a7 GIT binary patch literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggKCRTn!hLry%N3`p=0ijisr68ZKm;(*Y3Yg`~kFNlhqZ6nm<22*3WqP zYgw3tAFq#YVnRxaOQ8D=R*!_gZ{$i!uXMUi+S9PEFGYWXScmq01A{d`xehL2d(_!& zuJG|)&&%`@af3zaYRSpTdv=ptDnm{r-UW|!c26D literal 0 HcmV?d00001