Skip to content
This repository has been archived by the owner on Nov 5, 2024. It is now read-only.

Commit

Permalink
added circuit recipes up to extreme circuits in hard mode
Browse files Browse the repository at this point in the history
  • Loading branch information
Trinsdar committed Aug 8, 2023
1 parent 8678e28 commit 1d60c5b
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 9 deletions.
11 changes: 7 additions & 4 deletions common/src/main/java/muramasa/gregtech/data/GregTechData.java
Original file line number Diff line number Diff line change
Expand Up @@ -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/");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public class GregTechTags {
public static TagKey<Item> RESISTORS = TagUtils.getItemTag(new ResourceLocation(GTIRef.ID, "resistors"));
public static TagKey<Item> CAPACITORS = TagUtils.getItemTag(new ResourceLocation(GTIRef.ID, "capacitors"));
public static TagKey<Item> TRANSISTORS = TagUtils.getItemTag(new ResourceLocation(GTIRef.ID, "transistors"));
public static TagKey<Item> DIODES = TagUtils.getItemTag(new ResourceLocation(GTIRef.ID, "diodes"));

public static TagKey<Item> getTag(String id){
return TagUtils.getForgelikeItemTag(id);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
29 changes: 24 additions & 5 deletions common/src/main/java/muramasa/gregtech/loader/items/Circuitry.java
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,10 @@ private static void bloodyCircuits(Consumer<FinishedRecipe> 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<FinishedRecipe> output, AntimatterRecipeProvider provider){
Expand Down Expand Up @@ -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() {
Expand Down Expand Up @@ -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))
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 1d60c5b

Please sign in to comment.