Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Crystal circuit tweaks for fission #2550

Open
wants to merge 2 commits into
base: nuclear-fission
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,7 @@ public static void register() {
public static Material BoronCarbide;
public static Material HeavyWater;
public static Material HighPressureHeavyWater;
public static Material AntimonyTelluride;

/**
* Organic chemistry
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,9 @@ public static void register() {
.build();

Promethium = new Material.Builder(85, gregtechId("promethium"))
.iconSet(METALLIC)
.dust().ingot()
.flags(GENERATE_FINE_WIRE)
.color(0x74E0A0).iconSet(SHINY)
.element(Elements.Pm)
.build();

Expand Down Expand Up @@ -781,7 +783,9 @@ public static void register() {
.build();

Tellurium = new Material.Builder(106, gregtechId("tellurium"))
.iconSet(METALLIC)
.dust().ingot()
.flags(STD_METAL, GENERATE_FOIL)
.color(0xEFDDED).iconSet(METALLIC)
.element(Elements.Te)
.build();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1687,5 +1687,11 @@ public static void register() {
.flags(DISABLE_DECOMPOSITION)
.components(Deuterium, 2, Oxygen, 1)
.build();

AntimonyTelluride = new Material.Builder(469, gregtechId("antimony_telluride"))
.dust()
.color(0xA3A68E).iconSet(METALLIC)
.components(Antimony, 2, Tellurium, 3)
.build();
}
}
10 changes: 5 additions & 5 deletions src/main/java/gregtech/common/items/MetaItem1.java
Original file line number Diff line number Diff line change
Expand Up @@ -978,11 +978,11 @@ public void registerSubItems() {
// T13: ???

// Crystal Circuit Components: ID 701-705
RAW_CRYSTAL_CHIP = addItem(701, "crystal.raw");
RAW_CRYSTAL_CHIP_PART = addItem(702, "crystal.raw_chip");
ENGRAVED_CRYSTAL_CHIP = addItem(703, "engraved.crystal_chip");
CRYSTAL_CENTRAL_PROCESSING_UNIT = addItem(704, "crystal.central_processing_unit");
CRYSTAL_SYSTEM_ON_CHIP = addItem(705, "crystal.system_on_chip");
SPARSE_CRYSTALLINE_LATTICE = addItem(701, "crystal.lattice");
CRYSTALLINE_WAFER = addItem(702, "crystal.wafer");
CRYSTALLINE_MEMORY_UNIT = addItem(703, "crystal.memory_unit");
CRYSTAL_MEMORY_FRAGMENT = addItem(704, "crystal.memory_fragment");
PROMETHIUM_RANDOM_ACCESS_MEMORY = addItem(705, "crystal.pram");

// Wetware Circuit Components: ID 706-710
NEURO_PROCESSOR = addItem(708, "processor.neuro");
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/gregtech/common/items/MetaItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,6 @@ private MetaItems() {}
public static MetaItem<?>.MetaValueItem SYSTEM_ON_CHIP_WAFER;
public static MetaItem<?>.MetaValueItem SIMPLE_SYSTEM_ON_CHIP_WAFER;

public static MetaItem<?>.MetaValueItem ENGRAVED_CRYSTAL_CHIP;
public static MetaItem<?>.MetaValueItem ENGRAVED_LAPOTRON_CHIP;

public static MetaItem<?>.MetaValueItem HIGHLY_ADVANCED_SOC;
Expand All @@ -328,10 +327,11 @@ private MetaItems() {}
public static MetaItem<?>.MetaValueItem SYSTEM_ON_CHIP;
public static MetaItem<?>.MetaValueItem SIMPLE_SYSTEM_ON_CHIP;

public static MetaItem<?>.MetaValueItem RAW_CRYSTAL_CHIP;
public static MetaItem<?>.MetaValueItem RAW_CRYSTAL_CHIP_PART;
public static MetaItem<?>.MetaValueItem CRYSTAL_CENTRAL_PROCESSING_UNIT;
public static MetaItem<?>.MetaValueItem CRYSTAL_SYSTEM_ON_CHIP;
public static MetaItem<?>.MetaValueItem SPARSE_CRYSTALLINE_LATTICE;
public static MetaItem<?>.MetaValueItem CRYSTALLINE_WAFER;
public static MetaItem<?>.MetaValueItem CRYSTALLINE_MEMORY_UNIT;
public static MetaItem<?>.MetaValueItem CRYSTAL_MEMORY_FRAGMENT;
public static MetaItem<?>.MetaValueItem PROMETHIUM_RANDOM_ACCESS_MEMORY;

public static MetaItem<?>.MetaValueItem COATED_BOARD;
public static MetaItem<?>.MetaValueItem PHENOLIC_BOARD;
Expand Down
112 changes: 43 additions & 69 deletions src/main/java/gregtech/loaders/recipe/CircuitRecipes.java
Original file line number Diff line number Diff line change
Expand Up @@ -663,75 +663,47 @@ private static void componentRecipes() {
.duration(37).EUt(VA[EV]).buildAndRegister();

// Crystal Circuit Components
LASER_ENGRAVER_RECIPES.recipeBuilder()
.input(ENGRAVED_CRYSTAL_CHIP)
.notConsumable(craftingLens, Color.Lime)
.output(CRYSTAL_CENTRAL_PROCESSING_UNIT)
.cleanroom(CleanroomType.CLEANROOM)
.duration(100).EUt(10000).buildAndRegister();

LASER_ENGRAVER_RECIPES.recipeBuilder()
.input(CRYSTAL_CENTRAL_PROCESSING_UNIT)
.notConsumable(craftingLens, Color.Blue)
.output(CRYSTAL_SYSTEM_ON_CHIP)
.cleanroom(CleanroomType.CLEANROOM)
.duration(100).EUt(40000).buildAndRegister();
CHEMICAL_BATH_RECIPES.recipeBuilder()
.input(foil, Tellurium, 21) // this ratio results in 1 tellurium + 1 promethium = 8 PRAM
.fluidInputs(Duranium.getFluid(L * 10))
.output(SPARSE_CRYSTALLINE_LATTICE, 10)
.duration(1300).EUt(VA[LuV]).buildAndRegister();

AUTOCLAVE_RECIPES.recipeBuilder()
.input(gemExquisite, Emerald)
.fluidInputs(Europium.getFluid(L / 9))
.chancedOutput(RAW_CRYSTAL_CHIP, 1000, 2000)
.cleanroom(CleanroomType.CLEANROOM)
.duration(12000).EUt(320).buildAndRegister();
.input(SPARSE_CRYSTALLINE_LATTICE)
.fluidInputs(Water.getFluid(1000))
.input(dust, AntimonyTelluride)
.output(CRYSTALLINE_WAFER)
.duration(18000).EUt(VA[IV]).buildAndRegister();

AUTOCLAVE_RECIPES.recipeBuilder()
.input(gemExquisite, Olivine)
.fluidInputs(Europium.getFluid(L / 9))
.chancedOutput(RAW_CRYSTAL_CHIP, 1000, 2000)
.cleanroom(CleanroomType.CLEANROOM)
.duration(12000).EUt(320).buildAndRegister();

FORGE_HAMMER_RECIPES.recipeBuilder()
.input(RAW_CRYSTAL_CHIP)
.output(RAW_CRYSTAL_CHIP_PART, 9)
.EUt(VA[HV]).duration(100).buildAndRegister();
.input(SPARSE_CRYSTALLINE_LATTICE)
.fluidInputs(DistilledWater.getFluid(1000))
.input(dust, AntimonyTelluride)
.output(CRYSTALLINE_WAFER)
.duration(12000).EUt(VA[IV]).buildAndRegister();

AUTOCLAVE_RECIPES.recipeBuilder()
.input(RAW_CRYSTAL_CHIP_PART)
.fluidInputs(Europium.getFluid(L / 9))
.output(RAW_CRYSTAL_CHIP)
LASER_ENGRAVER_RECIPES.recipeBuilder()
.input(CRYSTALLINE_WAFER)
.notConsumable(craftingLens, Color.Lime)
.output(CRYSTALLINE_MEMORY_UNIT)
.cleanroom(CleanroomType.CLEANROOM)
.duration(12000).EUt(VA[HV]).buildAndRegister();
.duration(100).EUt(10000).buildAndRegister();

AUTOCLAVE_RECIPES.recipeBuilder()
.input(RAW_CRYSTAL_CHIP_PART)
.fluidInputs(Mutagen.getFluid(250))
.chancedOutput(RAW_CRYSTAL_CHIP, 8000, 250)
FORGE_HAMMER_RECIPES.recipeBuilder()
.input(CRYSTALLINE_MEMORY_UNIT)
.output(CRYSTAL_MEMORY_FRAGMENT, 9)
.cleanroom(CleanroomType.CLEANROOM)
.duration(12000).EUt(VA[HV]).buildAndRegister();
.EUt(VA[HV]).duration(100).buildAndRegister();

AUTOCLAVE_RECIPES.recipeBuilder()
.input(RAW_CRYSTAL_CHIP_PART)
.fluidInputs(BacterialSludge.getFluid(250))
.chancedOutput(RAW_CRYSTAL_CHIP, 8000, 250)
ASSEMBLER_RECIPES.recipeBuilder()
.input(CRYSTAL_MEMORY_FRAGMENT)
.input(wireFine, Promethium)
.input(foil, Tantalum)
.fluidInputs(SolderingAlloy.getFluid(L / 3))
.output(PROMETHIUM_RANDOM_ACCESS_MEMORY)
.cleanroom(CleanroomType.CLEANROOM)
.duration(12000).EUt(VA[HV]).buildAndRegister();

BLAST_RECIPES.recipeBuilder()
.input(plate, Emerald)
.input(RAW_CRYSTAL_CHIP)
.fluidInputs(Helium.getFluid(1000))
.output(ENGRAVED_CRYSTAL_CHIP)
.blastFurnaceTemp(5000)
.duration(900).EUt(VA[HV]).buildAndRegister();

BLAST_RECIPES.recipeBuilder()
.input(plate, Olivine)
.input(RAW_CRYSTAL_CHIP)
.fluidInputs(Helium.getFluid(1000))
.output(ENGRAVED_CRYSTAL_CHIP)
.blastFurnaceTemp(5000)
.duration(900).EUt(VA[HV]).buildAndRegister();
.duration(200).EUt(VA[IV]).buildAndRegister();

// Quantum Parts
CHEMICAL_BATH_RECIPES.recipeBuilder()
Expand Down Expand Up @@ -1399,7 +1371,7 @@ private static void circuitRecipes() {
// IV
CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(9600).duration(200)
.input(ELITE_CIRCUIT_BOARD)
.input(CRYSTAL_CENTRAL_PROCESSING_UNIT)
.input(CRYSTALLINE_MEMORY_UNIT, 2)
.input(NANO_CENTRAL_PROCESSING_UNIT, 2)
.input(ADVANCED_SMD_CAPACITOR, 6)
.input(ADVANCED_SMD_TRANSISTOR, 6)
Expand All @@ -1411,7 +1383,8 @@ private static void circuitRecipes() {
// IV SoC
CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(86000).duration(100)
.input(ELITE_CIRCUIT_BOARD)
.input(CRYSTAL_SYSTEM_ON_CHIP)
.input(CRYSTALLINE_MEMORY_UNIT, 3)
.input(HIGHLY_ADVANCED_SOC)
.input(wireFine, NiobiumTitanium, 8)
.input(bolt, YttriumBariumCuprate, 8)
.output(CRYSTAL_PROCESSOR_IV, outputAmount * 2)
Expand All @@ -1424,7 +1397,7 @@ private static void circuitRecipes() {
.input(CRYSTAL_PROCESSOR_IV, 2)
.input(ADVANCED_SMD_INDUCTOR, 4)
.input(ADVANCED_SMD_CAPACITOR, 8)
.input(RANDOM_ACCESS_MEMORY, 24)
.input(PROMETHIUM_RANDOM_ACCESS_MEMORY, 24)
.input(wireFine, NiobiumTitanium, 16)
.output(CRYSTAL_ASSEMBLY_LUV)
.solderMultiplier(2)
Expand All @@ -1435,7 +1408,7 @@ private static void circuitRecipes() {
CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(9600).duration(400)
.input(ELITE_CIRCUIT_BOARD)
.input(CRYSTAL_ASSEMBLY_LUV, 2)
.input(RANDOM_ACCESS_MEMORY, 4)
.input(PROMETHIUM_RANDOM_ACCESS_MEMORY, 4)
.input(NOR_MEMORY_CHIP, 32)
.input(NAND_MEMORY_CHIP, 64)
.input(wireFine, NiobiumTitanium, 32)
Expand All @@ -1448,7 +1421,7 @@ private static void circuitRecipes() {
ASSEMBLY_LINE_RECIPES.recipeBuilder().EUt(VA[LuV]).duration(800)
.input(frameGt, HSSE, 2)
.input(CRYSTAL_COMPUTER_ZPM, 2)
.input(RANDOM_ACCESS_MEMORY, 32)
.input(PROMETHIUM_RANDOM_ACCESS_MEMORY, 32)
.input(HIGH_POWER_INTEGRATED_CIRCUIT, 2)
.input(wireGtSingle, NiobiumTitanium, 8)
.input(ADVANCED_SMD_INDUCTOR, 8)
Expand Down Expand Up @@ -1479,7 +1452,7 @@ private static void circuitRecipes() {
// LuV
CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(38400).duration(200)
.input(NEURO_PROCESSOR)
.input(CRYSTAL_CENTRAL_PROCESSING_UNIT)
.input(CRYSTALLINE_MEMORY_UNIT, 2)
.input(NANO_CENTRAL_PROCESSING_UNIT)
.input(ADVANCED_SMD_CAPACITOR, 8)
.input(ADVANCED_SMD_TRANSISTOR, 8)
Expand All @@ -1491,6 +1464,7 @@ private static void circuitRecipes() {
// SoC LuV
CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(150000).duration(100)
.input(NEURO_PROCESSOR)
.input(CRYSTALLINE_MEMORY_UNIT, 3)
.input(HIGHLY_ADVANCED_SOC)
.input(wireFine, YttriumBariumCuprate, 8)
.input(bolt, Naquadah, 8)
Expand All @@ -1504,7 +1478,7 @@ private static void circuitRecipes() {
.input(WETWARE_PROCESSOR_LUV, 2)
.input(ADVANCED_SMD_INDUCTOR, 6)
.input(ADVANCED_SMD_CAPACITOR, 12)
.input(RANDOM_ACCESS_MEMORY, 24)
.input(PROMETHIUM_RANDOM_ACCESS_MEMORY, 24)
.input(wireFine, YttriumBariumCuprate, 16)
.solderMultiplier(2)
.output(WETWARE_PROCESSOR_ASSEMBLY_ZPM)
Expand All @@ -1517,7 +1491,7 @@ private static void circuitRecipes() {
.input(WETWARE_PROCESSOR_ASSEMBLY_ZPM, 2)
.input(ADVANCED_SMD_DIODE, 8)
.input(NOR_MEMORY_CHIP, 16)
.input(RANDOM_ACCESS_MEMORY, 32)
.input(PROMETHIUM_RANDOM_ACCESS_MEMORY, 32)
.input(wireFine, YttriumBariumCuprate, 24)
.input(foil, Polybenzimidazole, 32)
.input(plate, Europium, 4)
Expand All @@ -1538,7 +1512,7 @@ private static void circuitRecipes() {
.input(ADVANCED_SMD_RESISTOR, 32)
.input(ADVANCED_SMD_INDUCTOR, 32)
.input(foil, Polybenzimidazole, 64)
.input(RANDOM_ACCESS_MEMORY, 32)
.input(PROMETHIUM_RANDOM_ACCESS_MEMORY, 32)
.input(wireGtDouble, EnrichedNaquadahTriniumEuropiumDuranide, 16)
.input(plate, Europium, 8)
.fluidInputs(SolderingAlloy.getFluid(L * 20))
Expand Down Expand Up @@ -1582,7 +1556,7 @@ private static void circuitRecipes() {
CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder()
.input(WETWARE_CIRCUIT_BOARD)
.input(circuit, Tier.ZPM, 2)
.input(RANDOM_ACCESS_MEMORY, 32)
.input(PROMETHIUM_RANDOM_ACCESS_MEMORY, 32)
.input(NOR_MEMORY_CHIP, 64)
.input(NAND_MEMORY_CHIP, 64)
.input(wireFine, YttriumBariumCuprate, 32)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -594,5 +594,11 @@ public static void init() {
.circuitMeta(1)
.output(dust, RTMAlloy, 7)
.buildAndRegister();

MIXER_RECIPES.recipeBuilder().duration(350).EUt(VA[IV])
.input(dust, Antimony, 2)
.input(dust, Tellurium, 3)
.output(dust, AntimonyTelluride, 5)
.buildAndRegister();
}
}
30 changes: 16 additions & 14 deletions src/main/resources/assets/gregtech/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -716,18 +716,18 @@ metaitem.wafer.system_on_chip.name=SoC Wafer
metaitem.wafer.system_on_chip.tooltip=Raw Basic Circuit
metaitem.wafer.simple_system_on_chip.name=Simple SoC Wafer
metaitem.wafer.simple_system_on_chip.tooltip=Raw Simple Circuit
metaitem.engraved.crystal_chip.name=Engraved Crystal Chip
metaitem.engraved.crystal_chip.tooltip=Needed for Circuits
metaitem.crystal.raw.name=Raw Crystal Chip
metaitem.crystal.raw.tooltip=Raw Crystal Processor
metaitem.crystal.raw_chip.name=Raw Crystal Chip Parts
metaitem.crystal.raw_chip.tooltip=Raw Crystal Processor Parts
metaitem.crystal.lattice.name=Duranium-Tellurium Sparse Lattice
metaitem.crystal.lattice.tooltip=Dr. Tellurium
metaitem.crystal.wafer.name=Crystalline Wafer
metaitem.crystal.wafer.tooltip=Crystal Superlattice
metaitem.crystal.memory_fragment.name=Crystal Memory Fragment
metaitem.crystal.memory_fragment.tooltip=Micro Memory
metaitem.engraved.lapotron_chip.name=Engraved Lapotron Crystal Chip

metaitem.crystal.central_processing_unit.name=Crystal CPU
metaitem.crystal.central_processing_unit.tooltip=Crystal Processing Unit
metaitem.crystal.system_on_chip.name=Crystal SoC
metaitem.crystal.system_on_chip.tooltip=Crystal System on Chip
metaitem.crystal.memory_unit.name=Crystalline Memory Unit
metaitem.crystal.memory_unit.tooltip=Better Processor Memory
metaitem.crystal.pram.name=PRAM
metaitem.crystal.pram.tooltip=Promethium Random Access Memory
metaitem.plate.advanced_system_on_chip.name=ASoC
metaitem.plate.advanced_system_on_chip.tooltip=Advanced System on Chip
metaitem.plate.highly_advanced_system_on_chip.name=HASoC
Expand Down Expand Up @@ -814,13 +814,13 @@ metaitem.circuit.quantum_mainframe.tooltip=Quantum Computing comes to life!/n§a

# T6: Crystal
metaitem.circuit.crystal_processor.name=Crystal Processor
metaitem.circuit.crystal_processor.tooltip=Taking Advantage of Crystal Engraving/n§9IV-Tier Circuit
metaitem.circuit.crystal_processor.tooltip=Taking Advantage of Crystal Memory/n§9IV-Tier Circuit
metaitem.circuit.crystal_assembly.name=Crystal Processor Assembly
metaitem.circuit.crystal_assembly.tooltip=Taking Advantage of Crystal Engraving/n§9LuV-Tier Circuit
metaitem.circuit.crystal_assembly.tooltip=Taking Advantage of Crystal Memory/n§9LuV-Tier Circuit
metaitem.circuit.crystal_computer.name=Crystal Supercomputer
metaitem.circuit.crystal_computer.tooltip=Taking Advantage of Crystal Engraving/n§9ZPM-Tier Circuit
metaitem.circuit.crystal_computer.tooltip=Taking Advantage of Crystal Memory/n§9ZPM-Tier Circuit
metaitem.circuit.crystal_mainframe.name=Crystal Processor Mainframe
metaitem.circuit.crystal_mainframe.tooltip=Taking Advantage of Crystal Engraving/n§9UV-Tier Circuit
metaitem.circuit.crystal_mainframe.tooltip=Taking Advantage of Crystal Memory/n§9UV-Tier Circuit

# T7: Wetware
metaitem.circuit.wetware_processor.name=Wetware Processor
Expand Down Expand Up @@ -1899,6 +1899,8 @@ gregtech.material.boron_trioxide=Boron Trioxide
gregtech.material.boron_carbide=Boron Carbide
gregtech.material.heavy_water=Heavy Water
gregtech.material.high_pressure_heavy_water=High Pressure Heavy Water
gregtech.material.antimony_telluride=Antimony Telluride


# Organic Chemistry Materials
gregtech.material.silicone_rubber=Silicone Rubber
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gregtech:items/metaitems/crystal.lattice"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gregtech:items/metaitems/crystal.memory_fragment"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gregtech:items/metaitems/crystal.memory_unit"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gregtech:items/metaitems/crystal.pram"
}
}
Loading
Loading