From b62a569ca779df15208ccfb65803161ccc75953d Mon Sep 17 00:00:00 2001 From: DStrand1 Date: Sat, 3 Jul 2021 17:23:16 -0500 Subject: [PATCH 01/21] metaitems, models --- .../java/gregtech/common/items/MetaItem2.java | 87 ++++++++++++------ .../java/gregtech/common/items/MetaItems.java | 44 +++++++-- .../loaders/recipe/CircuitRecipes.java | 36 ++++---- .../item/metaitems/circuit.advanced.json | 6 -- .../circuit.advanced_integrated.json | 6 ++ .../metaitems/circuit.advanced_parts.json | 6 -- .../item/metaitems/circuit.assembly.json | 6 ++ .../models/item/metaitems/circuit.basic.json | 6 -- .../metaitems/circuit.basic_electronic.json | 6 -- .../metaitems/circuit.basic_integrated.json | 6 ++ .../metaitems/circuit.crystal_assembly.json | 6 ++ .../metaitems/circuit.crystal_computer.json | 6 ++ .../metaitems/circuit.crystal_mainframe.json | 6 ++ .../item/metaitems/circuit.data_control.json | 6 -- .../item/metaitems/circuit.electronic.json | 6 ++ .../item/metaitems/circuit.energy_flow.json | 6 -- .../models/item/metaitems/circuit.good.json | 6 -- .../metaitems/circuit.good_electronic.json | 6 ++ .../metaitems/circuit.good_integrated.json | 6 ++ .../item/metaitems/circuit.integrated.json | 6 -- .../item/metaitems/circuit.mainframe.json | 6 ++ .../metaitems/circuit.microprocessor.json | 6 ++ .../item/metaitems/circuit.nand_chip.json | 6 ++ .../item/metaitems/circuit.nano_assembly.json | 6 ++ .../item/metaitems/circuit.nano_computer.json | 6 ++ .../metaitems/circuit.nano_mainframe.json | 6 ++ .../circuit.nano_processor_assembly.json | 6 -- .../item/metaitems/circuit.processor.json | 6 ++ .../metaitems/circuit.processor_assembly.json | 6 -- .../metaitems/circuit.quantum_assembly.json | 6 ++ .../metaitems/circuit.quantum_computer.json | 6 ++ .../metaitems/circuit.quantum_mainframe.json | 6 ++ .../metaitems/circuit.wetware_computer.json | 6 ++ .../circuit.wetware_super_computer.json | 6 -- .../item/metaitems/circuit.workstation.json | 6 ++ .../items/metaitems/circuit.data_control.png | Bin 369 -> 0 bytes .../items/metaitems/circuit.energy_flow.png | Bin 364 -> 0 bytes .../items/metaitems/circuit.integrated.png | Bin 318 -> 0 bytes ...puter.png => circuit.wetware_computer.png} | Bin 39 files changed, 238 insertions(+), 121 deletions(-) delete mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.advanced.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.advanced_integrated.json delete mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.advanced_parts.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.assembly.json delete mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.basic.json delete mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.basic_electronic.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.basic_integrated.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.crystal_assembly.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.crystal_computer.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.crystal_mainframe.json delete mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.data_control.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.electronic.json delete mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.energy_flow.json delete mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.good.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.good_electronic.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.good_integrated.json delete mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.integrated.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.mainframe.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.microprocessor.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.nand_chip.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_assembly.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_computer.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_mainframe.json delete mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_processor_assembly.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.processor.json delete mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.processor_assembly.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.quantum_assembly.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.quantum_computer.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.quantum_mainframe.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.wetware_computer.json delete mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.wetware_super_computer.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit.workstation.json delete mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/circuit.data_control.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/circuit.energy_flow.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/circuit.integrated.png rename src/main/resources/assets/gregtech/textures/items/metaitems/{circuit.wetware_super_computer.png => circuit.wetware_computer.png} (100%) diff --git a/src/main/java/gregtech/common/items/MetaItem2.java b/src/main/java/gregtech/common/items/MetaItem2.java index 2714ba839fa..aaddf8ef705 100644 --- a/src/main/java/gregtech/common/items/MetaItem2.java +++ b/src/main/java/gregtech/common/items/MetaItem2.java @@ -75,9 +75,9 @@ public void registerSubItems() { ENERGY_FIELD_PROJECTOR = addItem(578, "energy_field_projector").addComponents(ElectricStats.createElectricItem(16000000L, GTValues.EV)).setMaxStackSize(1); SCANNER = addItem(579, "scanner").addComponents(ElectricStats.createElectricItem(200_000L, GTValues.LV), new ScannerBehavior(50)); - CARBON_FIBERS = addItem(504, "carbon.fibers"); - CARBON_MESH = addItem(505, "carbon.mesh"); - CARBON_PLATE = addItem(506, "carbon.plate"); + CARBON_FIBERS = addItem(526, "carbon.fibers"); + CARBON_MESH = addItem(527, "carbon.mesh"); + CARBON_PLATE = addItem(528, "carbon.plate"); INGOT_MIXED_METAL = addItem(432, "ingot.mixed_metal"); ADVANCED_ALLOY_PLATE = addItem(433, "plate.advanced_alloy"); INGOT_IRIDIUM_ALLOY = addItem(434, "ingot.iridium_alloy"); @@ -139,34 +139,61 @@ public void registerSubItems() { RANDOM_ACCESS_MEMORY = addItem(485, "plate.random_access_memory"); SYSTEM_ON_CHIP = addItem(486, "plate.system_on_chip"); - BASIC_CIRCUIT_LV = addItem(487, "circuit.basic").setUnificationData(OrePrefix.circuit, Tier.Basic); - BASIC_ELECTRONIC_CIRCUIT_LV = addItem(488, "circuit.basic_electronic").setUnificationData(OrePrefix.circuit, Tier.Basic); - ADVANCED_CIRCUIT_PARTS_LV = addItem(507, "circuit.advanced_parts").setUnificationData(OrePrefix.circuit, Tier.Basic); - GOOD_INTEGRATED_CIRCUIT_MV = addItem(489, "circuit.good").setUnificationData(OrePrefix.circuit, Tier.Good); - ADVANCED_CIRCUIT_MV = addItem(490, "circuit.advanced").setUnificationData(OrePrefix.circuit, Tier.Good); - - PROCESSOR_ASSEMBLY_HV = addItem(491, "circuit.processor_assembly").setUnificationData(OrePrefix.circuit, Tier.Advanced); - NANO_PROCESSOR_HV = addItem(492, "circuit.nano_processor").setUnificationData(OrePrefix.circuit, Tier.Advanced); - - NANO_PROCESSOR_ASSEMBLY_EV = addItem(493, "circuit.nano_processor_assembly").setUnificationData(OrePrefix.circuit, Tier.Extreme); - QUANTUM_PROCESSOR_EV = addItem(494, "circuit.quantum_processor").setUnificationData(OrePrefix.circuit, Tier.Extreme); - - DATA_CONTROL_CIRCUIT_IV = addItem(495, "circuit.data_control").setUnificationData(OrePrefix.circuit, Tier.Elite); - CRYSTAL_PROCESSOR_IV = addItem(496, "circuit.crystal_processor").setUnificationData(OrePrefix.circuit, Tier.Elite); - - ENERGY_FLOW_CIRCUIT_LUV = addItem(497, "circuit.energy_flow").setUnificationData(OrePrefix.circuit, Tier.Master); - WETWARE_PROCESSOR_LUV = addItem(498, "circuit.wetware_processor").setUnificationData(OrePrefix.circuit, Tier.Master); - - WETWARE_PROCESSOR_ASSEMBLY_ZPM = addItem(499, "circuit.wetware_assembly").setUnificationData(OrePrefix.circuit, Tier.Ultimate); - WETWARE_SUPER_COMPUTER_UV = addItem(500, "circuit.wetware_super_computer").setUnificationData(OrePrefix.circuit, Tier.Superconductor); - WETWARE_MAINFRAME_MAX = addItem(501, "circuit.wetware_mainframe").setUnificationData(OrePrefix.circuit, Tier.Infinite); - - ENGRAVED_CRYSTAL_CHIP = addItem(502, "engraved.crystal_chip"); - ENGRAVED_LAPOTRON_CHIP = addItem(503, "engraved.lapotron_chip"); - - TURBINE_ROTOR = addItem(508, "turbine_rotor").addComponents(new TurbineRotorBehavior()); - COVER_FACADE = addItem(509, "cover.facade").addComponents(new FacadeItem()).disableModelLoading(); + // CIRCUITS + + // T1: Electronic todo: textures + ELECTRONIC_CIRCUIT_LV = addItem(487, "circuit.electronic").setUnificationData(OrePrefix.circuit, Tier.Basic); + ELECTRONIC_CIRCUIT_MV = addItem(488, "circuit.good_electronic").setUnificationData(OrePrefix.circuit, Tier.Good); + + // T2: Integrated todo textures + INTEGRATED_CIRCUIT_LV = addItem(489, "circuit.basic_integrated").setUnificationData(OrePrefix.circuit, Tier.Basic); + INTEGRATED_CIRCUIT_MV = addItem(490, "circuit.good_integrated").setUnificationData(OrePrefix.circuit, Tier.Good); + INTEGRATED_CIRCUIT_HV = addItem(491, "circuit.advanced_integrated").setUnificationData(OrePrefix.circuit, Tier.Advanced); + + // Misc Unlocks todo textures + NAND_CHIP_ULV = addItem(492, "circuit.nand_chip").setUnificationData(OrePrefix.circuit, Tier.Primitive); + MICROPROCESSOR_LV = addItem(493, "circuit.microprocessor").setUnificationData(OrePrefix.circuit, Tier.Basic); + + // T3: Processor todo textures + PROCESSOR_MV = addItem(494, "circuit.processor").setUnificationData(OrePrefix.circuit, Tier.Good); + PROCESSOR_ASSEMBLY_HV = addItem(495, "circuit.assembly").setUnificationData(OrePrefix.circuit, Tier.Advanced); + WORKSTATION_EV = addItem(496, "circuit.workstation").setUnificationData(OrePrefix.circuit, Tier.Extreme); + MAINFRAME_IV = addItem(497, "circuit.mainframe").setUnificationData(OrePrefix.circuit, Tier.Elite); + + // T4: Nano todo textures + NANO_PROCESSOR_HV = addItem(498, "circuit.nano_processor").setUnificationData(OrePrefix.circuit, Tier.Advanced); + NANO_PROCESSOR_ASSEMBLY_EV = addItem(499, "circuit.nano_assembly").setUnificationData(OrePrefix.circuit, Tier.Extreme); + NANO_COMPUTER_IV = addItem(500, "circuit.nano_computer").setUnificationData(OrePrefix.circuit, Tier.Elite); + NANO_MAINFRAME_LUV = addItem(501, "circuit.nano_mainframe").setUnificationData(OrePrefix.circuit, Tier.Master); + + // T5: Quantum todo textures + QUANTUM_PROCESSOR_EV = addItem(502, "circuit.quantum_processor").setUnificationData(OrePrefix.circuit, Tier.Extreme); + QUANTUM_ASSEMBLY_IV = addItem(503, "circuit.quantum_assembly").setUnificationData(OrePrefix.circuit, Tier.Elite); + QUANTUM_COMPUTER_LUV = addItem(504, "circuit.quantum_computer").setUnificationData(OrePrefix.circuit, Tier.Master); + QUANTUM_MAINFRAME_ZPM = addItem(505, "circuit.quantum_mainframe").setUnificationData(OrePrefix.circuit, Tier.Ultimate); + + // T6: Crystal todo textures + CRYSTAL_PROCESSOR_IV = addItem(506, "circuit.crystal_processor").setUnificationData(OrePrefix.circuit, Tier.Elite); + CRYSTAL_ASSEMBLY_LUV = addItem(507, "circuit.crystal_assembly").setUnificationData(OrePrefix.circuit, Tier.Master); + CRYSTAL_COMPUTER_ZPM = addItem(508, "circuit.crystal_computer").setUnificationData(OrePrefix.circuit, Tier.Ultimate); + CRYSTAL_MAINFRAME_UV = addItem(509, "circuit.crystal_mainframe").setUnificationData(OrePrefix.circuit, Tier.Superconductor); + + // T7: Wetware + WETWARE_PROCESSOR_LUV = addItem(510, "circuit.wetware_processor").setUnificationData(OrePrefix.circuit, Tier.Master); + WETWARE_PROCESSOR_ASSEMBLY_ZPM = addItem(511, "circuit.wetware_assembly").setUnificationData(OrePrefix.circuit, Tier.Ultimate); + WETWARE_SUPER_COMPUTER_UV = addItem(512, "circuit.wetware_computer").setUnificationData(OrePrefix.circuit, Tier.Superconductor); + WETWARE_MAINFRAME_MAX = addItem(513, "circuit.wetware_mainframe").setUnificationData(OrePrefix.circuit, Tier.Infinite); + + // TODO REMOVE THESE + DATA_CONTROL_CIRCUIT_IV = addItem(518, "circuit.data_control").setUnificationData(OrePrefix.circuit, Tier.Elite); + ENERGY_FLOW_CIRCUIT_LUV = addItem(519, "circuit.energy_flow").setUnificationData(OrePrefix.circuit, Tier.Master); + + ENGRAVED_CRYSTAL_CHIP = addItem(514, "engraved.crystal_chip"); + ENGRAVED_LAPOTRON_CHIP = addItem(515, "engraved.lapotron_chip"); + + TURBINE_ROTOR = addItem(516, "turbine_rotor").addComponents(new TurbineRotorBehavior()); + COVER_FACADE = addItem(517, "cover.facade").addComponents(new FacadeItem()).disableModelLoading(); FLUID_REGULATORS[0] = FLUID_REGULATOR_LV = addItem(700, "fluid.regulator.lv"); FLUID_REGULATORS[1] = FLUID_REGULATOR_MV = addItem(701, "fluid.regulator.mv"); diff --git a/src/main/java/gregtech/common/items/MetaItems.java b/src/main/java/gregtech/common/items/MetaItems.java index c5ded6bba22..6c770c5c3e1 100644 --- a/src/main/java/gregtech/common/items/MetaItems.java +++ b/src/main/java/gregtech/common/items/MetaItems.java @@ -289,23 +289,53 @@ private MetaItems() { public static MetaItem.MetaValueItem SMD_TRANSISTOR; public static MetaItem.MetaValueItem TRANSISTOR; - public static MetaItem.MetaValueItem BASIC_CIRCUIT_LV; - public static MetaItem.MetaValueItem BASIC_ELECTRONIC_CIRCUIT_LV; - public static MetaItem.MetaValueItem ADVANCED_CIRCUIT_PARTS_LV; - public static MetaItem.MetaValueItem GOOD_INTEGRATED_CIRCUIT_MV; - public static MetaItem.MetaValueItem ADVANCED_CIRCUIT_MV; + // T1: Electronic + public static MetaItem.MetaValueItem ELECTRONIC_CIRCUIT_LV; + public static MetaItem.MetaValueItem ELECTRONIC_CIRCUIT_MV; + + // T2: Integrated + public static MetaItem.MetaValueItem INTEGRATED_CIRCUIT_LV; + public static MetaItem.MetaValueItem INTEGRATED_CIRCUIT_MV; + public static MetaItem.MetaValueItem INTEGRATED_CIRCUIT_HV; + + // ULV/LV easier circuits + public static MetaItem.MetaValueItem NAND_CHIP_ULV; + public static MetaItem.MetaValueItem MICROPROCESSOR_LV; + + // T3: Processor + public static MetaItem.MetaValueItem PROCESSOR_MV; public static MetaItem.MetaValueItem PROCESSOR_ASSEMBLY_HV; + public static MetaItem.MetaValueItem WORKSTATION_EV; + public static MetaItem.MetaValueItem MAINFRAME_IV; + + // T4: Nano public static MetaItem.MetaValueItem NANO_PROCESSOR_HV; public static MetaItem.MetaValueItem NANO_PROCESSOR_ASSEMBLY_EV; + public static MetaItem.MetaValueItem NANO_COMPUTER_IV; + public static MetaItem.MetaValueItem NANO_MAINFRAME_LUV; + + // T5: Quantum public static MetaItem.MetaValueItem QUANTUM_PROCESSOR_EV; - public static MetaItem.MetaValueItem DATA_CONTROL_CIRCUIT_IV; + public static MetaItem.MetaValueItem QUANTUM_ASSEMBLY_IV; + public static MetaItem.MetaValueItem QUANTUM_COMPUTER_LUV; + public static MetaItem.MetaValueItem QUANTUM_MAINFRAME_ZPM; + + // T6: Crystal public static MetaItem.MetaValueItem CRYSTAL_PROCESSOR_IV; - public static MetaItem.MetaValueItem ENERGY_FLOW_CIRCUIT_LUV; + public static MetaItem.MetaValueItem CRYSTAL_ASSEMBLY_LUV; + public static MetaItem.MetaValueItem CRYSTAL_COMPUTER_ZPM; + public static MetaItem.MetaValueItem CRYSTAL_MAINFRAME_UV; + + // T7: Wetware public static MetaItem.MetaValueItem WETWARE_PROCESSOR_LUV; public static MetaItem.MetaValueItem WETWARE_PROCESSOR_ASSEMBLY_ZPM; public static MetaItem.MetaValueItem WETWARE_SUPER_COMPUTER_UV; public static MetaItem.MetaValueItem WETWARE_MAINFRAME_MAX; + // TODO Remove these two + public static MetaItem.MetaValueItem DATA_CONTROL_CIRCUIT_IV; // was basically the Quantum Assembly + public static MetaItem.MetaValueItem ENERGY_FLOW_CIRCUIT_LUV; // was basically the Crystal Assembly + public static MetaItem.MetaValueItem COMPONENT_SAW_BLADE_DIAMOND; public static MetaItem.MetaValueItem COMPONENT_GRINDER_DIAMOND; public static MetaItem.MetaValueItem COMPONENT_GRINDER_TUNGSTEN; diff --git a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java index 4f68af4e8c9..02d3c4d26a4 100644 --- a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java @@ -656,7 +656,7 @@ private static void boardRecipes() { private static void circuitRecipes() { // Handcrafted Circuits - ModHandler.addShapedRecipe("basic_circuit", BASIC_CIRCUIT_LV.getStackForm(), + ModHandler.addShapedRecipe("basic_circuit", ELECTRONIC_CIRCUIT_LV.getStackForm(), "RPR", "VBV", "CCC", 'R', RESISTOR.getStackForm(), 'P', new UnificationEntry(plate, Steel), @@ -664,11 +664,11 @@ private static void circuitRecipes() { 'B', COATED_BOARD.getStackForm(), 'C', new UnificationEntry(cableGtSingle, RedAlloy)); - ModHandler.addShapedRecipe("good_circuit", GOOD_INTEGRATED_CIRCUIT_MV.getStackForm(), + ModHandler.addShapedRecipe("good_circuit", INTEGRATED_CIRCUIT_MV.getStackForm(), "RCP", "CDC", "PCR", 'R', new UnificationEntry(cableGtSingle, RedAlloy), 'P', new UnificationEntry(plate, Steel), - 'C', BASIC_CIRCUIT_LV.getStackForm(), + 'C', ELECTRONIC_CIRCUIT_LV.getStackForm(), 'D', DIODE.getStackForm()); //circuit assembling recipes TODO @@ -683,7 +683,7 @@ private static void circuitRecipes() { .input(RESISTOR, 2) .input(wireFine, Copper) .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(BASIC_ELECTRONIC_CIRCUIT_LV) + .output(INTEGRATED_CIRCUIT_LV) .buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(8) @@ -692,7 +692,7 @@ private static void circuitRecipes() { .input(SMD_RESISTOR, 2) .input(wireFine, Copper) .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(BASIC_ELECTRONIC_CIRCUIT_LV) + .output(INTEGRATED_CIRCUIT_LV) .buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(60) @@ -703,7 +703,7 @@ private static void circuitRecipes() { .input(TRANSISTOR, 4) .input(wireFine, Copper, 2) .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(ADVANCED_CIRCUIT_PARTS_LV, 4) + .output(MICROPROCESSOR_LV, 4) .buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(60) @@ -714,7 +714,7 @@ private static void circuitRecipes() { .input(SMD_TRANSISTOR, 4) .input(wireFine, Copper, 2) .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(ADVANCED_CIRCUIT_PARTS_LV, 4) + .output(MICROPROCESSOR_LV, 4) .buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().duration(50).EUt(600) @@ -722,26 +722,26 @@ private static void circuitRecipes() { .input(SYSTEM_ON_CHIP, 4) .input(wireFine, Copper, 2) .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(ADVANCED_CIRCUIT_PARTS_LV, 4) + .output(MICROPROCESSOR_LV, 4) .buildAndRegister(); // MV Circuits ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(16) .input(PHENOLIC_BOARD) - .input(BASIC_ELECTRONIC_CIRCUIT_LV, 3) + .input(INTEGRATED_CIRCUIT_LV, 3) .input(RESISTOR, 4) .input(wireFine, Gold, 8) .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(GOOD_INTEGRATED_CIRCUIT_MV) + .output(INTEGRATED_CIRCUIT_MV) .buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(16) .input(PHENOLIC_BOARD) - .input(BASIC_ELECTRONIC_CIRCUIT_LV, 3) + .input(INTEGRATED_CIRCUIT_LV, 3) .input(SMD_RESISTOR, 4) .input(wireFine, Gold, 8) .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(GOOD_INTEGRATED_CIRCUIT_MV) + .output(INTEGRATED_CIRCUIT_MV) .buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(60) @@ -752,7 +752,7 @@ private static void circuitRecipes() { .input(TRANSISTOR, 2) .input(wireFine, RedAlloy, 2) .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(ADVANCED_CIRCUIT_MV) + .output(PROCESSOR_MV) .buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(60) @@ -763,7 +763,7 @@ private static void circuitRecipes() { .input(SMD_TRANSISTOR, 2) .input(wireFine, RedAlloy, 2) .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(ADVANCED_CIRCUIT_MV) + .output(PROCESSOR_MV) .buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().duration(50).EUt(2400) @@ -771,13 +771,13 @@ private static void circuitRecipes() { .input(SYSTEM_ON_CHIP) .input(wireFine, RedAlloy, 2) .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(ADVANCED_CIRCUIT_MV) + .output(PROCESSOR_MV) .buildAndRegister(); // HV Circuits ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(90) .input(PLASTIC_BOARD) - .input(ADVANCED_CIRCUIT_MV, 2) + .input(PROCESSOR_MV, 2) .input(SMALL_COIL, 4) .input(CAPACITOR, 4) .input(RANDOM_ACCESS_MEMORY, 4) @@ -788,7 +788,7 @@ private static void circuitRecipes() { ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(90) .input(PLASTIC_BOARD) - .input(ADVANCED_CIRCUIT_MV, 2) + .input(PROCESSOR_MV, 2) .input(SMALL_COIL, 4) .input(SMD_CAPACITOR, 4) .input(RANDOM_ACCESS_MEMORY, 4) @@ -949,7 +949,7 @@ private static void circuitRecipes() { ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(90) .input(PLASTIC_BOARD) - .input(ADVANCED_CIRCUIT_MV) + .input(PROCESSOR_MV) .input(NAND_MEMORY_CHIP, 32) .input(RANDOM_ACCESS_MEMORY, 4) .input(wireFine, RedAlloy, 8) diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.advanced.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.advanced.json deleted file mode 100644 index 82937edd981..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.advanced.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/circuit.advanced" - } -} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.advanced_integrated.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.advanced_integrated.json new file mode 100644 index 00000000000..457acc54bac --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.advanced_integrated.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.advanced_integrated" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.advanced_parts.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.advanced_parts.json deleted file mode 100644 index 6347871ebfc..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.advanced_parts.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/circuit.advanced_parts" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.assembly.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.assembly.json new file mode 100644 index 00000000000..0421adbe465 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.assembly.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.assembly" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.basic.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.basic.json deleted file mode 100644 index ce5f6ae002f..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.basic.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/circuit.basic" - } -} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.basic_electronic.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.basic_electronic.json deleted file mode 100644 index 2b010b694be..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.basic_electronic.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/circuit.basic_electronic" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.basic_integrated.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.basic_integrated.json new file mode 100644 index 00000000000..f511a78e042 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.basic_integrated.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.basic_integrated" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.crystal_assembly.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.crystal_assembly.json new file mode 100644 index 00000000000..306446bca20 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.crystal_assembly.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.crystal_assembly" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.crystal_computer.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.crystal_computer.json new file mode 100644 index 00000000000..26b6a715c9f --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.crystal_computer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.crystal_computer" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.crystal_mainframe.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.crystal_mainframe.json new file mode 100644 index 00000000000..357da1aa751 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.crystal_mainframe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.crystal_mainframe" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.data_control.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.data_control.json deleted file mode 100644 index 81c657f2b69..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.data_control.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/circuit.data_control" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.electronic.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.electronic.json new file mode 100644 index 00000000000..a3dbb71ac08 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.electronic.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.electronic" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.energy_flow.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.energy_flow.json deleted file mode 100644 index 4dcda12bde5..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.energy_flow.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/circuit.energy_flow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.good.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.good.json deleted file mode 100644 index e898b3e4d07..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.good.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/circuit.good" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.good_electronic.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.good_electronic.json new file mode 100644 index 00000000000..acf64484b0d --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.good_electronic.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.good_electronic" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.good_integrated.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.good_integrated.json new file mode 100644 index 00000000000..419557b0f61 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.good_integrated.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.good_integrated" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.integrated.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.integrated.json deleted file mode 100644 index 8240e4fdcae..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.integrated.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/circuit.integrated" - } -} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.mainframe.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.mainframe.json new file mode 100644 index 00000000000..3edd262e4e2 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.mainframe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.mainframe" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.microprocessor.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.microprocessor.json new file mode 100644 index 00000000000..9bca9dfd85d --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.microprocessor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.microprocessor" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nand_chip.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nand_chip.json new file mode 100644 index 00000000000..7db1fe761f6 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nand_chip.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.nand_chip" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_assembly.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_assembly.json new file mode 100644 index 00000000000..cbdf360576b --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_assembly.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.nano_assembly" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_computer.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_computer.json new file mode 100644 index 00000000000..33cdca41503 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_computer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.nano_computer" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_mainframe.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_mainframe.json new file mode 100644 index 00000000000..e798c199dd3 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_mainframe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.nano_mainframe" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_processor_assembly.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_processor_assembly.json deleted file mode 100644 index 190bf69d190..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.nano_processor_assembly.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/circuit.nano_processor_assembly" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.processor.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.processor.json new file mode 100644 index 00000000000..e8b13cd8536 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.processor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.processor" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.processor_assembly.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.processor_assembly.json deleted file mode 100644 index a497f091a29..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.processor_assembly.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/circuit.processor_assembly" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.quantum_assembly.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.quantum_assembly.json new file mode 100644 index 00000000000..c0d7c4bb7c7 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.quantum_assembly.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.quantum_assembly" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.quantum_computer.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.quantum_computer.json new file mode 100644 index 00000000000..3ccf52bba4b --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.quantum_computer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.quantum_computer" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.quantum_mainframe.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.quantum_mainframe.json new file mode 100644 index 00000000000..7187b5848b0 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.quantum_mainframe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.quantum_mainframe" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.wetware_computer.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.wetware_computer.json new file mode 100644 index 00000000000..38951c7214d --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.wetware_computer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.wetware_computer" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.wetware_super_computer.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.wetware_super_computer.json deleted file mode 100644 index 85fd106b658..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.wetware_super_computer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/circuit.wetware_super_computer" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit.workstation.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.workstation.json new file mode 100644 index 00000000000..e98dd30a95a --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit.workstation.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit.workstation" + } +} diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.data_control.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.data_control.png deleted file mode 100644 index 2497642c3e8cdc962367d3aac587519fb04001e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p<)L71^VC4M4MkiEpy*OmPq6Dz-oifXsYHlUD1iEBhjaDG}z zd16s2LqTF@UWr~_YKel0o}r%EUq8+lKsDz*T^vI!{Cg*C6g^}h;C%P8F@x~V1m(5` z%N_f!trWz(9pZNqi5ISy6(#JD^5Uek%L zTg(~zj^Fyl<)6DEgAN;Yv(DJG&gE@g>>)*2qx;{^_6QX%efIfqib%z?fROn&o5b%Z zyeKnXyGEgS;cW)T#`_Kr3+|-uHJW$UUtq^o`S>-9dsO#2zOCaHm8`#OcgsOy+5tPA z{Jt+MRI`@*RH^a2>T0<#EA_Pel>E&LfX-k{3lF%zmE$3==E4=*tQ(iy1A2|Y)78&q Iol`;+0Njj=4gdfE diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.energy_flow.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.energy_flow.png deleted file mode 100644 index d6ff394c66ccb992281a3e9fb060e7c29522f700..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggKCRTnk;q?rUt${*6JzX3_EKaYTY}j?kL85hkOG0|4 zD$hL!iH_E#>K>03bAp!KV9wE69eP7qppH+WjpcrT&KR{Libw`}=(JuZgx5|97%Zt#|i?iaT|5_mH7d6&n++qWD_ zP1$!Z+4ItV#ky+;kF=kx`VtW0cKZGuM*T%%3p3gMl}+A0$n5mB4w#$WQ&9jQ>u8-&Bc@Hb_*o4n)WxUZK z@4xMY&ji&?jM5Y8=S3c=4RK_fV-|Y#cf)}@bNLzSSiW*Aww!+S*do9y^P1YyzWst% zIUej~XRvrap?F=gSLTXZj@L3yD_(uJxvrGVGb29wTGX~{pLX;7D7oiMfV9c|frcmi+r88&rX5oj-0xM})@wqZ{aqK51X@k+;T6=0KLWF>FVdQ I&MBb@01DuM3jhEB diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.wetware_super_computer.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.wetware_computer.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/circuit.wetware_super_computer.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/circuit.wetware_computer.png From 90a33b1183cfbb9c5ea3608f170c82c74006cd15 Mon Sep 17 00:00:00 2001 From: DStrand1 Date: Sat, 3 Jul 2021 22:20:11 -0500 Subject: [PATCH 02/21] lang, pngs, add Nt boule, SSoC, HASoC --- .../java/gregtech/common/ClientProxy.java | 2 +- .../java/gregtech/common/items/MetaItem2.java | 198 ++++++++++-------- .../java/gregtech/common/items/MetaItems.java | 8 +- .../resources/assets/gregtech/lang/en_us.lang | 130 +++++++++--- .../item/metaitems/boule.neutronium.json | 6 + .../plate.highly_advanced_system_on_chip.json | 6 + .../plate.simple_system_on_chip.json | 6 + .../wafer.highly_advanced_system_on_chip.json | 6 + .../item/metaitems/wafer.neutronium.json | 6 + .../wafer.simple_system_on_chip.json | 6 + .../items/metaitems/boule.neutronium.png | Bin 0 -> 3744 bytes .../metaitems/circuit.advanced_integrated.png | Bin 0 -> 1703 bytes ...ssor_assembly.png => circuit.assembly.png} | Bin .../items/metaitems/circuit.basic.png | Bin 305 -> 0 bytes ...ronic.png => circuit.basic_integrated.png} | Bin .../metaitems/circuit.crystal_assembly.png | Bin 0 -> 3023 bytes .../metaitems/circuit.crystal_computer.png | Bin 0 -> 3262 bytes .../metaitems/circuit.crystal_mainframe.png | Bin 0 -> 4043 bytes .../metaitems/circuit.crystal_processor.png | Bin 370 -> 319 bytes .../items/metaitems/circuit.electronic.png | Bin 0 -> 1698 bytes .../metaitems/circuit.good_electronic.png | Bin 0 -> 2992 bytes ...t.good.png => circuit.good_integrated.png} | Bin .../items/metaitems/circuit.mainframe.png | Bin 0 -> 4051 bytes ...d_parts.png => circuit.microprocessor.png} | Bin ...it.primitive.png => circuit.nand_chip.png} | Bin ...assembly.png => circuit.nano_assembly.png} | Bin .../items/metaitems/circuit.nano_computer.png | Bin 0 -> 1065 bytes .../metaitems/circuit.nano_mainframe.png | Bin 0 -> 4039 bytes ...uit.advanced.png => circuit.processor.png} | Bin .../metaitems/circuit.quantum_assembly.png | Bin 0 -> 348 bytes .../metaitems/circuit.quantum_computer.png | Bin 0 -> 1001 bytes .../metaitems/circuit.quantum_mainframe.png | Bin 0 -> 4062 bytes ...rcuit.data.png => circuit.workstation.png} | Bin .../plate.highly_advanced_system_on_chip.png | Bin 0 -> 3764 bytes .../metaitems/plate.simple_system_on_chip.png | Bin 0 -> 3923 bytes .../wafer.highly_advanced_system_on_chip.png | Bin 0 -> 3902 bytes .../items/metaitems/wafer.neutronium.png | Bin 0 -> 3945 bytes .../metaitems/wafer.simple_system_on_chip.png | Bin 0 -> 4232 bytes 38 files changed, 250 insertions(+), 124 deletions(-) create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/boule.neutronium.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/plate.highly_advanced_system_on_chip.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/plate.simple_system_on_chip.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/wafer.highly_advanced_system_on_chip.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/wafer.neutronium.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/wafer.simple_system_on_chip.json create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/boule.neutronium.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/circuit.advanced_integrated.png rename src/main/resources/assets/gregtech/textures/items/metaitems/{circuit.processor_assembly.png => circuit.assembly.png} (100%) delete mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/circuit.basic.png rename src/main/resources/assets/gregtech/textures/items/metaitems/{circuit.basic_electronic.png => circuit.basic_integrated.png} (100%) create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/circuit.crystal_assembly.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/circuit.crystal_computer.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/circuit.crystal_mainframe.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/circuit.electronic.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/circuit.good_electronic.png rename src/main/resources/assets/gregtech/textures/items/metaitems/{circuit.good.png => circuit.good_integrated.png} (100%) create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/circuit.mainframe.png rename src/main/resources/assets/gregtech/textures/items/metaitems/{circuit.advanced_parts.png => circuit.microprocessor.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{circuit.primitive.png => circuit.nand_chip.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{circuit.nano_processor_assembly.png => circuit.nano_assembly.png} (100%) create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/circuit.nano_computer.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/circuit.nano_mainframe.png rename src/main/resources/assets/gregtech/textures/items/metaitems/{circuit.advanced.png => circuit.processor.png} (100%) create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/circuit.quantum_assembly.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/circuit.quantum_computer.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/circuit.quantum_mainframe.png rename src/main/resources/assets/gregtech/textures/items/metaitems/{circuit.data.png => circuit.workstation.png} (100%) create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/plate.highly_advanced_system_on_chip.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/plate.simple_system_on_chip.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/wafer.highly_advanced_system_on_chip.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/wafer.neutronium.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/wafer.simple_system_on_chip.png diff --git a/src/main/java/gregtech/common/ClientProxy.java b/src/main/java/gregtech/common/ClientProxy.java index 862383ff7fa..c839a5d691f 100644 --- a/src/main/java/gregtech/common/ClientProxy.java +++ b/src/main/java/gregtech/common/ClientProxy.java @@ -164,7 +164,7 @@ public static void addMaterialFormulaHandler(ItemTooltipEvent event) { chemicalFormula = FluidTooltipUtil.getWaterTooltip(); } if (chemicalFormula != null && !chemicalFormula.isEmpty()) - event.getToolTip().add(1, ChatFormatting.GRAY.toString() + chemicalFormula); + event.getToolTip().add(1, ChatFormatting.YELLOW.toString() + chemicalFormula); } } diff --git a/src/main/java/gregtech/common/items/MetaItem2.java b/src/main/java/gregtech/common/items/MetaItem2.java index aaddf8ef705..b5bce09fc9b 100644 --- a/src/main/java/gregtech/common/items/MetaItem2.java +++ b/src/main/java/gregtech/common/items/MetaItem2.java @@ -52,6 +52,15 @@ public void registerSubItems() { FIRECLAY_BRICK = addItem(15, "brick.fireclay"); COKE_OVEN_BRICK = addItem(16, "brick.coke"); + SILICON_BOULE = addItem(20, "boule.silicon"); + GLOWSTONE_BOULE = addItem(21, "boule.glowstone"); + NAQUADAH_BOULE = addItem(22, "boule.naquadah"); + NEUTRONIUM_BOULE = addItem(23, "boule.neutronium"); + SILICON_WAFER = addItem(24, "wafer.silicon"); + GLOWSTONE_WAFER = addItem(25, "wafer.glowstone"); + NAQUADAH_WAFER = addItem(26, "wafer.naquadah"); + NEUTRONIUM_WAFER = addItem(27, "wafer.neutronium"); + BOTTLE_PURPLE_DRINK = addItem(100, "bottle.purple.drink").addComponents(new FoodStats(8, 0.2F, true, true, new ItemStack(Items.GLASS_BOTTLE), new RandomPotionEffect(MobEffects.HASTE, 800, 1, 90))); ENERGY_CRYSTAL = addItem(212, "energy_crystal").addComponents(ElectricStats.createRechargeableBattery(4000000L, GTValues.HV)).setModelAmount(8).setMaxStackSize(1); @@ -75,22 +84,15 @@ public void registerSubItems() { ENERGY_FIELD_PROJECTOR = addItem(578, "energy_field_projector").addComponents(ElectricStats.createElectricItem(16000000L, GTValues.EV)).setMaxStackSize(1); SCANNER = addItem(579, "scanner").addComponents(ElectricStats.createElectricItem(200_000L, GTValues.LV), new ScannerBehavior(50)); - CARBON_FIBERS = addItem(526, "carbon.fibers"); - CARBON_MESH = addItem(527, "carbon.mesh"); - CARBON_PLATE = addItem(528, "carbon.plate"); + CARBON_FIBERS = addItem(537, "carbon.fibers"); + CARBON_MESH = addItem(538, "carbon.mesh"); + CARBON_PLATE = addItem(539, "carbon.plate"); INGOT_MIXED_METAL = addItem(432, "ingot.mixed_metal"); ADVANCED_ALLOY_PLATE = addItem(433, "plate.advanced_alloy"); INGOT_IRIDIUM_ALLOY = addItem(434, "ingot.iridium_alloy"); PLATE_IRIDIUM_ALLOY = addItem(435, "plate.iridium_alloy"); NEUTRON_REFLECTOR = addItem(436, "neutron_reflector"); - SILICON_BOULE = addItem(439, "boule.silicon"); - GLOWSTONE_BOULE = addItem(437, "boule.glowstone"); - NAQUADAH_BOULE = addItem(438, "boule.naquadah"); - SILICON_WAFER = addItem(440, "wafer.silicon"); - GLOWSTONE_WAFER = addItem(441, "wafer.glowstone"); - NAQUADAH_WAFER = addItem(442, "wafer.naquadah"); - COATED_BOARD = addItem(443, "board.coated"); EPOXY_BOARD = addItem(444, "board.epoxy"); FIBER_BOARD = addItem(445, "board.fiber_reinforced"); @@ -112,88 +114,92 @@ public void registerSubItems() { SMD_TRANSISTOR = addItem(460, "component.smd.transistor"); TRANSISTOR = addItem(461, "component.transistor"); - ADVANCED_SYSTEM_ON_CHIP_WAFER = addItem(462, "wafer.advanced_system_on_chip"); - INTEGRATED_LOGIC_CIRCUIT_WAFER = addItem(463, "wafer.integrated_logic_circuit"); - CENTRAL_PROCESSING_UNIT_WAFER = addItem(464, "wafer.central_processing_unit"); - HIGH_POWER_INTEGRATED_CIRCUIT_WAFER = addItem(465, "wafer.high_power_integrated_circuit"); - NAND_MEMORY_CHIP_WAFER = addItem(466, "wafer.nand_memory_chip"); - NANO_CENTRAL_PROCESSING_UNIT_WAFER = addItem(467, "wafer.nano_central_processing_unit"); - NOR_MEMORY_CHIP_WAFER = addItem(468, "wafer.nor_memory_chip"); - POWER_INTEGRATED_CIRCUIT_WAFER = addItem(469, "wafer.power_integrated_circuit"); - QBIT_CENTRAL_PROCESSING_UNIT_WAFER = addItem(470, "wafer.qbit_central_processing_unit"); - RANDOM_ACCESS_MEMORY_WAFER = addItem(471, "wafer.random_access_memory"); - SYSTEM_ON_CHIP_WAFER = addItem(472, "wafer.system_on_chip"); - - RAW_CRYSTAL_CHIP = addItem(473, "crystal.raw"); - CRYSTAL_CENTRAL_PROCESSING_UNIT = addItem(474, "crystal.central_processing_unit"); - CRYSTAL_SYSTEM_ON_CHIP = addItem(475, "crystal.system_on_chip"); - ADVANCED_SYSTEM_ON_CHIP = addItem(476, "plate.advanced_system_on_chip"); - INTEGRATED_LOGIC_CIRCUIT = addItem(477, "plate.integrated_logic_circuit"); - CENTRAL_PROCESSING_UNIT = addItem(478, "plate.central_processing_unit"); - HIGH_POWER_INTEGRATED_CIRCUIT = addItem(479, "plate.high_power_integrated_circuit"); - NAND_MEMORY_CHIP = addItem(480, "plate.nand_memory_chip"); - NANO_CENTRAL_PROCESSING_UNIT = addItem(481, "plate.nano_central_processing_unit"); - NOR_MEMORY_CHIP = addItem(482, "plate.nor_memory_chip"); - POWER_INTEGRATED_CIRCUIT = addItem(483, "plate.power_integrated_circuit"); - QBIT_CENTRAL_PROCESSING_UNIT = addItem(484, "plate.qbit_central_processing_unit"); - RANDOM_ACCESS_MEMORY = addItem(485, "plate.random_access_memory"); - SYSTEM_ON_CHIP = addItem(486, "plate.system_on_chip"); + HIGHLY_ADVANCED_SOC_WAFER = addItem(462, "wafer.highly_advanced_system_on_chip"); + ADVANCED_SYSTEM_ON_CHIP_WAFER = addItem(463, "wafer.advanced_system_on_chip"); + INTEGRATED_LOGIC_CIRCUIT_WAFER = addItem(464, "wafer.integrated_logic_circuit"); + CENTRAL_PROCESSING_UNIT_WAFER = addItem(465, "wafer.central_processing_unit"); + HIGH_POWER_INTEGRATED_CIRCUIT_WAFER = addItem(466, "wafer.high_power_integrated_circuit"); + NAND_MEMORY_CHIP_WAFER = addItem(467, "wafer.nand_memory_chip"); + NANO_CENTRAL_PROCESSING_UNIT_WAFER = addItem(468, "wafer.nano_central_processing_unit"); + NOR_MEMORY_CHIP_WAFER = addItem(469, "wafer.nor_memory_chip"); + POWER_INTEGRATED_CIRCUIT_WAFER = addItem(470, "wafer.power_integrated_circuit"); + QBIT_CENTRAL_PROCESSING_UNIT_WAFER = addItem(471, "wafer.qbit_central_processing_unit"); + RANDOM_ACCESS_MEMORY_WAFER = addItem(472, "wafer.random_access_memory"); + SYSTEM_ON_CHIP_WAFER = addItem(473, "wafer.system_on_chip"); + SIMPLE_SYSTEM_ON_CHIP_WAFER = addItem(474, "wafer.simple_system_on_chip"); + + RAW_CRYSTAL_CHIP = addItem(475, "crystal.raw"); + CRYSTAL_CENTRAL_PROCESSING_UNIT = addItem(476, "crystal.central_processing_unit"); + CRYSTAL_SYSTEM_ON_CHIP = addItem(477, "crystal.system_on_chip"); + HIGHLY_ADVANCED_SOC = addItem(478, "plate.highly_advanced_system_on_chip"); + ADVANCED_SYSTEM_ON_CHIP = addItem(479, "plate.advanced_system_on_chip"); + INTEGRATED_LOGIC_CIRCUIT = addItem(480, "plate.integrated_logic_circuit"); + CENTRAL_PROCESSING_UNIT = addItem(481, "plate.central_processing_unit"); + HIGH_POWER_INTEGRATED_CIRCUIT = addItem(482, "plate.high_power_integrated_circuit"); + NAND_MEMORY_CHIP = addItem(483, "plate.nand_memory_chip"); + NANO_CENTRAL_PROCESSING_UNIT = addItem(484, "plate.nano_central_processing_unit"); + NOR_MEMORY_CHIP = addItem(485, "plate.nor_memory_chip"); + POWER_INTEGRATED_CIRCUIT = addItem(486, "plate.power_integrated_circuit"); + QBIT_CENTRAL_PROCESSING_UNIT = addItem(487, "plate.qbit_central_processing_unit"); + RANDOM_ACCESS_MEMORY = addItem(488, "plate.random_access_memory"); + SYSTEM_ON_CHIP = addItem(489, "plate.system_on_chip"); + SIMPLE_SYSTEM_ON_CHIP = addItem(490, "plate.simple_system_on_chip"); + + ENGRAVED_CRYSTAL_CHIP = addItem(491, "engraved.crystal_chip"); + ENGRAVED_LAPOTRON_CHIP = addItem(492, "engraved.lapotron_chip"); // CIRCUITS - // T1: Electronic todo: textures - ELECTRONIC_CIRCUIT_LV = addItem(487, "circuit.electronic").setUnificationData(OrePrefix.circuit, Tier.Basic); - ELECTRONIC_CIRCUIT_MV = addItem(488, "circuit.good_electronic").setUnificationData(OrePrefix.circuit, Tier.Good); - - // T2: Integrated todo textures - INTEGRATED_CIRCUIT_LV = addItem(489, "circuit.basic_integrated").setUnificationData(OrePrefix.circuit, Tier.Basic); - INTEGRATED_CIRCUIT_MV = addItem(490, "circuit.good_integrated").setUnificationData(OrePrefix.circuit, Tier.Good); - INTEGRATED_CIRCUIT_HV = addItem(491, "circuit.advanced_integrated").setUnificationData(OrePrefix.circuit, Tier.Advanced); - - // Misc Unlocks todo textures - NAND_CHIP_ULV = addItem(492, "circuit.nand_chip").setUnificationData(OrePrefix.circuit, Tier.Primitive); - MICROPROCESSOR_LV = addItem(493, "circuit.microprocessor").setUnificationData(OrePrefix.circuit, Tier.Basic); - - // T3: Processor todo textures - PROCESSOR_MV = addItem(494, "circuit.processor").setUnificationData(OrePrefix.circuit, Tier.Good); - PROCESSOR_ASSEMBLY_HV = addItem(495, "circuit.assembly").setUnificationData(OrePrefix.circuit, Tier.Advanced); - WORKSTATION_EV = addItem(496, "circuit.workstation").setUnificationData(OrePrefix.circuit, Tier.Extreme); - MAINFRAME_IV = addItem(497, "circuit.mainframe").setUnificationData(OrePrefix.circuit, Tier.Elite); - - // T4: Nano todo textures - NANO_PROCESSOR_HV = addItem(498, "circuit.nano_processor").setUnificationData(OrePrefix.circuit, Tier.Advanced); - NANO_PROCESSOR_ASSEMBLY_EV = addItem(499, "circuit.nano_assembly").setUnificationData(OrePrefix.circuit, Tier.Extreme); - NANO_COMPUTER_IV = addItem(500, "circuit.nano_computer").setUnificationData(OrePrefix.circuit, Tier.Elite); - NANO_MAINFRAME_LUV = addItem(501, "circuit.nano_mainframe").setUnificationData(OrePrefix.circuit, Tier.Master); - - // T5: Quantum todo textures - QUANTUM_PROCESSOR_EV = addItem(502, "circuit.quantum_processor").setUnificationData(OrePrefix.circuit, Tier.Extreme); - QUANTUM_ASSEMBLY_IV = addItem(503, "circuit.quantum_assembly").setUnificationData(OrePrefix.circuit, Tier.Elite); - QUANTUM_COMPUTER_LUV = addItem(504, "circuit.quantum_computer").setUnificationData(OrePrefix.circuit, Tier.Master); - QUANTUM_MAINFRAME_ZPM = addItem(505, "circuit.quantum_mainframe").setUnificationData(OrePrefix.circuit, Tier.Ultimate); - - // T6: Crystal todo textures - CRYSTAL_PROCESSOR_IV = addItem(506, "circuit.crystal_processor").setUnificationData(OrePrefix.circuit, Tier.Elite); - CRYSTAL_ASSEMBLY_LUV = addItem(507, "circuit.crystal_assembly").setUnificationData(OrePrefix.circuit, Tier.Master); - CRYSTAL_COMPUTER_ZPM = addItem(508, "circuit.crystal_computer").setUnificationData(OrePrefix.circuit, Tier.Ultimate); - CRYSTAL_MAINFRAME_UV = addItem(509, "circuit.crystal_mainframe").setUnificationData(OrePrefix.circuit, Tier.Superconductor); + // T1: Electronic + ELECTRONIC_CIRCUIT_LV = addItem(500, "circuit.electronic").setUnificationData(OrePrefix.circuit, Tier.Basic); + ELECTRONIC_CIRCUIT_MV = addItem(501, "circuit.good_electronic").setUnificationData(OrePrefix.circuit, Tier.Good); + + // T2: Integrated + INTEGRATED_CIRCUIT_LV = addItem(502, "circuit.basic_integrated").setUnificationData(OrePrefix.circuit, Tier.Basic); + INTEGRATED_CIRCUIT_MV = addItem(503, "circuit.good_integrated").setUnificationData(OrePrefix.circuit, Tier.Good); + INTEGRATED_CIRCUIT_HV = addItem(504, "circuit.advanced_integrated").setUnificationData(OrePrefix.circuit, Tier.Advanced); + + // Misc Unlocks + NAND_CHIP_ULV = addItem(505, "circuit.nand_chip").setUnificationData(OrePrefix.circuit, Tier.Primitive); + MICROPROCESSOR_LV = addItem(506, "circuit.microprocessor").setUnificationData(OrePrefix.circuit, Tier.Basic); + + // T3: Processor + PROCESSOR_MV = addItem(507, "circuit.processor").setUnificationData(OrePrefix.circuit, Tier.Good); + PROCESSOR_ASSEMBLY_HV = addItem(508, "circuit.assembly").setUnificationData(OrePrefix.circuit, Tier.Advanced); + WORKSTATION_EV = addItem(509, "circuit.workstation").setUnificationData(OrePrefix.circuit, Tier.Extreme); + MAINFRAME_IV = addItem(510, "circuit.mainframe").setUnificationData(OrePrefix.circuit, Tier.Elite); + + // T4: Nano + NANO_PROCESSOR_HV = addItem(511, "circuit.nano_processor").setUnificationData(OrePrefix.circuit, Tier.Advanced); + NANO_PROCESSOR_ASSEMBLY_EV = addItem(512, "circuit.nano_assembly").setUnificationData(OrePrefix.circuit, Tier.Extreme); + NANO_COMPUTER_IV = addItem(513, "circuit.nano_computer").setUnificationData(OrePrefix.circuit, Tier.Elite); + NANO_MAINFRAME_LUV = addItem(514, "circuit.nano_mainframe").setUnificationData(OrePrefix.circuit, Tier.Master); + + // T5: Quantum + QUANTUM_PROCESSOR_EV = addItem(515, "circuit.quantum_processor").setUnificationData(OrePrefix.circuit, Tier.Extreme); + QUANTUM_ASSEMBLY_IV = addItem(516, "circuit.quantum_assembly").setUnificationData(OrePrefix.circuit, Tier.Elite); + QUANTUM_COMPUTER_LUV = addItem(517, "circuit.quantum_computer").setUnificationData(OrePrefix.circuit, Tier.Master); + QUANTUM_MAINFRAME_ZPM = addItem(518, "circuit.quantum_mainframe").setUnificationData(OrePrefix.circuit, Tier.Ultimate); + + // T6: Crystal + CRYSTAL_PROCESSOR_IV = addItem(519, "circuit.crystal_processor").setUnificationData(OrePrefix.circuit, Tier.Elite); + CRYSTAL_ASSEMBLY_LUV = addItem(520, "circuit.crystal_assembly").setUnificationData(OrePrefix.circuit, Tier.Master); + CRYSTAL_COMPUTER_ZPM = addItem(521, "circuit.crystal_computer").setUnificationData(OrePrefix.circuit, Tier.Ultimate); + CRYSTAL_MAINFRAME_UV = addItem(522, "circuit.crystal_mainframe").setUnificationData(OrePrefix.circuit, Tier.Superconductor); // T7: Wetware - WETWARE_PROCESSOR_LUV = addItem(510, "circuit.wetware_processor").setUnificationData(OrePrefix.circuit, Tier.Master); - WETWARE_PROCESSOR_ASSEMBLY_ZPM = addItem(511, "circuit.wetware_assembly").setUnificationData(OrePrefix.circuit, Tier.Ultimate); - WETWARE_SUPER_COMPUTER_UV = addItem(512, "circuit.wetware_computer").setUnificationData(OrePrefix.circuit, Tier.Superconductor); - WETWARE_MAINFRAME_MAX = addItem(513, "circuit.wetware_mainframe").setUnificationData(OrePrefix.circuit, Tier.Infinite); + WETWARE_PROCESSOR_LUV = addItem(523, "circuit.wetware_processor").setUnificationData(OrePrefix.circuit, Tier.Master); + WETWARE_PROCESSOR_ASSEMBLY_ZPM = addItem(524, "circuit.wetware_assembly").setUnificationData(OrePrefix.circuit, Tier.Ultimate); + WETWARE_SUPER_COMPUTER_UV = addItem(525, "circuit.wetware_computer").setUnificationData(OrePrefix.circuit, Tier.Superconductor); + WETWARE_MAINFRAME_MAX = addItem(526, "circuit.wetware_mainframe").setUnificationData(OrePrefix.circuit, Tier.Infinite); // TODO REMOVE THESE - DATA_CONTROL_CIRCUIT_IV = addItem(518, "circuit.data_control").setUnificationData(OrePrefix.circuit, Tier.Elite); - ENERGY_FLOW_CIRCUIT_LUV = addItem(519, "circuit.energy_flow").setUnificationData(OrePrefix.circuit, Tier.Master); - - ENGRAVED_CRYSTAL_CHIP = addItem(514, "engraved.crystal_chip"); - ENGRAVED_LAPOTRON_CHIP = addItem(515, "engraved.lapotron_chip"); + DATA_CONTROL_CIRCUIT_IV = addItem(527, "circuit.data_control").setUnificationData(OrePrefix.circuit, Tier.Elite); + ENERGY_FLOW_CIRCUIT_LUV = addItem(528, "circuit.energy_flow").setUnificationData(OrePrefix.circuit, Tier.Master); - TURBINE_ROTOR = addItem(516, "turbine_rotor").addComponents(new TurbineRotorBehavior()); - COVER_FACADE = addItem(517, "cover.facade").addComponents(new FacadeItem()).disableModelLoading(); + TURBINE_ROTOR = addItem(529, "turbine_rotor").addComponents(new TurbineRotorBehavior()); + COVER_FACADE = addItem(530, "cover.facade").addComponents(new FacadeItem()).disableModelLoading(); FLUID_REGULATORS[0] = FLUID_REGULATOR_LV = addItem(700, "fluid.regulator.lv"); FLUID_REGULATORS[1] = FLUID_REGULATOR_MV = addItem(701, "fluid.regulator.mv"); @@ -205,18 +211,32 @@ public void registerSubItems() { FLUID_REGULATORS[7] = FLUID_REGULATOR_UV = addItem(707, "fluid.regulator.uv"); if (ConfigHolder.U.GT5u.enableZPMandUVBats) { - ENERGY_MODULE = addItem(520, "energy.module").addComponents(new IItemComponent[] { ElectricStats.createRechargeableBattery(10000000000L, GTValues.ZPM) }).setModelAmount(8); - ENERGY_CLUSTER = addItem(521, "energy.cluster").addComponents(new IItemComponent[] { ElectricStats.createRechargeableBattery(100000000000L, GTValues.UV) }).setModelAmount(8); + ENERGY_MODULE = addItem(531, "energy.module").addComponents(new IItemComponent[] { ElectricStats.createRechargeableBattery(10000000000L, GTValues.ZPM) }).setModelAmount(8); + ENERGY_CLUSTER = addItem(532, "energy.cluster").addComponents(new IItemComponent[] { ElectricStats.createRechargeableBattery(100000000000L, GTValues.UV) }).setModelAmount(8); } if (ConfigHolder.U.GT5u.replaceUVwithMAXBat) { - MAX_BATTERY = addItem(522, "max.battery").addComponents(new IItemComponent[] { ElectricStats.createRechargeableBattery(Long.MAX_VALUE, GTValues.MAX) }).setModelAmount(8); + MAX_BATTERY = addItem(533, "max.battery").addComponents(new IItemComponent[] { ElectricStats.createRechargeableBattery(Long.MAX_VALUE, GTValues.MAX) }).setModelAmount(8); MetaItems.ZPM2.setInvisible(); } - NEURO_PROCESSOR = addItem(523, "processor.neuro"); - STEM_CELLS = addItem(524, "stem_cells"); - PETRI_DISH = addItem(525, "petri_dish"); + NEURO_PROCESSOR = addItem(534, "processor.neuro"); + STEM_CELLS = addItem(535, "stem_cells"); + PETRI_DISH = addItem(536, "petri_dish"); + } + + @Override + public void registerOreDict() { + super.registerOreDict(); + + OreDictUnifier.registerOre(CAPACITOR.getStackForm(), "capacitor"); + OreDictUnifier.registerOre(SMD_CAPACITOR.getStackForm(), "capacitor"); + OreDictUnifier.registerOre(TRANSISTOR.getStackForm(), "transistor"); + OreDictUnifier.registerOre(SMD_TRANSISTOR.getStackForm(), "transistor"); + OreDictUnifier.registerOre(DIODE.getStackForm(), "diode"); + OreDictUnifier.registerOre(SMD_DIODE.getStackForm(), "diode"); + OreDictUnifier.registerOre(RESISTOR.getStackForm(), "resistor"); + OreDictUnifier.registerOre(SMD_RESISTOR.getStackForm(), "resistor"); } public void registerRecipes() { diff --git a/src/main/java/gregtech/common/items/MetaItems.java b/src/main/java/gregtech/common/items/MetaItems.java index 6c770c5c3e1..ee220b42016 100644 --- a/src/main/java/gregtech/common/items/MetaItems.java +++ b/src/main/java/gregtech/common/items/MetaItems.java @@ -233,13 +233,16 @@ private MetaItems() { public static MetaItem.MetaValueItem TOOL_DATA_STICK; public static MetaItem.MetaValueItem TOOL_DATA_ORB; + public static MetaItem.MetaValueItem SILICON_BOULE; public static MetaItem.MetaValueItem GLOWSTONE_BOULE; public static MetaItem.MetaValueItem NAQUADAH_BOULE; - public static MetaItem.MetaValueItem SILICON_BOULE; + public static MetaItem.MetaValueItem NEUTRONIUM_BOULE; public static MetaItem.MetaValueItem SILICON_WAFER; public static MetaItem.MetaValueItem GLOWSTONE_WAFER; public static MetaItem.MetaValueItem NAQUADAH_WAFER; + public static MetaItem.MetaValueItem NEUTRONIUM_WAFER; + public static MetaItem.MetaValueItem HIGHLY_ADVANCED_SOC_WAFER; public static MetaItem.MetaValueItem ADVANCED_SYSTEM_ON_CHIP_WAFER; public static MetaItem.MetaValueItem INTEGRATED_LOGIC_CIRCUIT_WAFER; public static MetaItem.MetaValueItem CENTRAL_PROCESSING_UNIT_WAFER; @@ -251,9 +254,11 @@ private MetaItems() { public static MetaItem.MetaValueItem QBIT_CENTRAL_PROCESSING_UNIT_WAFER; public static MetaItem.MetaValueItem RANDOM_ACCESS_MEMORY_WAFER; 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; public static MetaItem.MetaValueItem ADVANCED_SYSTEM_ON_CHIP; public static MetaItem.MetaValueItem INTEGRATED_LOGIC_CIRCUIT; public static MetaItem.MetaValueItem CENTRAL_PROCESSING_UNIT; @@ -265,6 +270,7 @@ private MetaItems() { public static MetaItem.MetaValueItem QBIT_CENTRAL_PROCESSING_UNIT; public static MetaItem.MetaValueItem RANDOM_ACCESS_MEMORY; 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 CRYSTAL_CENTRAL_PROCESSING_UNIT; public static MetaItem.MetaValueItem CRYSTAL_SYSTEM_ON_CHIP; diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 4eba9c92358..9c577ec6847 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -424,18 +424,28 @@ metaitem.tool.datastick.name=Data Stick metaitem.tool.datastick.tooltip=A Low Capacity Data Storage metaitem.tool.dataorb.name=Data Orb metaitem.tool.dataorb.tooltip=A High Capacity Data Storage -metaitem.circuit.integrated.name=Integrated circuit +metaitem.circuit.integrated.name=Programmed Circuit metaitem.circuit.integrated.tooltip=Use to open configuration GUI -metaitem.circuit.integrated.gui=Integrated Circuit Configuration -metaitem.circuit.integrated.jei_description=JEI is only showing recipes for the given configuration.\n\nYou can select a configuration in the Integrated circuit configuration tab. +metaitem.circuit.integrated.gui=Programmed Circuit Configuration +metaitem.circuit.integrated.jei_description=JEI is only showing recipes for the given configuration.\n\nYou can select a configuration in the Programmed Circuit configuration tab. #CIRCUITS LOCALIZATION -metaitem.boule.silicon.name=Silicon Boule -metaitem.boule.glowstone.name=Glowstone-doped Boule -metaitem.boule.naquadah.name=Naquadah-doped Boule +metaitem.boule.silicon.name=Monocrystalline Silicon Boule +metaitem.boule.silicon.tooltip=Raw Circuit +metaitem.boule.glowstone.name=Glowstone-doped Monocrystalline Silicon Boule +metaitem.boule.glowstone.tooltip=Raw Circuit +metaitem.boule.naquadah.name=Naquadah-doped Monocrystalline Silicon Boule +metaitem.boule.naquadah.tooltip=Raw Circuit +metaitem.boule.neutronium.name=Neutronium-doped Monocrystalline Silicon Boule +metaitem.boule.neutronium.tooltip=Raw Circuit metaitem.wafer.silicon.name=Silicon Wafer +metaitem.wafer.silicon.tooltip=Raw Circuit metaitem.wafer.glowstone.name=Glowstone-doped Wafer +metaitem.wafer.glowstone.tooltip=Raw Circuit metaitem.wafer.naquadah.name=Naquadah-doped Wafer +metaitem.wafer.naquadah.tooltip=Raw Circuit +metaitem.wafer.neutronium.name=Neutronium-doped Wafer +metaitem.wafer.neutronium.tooltip=Raw Circuit metaitem.board.coated.name=Coated Circuit Board metaitem.board.epoxy.name=Epoxy Circuit Board @@ -443,10 +453,11 @@ metaitem.board.fiber_reinforced.name=Fiber-Reinforced Circuit Board metaitem.board.multilayer.fiber_reinforced.name=Multi-layer Fiber-Reinforced Circuit Board metaitem.board.phenolic.name=Phenolic Circuit Board metaitem.board.plastic.name=Plastic Circuit Board -metaitem.board.wetware.name=Wetware Circuit Board +metaitem.board.wetware.name=Wetware Lifesupport Circuit Board +metaitem.board.wetware.tooltip=The Board that keeps life metaitem.circuit.vacuum_tube.name=Vacuum Tube -metaitem.circuit.vacuum_tube.description=A Simple Circuit +metaitem.circuit.vacuum_tube.tooltip=Technically a Diode/n§cULV-tier metaitem.component.diode.name=Diode metaitem.component.resistor.name=Resistor metaitem.component.transistor.name=Transistor @@ -463,9 +474,11 @@ metaitem.component.smd.transistor.tooltip=Electronic Component metaitem.component.smd.resistor.name=SMD Resistor metaitem.component.smd.resistor.tooltip=Electronic Component +metaitem.wafer.highly_advanced_system_on_chip.name=HASoC Wafer +metaitem.wafer.highly_advanced_system_on_chip.tooltip=Raw Circuit metaitem.wafer.advanced_system_on_chip.name=ASoC Wafer metaitem.wafer.advanced_system_on_chip.tooltip=Raw Circuit -metaitem.wafer.integrated_logic_circuit.name=Integrated Circuit Wafer +metaitem.wafer.integrated_logic_circuit.name=Integrated Logic Circuit Wafer metaitem.wafer.integrated_logic_circuit.tooltip=Raw Circuit metaitem.wafer.central_processing_unit.name=CPU Wafer metaitem.wafer.central_processing_unit.tooltip=Raw Circuit @@ -485,6 +498,8 @@ metaitem.wafer.random_access_memory.name=RAM Wafer metaitem.wafer.random_access_memory.tooltip=Raw Circuit metaitem.wafer.system_on_chip.name=SoC Wafer metaitem.wafer.system_on_chip.tooltip=Raw Circuit +metaitem.wafer.simple_system_on_chip.name=Simple SoC Wafer +metaitem.wafer.simple_system_on_chip.tooltip=Raw Primitive Circuit metaitem.engraved.crystal_chip.name=Engraved Crystal Chip metaitem.engraved.crystal_chip.tooltip=Needed for Circuits metaitem.crystal.raw.name=Raw Crystal Chip @@ -497,7 +512,9 @@ metaitem.crystal.system_on_chip.name=Crystal SoC metaitem.crystal.system_on_chip.tooltip=Crystal System on a Chip metaitem.plate.advanced_system_on_chip.name=ASoC metaitem.plate.advanced_system_on_chip.tooltip=Advanced System on Chip -metaitem.plate.integrated_logic_circuit.name=Integrated Circuit +metaitem.plate.highly_advanced_system_on_chip.name=HASoC +metaitem.plate.highly_advanced_system_on_chip.tooltip=Highly Advanced System on a Chip +metaitem.plate.integrated_logic_circuit.name=Integrated Logic Circuit metaitem.plate.central_processing_unit.name=Central Processing Unit metaitem.plate.high_power_integrated_circuit.name=HPIC metaitem.plate.high_power_integrated_circuit.tooltip=High-Power Integrated Circuit @@ -511,40 +528,87 @@ metaitem.plate.qbit_central_processing_unit.name=QBit CPU metaitem.plate.random_access_memory.name=RAM metaitem.plate.random_access_memory.tooltip=Random Access Memory metaitem.plate.system_on_chip.name=SoC -metaitem.plate.system_on_chip.tooltip=System on Chip - -metaitem.circuit.basic.name=Basic Circuit -metaitem.circuit.basic_electronic.name=Basic Electronic Circuit -metaitem.circuit.basic_electronic.tooltip=A Basic Circuit -metaitem.circuit.advanced_parts.name=Advanced Circuit Parts -metaitem.circuit.advanced_parts.tooltip=A Basic Circuit -metaitem.circuit.good.name=Good Electronic Circuit -metaitem.circuit.good.tooltip=A Good Circuit -metaitem.circuit.advanced.name=Advanced Circuit -metaitem.circuit.advanced.tooltip=A Good Circuit -metaitem.circuit.processor_assembly.name=Processor Assembly -metaitem.circuit.processor_assembly.tooltip=An Advanced Circuit +metaitem.plate.system_on_chip.tooltip=System on a Chip +metaitem.plate.simple_system_on_chip.name=Simple SoC +metaitem.plate.simple_system_on_chip.tooltip=Simple System on a Chip + + +# T1: Electronic +metaitem.circuit.electronic.name=Electronic Circuit +metaitem.circuit.electronic.tooltip=Your First Circuit/n§cLV-tier +metaitem.circuit.good_electronic.name=Good Electronic Circuit +metaitem.circuit.good_electronic.tooltip=Your Second Circuit/n§cMV-tier + +# T2: Integrated +metaitem.circuit.basic_integrated.name=Integrated Logic Circuit +metaitem.circuit.basic_integrated.tooltip=Smaller and more powerful/n§6LV-tier +metaitem.circuit.good_integrated.name=Good Integrated Circuit +metaitem.circuit.good_integrated.tooltip=Smaller and more powerful/n§6MV-tier +metaitem.circuit.advanced_integrated.name=Advanced Integrated Circuit +metaitem.circuit.advanced_integrated.tooltip=Smaller and more powerful/n§6HV-tier + +# Misc +metaitem.circuit.nand_chip.name=NAND Chip +metaitem.circuit.nand_chip.tooltip=A Superior Simple Circuit/n§6ULV-tier +metaitem.circuit.microprocessor.name=Microprocessor +metaitem.circuit.microprocessor.tooltip=A Superior Basic Circuit/n§eLV-tier + +# T3: Processor +metaitem.circuit.processor.name=Integrated Processor +metaitem.circuit.processor.tooltip=Amazing Computation Speed!/n§eMV-tier +metaitem.circuit.assembly.name=Processor Assembly +metaitem.circuit.assembly.tooltip=Amazing Computation Speed!/n§eHV-tier +metaitem.circuit.workstation.name=Workstation +metaitem.circuit.workstation.tooltip=Amazing Computation Speed!/n§eEV-tier +metaitem.circuit.mainframe.name=Mainframe +metaitem.circuit.mainframe.tooltip=Amazing Computation Speed!/n§eIV-tier + +# T4: Nano metaitem.circuit.nano_processor.name=Nanoprocessor -metaitem.circuit.nano_processor.tooltip=Smaller than ever -metaitem.circuit.nano_processor_assembly.name=Nano Processor Assembly +metaitem.circuit.nano_processor.tooltip=Smaller than ever/n§aHV-tier +metaitem.circuit.nano_assembly.name=Nanoprocessor Assembly +metaitem.circuit.nano_assembly.tooltip=Smaller than ever/n§aEV-tier +metaitem.circuit.nano_computer.name=Nano Supercomputer +metaitem.circuit.nano_computer.tooltip=Smaller than ever/n§aIV-tier +metaitem.circuit.nano_mainframe.name=Nanoprocessor Mainframe +metaitem.circuit.nano_mainframe.tooltip=Smaller than ever/n§aLuV-tier + +# T5: Quantum metaitem.circuit.quantum_processor.name=Quantumprocessor -metaitem.circuit.quantum_processor.tooltip=Quantum computing comes to life! -metaitem.circuit.data_control.name=Data Control Circuit -metaitem.circuit.crystal_processor.name=Crystalprocessor -metaitem.circuit.crystal_processor.tooltip=Taking Advantage of Crystal Engraving -metaitem.circuit.energy_flow.name=Energy Flow Circuit +metaitem.circuit.quantum_processor.tooltip=Quantum Computing comes to life!/n§bEV-tier +metaitem.circuit.quantum_assembly.name=Quantumprocessor Assembly +metaitem.circuit.quantum_assembly.tooltip=Quantum Computing comes to life!/n§bIV-tier +metaitem.circuit.quantum_computer.name=Quantum Supercomputer +metaitem.circuit.quantum_computer.tooltip=Quantum Computing comes to life!/n§bLuV-tier +metaitem.circuit.quantum_mainframe.name=Quantumprocessor Mainframe +metaitem.circuit.quantum_mainframe.tooltip=Quantum Computing comes to life!/n§bZPM-tier + +# T6: Crystal +metaitem.circuit.crystal_processor.name=Crystal Processor +metaitem.circuit.crystal_processor.tooltip=Taking Advantage of Crystal Engraving/n§9IV-tier +metaitem.circuit.crystal_assembly.name=Crystal Processor Assembly +metaitem.circuit.crystal_assembly.tooltip=Taking Advantage of Crystal Engraving/n§9LuV-tier +metaitem.circuit.crystal_computer.name=Crystal Supercomputer +metaitem.circuit.crystal_computer.tooltip=Taking Advantage of Crystal Engraving/n§9ZPM-tier +metaitem.circuit.crystal_mainframe.name=Crystal Processor Mainframe +metaitem.circuit.crystal_mainframe.tooltip=Taking Advantage of Crystal Engraving/n§9UV-tier + +# T7: Wetware metaitem.circuit.wetware_processor.name=Wetware Processor -metaitem.circuit.wetware_processor.tooltip=You have a feeling like it's watching you +metaitem.circuit.wetware_processor.tooltip=You have a feeling like it's watching you/n§5LuV-tier metaitem.circuit.wetware_assembly.name=Wetware Assembly -metaitem.circuit.wetware_assembly.tooltip=Can run Minecraft -metaitem.circuit.wetware_super_computer.name=Wetware Supercomputer +metaitem.circuit.wetware_assembly.tooltip=Can run Minecraft/n§5ZPM-tier +metaitem.circuit.wetware_computer.name=Wetware Supercomputer +metaitem.circuit.wetware_computer.tooltip=Ultimate fusion of Flesh and Machine/n§5UV-tier metaitem.circuit.wetware_mainframe.name=Wetware Mainframe +metaitem.circuit.wetware_mainframe.tooltip=The best Man has ever seen/n§5UHV-tier metaitem.stem_cells.name=Stem Cells metaitem.stem_cells.tooltip=Raw Intelligence metaitem.processor.neuro.name=Neuro Processing Unit metaitem.processor.neuro.tooltip=Neuro CPU metaitem.petri_dish.name=Petri Dish +metaitem.petri_dish.tooltip=For cultivating Cells metaitem.carbon.fibers.name=Raw Carbon Fibers metaitem.carbon.mesh.name=Carbon Fiber Mesh diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/boule.neutronium.json b/src/main/resources/assets/gregtech/models/item/metaitems/boule.neutronium.json new file mode 100644 index 00000000000..f33a149c054 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/boule.neutronium.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/boule.neutronium" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/plate.highly_advanced_system_on_chip.json b/src/main/resources/assets/gregtech/models/item/metaitems/plate.highly_advanced_system_on_chip.json new file mode 100644 index 00000000000..527d0d66fb3 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/plate.highly_advanced_system_on_chip.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/plate.highly_advanced_system_on_chip" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/plate.simple_system_on_chip.json b/src/main/resources/assets/gregtech/models/item/metaitems/plate.simple_system_on_chip.json new file mode 100644 index 00000000000..ad4bb548b66 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/plate.simple_system_on_chip.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/plate.simple_system_on_chip" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/wafer.highly_advanced_system_on_chip.json b/src/main/resources/assets/gregtech/models/item/metaitems/wafer.highly_advanced_system_on_chip.json new file mode 100644 index 00000000000..551f4613310 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/wafer.highly_advanced_system_on_chip.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/wafer.highly_advanced_system_on_chip" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/wafer.neutronium.json b/src/main/resources/assets/gregtech/models/item/metaitems/wafer.neutronium.json new file mode 100644 index 00000000000..b333bd3d944 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/wafer.neutronium.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/wafer.neutronium" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/wafer.simple_system_on_chip.json b/src/main/resources/assets/gregtech/models/item/metaitems/wafer.simple_system_on_chip.json new file mode 100644 index 00000000000..8e130902c54 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/wafer.simple_system_on_chip.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/wafer.simple_system_on_chip" + } +} diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/boule.neutronium.png b/src/main/resources/assets/gregtech/textures/items/metaitems/boule.neutronium.png new file mode 100644 index 0000000000000000000000000000000000000000..316c03a7608a1c0893c44560d0be6a84470f7d16 GIT binary patch literal 3744 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 AaR2}S diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.basic_electronic.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.basic_integrated.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/circuit.basic_electronic.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/circuit.basic_integrated.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.crystal_assembly.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.crystal_assembly.png new file mode 100644 index 0000000000000000000000000000000000000000..3f366301b9b13f95ba83ebd992a6fac3804f489d GIT binary patch literal 3023 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 Ru5|za002ovPDHLkV1nVXq?-T$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.crystal_computer.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.crystal_computer.png new file mode 100644 index 0000000000000000000000000000000000000000..4cae7f4118de58175c50656d300bf63ab4fbc34f GIT binary patch literal 3262 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.crystal_processor.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.crystal_processor.png index 864e1d61f5befbc8da18b29951066e683d46a4d2..1491144be967dad73b49f9ad28564aa7a8d24d40 100644 GIT binary patch delta 292 zcmV+<0o(ra0>1)~B!32COGiWi{{a60|De66lK=n!32;bRa{vGf5&!@T5&_cPe*6Fc z00(qQO+^Rc0vrGz1kzj6-LQ50Y%vN~6ga9b%K`xCD`5s^ z;f_L02i~vJS)_I0K((SyKTh+=RUIL>-(!|MJ{qBQWVH}akFhsK)fF(b-)f{8JC37;ul2Fls>n00003H9UkOHgl}4Ie_^wJS!#Lj{s$U*=B002ovPDHLkV1gxTgGvAZ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.electronic.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.electronic.png new file mode 100644 index 0000000000000000000000000000000000000000..da49c1e94900006585d55f17aaed49c5670ffcba GIT binary patch literal 1698 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 FV1l`~n0o*K literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.advanced_parts.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.microprocessor.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/circuit.advanced_parts.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/circuit.microprocessor.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.primitive.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.nand_chip.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/circuit.primitive.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/circuit.nand_chip.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.nano_processor_assembly.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.nano_assembly.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/circuit.nano_processor_assembly.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/circuit.nano_assembly.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.nano_computer.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.nano_computer.png new file mode 100644 index 0000000000000000000000000000000000000000..7f0fcaca52fe16ec867ef4bac1007fe0af946c63 GIT binary patch literal 1065 zcmV+^1lIeBP)pE6Igje@?tTHVs~F(5M+%o) z0>c}y;vLw!i|2PrGqZ+LN+pxYuQHj;k|ze_vy%!SGJ4GuaFc(oaW}t7PizEQ`V?UI z^z^*$d_pycex^-)H1Iiq@&a7{((RoAApmS(6VR$lum=NjC|z*i$8Tx|&Q>lpD)g`E4z2-t<7>4m8&`|Aw z3j_B996;=s8UDyg-i^iKseXhI%+Ah!y}G)ZaEB0($A2!^Jsj~3oNDPs33xTL0X$Yj zKmdr2j*bD~&^;N@qwNB~o_jNQ)w>z^9ja6 z7>o~S73tiVAIB>vbG#b6V zy}dme4u?(NRRi>)01&~;rDzl8q;xW&cAUv1m|J`@T? zDwA+^z|Rg>4qSYEjO?MuOGyNS!Sy0#DC_6&avcmr<#1iXi5;Py_SvIP4v;1jsoORygUeu1mmf&Ccp3!Eni z_awk4a1V?DzreZjHBeD7p;b2 jC=c2#%d!sge~*6wW!SX|QFG+900000NkvXXu0mjfm)Gy< literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.nano_mainframe.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.nano_mainframe.png new file mode 100644 index 0000000000000000000000000000000000000000..f2ac92335973c67816ba7808fbee2ff381b03cbd GIT binary patch literal 4039 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.quantum_computer.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.quantum_computer.png new file mode 100644 index 0000000000000000000000000000000000000000..ea4ab6d5bcb39249a2a9878cb962b2d88002987e GIT binary patch literal 1001 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 Ql>h($07*qoM6N<$f>n2`G5`Po literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.data.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit.workstation.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/circuit.data.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/circuit.workstation.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/plate.highly_advanced_system_on_chip.png b/src/main/resources/assets/gregtech/textures/items/metaitems/plate.highly_advanced_system_on_chip.png new file mode 100644 index 0000000000000000000000000000000000000000..bcdc4fa183a5f222ebc16821334fe3ba313a06d7 GIT binary patch literal 3764 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 M07*qoM6N<$f@3vcasU7T literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.neutronium.png b/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.neutronium.png new file mode 100644 index 0000000000000000000000000000000000000000..272ced3b3c8d553890b9ff6f2c3d1d86de947a77 GIT binary patch literal 3945 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 DXai#o literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.simple_system_on_chip.png b/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.simple_system_on_chip.png new file mode 100644 index 0000000000000000000000000000000000000000..57185d40bf138d34dea53db85d0f61ff12a6ecfa GIT binary patch literal 4232 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 Date: Sat, 3 Jul 2021 22:26:36 -0500 Subject: [PATCH 03/21] add Gregicality tier marker materials --- .../gregtech/api/unification/material/MarkerMaterials.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/gregtech/api/unification/material/MarkerMaterials.java b/src/main/java/gregtech/api/unification/material/MarkerMaterials.java index fc92a945cda..416023a14f4 100644 --- a/src/main/java/gregtech/api/unification/material/MarkerMaterials.java +++ b/src/main/java/gregtech/api/unification/material/MarkerMaterials.java @@ -98,6 +98,12 @@ public static class Tier { public static Material Superconductor = new Material(355, "superconductor", 0xFFFFFF, MaterialIconSet.NONE, of(), 0L, null) { }; public static Material Infinite = new MarkerMaterial("infinite"); + + public static Material UEVCircuit = new MarkerMaterial("uev"); + public static Material UIVCircuit = new MarkerMaterial("uiv"); + public static Material UMVCircuit = new MarkerMaterial("umv"); + public static Material UXVCircuit = new MarkerMaterial("uxv"); + public static Material MAXCircuit = new MarkerMaterial("max"); } } From 1815a9f22aa5c12f2edf3cb867fdd06024332ba3 Mon Sep 17 00:00:00 2001 From: DStrand1 Date: Sat, 3 Jul 2021 22:36:03 -0500 Subject: [PATCH 04/21] change duration calculation for Cutter recipes --- .../gregtech/api/recipes/builders/CutterRecipeBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/gregtech/api/recipes/builders/CutterRecipeBuilder.java b/src/main/java/gregtech/api/recipes/builders/CutterRecipeBuilder.java index 4c590c63a3a..951b0b83ee2 100644 --- a/src/main/java/gregtech/api/recipes/builders/CutterRecipeBuilder.java +++ b/src/main/java/gregtech/api/recipes/builders/CutterRecipeBuilder.java @@ -39,10 +39,10 @@ public void buildAndRegister() { .duration(duration * 2).build()); recipeMap.addRecipe(this.copy() .fluidInputs(ModHandler.getDistilledWater(Math.max(3, Math.min(750, duration * EUt / 426)))) - .duration((int) (duration * 1.3)).build()); + .duration((int) (duration * 1.5)).build()); recipeMap.addRecipe(this.copy() .fluidInputs(Materials.Lubricant.getFluid(Math.max(1, Math.min(250, duration * EUt / 1280)))) - .duration(Math.max(1, duration / 2)).build()); + .duration(Math.max(1, duration)).build()); } else { recipeMap.addRecipe(build()); } From 31080ee016b54eebed7327bf7a6a938cfa037088 Mon Sep 17 00:00:00 2001 From: DStrand1 Date: Sat, 3 Jul 2021 23:25:12 -0500 Subject: [PATCH 05/21] Add the Circuit Assembler --- .../java/gregtech/api/gui/GuiTextures.java | 1 + .../java/gregtech/api/recipes/RecipeMaps.java | 6 ++ .../CircuitAssemblerRecipeBuilder.java | 66 +++++++++++++++++++ .../metatileentities/MetaTileEntities.java | 28 +++++--- .../resources/assets/gregtech/lang/en_us.lang | 11 ++++ 5 files changed, 102 insertions(+), 10 deletions(-) create mode 100644 src/main/java/gregtech/api/recipes/builders/CircuitAssemblerRecipeBuilder.java diff --git a/src/main/java/gregtech/api/gui/GuiTextures.java b/src/main/java/gregtech/api/gui/GuiTextures.java index e6694a04ba6..745751df132 100644 --- a/src/main/java/gregtech/api/gui/GuiTextures.java +++ b/src/main/java/gregtech/api/gui/GuiTextures.java @@ -125,6 +125,7 @@ public class GuiTextures { public static final TextureArea PROGRESS_BAR_SIFT = TextureArea.fullImage("textures/gui/progress_bar/progress_bar_sift.png"); public static final TextureArea PROGRESS_BAR_SLICE = TextureArea.fullImage("textures/gui/progress_bar/progress_bar_slice.png"); public static final TextureArea PROGRESS_BAR_WIREMILL = TextureArea.fullImage("textures/gui/progress_bar/progress_bar_wiremill.png"); + public static final TextureArea PROGRESS_BAR_CIRCUIT_ASSEMBLER = TextureArea.fullImage("textures/gui/progress_bar/progress_bar_circuit_assembler.png"); //JEI public static final TextureArea MULTIBLOCK_CATEGORY = TextureArea.fullImage("textures/gui/icon/coke_oven.png"); diff --git a/src/main/java/gregtech/api/recipes/RecipeMaps.java b/src/main/java/gregtech/api/recipes/RecipeMaps.java index 4e446b68e56..660bf3962ec 100644 --- a/src/main/java/gregtech/api/recipes/RecipeMaps.java +++ b/src/main/java/gregtech/api/recipes/RecipeMaps.java @@ -710,6 +710,12 @@ public class RecipeMaps { .setSlotOverlay(false, false, GuiTextures.BENDER_OVERLAY) .setProgressBar(GuiTextures.PROGRESS_BAR_BENDING, ProgressWidget.MoveType.HORIZONTAL); + @ZenProperty + public static final RecipeMap CIRCUIT_ASSEMBLER_RECIPES = new RecipeMap<>("circuit_assembler", + 1, 6, 1, 1, 0, 1, 0, 0, new CircuitAssemblerRecipeBuilder()) + .setSlotOverlay(false, false, GuiTextures.CIRCUIT_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_CIRCUIT_ASSEMBLER, ProgressWidget.MoveType.HORIZONTAL); + @ZenProperty public static final FuelRecipeMap COMBUSTION_GENERATOR_FUELS = new FuelRecipeMap("combustion_generator"); diff --git a/src/main/java/gregtech/api/recipes/builders/CircuitAssemblerRecipeBuilder.java b/src/main/java/gregtech/api/recipes/builders/CircuitAssemblerRecipeBuilder.java new file mode 100644 index 00000000000..6d441758df6 --- /dev/null +++ b/src/main/java/gregtech/api/recipes/builders/CircuitAssemblerRecipeBuilder.java @@ -0,0 +1,66 @@ +package gregtech.api.recipes.builders; + +import gregtech.api.GTValues; +import gregtech.api.recipes.Recipe; +import gregtech.api.recipes.RecipeBuilder; +import gregtech.api.recipes.RecipeMap; +import gregtech.api.unification.material.Materials; +import gregtech.api.util.EnumValidationResult; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTUtility; +import gregtech.api.util.ValidationResult; + +import javax.annotation.Nonnull; + +public class CircuitAssemblerRecipeBuilder extends RecipeBuilder { + + private int solderMultiplier = 1; + + public CircuitAssemblerRecipeBuilder() { + } + + public CircuitAssemblerRecipeBuilder(Recipe recipe, RecipeMap recipeMap) { + super(recipe, recipeMap); + } + + public CircuitAssemblerRecipeBuilder(RecipeBuilder recipeBuilder) { + super(recipeBuilder); + } + + @Override + @Nonnull + public CircuitAssemblerRecipeBuilder copy() { + return new CircuitAssemblerRecipeBuilder(this); + } + + public CircuitAssemblerRecipeBuilder solderMultiplier(int multiplier) { + if (!GTUtility.isBetweenInclusive(1, 64000, (long) GTValues.L * multiplier)) { + GTLog.logger.error("Fluid multiplier cannot exceed 64000mb total. Multiplier: {}", multiplier); + GTLog.logger.error("Stacktrace:", new IllegalArgumentException()); + recipeStatus = EnumValidationResult.INVALID; + } + this.solderMultiplier = multiplier; + return this; + } + + @Override + @Nonnull + public ValidationResult build() { + return ValidationResult.newResult(finalizeAndValidate(), + new Recipe(inputs, outputs, chancedOutputs, fluidInputs, fluidOutputs, duration, EUt, hidden)); + } + + @Override + public void buildAndRegister() { + if (fluidInputs.isEmpty()) { + recipeMap.addRecipe(this.copy() + .fluidInputs(Materials.SolderingAlloy.getFluid(Math.max(1, GTValues.L / 2 * solderMultiplier))) + .build()); + recipeMap.addRecipe(this.copy() + .fluidInputs(Materials.Tin.getFluid(Math.max(1, GTValues.L * solderMultiplier))) + .build()); + } else { + recipeMap.addRecipe(build()); + } + } +} diff --git a/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java b/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java index 3a263865485..b0d039c17a3 100644 --- a/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java +++ b/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java @@ -103,6 +103,7 @@ public class MetaTileEntities { public static SimpleMachineMetaTileEntity[] THERMAL_CENTRIFUGE = new SimpleMachineMetaTileEntity[GTValues.V.length - 1]; public static SimpleMachineMetaTileEntity[] WIREMILL = new SimpleMachineMetaTileEntity[GTValues.V.length - 1]; public static SimpleMachineMetaTileEntity[] CLUSTER_MILL = new SimpleMachineMetaTileEntity[GTValues.V.length - 1]; + public static SimpleMachineMetaTileEntity[] CIRCUIT_ASSEMBLER = new SimpleMachineMetaTileEntity[GTValues.UV]; //GENERATORS SECTION public static SimpleGeneratorMetaTileEntity[] COMBUSTION_GENERATOR = new SimpleGeneratorMetaTileEntity[4]; @@ -251,7 +252,7 @@ public static void init() { // Arc Furnace, IDs 110-124 registerSimpleMetaTileEntity(ARC_FURNACE, 110, "arc_furnace", RecipeMaps.ARC_FURNACE_RECIPES, Textures.ARC_FURNACE_OVERLAY, - ConfigHolder.U.machines.midTierArcFurnaces, ConfigHolder.U.machines.highTierArcFurnaces, false); + ConfigHolder.U.machines.midTierArcFurnaces, ConfigHolder.U.machines.highTierArcFurnaces, false, false); // Assembler, IDs 125-139 registerSimpleMetaTileEntity(ASSEMBLER, 125, "assembler", RecipeMaps.ASSEMBLER_RECIPES, Textures.ASSEMBLER_OVERLAY, @@ -259,7 +260,7 @@ public static void init() { // Autoclave, IDs 140-154 registerSimpleMetaTileEntity(AUTOCLAVE, 140, "autoclave", RecipeMaps.AUTOCLAVE_RECIPES, Textures.AUTOCLAVE_OVERLAY, - ConfigHolder.U.machines.midTierAutoclaves, ConfigHolder.U.machines.highTierAutoclaves, false); + ConfigHolder.U.machines.midTierAutoclaves, ConfigHolder.U.machines.highTierAutoclaves, false, false); // Bender, IDs 155-169 registerSimpleMetaTileEntity(BENDER, 155, "bender", RecipeMaps.BENDER_RECIPES, Textures.BENDER_OVERLAY, @@ -275,7 +276,7 @@ public static void init() { // Centrifuge, IDs 200-214 registerSimpleMetaTileEntity(CENTRIFUGE, 200, "centrifuge", RecipeMaps.CENTRIFUGE_RECIPES, Textures.CENTRIFUGE_OVERLAY, - ConfigHolder.U.machines.midTierCentrifuges, ConfigHolder.U.machines.highTierCentrifuges, false); + ConfigHolder.U.machines.midTierCentrifuges, ConfigHolder.U.machines.highTierCentrifuges, false, false); // Chemical Bath, IDs 215-229 registerSimpleMetaTileEntity(CHEMICAL_BATH, 215, "chemical_bath", RecipeMaps.CHEMICAL_BATH_RECIPES, Textures.CHEMICAL_BATH_OVERLAY, @@ -299,7 +300,7 @@ public static void init() { // Electrolyzer, IDs 290-304 registerSimpleMetaTileEntity(ELECTROLYZER, 290, "electrolyzer", RecipeMaps.ELECTROLYZER_RECIPES, Textures.ELECTROLYZER_OVERLAY, - ConfigHolder.U.machines.midTierElectrolyzers, ConfigHolder.U.machines.highTierElectrolyzers, false); + ConfigHolder.U.machines.midTierElectrolyzers, ConfigHolder.U.machines.highTierElectrolyzers, false, false); // Electromagnetic Separator, IDs 305-319 registerSimpleMetaTileEntity(ELECTROMAGNETIC_SEPARATOR, 305, "electromagnetic_separator", RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES, Textures.ELECTROMAGNETIC_SEPARATOR_OVERLAY, @@ -351,7 +352,7 @@ public static void init() { // Mixer, IDs 485-499 registerSimpleMetaTileEntity(MIXER, 485, "mixer", RecipeMaps.MIXER_RECIPES, Textures.MIXER_OVERLAY, - ConfigHolder.U.machines.midTierMixers, ConfigHolder.U.machines.highTierMixers, false); + ConfigHolder.U.machines.midTierMixers, ConfigHolder.U.machines.highTierMixers, false, false); // Ore Washer, IDs 500-514 registerSimpleMetaTileEntity(ORE_WASHER, 500, "ore_washer", RecipeMaps.ORE_WASHER_RECIPES, Textures.ORE_WASHER_OVERLAY, @@ -367,7 +368,7 @@ public static void init() { // Plasma Arc Furnace, IDs 545-559 registerSimpleMetaTileEntity(PLASMA_ARC_FURNACE, 545, "plasma_arc_furnace", RecipeMaps.PLASMA_ARC_FURNACE_RECIPES, Textures.PLASMA_ARC_FURNACE_OVERLAY, - ConfigHolder.U.machines.midTierPlasmaArcFurnaces, ConfigHolder.U.machines.highTierPlasmaArcFurnaces, false); + ConfigHolder.U.machines.midTierPlasmaArcFurnaces, ConfigHolder.U.machines.highTierPlasmaArcFurnaces, false, false); // Polarizer, IDs 560-574 registerSimpleMetaTileEntity(POLARIZER, 560, "polarizer", RecipeMaps.POLARIZER_RECIPES, Textures.POLARIZER_OVERLAY, @@ -395,6 +396,10 @@ public static void init() { ConfigHolder.U.machines.midTierClusterMills, ConfigHolder.U.machines.highTierClusterMills); } + // Circuit Assembler, IDs 650-664 + registerSimpleMetaTileEntity(CIRCUIT_ASSEMBLER, 650, "circuit_assembler", RecipeMaps.CIRCUIT_ASSEMBLER_RECIPES, Textures.ASSEMBLER_OVERLAY, + true, false, true, true); + // Some space here for more SimpleMachines // Space left for these just in case @@ -664,10 +669,13 @@ private static void registerSimpleMetaTileEntity(SimpleMachineMetaTileEntity[] m OrientedOverlayRenderer texture, boolean midTier, boolean highTier, - boolean hasFrontFacing) { + boolean hasFrontFacing, + boolean ignoreConfig) { for (int i = 0; i < machines.length - 1; i++) { - if (i > 4 && !(ConfigHolder.U.machines.midTierMachines || midTier)) continue; - if (i > 7 && !(ConfigHolder.U.machines.highTierMachines || highTier)) break; + if (!ignoreConfig) { + if (i > 4 && !(ConfigHolder.U.machines.midTierMachines || midTier)) continue; + if (i > 7 && !(ConfigHolder.U.machines.highTierMachines || highTier)) break; + } String voltageName = GTValues.VN[i + 1].toLowerCase(); machines[i] = GregTechAPI.registerMetaTileEntity(startId + i, @@ -682,7 +690,7 @@ private static void registerSimpleMetaTileEntity(SimpleMachineMetaTileEntity[] m OrientedOverlayRenderer texture, boolean midTier, boolean highTier) { - registerSimpleMetaTileEntity(machines, startId, name, map, texture, midTier, highTier, true); + registerSimpleMetaTileEntity(machines, startId, name, map, texture, midTier, highTier, true, false); } private static ResourceLocation gregtechId(String name) { diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 9c577ec6847..349fbcc3035 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -1871,6 +1871,7 @@ recipemap.steam_turbine.name=Steam Turbine recipemap.semi_fluid_generator.name=Semi Fluid Fuels recipemap.plasma_generator.name=Plasma Generator recipemap.cluster_mill.name=Cluster Mill +recipemap.circuit_assembler.name=Circuit Assembler behaviour.hoe=Can till dirt behaviour.soft_hammer=Activates and Deactivates Machines @@ -2849,6 +2850,16 @@ gregtech.machine.cluster_mill.uiv.name=High-Tech Cluster Mill III gregtech.machine.cluster_mill.umv.name=High-Tech Cluster Mill IV gregtech.machine.cluster_mill.uxv.name=Ultimate Cluster Mill +gregtech.machine.circuit_assembler.tooltip=Pick-n-Place all over the place + +gregtech.machine.circuit_assembler.lv.name=Basic Circuit Assembler +gregtech.machine.circuit_assembler.mv.name=Advanced Circuit Assembler +gregtech.machine.circuit_assembler.hv.name=Advanced Circuit Assembler II +gregtech.machine.circuit_assembler.ev.name=Advanced Circuit Assembler III +gregtech.machine.circuit_assembler.iv.name=Elite Circuit Assembler +gregtech.machine.circuit_assembler.luv.name=Elite Circuit Assembler II +gregtech.machine.circuit_assembler.zpm.name=Elite Circuit Assembler III + # Machine hulls gregtech.machine.hull.tooltip=§fYou just need §5I§dm§4a§cg§ei§an§ba§3t§7i§1o§5n§f to use this From ac6a4583d146cbb891a5fc232cabccefbfdcbd9b Mon Sep 17 00:00:00 2001 From: DStrand1 Date: Sat, 3 Jul 2021 23:51:47 -0500 Subject: [PATCH 06/21] rework wafer recipes --- .../loaders/recipe/CircuitRecipes.java | 106 +++++++++++------- 1 file changed, 66 insertions(+), 40 deletions(-) diff --git a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java index 02d3c4d26a4..ab28e27f52d 100644 --- a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java @@ -51,67 +51,91 @@ private static void waferRecipes() { .blastFurnaceTemp(2484) .buildAndRegister(); - BLAST_RECIPES.recipeBuilder().duration(1500).EUt(1920) - .input(block, Silicon, 9) + BLAST_RECIPES.recipeBuilder().duration(15000).EUt(1920) + .input(block, Silicon, 16) .input(ingot, Naquadah) .fluidInputs(Argon.getFluid(8000)) .output(NAQUADAH_BOULE) .blastFurnaceTemp(5400) .buildAndRegister(); + BLAST_RECIPES.recipeBuilder().duration(18000).EUt(7680) + .input(block, Silicon, 32) + .input(ingot, Neutronium, 4) + .notConsumable(new IntCircuitIngredient(1)) + .fluidInputs(Radon.getFluid(8000)) + .output(NEUTRONIUM_BOULE) + .blastFurnaceTemp(6484) + .buildAndRegister(); + // Boule cutting - CUTTER_RECIPES.recipeBuilder().duration(200).EUt(8) .input(SILICON_BOULE).output(SILICON_WAFER, 16).buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(400).EUt(64) .input(GLOWSTONE_BOULE).output(GLOWSTONE_WAFER, 32).buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(800).EUt(384).input(NAQUADAH_BOULE).output(NAQUADAH_WAFER, 64).buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(400).EUt(16) .input(SILICON_BOULE) .output(SILICON_WAFER, 16).buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(800).EUt(120) .input(GLOWSTONE_BOULE) .output(GLOWSTONE_WAFER, 32).buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(1600).EUt(480) .input(NAQUADAH_BOULE) .output(NAQUADAH_WAFER, 64).buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(2400).EUt(1920).input(NEUTRONIUM_BOULE).output(NEUTRONIUM_WAFER, 64).output(NEUTRONIUM_WAFER, 32).buildAndRegister(); // Wafer engraving - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(SILICON_WAFER) .notConsumable(craftingLens, Color.Red) .output(INTEGRATED_LOGIC_CIRCUIT_WAFER) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480) .input(GLOWSTONE_WAFER).notConsumable(craftingLens, Color.Red) .output(INTEGRATED_LOGIC_CIRCUIT_WAFER, 4).buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Red) .output(INTEGRATED_LOGIC_CIRCUIT_WAFER, 8).buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(SILICON_WAFER) .notConsumable(craftingLens, Color.Red) .output(INTEGRATED_LOGIC_CIRCUIT_WAFER) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.Red) .output(INTEGRATED_LOGIC_CIRCUIT_WAFER, 4) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Red) .output(INTEGRATED_LOGIC_CIRCUIT_WAFER, 8) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(50).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Red) .output(INTEGRATED_LOGIC_CIRCUIT_WAFER, 16) .buildAndRegister(); + + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(SILICON_WAFER) .notConsumable(craftingLens, Color.Silver) .output(RANDOM_ACCESS_MEMORY_WAFER) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.Silver) .output(RANDOM_ACCESS_MEMORY_WAFER, 4) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Silver) .output(RANDOM_ACCESS_MEMORY_WAFER, 8) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(50) .EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Silver) .output(RANDOM_ACCESS_MEMORY_WAFER, 16) .buildAndRegister(); + + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(480) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.LightBlue).output(NAND_MEMORY_CHIP_WAFER) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.LightBlue).output(NAND_MEMORY_CHIP_WAFER, 4) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.LightBlue).output(NAND_MEMORY_CHIP_WAFER, 8) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(SILICON_WAFER) .notConsumable(craftingLens, Color.Silver) .output(RANDOM_ACCESS_MEMORY_WAFER) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480) .input(GLOWSTONE_WAFER).notConsumable(craftingLens, Color.Silver) .output(RANDOM_ACCESS_MEMORY_WAFER, 4) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Silver) .output(RANDOM_ACCESS_MEMORY_WAFER, 8) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(480) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.Lime) .output(NOR_MEMORY_CHIP_WAFER) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Lime) .output(NOR_MEMORY_CHIP_WAFER, 4) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Lime) .output(NOR_MEMORY_CHIP_WAFER, 8) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480) .input(GLOWSTONE_WAFER).notConsumable(craftingLens, Color.LightBlue).output(NAND_MEMORY_CHIP_WAFER) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.LightBlue).output(NAND_MEMORY_CHIP_WAFER, 4) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(SILICON_WAFER) .notConsumable(craftingLens, Color.White) .output(CENTRAL_PROCESSING_UNIT_WAFER) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.White) .output(CENTRAL_PROCESSING_UNIT_WAFER, 4) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.White) .output(CENTRAL_PROCESSING_UNIT_WAFER, 8) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(50) .EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.White) .output(CENTRAL_PROCESSING_UNIT_WAFER, 16) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480) .input(GLOWSTONE_WAFER).notConsumable(craftingLens, Color.Lime) .output(NOR_MEMORY_CHIP_WAFER) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Lime) .output(NOR_MEMORY_CHIP_WAFER, 4) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(480) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.Blue) .output(POWER_INTEGRATED_CIRCUIT_WAFER) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Blue) .output(POWER_INTEGRATED_CIRCUIT_WAFER, 4) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Blue) .output(POWER_INTEGRATED_CIRCUIT_WAFER, 8) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(SILICON_WAFER) .notConsumable(craftingLens, Color.White) .output(CENTRAL_PROCESSING_UNIT_WAFER) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480) .input(GLOWSTONE_WAFER).notConsumable(craftingLens, Color.White) .output(CENTRAL_PROCESSING_UNIT_WAFER, 4) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.White) .output(CENTRAL_PROCESSING_UNIT_WAFER, 8) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(300).EUt(120) .input(SILICON_WAFER) .notConsumable(craftingLens, Color.Orange) .output(SIMPLE_SYSTEM_ON_CHIP_WAFER) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480) .input(GLOWSTONE_WAFER).notConsumable(craftingLens, Color.Blue) .output(POWER_INTEGRATED_CIRCUIT_WAFER) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Blue) .output(POWER_INTEGRATED_CIRCUIT_WAFER, 4).buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(480) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.Yellow) .output(SYSTEM_ON_CHIP_WAFER) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Yellow) .output(SYSTEM_ON_CHIP_WAFER, 4) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Yellow) .output(SYSTEM_ON_CHIP_WAFER, 8) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Yellow) .output(SYSTEM_ON_CHIP_WAFER, 2) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Orange) .output(ADVANCED_SYSTEM_ON_CHIP_WAFER) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Orange) .output(ADVANCED_SYSTEM_ON_CHIP_WAFER) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Orange) .output(ADVANCED_SYSTEM_ON_CHIP_WAFER, 2) .buildAndRegister(); + + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Pink) .output(HIGHLY_ADVANCED_SOC_WAFER) .buildAndRegister(); // Wafer chemical refining recipes - CHEMICAL_RECIPES.recipeBuilder().duration(1200).EUt(1920) + CHEMICAL_RECIPES.recipeBuilder().duration(1200).EUt(7680) .input(POWER_INTEGRATED_CIRCUIT_WAFER) .input(dust, IndiumGalliumPhosphide, 2) - .fluidInputs(RedAlloy.getFluid(288)) + .fluidInputs(RedAlloy.getFluid(L * 2)) .output(HIGH_POWER_INTEGRATED_CIRCUIT_WAFER) .buildAndRegister(); - CHEMICAL_RECIPES.recipeBuilder().duration(400).EUt(480) + CHEMICAL_RECIPES.recipeBuilder().duration(1200).EUt(1920) .input(CENTRAL_PROCESSING_UNIT_WAFER) .input(CARBON_FIBERS, 16) - .fluidInputs(Glowstone.getFluid(576)) + .fluidInputs(Glowstone.getFluid(L * 4)) .output(NANO_CENTRAL_PROCESSING_UNIT_WAFER) .buildAndRegister(); - CHEMICAL_RECIPES.recipeBuilder().duration(400).EUt(1920) + CHEMICAL_RECIPES.recipeBuilder().duration(900).EUt(1920) .input(NANO_CENTRAL_PROCESSING_UNIT_WAFER) .input(QUANTUM_EYE, 2) - .fluidInputs(GalliumArsenide.getFluid(288)) + .fluidInputs(GalliumArsenide.getFluid(L * 2)) .output(QBIT_CENTRAL_PROCESSING_UNIT_WAFER) .buildAndRegister(); - CHEMICAL_RECIPES.recipeBuilder().duration(600).EUt(1920) + CHEMICAL_RECIPES.recipeBuilder().duration(1200).EUt(1920) .input(NANO_CENTRAL_PROCESSING_UNIT_WAFER) .input(dust, IndiumGalliumPhosphide) .fluidInputs(Radon.getFluid(50)) @@ -119,17 +143,19 @@ private static void waferRecipes() { .buildAndRegister(); // Wafer cutting - CUTTER_RECIPES.recipeBuilder().duration(600).EUt(48).input(ADVANCED_SYSTEM_ON_CHIP_WAFER) .output(ADVANCED_SYSTEM_ON_CHIP, 6) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(600).EUt(48).input(SYSTEM_ON_CHIP_WAFER) .output(SYSTEM_ON_CHIP, 6) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(600).EUt(48).input(RANDOM_ACCESS_MEMORY_WAFER) .output(RANDOM_ACCESS_MEMORY, 32) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(600).EUt(48).input(QBIT_CENTRAL_PROCESSING_UNIT_WAFER) .output(QBIT_CENTRAL_PROCESSING_UNIT, 5) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(600).EUt(48).input(POWER_INTEGRATED_CIRCUIT_WAFER) .output(POWER_INTEGRATED_CIRCUIT, 4) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(600).EUt(48).input(HIGH_POWER_INTEGRATED_CIRCUIT_WAFER).output(HIGH_POWER_INTEGRATED_CIRCUIT, 2).buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(600).EUt(48).input(NOR_MEMORY_CHIP_WAFER) .output(NOR_MEMORY_CHIP, 16) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(600).EUt(48).input(NAND_MEMORY_CHIP_WAFER) .output(NAND_MEMORY_CHIP, 32) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(600).EUt(48).input(CENTRAL_PROCESSING_UNIT_WAFER) .output(CENTRAL_PROCESSING_UNIT, 8) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(600).EUt(48).input(INTEGRATED_LOGIC_CIRCUIT_WAFER) .output(INTEGRATED_LOGIC_CIRCUIT, 8) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(600).EUt(48).input(NANO_CENTRAL_PROCESSING_UNIT_WAFER) .output(NANO_CENTRAL_PROCESSING_UNIT, 7) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(7680).input(HIGHLY_ADVANCED_SOC_WAFER) .output(HIGHLY_ADVANCED_SOC, 6) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(1920).input(ADVANCED_SYSTEM_ON_CHIP_WAFER) .output(ADVANCED_SYSTEM_ON_CHIP, 6) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(480) .input(SYSTEM_ON_CHIP_WAFER) .output(SYSTEM_ON_CHIP, 6) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(64) .input(SIMPLE_SYSTEM_ON_CHIP_WAFER) .output(SIMPLE_SYSTEM_ON_CHIP, 6) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(96) .input(RANDOM_ACCESS_MEMORY_WAFER) .output(RANDOM_ACCESS_MEMORY, 32) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(1920).input(QBIT_CENTRAL_PROCESSING_UNIT_WAFER) .output(QBIT_CENTRAL_PROCESSING_UNIT, 4) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(1920) .input(POWER_INTEGRATED_CIRCUIT_WAFER) .output(POWER_INTEGRATED_CIRCUIT, 4) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(7680).input(HIGH_POWER_INTEGRATED_CIRCUIT_WAFER).output(HIGH_POWER_INTEGRATED_CIRCUIT, 2).buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(192) .input(NOR_MEMORY_CHIP_WAFER) .output(NOR_MEMORY_CHIP, 16) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(192) .input(NAND_MEMORY_CHIP_WAFER) .output(NAND_MEMORY_CHIP, 32) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(CENTRAL_PROCESSING_UNIT_WAFER) .output(CENTRAL_PROCESSING_UNIT, 8) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(64) .input(INTEGRATED_LOGIC_CIRCUIT_WAFER) .output(INTEGRATED_LOGIC_CIRCUIT, 8) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(480).input(NANO_CENTRAL_PROCESSING_UNIT_WAFER) .output(NANO_CENTRAL_PROCESSING_UNIT, 8) .buildAndRegister(); } private static void componentRecipes() { From 4be62060673ec06fc9494451cd17783bc2fb5253 Mon Sep 17 00:00:00 2001 From: DStrand1 Date: Sun, 4 Jul 2021 01:22:55 -0500 Subject: [PATCH 07/21] properly sort JEI items --- src/main/java/gregtech/api/items/metaitem/MetaItem.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/gregtech/api/items/metaitem/MetaItem.java b/src/main/java/gregtech/api/items/metaitem/MetaItem.java index 6bcdc7fb10d..731eadc3bf9 100644 --- a/src/main/java/gregtech/api/items/metaitem/MetaItem.java +++ b/src/main/java/gregtech/api/items/metaitem/MetaItem.java @@ -80,7 +80,7 @@ public static List> getMetaItems() { return Collections.unmodifiableList(META_ITEMS); } - protected TShortObjectMap metaItems = new TShortObjectHashMap<>(); + protected Map metaItems = new TreeMap<>(); private Map names = new HashMap<>(); protected TShortObjectMap metaItemsModels = new TShortObjectHashMap<>(); protected TShortObjectHashMap specialItemsModels = new TShortObjectHashMap<>(); @@ -102,7 +102,7 @@ public void registerColor() { @SideOnly(Side.CLIENT) public void registerModels() { - for (short itemMetaKey : metaItems.keys()) { + for (short itemMetaKey : metaItems.keySet()) { T metaValueItem = metaItems.get(itemMetaKey); int numberOfModels = metaValueItem.getModelAmount(); if (numberOfModels > 1) { @@ -224,7 +224,7 @@ public final T addItem(int metaValue, String unlocalizedName) { } public final Collection getAllItems() { - return Collections.unmodifiableCollection(metaItems.valueCollection()); + return Collections.unmodifiableCollection(metaItems.values()); } public final T getItem(short metaValue) { @@ -570,7 +570,7 @@ public void getSubItems(CreativeTabs tab, NonNullList subItems) { if (tab != GregTechAPI.TAB_GREGTECH && tab != CreativeTabs.SEARCH) { return; } - for (T enabledItem : metaItems.valueCollection()) { + for (T enabledItem : metaItems.values()) { if (!enabledItem.isVisible()) continue; ItemStack itemStack = enabledItem.getStackForm(); From c81a90e42cfb42ef07ba48337aaf1ae8fd28ef9c Mon Sep 17 00:00:00 2001 From: DStrand1 Date: Sun, 4 Jul 2021 01:28:41 -0500 Subject: [PATCH 08/21] add finished circuit boards --- .../java/gregtech/common/items/MetaItem2.java | 27 +++++++++++------- .../java/gregtech/common/items/MetaItems.java | 16 +++++++---- .../resources/assets/gregtech/lang/en_us.lang | 25 ++++++++++++++-- .../metaitems/circuit_board.advanced.json | 6 ++++ .../item/metaitems/circuit_board.basic.json | 6 ++++ .../item/metaitems/circuit_board.elite.json | 6 ++++ .../item/metaitems/circuit_board.extreme.json | 6 ++++ .../item/metaitems/circuit_board.good.json | 6 ++++ .../item/metaitems/circuit_board.plastic.json | 6 ++++ .../item/metaitems/circuit_board.wetware.json | 6 ++++ .../metaitems/circuit_board.advanced.png | Bin 0 -> 3289 bytes .../items/metaitems/circuit_board.basic.png | Bin 0 -> 3354 bytes .../items/metaitems/circuit_board.elite.png | Bin 0 -> 3301 bytes .../items/metaitems/circuit_board.extreme.png | Bin 0 -> 3291 bytes .../items/metaitems/circuit_board.good.png | Bin 0 -> 3346 bytes .../items/metaitems/circuit_board.plastic.png | Bin 0 -> 3115 bytes .../items/metaitems/circuit_board.wetware.png | Bin 0 -> 3335 bytes 17 files changed, 91 insertions(+), 19 deletions(-) create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.advanced.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.basic.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.elite.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.extreme.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.good.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.plastic.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.wetware.json create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.advanced.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.basic.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.elite.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.extreme.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.good.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.plastic.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.wetware.png diff --git a/src/main/java/gregtech/common/items/MetaItem2.java b/src/main/java/gregtech/common/items/MetaItem2.java index b5bce09fc9b..d5f09f0cc7a 100644 --- a/src/main/java/gregtech/common/items/MetaItem2.java +++ b/src/main/java/gregtech/common/items/MetaItem2.java @@ -61,6 +61,22 @@ public void registerSubItems() { NAQUADAH_WAFER = addItem(26, "wafer.naquadah"); NEUTRONIUM_WAFER = addItem(27, "wafer.neutronium"); + COATED_BOARD = addItem(30, "board.coated"); + PHENOLIC_BOARD = addItem(32, "board.phenolic"); + PLASTIC_BOARD = addItem(34, "board.plastic"); + EPOXY_BOARD = addItem(36, "board.epoxy"); + FIBER_BOARD = addItem(38, "board.fiber_reinforced"); + MULTILAYER_FIBER_BOARD = addItem(40, "board.multilayer.fiber_reinforced"); + WETWARE_BOARD = addItem(42, "board.wetware"); + + BASIC_CIRCUIT_BOARD = addItem(31, "circuit_board.basic"); + GOOD_CIRCUIT_BOARD = addItem(33, "circuit_board.good"); + PLASTIC_CIRCUIT_BOARD = addItem(35, "circuit_board.plastic"); + ADVANCED_CIRCUIT_BOARD = addItem(37, "circuit_board.advanced"); + EXTREME_CIRCUIT_BOARD = addItem(39, "circuit_board.extreme"); + ELITE_CIRCUIT_BOARD = addItem(41, "circuit_board.elite"); + WETWARE_CIRCUIT_BOARD = addItem(43, "circuit_board.wetware"); + BOTTLE_PURPLE_DRINK = addItem(100, "bottle.purple.drink").addComponents(new FoodStats(8, 0.2F, true, true, new ItemStack(Items.GLASS_BOTTLE), new RandomPotionEffect(MobEffects.HASTE, 800, 1, 90))); ENERGY_CRYSTAL = addItem(212, "energy_crystal").addComponents(ElectricStats.createRechargeableBattery(4000000L, GTValues.HV)).setModelAmount(8).setMaxStackSize(1); @@ -93,13 +109,6 @@ public void registerSubItems() { PLATE_IRIDIUM_ALLOY = addItem(435, "plate.iridium_alloy"); NEUTRON_REFLECTOR = addItem(436, "neutron_reflector"); - COATED_BOARD = addItem(443, "board.coated"); - EPOXY_BOARD = addItem(444, "board.epoxy"); - FIBER_BOARD = addItem(445, "board.fiber_reinforced"); - MULTILAYER_FIBER_BOARD = addItem(446, "board.multilayer.fiber_reinforced"); - PHENOLIC_BOARD = addItem(447, "board.phenolic"); - PLASTIC_BOARD = addItem(448, "board.plastic"); - WETWARE_BOARD = addItem(449, "board.wetware"); VACUUM_TUBE = addItem(450, "circuit.vacuum_tube").setUnificationData(OrePrefix.circuit, Tier.Primitive); DIODE = addItem(451, "component.diode"); @@ -194,10 +203,6 @@ public void registerSubItems() { WETWARE_SUPER_COMPUTER_UV = addItem(525, "circuit.wetware_computer").setUnificationData(OrePrefix.circuit, Tier.Superconductor); WETWARE_MAINFRAME_MAX = addItem(526, "circuit.wetware_mainframe").setUnificationData(OrePrefix.circuit, Tier.Infinite); - // TODO REMOVE THESE - DATA_CONTROL_CIRCUIT_IV = addItem(527, "circuit.data_control").setUnificationData(OrePrefix.circuit, Tier.Elite); - ENERGY_FLOW_CIRCUIT_LUV = addItem(528, "circuit.energy_flow").setUnificationData(OrePrefix.circuit, Tier.Master); - TURBINE_ROTOR = addItem(529, "turbine_rotor").addComponents(new TurbineRotorBehavior()); COVER_FACADE = addItem(530, "cover.facade").addComponents(new FacadeItem()).disableModelLoading(); diff --git a/src/main/java/gregtech/common/items/MetaItems.java b/src/main/java/gregtech/common/items/MetaItems.java index ee220b42016..f3c270112d0 100644 --- a/src/main/java/gregtech/common/items/MetaItems.java +++ b/src/main/java/gregtech/common/items/MetaItems.java @@ -276,13 +276,21 @@ private MetaItems() { public static MetaItem.MetaValueItem CRYSTAL_SYSTEM_ON_CHIP; public static MetaItem.MetaValueItem COATED_BOARD; + public static MetaItem.MetaValueItem PHENOLIC_BOARD; + public static MetaItem.MetaValueItem PLASTIC_BOARD; public static MetaItem.MetaValueItem EPOXY_BOARD; public static MetaItem.MetaValueItem FIBER_BOARD; public static MetaItem.MetaValueItem MULTILAYER_FIBER_BOARD; - public static MetaItem.MetaValueItem PHENOLIC_BOARD; - public static MetaItem.MetaValueItem PLASTIC_BOARD; public static MetaItem.MetaValueItem WETWARE_BOARD; + public static MetaItem.MetaValueItem BASIC_CIRCUIT_BOARD; + public static MetaItem.MetaValueItem GOOD_CIRCUIT_BOARD; + public static MetaItem.MetaValueItem PLASTIC_CIRCUIT_BOARD; + public static MetaItem.MetaValueItem ADVANCED_CIRCUIT_BOARD; + public static MetaItem.MetaValueItem EXTREME_CIRCUIT_BOARD; + public static MetaItem.MetaValueItem ELITE_CIRCUIT_BOARD; + public static MetaItem.MetaValueItem WETWARE_CIRCUIT_BOARD; + public static MetaItem.MetaValueItem VACUUM_TUBE; public static MetaItem.MetaValueItem GLASS_TUBE; public static MetaItem.MetaValueItem RESISTOR; @@ -338,10 +346,6 @@ private MetaItems() { public static MetaItem.MetaValueItem WETWARE_SUPER_COMPUTER_UV; public static MetaItem.MetaValueItem WETWARE_MAINFRAME_MAX; - // TODO Remove these two - public static MetaItem.MetaValueItem DATA_CONTROL_CIRCUIT_IV; // was basically the Quantum Assembly - public static MetaItem.MetaValueItem ENERGY_FLOW_CIRCUIT_LUV; // was basically the Crystal Assembly - public static MetaItem.MetaValueItem COMPONENT_SAW_BLADE_DIAMOND; public static MetaItem.MetaValueItem COMPONENT_GRINDER_DIAMOND; public static MetaItem.MetaValueItem COMPONENT_GRINDER_TUNGSTEN; diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 349fbcc3035..b052201828a 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -448,14 +448,35 @@ metaitem.wafer.neutronium.name=Neutronium-doped Wafer metaitem.wafer.neutronium.tooltip=Raw Circuit metaitem.board.coated.name=Coated Circuit Board +metaitem.board.coated.tooltip=A Coated Board +metaitem.board.phenolic.name=Phenolic Circuit Board +metaitem.board.phenolic.tooltip=A Good Board +metaitem.board.plastic.name=Plastic Circuit Board +metaitem.board.plastic.tooltip=A Good Board metaitem.board.epoxy.name=Epoxy Circuit Board +metaitem.board.epoxy.tooltip=An Advanced Board metaitem.board.fiber_reinforced.name=Fiber-Reinforced Circuit Board +metaitem.board.fiber_reinforced.tooltip=An Extreme Board metaitem.board.multilayer.fiber_reinforced.name=Multi-layer Fiber-Reinforced Circuit Board -metaitem.board.phenolic.name=Phenolic Circuit Board -metaitem.board.plastic.name=Plastic Circuit Board +metaitem.board.multiplayer.fiber_reinforced.name=An Elite Board metaitem.board.wetware.name=Wetware Lifesupport Circuit Board metaitem.board.wetware.tooltip=The Board that keeps life +metaitem.circuit_board.basic.name=Circuit Board +metaitem.circuit_board.basic.tooltip=A Basic Circuit Board +metaitem.circuit_board.good.name=Good Circuit Board +metaitem.circuit_board.good.tooltip=A Good Circuit Board +metaitem.circuit_board.plastic.name=Plastic Circuit Board +metaitem.circuit_board.plastic.tooltip=A Good Circuit Board +metaitem.circuit_board.advanced.name=Advanced Circuit Board +metaitem.circuit_board.advanced.tooltip=An Advanced Circuit Board +metaitem.circuit_board.extreme.name=Extreme Circuit Board +metaitem.circuit_board.extreme.tooltip=A More Advanced Circuit Board +metaitem.circuit_board.elite.name=Elite Circuit Board +metaitem.circuit_board.elite.tooltip=An Elite Circuit Board +metaitem.circuit_board.wetware.name=Master Circuit Board +metaitem.circuit_board.wetware.tooltip=The Board that keeps life + metaitem.circuit.vacuum_tube.name=Vacuum Tube metaitem.circuit.vacuum_tube.tooltip=Technically a Diode/n§cULV-tier metaitem.component.diode.name=Diode diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.advanced.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.advanced.json new file mode 100644 index 00000000000..3ea7d1f1a70 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.advanced.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit_board.advanced" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.basic.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.basic.json new file mode 100644 index 00000000000..62435dc5cf7 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.basic.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit_board.basic" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.elite.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.elite.json new file mode 100644 index 00000000000..c35da5d3774 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.elite.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit_board.elite" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.extreme.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.extreme.json new file mode 100644 index 00000000000..2eea53b0b5e --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.extreme.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit_board.extreme" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.good.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.good.json new file mode 100644 index 00000000000..07407ecda9a --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.good.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit_board.good" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.plastic.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.plastic.json new file mode 100644 index 00000000000..fd711793a1c --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.plastic.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit_board.plastic" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.wetware.json b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.wetware.json new file mode 100644 index 00000000000..fdb706b016e --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/circuit_board.wetware.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/circuit_board.wetware" + } +} diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.advanced.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.advanced.png new file mode 100644 index 0000000000000000000000000000000000000000..7108a9fbe656547c03c1a38793fe514dda6d7858 GIT binary patch literal 3289 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.elite.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.elite.png new file mode 100644 index 0000000000000000000000000000000000000000..577d9a49ab1ee1d1706a7e365a768e121907c4ad GIT binary patch literal 3301 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 Z2LQNdG`g1VYI^_x002ovPDHLkV1k$|5u5-3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.good.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.good.png new file mode 100644 index 0000000000000000000000000000000000000000..c971bfa81da8ad0bce59e69d880063608e96f120 GIT binary patch literal 3346 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.plastic.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.plastic.png new file mode 100644 index 0000000000000000000000000000000000000000..d8bef2fda05a554e0559f608b6c7fccc3cfc9cc6 GIT binary patch literal 3115 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 FV1iPA(X9Xg literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.wetware.png b/src/main/resources/assets/gregtech/textures/items/metaitems/circuit_board.wetware.png new file mode 100644 index 0000000000000000000000000000000000000000..80d15f4d36b86b5b01f5fd6859a412386cdad5f6 GIT binary patch literal 3335 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 Date: Sun, 4 Jul 2021 01:28:58 -0500 Subject: [PATCH 09/21] rework wafers, circuit components --- .../loaders/recipe/CircuitRecipes.java | 242 +++++++++++------- 1 file changed, 144 insertions(+), 98 deletions(-) diff --git a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java index ab28e27f52d..458c73154a0 100644 --- a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java @@ -78,7 +78,7 @@ private static void waferRecipes() { LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(SILICON_WAFER) .notConsumable(craftingLens, Color.Red) .output(INTEGRATED_LOGIC_CIRCUIT_WAFER) .buildAndRegister(); LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.Red) .output(INTEGRATED_LOGIC_CIRCUIT_WAFER, 4) .buildAndRegister(); LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Red) .output(INTEGRATED_LOGIC_CIRCUIT_WAFER, 8) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(50).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Red) .output(INTEGRATED_LOGIC_CIRCUIT_WAFER, 16) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(50).EUt(7680).input(NEUTRONIUM_WAFER) .notConsumable(craftingLens, Color.Red) .output(INTEGRATED_LOGIC_CIRCUIT_WAFER, 16).buildAndRegister(); LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(SILICON_WAFER) .notConsumable(craftingLens, Color.Silver) .output(RANDOM_ACCESS_MEMORY_WAFER) .buildAndRegister(); LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.Silver) .output(RANDOM_ACCESS_MEMORY_WAFER, 4) .buildAndRegister(); @@ -149,110 +149,157 @@ private static void waferRecipes() { CUTTER_RECIPES.recipeBuilder().duration(900).EUt(64) .input(SIMPLE_SYSTEM_ON_CHIP_WAFER) .output(SIMPLE_SYSTEM_ON_CHIP, 6) .buildAndRegister(); CUTTER_RECIPES.recipeBuilder().duration(900).EUt(96) .input(RANDOM_ACCESS_MEMORY_WAFER) .output(RANDOM_ACCESS_MEMORY, 32) .buildAndRegister(); CUTTER_RECIPES.recipeBuilder().duration(900).EUt(1920).input(QBIT_CENTRAL_PROCESSING_UNIT_WAFER) .output(QBIT_CENTRAL_PROCESSING_UNIT, 4) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(900).EUt(1920) .input(POWER_INTEGRATED_CIRCUIT_WAFER) .output(POWER_INTEGRATED_CIRCUIT, 4) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(1920).input(POWER_INTEGRATED_CIRCUIT_WAFER) .output(POWER_INTEGRATED_CIRCUIT, 4) .buildAndRegister(); CUTTER_RECIPES.recipeBuilder().duration(900).EUt(7680).input(HIGH_POWER_INTEGRATED_CIRCUIT_WAFER).output(HIGH_POWER_INTEGRATED_CIRCUIT, 2).buildAndRegister(); CUTTER_RECIPES.recipeBuilder().duration(900).EUt(192) .input(NOR_MEMORY_CHIP_WAFER) .output(NOR_MEMORY_CHIP, 16) .buildAndRegister(); CUTTER_RECIPES.recipeBuilder().duration(900).EUt(192) .input(NAND_MEMORY_CHIP_WAFER) .output(NAND_MEMORY_CHIP, 32) .buildAndRegister(); CUTTER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(CENTRAL_PROCESSING_UNIT_WAFER) .output(CENTRAL_PROCESSING_UNIT, 8) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(900).EUt(64) .input(INTEGRATED_LOGIC_CIRCUIT_WAFER) .output(INTEGRATED_LOGIC_CIRCUIT, 8) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(900).EUt(480).input(NANO_CENTRAL_PROCESSING_UNIT_WAFER) .output(NANO_CENTRAL_PROCESSING_UNIT, 8) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(64) .input(INTEGRATED_LOGIC_CIRCUIT_WAFER) .output(INTEGRATED_LOGIC_CIRCUIT, 8) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(480). input(NANO_CENTRAL_PROCESSING_UNIT_WAFER) .output(NANO_CENTRAL_PROCESSING_UNIT, 8) .buildAndRegister(); } private static void componentRecipes() { // Vacuum Tube - ModHandler.addShapedRecipe("vacuum_tube_wire", VACUUM_TUBE.getStackForm(), + ModHandler.addShapedRecipe("vacuum_tube", VACUUM_TUBE.getStackForm(), "PTP", "WWW", - 'P', new ItemStack(Items.PAPER), + 'P', new UnificationEntry(stick, Steel), 'T', GLASS_TUBE.getStackForm(), 'W', new UnificationEntry(wireGtSingle, Copper)); - ModHandler.addShapedRecipe("vacuum_tube_wire_fine", VACUUM_TUBE.getStackForm(), - "PTP", "WWW", - 'P', new ItemStack(Items.PAPER), - 'T', GLASS_TUBE.getStackForm(), - 'W', new UnificationEntry(wireFine, Copper)); - ASSEMBLER_RECIPES.recipeBuilder().duration(120).EUt(8) .input(GLASS_TUBE) - .inputs(new ItemStack(Items.PAPER, 2)) + .input(bolt, Steel, 2) .input(wireGtSingle, Copper, 2) - .output(VACUUM_TUBE) + .output(VACUUM_TUBE, 2) + .buildAndRegister(); + + ASSEMBLER_RECIPES.recipeBuilder().duration(40).EUt(8) + .input(GLASS_TUBE) + .input(bolt, Steel) + .input(wireGtSingle, Copper, 2) + .fluidInputs(RedAlloy.getFluid(18)) + .output(VACUUM_TUBE, 4) .buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().duration(120).EUt(8) .input(GLASS_TUBE) - .inputs(new ItemStack(Items.PAPER, 2)) - .input(wireFine, Copper, 2) - .output(VACUUM_TUBE) + .input(bolt, Steel, 2) + .input(wireGtSingle, AnnealedCopper, 2) + .output(VACUUM_TUBE, 4) + .buildAndRegister(); + + ASSEMBLER_RECIPES.recipeBuilder().duration(40).EUt(8) + .input(GLASS_TUBE) + .input(bolt, Steel) + .input(wireGtSingle, AnnealedCopper, 2) + .fluidInputs(RedAlloy.getFluid(18)) + .output(VACUUM_TUBE, 6) .buildAndRegister(); - ALLOY_SMELTER_RECIPES.recipeBuilder().duration(160).EUt(8) + ALLOY_SMELTER_RECIPES.recipeBuilder().duration(240).EUt(8) + .input(dust, Glass) + .notConsumable(SHAPE_MOLD_BALL) + .output(GLASS_TUBE) + .buildAndRegister(); + + FORMING_PRESS_RECIPES.recipeBuilder().duration(80).EUt(8) .input(dust, Glass) .notConsumable(SHAPE_MOLD_BALL) .output(GLASS_TUBE) .buildAndRegister(); // Resistor - ModHandler.addShapedRecipe("resistor_wire", RESISTOR.getStackForm(3), - " P ", "WCW", " P ", + ModHandler.addShapedRecipe("resistor_wire", RESISTOR.getStackForm(2), + "SPS", "WCW", " P ", 'P', new ItemStack(Items.PAPER), + 'S', RUBBER_DROP.getStackForm(), 'W', new UnificationEntry(wireGtSingle, Copper), 'C', new UnificationEntry(dust, Coal)); - ModHandler.addShapedRecipe("resistor_wire_fine", RESISTOR.getStackForm(3), - " P ", "WCW", " P ", + ModHandler.addShapedRecipe("resistor_wire_fine", RESISTOR.getStackForm(2), + "SPS", "WCW", " P ", 'P', new ItemStack(Items.PAPER), + 'S', RUBBER_DROP.getStackForm(), 'W', new UnificationEntry(wireFine, Copper), 'C', new UnificationEntry(dust, Coal)); - ModHandler.addShapedRecipe("resistor_wire_charcoal", RESISTOR.getStackForm(3), - " P ", "WCW", " P ", + ModHandler.addShapedRecipe("resistor_wire_charcoal", RESISTOR.getStackForm(2), + "SPS", "WCW", " P ", 'P', new ItemStack(Items.PAPER), + 'S', RUBBER_DROP.getStackForm(), 'W', new UnificationEntry(wireGtSingle, Copper), 'C', new UnificationEntry(dust, Charcoal)); - ModHandler.addShapedRecipe("resistor_wire_fine_charcoal", RESISTOR.getStackForm(3), - " P ", "WCW", " P ", + ModHandler.addShapedRecipe("resistor_wire_fine_charcoal", RESISTOR.getStackForm(2), + "SPS", "WCW", " P ", 'P', new ItemStack(Items.PAPER), + 'S', RUBBER_DROP.getStackForm(), 'W', new UnificationEntry(wireFine, Copper), 'C', new UnificationEntry(dust, Charcoal)); - ModHandler.addShapedRecipe("resistor_wire_carbon", RESISTOR.getStackForm(3), - " P ", "WCW", " P ", + ModHandler.addShapedRecipe("resistor_wire_carbon", RESISTOR.getStackForm(2), + "SPS", "WCW", " P ", 'P', new ItemStack(Items.PAPER), + 'S', RUBBER_DROP.getStackForm(), 'W', new UnificationEntry(wireGtSingle, Copper), 'C', new UnificationEntry(dust, Carbon)); - ModHandler.addShapedRecipe("resistor_wire_fine_carbon", RESISTOR.getStackForm(3), - " P ", "WCW", " P ", + ModHandler.addShapedRecipe("resistor_wire_fine_carbon", RESISTOR.getStackForm(2), + "SPS", "WCW", " P ", 'P', new ItemStack(Items.PAPER), + 'S', RUBBER_DROP.getStackForm(), 'W', new UnificationEntry(wireFine, Copper), 'C', new UnificationEntry(dust, Carbon)); ASSEMBLER_RECIPES.recipeBuilder().duration(160).EUt(6) .input(dust, Coal) .input(wireFine, Copper, 4) - .output(RESISTOR, 12) + .output(RESISTOR, 4) + .fluidInputs(Glue.getFluid(100)) .buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().duration(160).EUt(6) .input(dust, Charcoal) .input(wireFine, Copper, 4) - .output(RESISTOR, 12) + .output(RESISTOR, 4) + .fluidInputs(Glue.getFluid(100)) .buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().duration(160).EUt(6) .input(dust, Carbon) .input(wireFine, Copper, 4) - .output(RESISTOR, 12) + .output(RESISTOR, 4) + .fluidInputs(Glue.getFluid(100)) + .buildAndRegister(); + + ASSEMBLER_RECIPES.recipeBuilder().duration(160).EUt(6) + .input(dust, Coal) + .input(wireFine, AnnealedCopper, 4) + .output(RESISTOR, 8) + .fluidInputs(Glue.getFluid(100)) + .buildAndRegister(); + + ASSEMBLER_RECIPES.recipeBuilder().duration(160).EUt(6) + .input(dust, Charcoal) + .input(wireFine, AnnealedCopper, 4) + .output(RESISTOR, 8) + .fluidInputs(Glue.getFluid(100)) + .buildAndRegister(); + + ASSEMBLER_RECIPES.recipeBuilder().duration(160).EUt(6) + .input(dust, Carbon) + .input(wireFine, AnnealedCopper, 4) + .output(RESISTOR, 8) + .fluidInputs(Glue.getFluid(100)) .buildAndRegister(); // Capacitor - ASSEMBLER_RECIPES.recipeBuilder().duration(80).EUt(96) - .input(plate, Polyethylene) + ASSEMBLER_RECIPES.recipeBuilder().duration(320).EUt(120) + .input(foil, Polyethylene) .input(foil, Aluminium, 2) - .output(CAPACITOR, 2) + .fluidInputs(Polyethylene.getFluid(L)) + .output(CAPACITOR, 8) .buildAndRegister(); // Transistor @@ -264,152 +311,150 @@ private static void componentRecipes() { .buildAndRegister(); // Diode - ModHandler.addShapedRecipe("diode", DIODE.getStackForm(), - "DG ", "TWT", "DG ", - 'D', "dyeBlack", - 'G', "paneGlass", - 'T', new UnificationEntry(wireGtSingle, Tin), - 'W', new UnificationEntry(dustSmall, GalliumArsenide)); - - ModHandler.addShapedRecipe("diode_wire", DIODE.getStackForm(), - "DG ", "TWT", "DG ", - 'D', "dyeBlack", - 'G', "paneGlass", - 'T', new UnificationEntry(wireFine, Tin), - 'W', new UnificationEntry(dustSmall, GalliumArsenide)); - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(30) .input(wireFine, Copper, 4) .input(dustSmall, GalliumArsenide) - .fluidInputs(Polyethylene.getFluid(144)) + .fluidInputs(Polyethylene.getFluid(L)) .output(DIODE, 2) .buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(30) .input(wireFine, Copper, 4) .input(SILICON_WAFER) - .fluidInputs(Polyethylene.getFluid(144)) + .fluidInputs(Polyethylene.getFluid(L)) .output(DIODE, 4) .buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(30) .input(wireFine, AnnealedCopper, 4) .input(dustSmall, GalliumArsenide) - .fluidInputs(Polyethylene.getFluid(144)) + .fluidInputs(Polyethylene.getFluid(L)) .output(DIODE, 6) .buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(30) .input(wireFine, AnnealedCopper, 4) .input(SILICON_WAFER) - .fluidInputs(Polyethylene.getFluid(144)) + .fluidInputs(Polyethylene.getFluid(L)) .output(DIODE, 8) .buildAndRegister(); // Small Coil - ModHandler.addShapedRecipe("small_coil_copper_steel", SMALL_COIL.getStackForm(), - "WWW", "WBW", "WWW", - 'W', new UnificationEntry(wireFine, Copper), - 'B', new UnificationEntry(ring, Steel)); - - ASSEMBLER_RECIPES.recipeBuilder().duration(320).EUt(60) - .input(ring, Steel) - .input(wireFine, Copper, 2) - .output(SMALL_COIL, 2) - .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(320).EUt(60) .input(ring, NickelZincFerrite) .input(wireFine, Copper, 2) - .output(SMALL_COIL, 4) - .buildAndRegister(); - - ASSEMBLER_RECIPES.recipeBuilder().duration(320).EUt(60) - .input(ring, Steel) - .input(wireFine, AnnealedCopper, 2) + .fluidInputs(Polyethylene.getFluid(L / 4)) .output(SMALL_COIL, 4) .buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().duration(320).EUt(60) .input(ring, NickelZincFerrite) .input(wireFine, AnnealedCopper, 2) + .fluidInputs(Polyethylene.getFluid(L / 4)) .output(SMALL_COIL, 8) .buildAndRegister(); // SMD Resistor - ASSEMBLER_RECIPES.recipeBuilder().duration(80).EUt(120) + ASSEMBLER_RECIPES.recipeBuilder().duration(160).EUt(480) .input(dust, Carbon) .input(wireFine, Electrum, 4) - .fluidInputs(Polyethylene.getFluid(144)) - .output(SMD_RESISTOR, 24) + .fluidInputs(Polyethylene.getFluid(L * 2)) + .output(SMD_RESISTOR, 16) .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(80).EUt(480) + ASSEMBLER_RECIPES.recipeBuilder().duration(80).EUt(1920) .input(dust, Carbon) .input(wireFine, Electrum, 4) - .fluidInputs(Polybenzimidazole.getFluid(72)) + .fluidInputs(Polybenzimidazole.getFluid(L / 2)) .output(SMD_RESISTOR, 48) .buildAndRegister(); // SMD Diode - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(120) + ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(480) .input(dust, GalliumArsenide) .input(wireFine, Platinum, 8) - .fluidInputs(Polyethylene.getFluid(144)) + .fluidInputs(Polyethylene.getFluid(288)) .output(SMD_DIODE, 32) .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(480) + ASSEMBLER_RECIPES.recipeBuilder().duration(100).EUt(1920) .input(dust, GalliumArsenide) .input(wireFine, Platinum, 8) - .fluidInputs(Polybenzimidazole.getFluid(72)) + .fluidInputs(Polybenzimidazole.getFluid(L / 2)) .output(SMD_DIODE, 64) .buildAndRegister(); // SMD Transistor - ASSEMBLER_RECIPES.recipeBuilder().duration(80).EUt(120) + ASSEMBLER_RECIPES.recipeBuilder().duration(160).EUt(480) .input(foil, Gallium) .input(wireFine, AnnealedCopper, 8) - .fluidInputs(Polyethylene.getFluid(288)) - .output(SMD_TRANSISTOR, 32) + .fluidInputs(Polyethylene.getFluid(L)) + .output(SMD_TRANSISTOR, 16) .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(80).EUt(480) + ASSEMBLER_RECIPES.recipeBuilder().duration(80).EUt(1920) .input(foil, Gallium) .input(wireFine, AnnealedCopper, 8) - .fluidInputs(Polybenzimidazole.getFluid(144)) - .output(SMD_TRANSISTOR, 64) + .fluidInputs(Polybenzimidazole.getFluid(L / 2)) + .output(SMD_TRANSISTOR, 48) .buildAndRegister(); // SMD Capacitor - ASSEMBLER_RECIPES.recipeBuilder().duration(60).EUt(120) + ASSEMBLER_RECIPES.recipeBuilder().duration(80).EUt(480) .input(foil, SiliconeRubber) .input(foil, Aluminium) .fluidInputs(Polyethylene.getFluid(72)) .output(SMD_CAPACITOR, 8) .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(60).EUt(120) + ASSEMBLER_RECIPES.recipeBuilder().duration(80).EUt(480) .input(foil, PolyvinylChloride, 2) .input(foil, Aluminium) .fluidInputs(Polyethylene.getFluid(72)) .output(SMD_CAPACITOR, 12) .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(60).EUt(120) + ASSEMBLER_RECIPES.recipeBuilder().duration(120).EUt(480) .input(foil, SiliconeRubber) .input(foil, Tantalum) .fluidInputs(Polyethylene.getFluid(72)) .output(SMD_CAPACITOR, 16) .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(60).EUt(120) + ASSEMBLER_RECIPES.recipeBuilder().duration(120).EUt(480) .input(foil, PolyvinylChloride, 2) .input(foil, Tantalum) .fluidInputs(Polyethylene.getFluid(72)) .output(SMD_CAPACITOR, 24) .buildAndRegister(); - // TODO PBI SMD_CAPACITOR RECIPES + + ASSEMBLER_RECIPES.recipeBuilder().duration(40).EUt(1920) + .input(foil, SiliconeRubber) + .input(foil, Aluminium) + .fluidInputs(Polybenzimidazole.getFluid(18)) + .output(SMD_CAPACITOR, 24) + .buildAndRegister(); + + ASSEMBLER_RECIPES.recipeBuilder().duration(40).EUt(1920) + .input(foil, PolyvinylChloride, 2) + .input(foil, Aluminium) + .fluidInputs(Polybenzimidazole.getFluid(18)) + .output(SMD_CAPACITOR, 36) + .buildAndRegister(); + + ASSEMBLER_RECIPES.recipeBuilder().duration(60).EUt(1920) + .input(foil, SiliconeRubber) + .input(foil, Tantalum) + .fluidInputs(Polybenzimidazole.getFluid(18)) + .output(SMD_CAPACITOR, 48) + .buildAndRegister(); + + ASSEMBLER_RECIPES.recipeBuilder().duration(60).EUt(1920) + .input(foil, PolyvinylChloride, 2) + .input(foil, Tantalum) + .fluidInputs(Polybenzimidazole.getFluid(18)) + .output(SMD_CAPACITOR, 64) + .buildAndRegister(); // Carbon Fibers if (ConfigHolder.U.GT5u.polymerCarbonFiber) { @@ -456,7 +501,7 @@ private static void componentRecipes() { .buildAndRegister(); } - // Crystal Circuit Components + // Crystal Circuit Components TODO LASER_ENGRAVER_RECIPES.recipeBuilder().duration(256).EUt(480) .input(LAPOTRON_CRYSTAL) .notConsumable(craftingLens, Color.Blue) @@ -528,15 +573,14 @@ private static void componentRecipes() { // Neutron Reflector TODO Move out of here ASSEMBLER_RECIPES.recipeBuilder().duration(4000).EUt(120) .input(PLATE_IRIDIUM_ALLOY) - .input(plate, Beryllium, 32) - .input(plate, TungstenCarbide, 4) + .input(plateDouble, Beryllium, 16) + .input(plateDouble, TungstenCarbide, 2) .fluidInputs(TinAlloy.getFluid(L * 32)) .output(NEUTRON_REFLECTOR) .buildAndRegister(); - } - private static void boardRecipes() { + private static void boardRecipes() { // TODO Start here // Coated board ModHandler.addShapedRecipe("coated_board", COATED_BOARD.getStackForm(3), @@ -874,6 +918,7 @@ private static void circuitRecipes() { .buildAndRegister(); // IV Circuits + /* ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(1960) .input(FIBER_BOARD) .input(QUANTUM_PROCESSOR_EV, 2) @@ -883,7 +928,7 @@ private static void circuitRecipes() { .input(wireFine, Platinum, 6) .fluidInputs(material.getFluid(L * multiplier)) .output(DATA_CONTROL_CIRCUIT_IV) - .buildAndRegister(); + .buildAndRegister();*/ ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(7600) .input(MULTILAYER_FIBER_BOARD) @@ -905,6 +950,7 @@ private static void circuitRecipes() { .buildAndRegister(); // LuV Circuits + /* ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(7600) .input(MULTILAYER_FIBER_BOARD) .input(CRYSTAL_PROCESSOR_IV, 2) @@ -914,7 +960,7 @@ private static void circuitRecipes() { .input(wireFine, NiobiumTitanium, 6) .fluidInputs(material.getFluid(L * multiplier)) .output(ENERGY_FLOW_CIRCUIT_LUV) - .buildAndRegister(); + .buildAndRegister();*/ ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(32800) .input(WETWARE_BOARD) From d4e859def86c1e20e38612c7b84d9b6c2bf50c57 Mon Sep 17 00:00:00 2001 From: DStrand1 Date: Sun, 4 Jul 2021 13:32:15 -0500 Subject: [PATCH 10/21] add formula tooltips to blocks, glass fiber --- .../java/gregtech/common/ClientProxy.java | 51 +++++++++---------- .../integration/jei/utils/JEIHooks.java | 2 +- .../resources/assets/gregtech/lang/en_us.lang | 6 +++ 3 files changed, 32 insertions(+), 27 deletions(-) diff --git a/src/main/java/gregtech/common/ClientProxy.java b/src/main/java/gregtech/common/ClientProxy.java index c839a5d691f..2541cd446fa 100644 --- a/src/main/java/gregtech/common/ClientProxy.java +++ b/src/main/java/gregtech/common/ClientProxy.java @@ -137,34 +137,33 @@ public static void addMaterialFormulaHandler(ItemTooltipEvent event) { ItemStack itemStack = event.getItemStack(); // Handles Item tooltips - if (!(itemStack.getItem() instanceof ItemBlock)) { - String chemicalFormula = null; - - // Test for Items - UnificationEntry unificationEntry = OreDictUnifier.getUnificationEntry(itemStack); - if (unificationEntry != null && unificationEntry.material != null) { - chemicalFormula = unificationEntry.material.getChemicalFormula(); - - // Test for Fluids - } else if (ItemNBTUtils.hasTag(itemStack)) { - - // Vanilla bucket - chemicalFormula = FluidTooltipUtil.getFluidTooltip(ItemNBTUtils.getString(itemStack, "FluidName")); - - // GTCE Cells, Forestry cans, some other containers - if (chemicalFormula == null) { - NBTTagCompound compound = itemStack.getTagCompound(); - if (compound != null && compound.hasKey(FluidHandlerItemStack.FLUID_NBT_KEY, Constants.NBT.TAG_COMPOUND)) { - chemicalFormula = FluidTooltipUtil.getFluidTooltip(FluidStack.loadFluidStackFromNBT(compound.getCompoundTag(FluidHandlerItemStack.FLUID_NBT_KEY))); - } - } + String chemicalFormula = null; + + // Test for Items + UnificationEntry unificationEntry = OreDictUnifier.getUnificationEntry(itemStack); + if (unificationEntry != null && unificationEntry.material != null) { + chemicalFormula = unificationEntry.material.getChemicalFormula(); + + // Test for Fluids + } else if (ItemNBTUtils.hasTag(itemStack)) { + + // Vanilla bucket + chemicalFormula = FluidTooltipUtil.getFluidTooltip(ItemNBTUtils.getString(itemStack, "FluidName")); - // Water buckets have a separate registry name from other buckets - } else if(itemStack.getItem().equals(Items.WATER_BUCKET)) { - chemicalFormula = FluidTooltipUtil.getWaterTooltip(); + // GTCE Cells, Forestry cans, some other containers + if (chemicalFormula == null) { + NBTTagCompound compound = itemStack.getTagCompound(); + if (compound != null && compound.hasKey(FluidHandlerItemStack.FLUID_NBT_KEY, Constants.NBT.TAG_COMPOUND)) { + chemicalFormula = FluidTooltipUtil.getFluidTooltip(FluidStack.loadFluidStackFromNBT(compound.getCompoundTag(FluidHandlerItemStack.FLUID_NBT_KEY))); + } } - if (chemicalFormula != null && !chemicalFormula.isEmpty()) - event.getToolTip().add(1, ChatFormatting.YELLOW.toString() + chemicalFormula); + + // Water buckets have a separate registry name from other buckets + } else if(itemStack.getItem().equals(Items.WATER_BUCKET)) { + chemicalFormula = FluidTooltipUtil.getWaterTooltip(); + } + if (chemicalFormula != null && !chemicalFormula.isEmpty()) { + event.getToolTip().add(1, ChatFormatting.YELLOW.toString() + chemicalFormula); } } diff --git a/src/main/java/gregtech/integration/jei/utils/JEIHooks.java b/src/main/java/gregtech/integration/jei/utils/JEIHooks.java index cb533119826..19f2b775a4b 100644 --- a/src/main/java/gregtech/integration/jei/utils/JEIHooks.java +++ b/src/main/java/gregtech/integration/jei/utils/JEIHooks.java @@ -21,7 +21,7 @@ public static void addFluidTooltip(List tooltip, Object ingredient) { if (ingredient instanceof FluidStack) { String formula = FluidTooltipUtil.getFluidTooltip(((FluidStack) ingredient).getFluid()); if (formula != null && !formula.isEmpty()) { - tooltip.add(1, ChatFormatting.GRAY + formula); + tooltip.add(1, ChatFormatting.YELLOW + formula); } } } diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index b052201828a..4d766412fd5 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -480,12 +480,18 @@ metaitem.circuit_board.wetware.tooltip=The Board that keeps life metaitem.circuit.vacuum_tube.name=Vacuum Tube metaitem.circuit.vacuum_tube.tooltip=Technically a Diode/n§cULV-tier metaitem.component.diode.name=Diode +metaitem.component.diode.tooltip=Basic Electronic Component metaitem.component.resistor.name=Resistor +metaitem.component.resistor.tooltip=Basic Electronic Component metaitem.component.transistor.name=Transistor +metaitem.component.transistor.tooltip=Basic Electronic Component metaitem.component.capacitor.name=Capacitor +metaitem.component.capacitor.tooltip=Basic Electronic Component metaitem.component.glass.fiber.name=Glass Fibers +metaitem.component.glass.fiber.tooltip=§eB(SiO₂)₇ metaitem.component.glass.tube.name=Glass Tube metaitem.component.small_coil.name=Small Coil +metaitem.component.small_coil.tooltip=Basic Electronic Component metaitem.component.smd.diode.name=SMD Diode metaitem.component.smd.diode.tooltip=Electronic Component metaitem.component.smd.capacitor.name=SMD Capacitor From c214efe73d41b7bfe1dcc84b31e2ad974c4fea0b Mon Sep 17 00:00:00 2001 From: DStrand1 Date: Sun, 4 Jul 2021 13:32:42 -0500 Subject: [PATCH 11/21] add Iron III Chloride --- .../api/unification/material/Materials.java | 15 ++++++++------- .../loaders/recipe/chemistry/ReactorRecipes.java | 9 +++++++++ .../recipe/chemistry/SeparationRecipes.java | 8 ++++---- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/main/java/gregtech/api/unification/material/Materials.java b/src/main/java/gregtech/api/unification/material/Materials.java index deb175ffbaf..737cbfecaef 100644 --- a/src/main/java/gregtech/api/unification/material/Materials.java +++ b/src/main/java/gregtech/api/unification/material/Materials.java @@ -405,6 +405,14 @@ public static void register() { public static SimpleFluidMaterial OilMedium = new SimpleFluidMaterial(119, "oil_medium", 0x0A0A0A, FLUID, of(), GENERATE_FLUID_BLOCK); public static SimpleFluidMaterial OilLight = new SimpleFluidMaterial(120, "oil_light", 0x0A0A0A, FLUID, of(), GENERATE_FLUID_BLOCK); public static SimpleFluidMaterial NaturalGas = new SimpleFluidMaterial(121, "natural_gas", 0xFFFFFF, FLUID, of(), STATE_GAS | GENERATE_FLUID_BLOCK); + public static final SimpleFluidMaterial DiphenylIsophtalate = new SimpleFluidMaterial(122, "diphenyl_isophthalate", 0x246E57, DULL, of(new MaterialStack(Carbon, 20), new MaterialStack(Hydrogen, 14), new MaterialStack(Oxygen, 4)), DISABLE_DECOMPOSITION); + public static final SimpleFluidMaterial PhthalicAcid = new SimpleFluidMaterial(123, "phthalic_acid", 0xD1D1D1, FLUID, of(new MaterialStack(Carbon, 8), new MaterialStack(Hydrogen, 6), new MaterialStack(Oxygen, 4)), GENERATE_FLUID_BLOCK | DISABLE_DECOMPOSITION); + public static final SimpleFluidMaterial Dimethylbenzene = new SimpleFluidMaterial(124, "dimethylbenzene", 0x669C40, FLUID, of(new MaterialStack(Carbon, 8), new MaterialStack(Hydrogen, 10)), DISABLE_DECOMPOSITION).setFormula("C6H4(CH3)2"); + public static final SimpleFluidMaterial Diaminobenzidine = new SimpleFluidMaterial(125, "diaminobenzidine", 0x337D59, DULL, of(new MaterialStack(Carbon, 12), new MaterialStack(Hydrogen, 14), new MaterialStack(Nitrogen, 4)), DISABLE_DECOMPOSITION); + public static final SimpleFluidMaterial Dichlorobenzidine = new SimpleFluidMaterial(126, "dichlorobenzidine", 0xA1DEA6, DULL, of(new MaterialStack(Carbon, 12), new MaterialStack(Hydrogen, 10), new MaterialStack(Chlorine, 2), new MaterialStack(Nitrogen, 2)), DISABLE_DECOMPOSITION); + public static final SimpleFluidMaterial Nitrochlorobenzene = new SimpleFluidMaterial(127, "nitrochlorobenzene", 0x8FB51A, DULL, of(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 4), new MaterialStack(Chlorine, 1), new MaterialStack(Nitrogen, 1), new MaterialStack(Oxygen, 2)), DISABLE_DECOMPOSITION); + public static final SimpleFluidMaterial Chlorobenzene = new SimpleFluidMaterial(128, "chlorobenzene", 0x326A3E, DULL, of(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 5), new MaterialStack(Chlorine, 1)), DISABLE_DECOMPOSITION); + public static SimpleFluidMaterial Iron3Chloride = new SimpleFluidMaterial(129, "iron_iii_chloride", 0x060B0B, FLUID, of(new MaterialStack(Iron, 1), new MaterialStack(Chlorine, 3)), DECOMPOSITION_BY_ELECTROLYZING); public static SimpleDustMaterial SodiumHydroxide = new SimpleDustMaterial(1, "sodium_hydroxide", 0x003380, DULL, of(new MaterialStack(Sodium, 1), new MaterialStack(Oxygen, 1), new MaterialStack(Hydrogen, 1)), GENERATE_SMALL_TINY); public static SimpleDustMaterial MagnesiumChloride = new SimpleDustMaterial(2, "magnesium_chloride", 0xD40D5C, DULL, of(new MaterialStack(Magnesium, 1), new MaterialStack(Chlorine, 2)), GENERATE_SMALL_TINY); @@ -575,13 +583,6 @@ public static void register() { // TODO Put these in good places, PBI Tools public static final IngotMaterial Polybenzimidazole = new IngotMaterial(356, "polybenzimidazole", 0x2D2D2D, DULL, 0, of(new MaterialStack(Carbon, 20), new MaterialStack(Hydrogen, 12), new MaterialStack(Nitrogen, 4)), EXCLUDE_BLOCK_CRAFTING_RECIPES | SMELT_INTO_FLUID | NO_SMASHING | DISABLE_DECOMPOSITION | GENERATE_FOIL); - public static final SimpleFluidMaterial DiphenylIsophtalate = new SimpleFluidMaterial(122, "diphenyl_isophthalate", 0x246E57, DULL, of(new MaterialStack(Carbon, 20), new MaterialStack(Hydrogen, 14), new MaterialStack(Oxygen, 4)), DISABLE_DECOMPOSITION); - public static final SimpleFluidMaterial PhthalicAcid = new SimpleFluidMaterial(123, "phthalic_acid", 0xD1D1D1, FLUID, of(new MaterialStack(Carbon, 8), new MaterialStack(Hydrogen, 6), new MaterialStack(Oxygen, 4)), GENERATE_FLUID_BLOCK | DISABLE_DECOMPOSITION); - public static final SimpleFluidMaterial Dimethylbenzene = new SimpleFluidMaterial(124, "dimethylbenzene", 0x669C40, FLUID, of(new MaterialStack(Carbon, 8), new MaterialStack(Hydrogen, 10)), DISABLE_DECOMPOSITION).setFormula("C6H4(CH3)2"); - public static final SimpleFluidMaterial Diaminobenzidine = new SimpleFluidMaterial(125, "diaminobenzidine", 0x337D59, DULL, of(new MaterialStack(Carbon, 12), new MaterialStack(Hydrogen, 14), new MaterialStack(Nitrogen, 4)), DISABLE_DECOMPOSITION); - public static final SimpleFluidMaterial Dichlorobenzidine = new SimpleFluidMaterial(126, "dichlorobenzidine", 0xA1DEA6, DULL, of(new MaterialStack(Carbon, 12), new MaterialStack(Hydrogen, 10), new MaterialStack(Chlorine, 2), new MaterialStack(Nitrogen, 2)), DISABLE_DECOMPOSITION); - public static final SimpleFluidMaterial Nitrochlorobenzene = new SimpleFluidMaterial(127, "nitrochlorobenzene", 0x8FB51A, DULL, of(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 4), new MaterialStack(Chlorine, 1), new MaterialStack(Nitrogen, 1), new MaterialStack(Oxygen, 2)), DISABLE_DECOMPOSITION); - public static final SimpleFluidMaterial Chlorobenzene = new SimpleFluidMaterial(128, "chlorobenzene", 0x326A3E, DULL, of(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 5), new MaterialStack(Chlorine, 1)), DISABLE_DECOMPOSITION); public static final SimpleDustMaterial PotassiumDichromate = new SimpleDustMaterial(845, "potassium_dichromate", 0xFF084E, DULL, of(new MaterialStack(Potassium, 2), new MaterialStack(Chrome, 2), new MaterialStack(Oxygen, 7)), GENERATE_SMALL_TINY); public static final SimpleDustMaterial ChromiumTrioxide = new SimpleDustMaterial(848, "chromium_trioxide", 0xFFE4E1, DULL, of(new MaterialStack(Chrome, 1), new MaterialStack(Oxygen, 3)), GENERATE_SMALL_TINY); diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java index 371d60d5c2c..00b14eed532 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java @@ -245,6 +245,7 @@ public static void init() { .fluidOutputs(HydrochloricAcid.getFluid(1000)) .duration(60).EUt(8).buildAndRegister(); + // NaCl + H2SO4 -> NaHSO4 + HCl CHEMICAL_RECIPES.recipeBuilder() .input(dust, Salt, 2) .fluidInputs(SulfuricAcid.getFluid(1000)) @@ -252,6 +253,14 @@ public static void init() { .fluidOutputs(HydrochloricAcid.getFluid(1000)) .duration(60).EUt(30).buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder() + .input(dust, Iron) + .fluidInputs(Chlorine.getFluid(3000)) + .notConsumable(new IntCircuitIngredient(1)) + .fluidOutputs(Iron3Chloride.getFluid(1000)) + .duration(400).EUt(30) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder() .notConsumable(new IntCircuitIngredient(1)) .fluidInputs(Chlorine.getFluid(6000)) diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java index 9c4c87ad03d..292b31f1f34 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java @@ -306,10 +306,10 @@ public static void init() { // Electrolyzer ELECTROLYZER_RECIPES.recipeBuilder() - .input(dust, SodiumBisulfate, 14) - .fluidOutputs(SodiumPersulfate.getFluid(1000)) - .fluidOutputs(Hydrogen.getFluid(2000)) - .duration(448).EUt(60).buildAndRegister(); + .input(dust, SodiumBisulfate, 7) + .fluidOutputs(SodiumPersulfate.getFluid(500)) + .fluidOutputs(Hydrogen.getFluid(1000)) + .duration(150).EUt(30).buildAndRegister(); ELECTROLYZER_RECIPES.recipeBuilder() .fluidInputs(SaltWater.getFluid(1000)) From 4717033cf4ecda623a7579b5e42b2f2cd2bf51ce Mon Sep 17 00:00:00 2001 From: DStrand1 Date: Sun, 4 Jul 2021 14:08:17 -0500 Subject: [PATCH 12/21] finish boards, crystal parts add missing lang and flag --- .../api/unification/material/Materials.java | 2 +- .../loaders/recipe/CircuitRecipes.java | 199 +++++++++++++++--- .../resources/assets/gregtech/lang/en_us.lang | 1 + 3 files changed, 169 insertions(+), 33 deletions(-) diff --git a/src/main/java/gregtech/api/unification/material/Materials.java b/src/main/java/gregtech/api/unification/material/Materials.java index 737cbfecaef..632089e70f7 100644 --- a/src/main/java/gregtech/api/unification/material/Materials.java +++ b/src/main/java/gregtech/api/unification/material/Materials.java @@ -271,7 +271,7 @@ public static void register() { public static DustMaterial Potash = new DustMaterial(227, "potash", 0x784137, DULL, 1, of(new MaterialStack(Potassium, 2), new MaterialStack(Oxygen, 1)), 0); public static DustMaterial SodaAsh = new DustMaterial(228, "soda_ash", 0xDCDCFF, DULL, 1, of(new MaterialStack(Sodium, 2), new MaterialStack(Carbon, 1), new MaterialStack(Oxygen, 3)), 0); public static IngotMaterial IndiumGalliumPhosphide = new IngotMaterial(229, "indium_gallium_phosphide", 0xA08CBE, DULL, 1, of(new MaterialStack(Indium, 1), new MaterialStack(Gallium, 1), new MaterialStack(Phosphorus, 1)), DECOMPOSITION_BY_CENTRIFUGING | GENERATE_PLATE); - public static IngotMaterial NickelZincFerrite = new IngotMaterial(230, "nickel_zinc_ferrite", 0x3C3C3C, METALLIC, 0, of(new MaterialStack(Nickel, 1), new MaterialStack(Zinc, 1), new MaterialStack(Iron, 4), new MaterialStack(Oxygen, 8)), EXT_METAL, null, 1500); + public static IngotMaterial NickelZincFerrite = new IngotMaterial(230, "nickel_zinc_ferrite", 0x3C3C3C, METALLIC, 0, of(new MaterialStack(Nickel, 1), new MaterialStack(Zinc, 1), new MaterialStack(Iron, 4), new MaterialStack(Oxygen, 8)), EXT_METAL | GENERATE_RING, null, 1500); public static DustMaterial SiliconDioxide = new DustMaterial(231, "silicon_dioxide", 0xC8C8C8, QUARTZ, 1, of(new MaterialStack(Silicon, 1), new MaterialStack(Oxygen, 2)), NO_SMASHING | NO_SMELTING | CRYSTALLISABLE); /** diff --git a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java index 458c73154a0..214411bb861 100644 --- a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java @@ -508,13 +508,13 @@ private static void componentRecipes() { .output(ENGRAVED_LAPOTRON_CHIP, 3) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(100).EUt(7600) + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(100).EUt(10000) .input(ENGRAVED_CRYSTAL_CHIP) .notConsumable(craftingLens, Color.Lime) .output(CRYSTAL_CENTRAL_PROCESSING_UNIT) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(100).EUt(32000) + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(100).EUt(40000) .input(CRYSTAL_CENTRAL_PROCESSING_UNIT) .notConsumable(craftingLens, Color.Blue) .output(CRYSTAL_SYSTEM_ON_CHIP) @@ -582,22 +582,56 @@ private static void componentRecipes() { private static void boardRecipes() { // TODO Start here - // Coated board + // Coated Board ModHandler.addShapedRecipe("coated_board", COATED_BOARD.getStackForm(3), " R ", "PPP", " R ", 'R', RUBBER_DROP.getStackForm(), 'P', new UnificationEntry(plate, Wood)); ModHandler.addShapelessRecipe("coated_board_1x", COATED_BOARD.getStackForm(), - RUBBER_DROP.getStackForm(), new UnificationEntry(plate, Wood), - new UnificationEntry(plate, Wood)); + RUBBER_DROP.getStackForm(), + RUBBER_DROP.getStackForm()); - ASSEMBLER_RECIPES.recipeBuilder().duration(160).EUt(8) - .input(plate, Wood, 8) - .input(RUBBER_DROP) - .fluidInputs(Glue.getFluid(100)) - .output(COATED_BOARD, 8) + ModHandler.addShapedRecipe("basic_circuit_board", BASIC_CIRCUIT_BOARD.getStackForm(), + "WWW", "WBW", "WWW", + 'W', new UnificationEntry(wireGtSingle, Copper), + 'B', COATED_BOARD.getStackForm()); + + // Basic Circuit Board + ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(8) + .input(foil, Copper, 4) + .input(plate, Wood) + .fluidInputs(Glue.getFluid(72)) + .output(BASIC_CIRCUIT_BOARD) + .buildAndRegister(); + + ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(8) + .input(foil, Copper, 4) + .input(plate, Wood) + .fluidInputs(Polyethylene.getFluid(36)) + .output(BASIC_CIRCUIT_BOARD, 2) + .buildAndRegister(); + + ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(8) + .input(foil, Copper, 4) + .input(plate, Wood) + .fluidInputs(Polytetrafluoroethylene.getFluid(18)) + .output(BASIC_CIRCUIT_BOARD, 2) + .buildAndRegister(); + + ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(8) + .input(foil, Copper, 4) + .input(plate, Wood) + .fluidInputs(Epoxy.getFluid(18)) + .output(BASIC_CIRCUIT_BOARD, 3) + .buildAndRegister(); + + ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(8) + .input(foil, Copper, 4) + .input(plate, Wood) + .fluidInputs(Polybenzimidazole.getFluid(9)) + .output(BASIC_CIRCUIT_BOARD, 4) .buildAndRegister(); // Phenolic Board @@ -622,43 +656,93 @@ private static void boardRecipes() { // TODO Start here .output(PHENOLIC_BOARD, 3) .buildAndRegister(); + // Good Circuit Board + ModHandler.addShapedRecipe("good_circuit_board", GOOD_CIRCUIT_BOARD.getStackForm(), + "WWW", "WBW", "WWW", + 'W', new UnificationEntry(wireGtSingle, Gold), + 'B', PHENOLIC_BOARD.getStackForm()); + + CHEMICAL_RECIPES.recipeBuilder().EUt(30).duration(300) + .input(foil, Gold, 4) + .input(PHENOLIC_BOARD) + .fluidInputs(SodiumPersulfate.getFluid(250)) + .output(GOOD_CIRCUIT_BOARD) + .buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder().EUt(480).duration(75) + .input(foil, Gold, 4) + .input(PHENOLIC_BOARD) + .fluidInputs(Iron3Chloride.getFluid(125)) + .output(GOOD_CIRCUIT_BOARD) + .buildAndRegister(); + // Plastic Board - CHEMICAL_RECIPES.recipeBuilder().duration(600).EUt(10) + CHEMICAL_RECIPES.recipeBuilder().duration(500).EUt(10) .input(plate, Polyethylene) .input(foil, Copper, 4) - .fluidInputs(SulfuricAcid.getFluid(125)) + .fluidInputs(SulfuricAcid.getFluid(250)) .output(PLASTIC_BOARD) .buildAndRegister(); - CHEMICAL_RECIPES.recipeBuilder().duration(600).EUt(10) + CHEMICAL_RECIPES.recipeBuilder().duration(500).EUt(10) .input(plate, PolyvinylChloride) .input(foil, Copper, 4) - .fluidInputs(SulfuricAcid.getFluid(125)) + .fluidInputs(SulfuricAcid.getFluid(250)) .output(PLASTIC_BOARD, 2) .buildAndRegister(); - CHEMICAL_RECIPES.recipeBuilder().duration(600).EUt(10) + CHEMICAL_RECIPES.recipeBuilder().duration(500).EUt(10) .input(plate, Polytetrafluoroethylene) .input(foil, Copper, 4) - .fluidInputs(SulfuricAcid.getFluid(125)) + .fluidInputs(SulfuricAcid.getFluid(250)) .output(PLASTIC_BOARD, 4) .buildAndRegister(); - CHEMICAL_RECIPES.recipeBuilder().duration(600).EUt(10) + CHEMICAL_RECIPES.recipeBuilder().duration(500).EUt(10) .input(plate, Polybenzimidazole) .input(foil, Copper, 4) - .fluidInputs(SulfuricAcid.getFluid(125)) + .fluidInputs(SulfuricAcid.getFluid(250)) .output(PLASTIC_BOARD, 8) .buildAndRegister(); + // Plastic Circuit Board + CHEMICAL_RECIPES.recipeBuilder().duration(600).EUt(30) + .input(PLASTIC_BOARD) + .input(foil, Copper, 6) + .fluidInputs(SodiumPersulfate.getFluid(500)) + .output(PLASTIC_CIRCUIT_BOARD) + .buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder().duration(150).EUt(480) + .input(PLASTIC_BOARD) + .input(foil, Copper, 6) + .fluidInputs(Iron3Chloride.getFluid(250)) + .output(PLASTIC_CIRCUIT_BOARD) + .buildAndRegister(); + // Epoxy Board - CHEMICAL_RECIPES.recipeBuilder().duration(500).EUt(10) + CHEMICAL_RECIPES.recipeBuilder().duration(600).EUt(30) .input(plate, Epoxy) - .input(foil, Copper) - .fluidInputs(SulfuricAcid.getFluid(125)) + .input(foil, Gold, 8) + .fluidInputs(SulfuricAcid.getFluid(500)) .output(EPOXY_BOARD) .buildAndRegister(); + // Advanced Circuit Board + CHEMICAL_RECIPES.recipeBuilder().duration(900).EUt(30) + .input(EPOXY_BOARD) + .input(foil, Electrum, 8) + .fluidInputs(SodiumPersulfate.getFluid(1000)) + .output(ADVANCED_CIRCUIT_BOARD) + .buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder().duration(225).EUt(480) + .input(EPOXY_BOARD) + .input(foil, Electrum, 8) + .fluidInputs(Iron3Chloride.getFluid(500)) + .output(ADVANCED_CIRCUIT_BOARD) + .buildAndRegister(); + // Fiber Reinforced Epoxy Board CHEMICAL_BATH_RECIPES.recipeBuilder().duration(240).EUt(16) .input(GLASS_FIBER) @@ -672,12 +756,18 @@ private static void boardRecipes() { // TODO Start here .output(plate, ReinforcedEpoxyResin) .buildAndRegister(); + // Borosilicate Glass Recipes EXTRUDER_RECIPES.recipeBuilder().duration(160).EUt(96) .input(ingot, BorosilicateGlass) .notConsumable(SHAPE_EXTRUDER_WIRE) .output(GLASS_FIBER, 8) .buildAndRegister(); + WIREMILL_RECIPES.recipeBuilder().duration(200).EUt(120) + .input(ingot, BorosilicateGlass) + .output(GLASS_FIBER, 8) + .buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder().duration(500).EUt(10) .input(plate, ReinforcedEpoxyResin) .input(foil, Copper) @@ -685,14 +775,44 @@ private static void boardRecipes() { // TODO Start here .output(FIBER_BOARD) .buildAndRegister(); - // Multi-Layer Fiber Reinforced Epoxy Board - CHEMICAL_RECIPES.recipeBuilder().duration(100).EUt(480) + // Extreme Circuit Board + CHEMICAL_RECIPES.recipeBuilder().duration(300).EUt(480) .input(FIBER_BOARD) - .input(foil, Electrum, 16) - .fluidInputs(SulfuricAcid.getFluid(250)) + .input(foil, AnnealedCopper, 12) + .fluidInputs(SodiumPersulfate.getFluid(2000)) + .output(EXTREME_CIRCUIT_BOARD) + .buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder().duration(150).EUt(1920) + .input(FIBER_BOARD) + .input(foil, AnnealedCopper, 12) + .fluidInputs(Iron3Chloride.getFluid(1000)) + .output(EXTREME_CIRCUIT_BOARD) + .buildAndRegister(); + + // Multi-Layer Fiber Reinforced Epoxy Board + CHEMICAL_RECIPES.recipeBuilder().duration(500).EUt(480) + .input(FIBER_BOARD, 2) + .input(foil, Platinum, 8) + .fluidInputs(SulfuricAcid.getFluid(500)) .output(MULTILAYER_FIBER_BOARD) .buildAndRegister(); + // Elite Circuit Board + CHEMICAL_RECIPES.recipeBuilder().duration(300).EUt(1920) + .input(MULTILAYER_FIBER_BOARD) + .input(foil, Platinum, 8) + .fluidInputs(SodiumPersulfate.getFluid(4000)) + .output(ELITE_CIRCUIT_BOARD) + .buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder().duration(150).EUt(7680) + .input(MULTILAYER_FIBER_BOARD) + .input(foil, Platinum, 8) + .fluidInputs(Iron3Chloride.getFluid(2000)) + .output(ELITE_CIRCUIT_BOARD) + .buildAndRegister(); + // Wetware Board FLUID_SOLIDFICATION_RECIPES.recipeBuilder().duration(160).EUt(16) .notConsumable(SHAPE_MOLD_CYLINDER) @@ -712,14 +832,29 @@ private static void boardRecipes() { // TODO Start here .output(PETRI_DISH, 2) .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(480) - .input(MULTILAYER_FIBER_BOARD) - .input(circuit, Tier.Good) - .input(ELECTRIC_PUMP_LV) - .input(SENSOR_LV) + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().duration(1200).EUt(30720) + .input(MULTILAYER_FIBER_BOARD, 16) .input(PETRI_DISH) - .fluidInputs(SterileGrowthMedium.getFluid(250)) - .output(WETWARE_BOARD) + .input(ELECTRIC_PUMP_LUV) + .input(SENSOR_IV) + .input(circuit, Tier.Elite) + .input(foil, NiobiumTitanium, 16) + .fluidInputs(SterileGrowthMedium.getFluid(4000)) + .output(WETWARE_BOARD, 16) + .buildAndRegister(); + + ASSEMBLER_RECIPES.recipeBuilder().duration(300).EUt(7680) + .input(WETWARE_BOARD) + .input(foil, NiobiumTitanium, 32) + .fluidInputs(SodiumPersulfate.getFluid(8000)) + .output(WETWARE_CIRCUIT_BOARD) + .buildAndRegister(); + + ASSEMBLER_RECIPES.recipeBuilder().duration(150).EUt(30720) + .input(WETWARE_BOARD) + .input(foil, NiobiumTitanium, 32) + .fluidInputs(Iron3Chloride.getFluid(4000)) + .output(WETWARE_CIRCUIT_BOARD) .buildAndRegister(); } diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 4d766412fd5..5d6dd433adf 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -1624,6 +1624,7 @@ material.nitrochlorobenzene=2-Nitrochlorobenzene material.chlorobenzene=Chlorobenzene material.potassium_dichromate=Potassium Dichromate material.chromium_trioxide=Chromium Trioxide +material.iron_iii_chloride=Iron III Chloride item.nether_quartz.oreNetherrack=Nether Quartz Ore item.gunpowder.dustTiny=Tiny Pile of Gunpowder From 1643e59a9a74026b4f841300ec8159f3c02e630a Mon Sep 17 00:00:00 2001 From: DStrand1 Date: Sun, 4 Jul 2021 14:12:53 -0500 Subject: [PATCH 13/21] add missing Circuit Assembler recipe --- src/main/java/gregtech/loaders/recipe/CircuitRecipes.java | 4 ++-- .../java/gregtech/loaders/recipe/MetaTileEntityLoader.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java index 214411bb861..5883271678f 100644 --- a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java @@ -501,7 +501,7 @@ private static void componentRecipes() { .buildAndRegister(); } - // Crystal Circuit Components TODO + // Crystal Circuit Components LASER_ENGRAVER_RECIPES.recipeBuilder().duration(256).EUt(480) .input(LAPOTRON_CRYSTAL) .notConsumable(craftingLens, Color.Blue) @@ -580,7 +580,7 @@ private static void componentRecipes() { .buildAndRegister(); } - private static void boardRecipes() { // TODO Start here + private static void boardRecipes() { // Coated Board ModHandler.addShapedRecipe("coated_board", COATED_BOARD.getStackForm(3), diff --git a/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java b/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java index f23efe5a739..384013e95f4 100644 --- a/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java @@ -395,6 +395,7 @@ public static void init() { registerMachineRecipe(MetaTileEntities.ARC_FURNACE, "WGW", "CMC", "PPP", 'M', HULL, 'P', PLATE, 'C', CIRCUIT, 'W', CABLE_QUAD, 'G', new UnificationEntry(OrePrefix.ingot, Materials.Graphite)); registerMachineRecipe(MetaTileEntities.PLASMA_ARC_FURNACE, "WGW", "CMC", "TPT", 'M', HULL, 'P', PLATE, 'C', BETTER_CIRCUIT, 'W', CABLE_QUAD, 'T', PUMP, 'G', new UnificationEntry(OrePrefix.ingot, Materials.Graphite)); registerMachineRecipe(MetaTileEntities.CLUSTER_MILL, "MMM", "CHC", "MMM", 'M', MOTOR, 'C', CIRCUIT, 'H', HULL); + registerMachineRecipe(MetaTileEntities.CIRCUIT_ASSEMBLER, "RIE", "CHC", "WIW", 'R', ROBOT_ARM, 'I', BETTER_CIRCUIT, 'E', EMITTER, 'C', CONVEYOR, 'H', HULL, 'W', CABLE); registerMachineRecipe(MetaTileEntities.PUMP, "WGW", "GMG", "TGT", 'M', HULL, 'W', CIRCUIT, 'G', PUMP, 'T', PIPE_LARGE); registerMachineRecipe(MetaTileEntities.FISHER, "WTW", "PMP", "TGT", 'M', HULL, 'W', CIRCUIT, 'G', PUMP, 'T', MOTOR, 'P', PISTON); From 14b661fad2e32c8442801ced10117bcb36f4ad27 Mon Sep 17 00:00:00 2001 From: DStrand1 Date: Sun, 4 Jul 2021 14:42:07 -0500 Subject: [PATCH 14/21] fix some loose ends --- .../unification/material/MarkerMaterials.java | 7 ++++ .../api/unification/ore/OrePrefix.java | 1 + .../java/gregtech/common/items/MetaItem2.java | 31 +++++------------- .../loaders/recipe/CircuitRecipes.java | 20 ++++++++--- .../progress_bar_circuit_assembler.png | Bin 0 -> 366 bytes 5 files changed, 33 insertions(+), 26 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/gui/progress_bar/progress_bar_circuit_assembler.png diff --git a/src/main/java/gregtech/api/unification/material/MarkerMaterials.java b/src/main/java/gregtech/api/unification/material/MarkerMaterials.java index 416023a14f4..2fb4187b031 100644 --- a/src/main/java/gregtech/api/unification/material/MarkerMaterials.java +++ b/src/main/java/gregtech/api/unification/material/MarkerMaterials.java @@ -106,4 +106,11 @@ public static class Tier { public static Material MAXCircuit = new MarkerMaterial("max"); } + public static class Component { + public static Material Resistor = new MarkerMaterial("resistor"); + public static Material Transistor = new MarkerMaterial("transistor"); + public static Material Capacitor = new MarkerMaterial("capacitor"); + public static Material Diode = new MarkerMaterial("diode"); + } + } diff --git a/src/main/java/gregtech/api/unification/ore/OrePrefix.java b/src/main/java/gregtech/api/unification/ore/OrePrefix.java index 1960365b531..274de867738 100644 --- a/src/main/java/gregtech/api/unification/ore/OrePrefix.java +++ b/src/main/java/gregtech/api/unification/ore/OrePrefix.java @@ -168,6 +168,7 @@ public enum OrePrefix { battery("Reusable Batteries", -1, null, null, DISALLOW_RECYCLING, null), // Introduced by Calclavia circuit("Circuits", -1, null, null, ENABLE_UNIFICATION | DISALLOW_RECYCLING, null), // Introduced by Calclavia chipset("Chipsets", -1, null, null, ENABLE_UNIFICATION | DISALLOW_RECYCLING, null), // Introduced by Buildcraft + component("Components", -1, null, null, ENABLE_UNIFICATION | DISALLOW_RECYCLING, null), // Used for Gregification Addon diff --git a/src/main/java/gregtech/common/items/MetaItem2.java b/src/main/java/gregtech/common/items/MetaItem2.java index d5f09f0cc7a..4781357edcc 100644 --- a/src/main/java/gregtech/common/items/MetaItem2.java +++ b/src/main/java/gregtech/common/items/MetaItem2.java @@ -9,6 +9,7 @@ import gregtech.api.recipes.CountableIngredient; import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.OreDictUnifier; +import gregtech.api.unification.material.MarkerMaterials.Component; import gregtech.api.unification.material.MarkerMaterials.Tier; import gregtech.api.unification.material.Materials; import gregtech.api.unification.ore.OrePrefix; @@ -111,17 +112,17 @@ public void registerSubItems() { VACUUM_TUBE = addItem(450, "circuit.vacuum_tube").setUnificationData(OrePrefix.circuit, Tier.Primitive); - DIODE = addItem(451, "component.diode"); - CAPACITOR = addItem(452, "component.capacitor"); + DIODE = addItem(451, "component.diode").setUnificationData(OrePrefix.component, Component.Diode); + CAPACITOR = addItem(452, "component.capacitor").setUnificationData(OrePrefix.component, Component.Capacitor); GLASS_FIBER = addItem(453, "component.glass.fiber"); GLASS_TUBE = addItem(454, "component.glass.tube"); - RESISTOR = addItem(455, "component.resistor"); + RESISTOR = addItem(455, "component.resistor").setUnificationData(OrePrefix.component, Component.Resistor); SMALL_COIL = addItem(456, "component.small_coil"); - SMD_DIODE = addItem(457, "component.smd.diode"); - SMD_CAPACITOR = addItem(458, "component.smd.capacitor"); - SMD_RESISTOR = addItem(459, "component.smd.resistor"); - SMD_TRANSISTOR = addItem(460, "component.smd.transistor"); - TRANSISTOR = addItem(461, "component.transistor"); + SMD_DIODE = addItem(457, "component.smd.diode").setUnificationData(OrePrefix.component, Component.Diode); + SMD_CAPACITOR = addItem(458, "component.smd.capacitor").setUnificationData(OrePrefix.component, Component.Capacitor); + SMD_RESISTOR = addItem(459, "component.smd.resistor").setUnificationData(OrePrefix.component, Component.Resistor); + SMD_TRANSISTOR = addItem(460, "component.smd.transistor").setUnificationData(OrePrefix.component, Component.Transistor); + TRANSISTOR = addItem(461, "component.transistor").setUnificationData(OrePrefix.component, Component.Transistor); HIGHLY_ADVANCED_SOC_WAFER = addItem(462, "wafer.highly_advanced_system_on_chip"); ADVANCED_SYSTEM_ON_CHIP_WAFER = addItem(463, "wafer.advanced_system_on_chip"); @@ -230,20 +231,6 @@ public void registerSubItems() { PETRI_DISH = addItem(536, "petri_dish"); } - @Override - public void registerOreDict() { - super.registerOreDict(); - - OreDictUnifier.registerOre(CAPACITOR.getStackForm(), "capacitor"); - OreDictUnifier.registerOre(SMD_CAPACITOR.getStackForm(), "capacitor"); - OreDictUnifier.registerOre(TRANSISTOR.getStackForm(), "transistor"); - OreDictUnifier.registerOre(SMD_TRANSISTOR.getStackForm(), "transistor"); - OreDictUnifier.registerOre(DIODE.getStackForm(), "diode"); - OreDictUnifier.registerOre(SMD_DIODE.getStackForm(), "diode"); - OreDictUnifier.registerOre(RESISTOR.getStackForm(), "resistor"); - OreDictUnifier.registerOre(SMD_RESISTOR.getStackForm(), "resistor"); - } - public void registerRecipes() { // Dyes recipes RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder() diff --git a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java index 5883271678f..4ff933f95f5 100644 --- a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java @@ -1,6 +1,9 @@ package gregtech.loaders.recipe; import gregtech.api.recipes.ModHandler; +import gregtech.api.recipes.ingredients.IntCircuitIngredient; +import gregtech.api.unification.material.MarkerMaterials.Component; +import gregtech.api.unification.material.MarkerMaterials.Tier; import gregtech.api.unification.material.MarkerMaterials.Color; import gregtech.api.unification.material.MarkerMaterials.Tier; import gregtech.api.unification.material.type.IngotMaterial; @@ -62,7 +65,6 @@ private static void waferRecipes() { BLAST_RECIPES.recipeBuilder().duration(18000).EUt(7680) .input(block, Silicon, 32) .input(ingot, Neutronium, 4) - .notConsumable(new IntCircuitIngredient(1)) .fluidInputs(Radon.getFluid(8000)) .output(NEUTRONIUM_BOULE) .blastFurnaceTemp(6484) @@ -111,7 +113,7 @@ private static void waferRecipes() { LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Orange) .output(ADVANCED_SYSTEM_ON_CHIP_WAFER) .buildAndRegister(); LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Orange) .output(ADVANCED_SYSTEM_ON_CHIP_WAFER, 2) .buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Pink) .output(HIGHLY_ADVANCED_SOC_WAFER) .buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Magenta) .output(HIGHLY_ADVANCED_SOC_WAFER) .buildAndRegister(); // Wafer chemical refining recipes CHEMICAL_RECIPES.recipeBuilder().duration(1200).EUt(7680) @@ -860,15 +862,25 @@ private static void boardRecipes() { private static void circuitRecipes() { - // Handcrafted Circuits + // T1: Electronic ModHandler.addShapedRecipe("basic_circuit", ELECTRONIC_CIRCUIT_LV.getStackForm(), "RPR", "VBV", "CCC", 'R', RESISTOR.getStackForm(), 'P', new UnificationEntry(plate, Steel), 'V', VACUUM_TUBE.getStackForm(), - 'B', COATED_BOARD.getStackForm(), + 'B', BASIC_CIRCUIT_BOARD.getStackForm(), 'C', new UnificationEntry(cableGtSingle, RedAlloy)); + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(16).duration(200) + .input(BASIC_CIRCUIT_BOARD) + .input(component, Component.Resistor, 2) + .input(wireGtSingle, RedAlloy, 2) + .input(circuit, Tier.Primitive, 2) + .output(ELECTRONIC_CIRCUIT_LV, 2) + .buildAndRegister(); + + + ModHandler.addShapedRecipe("good_circuit", INTEGRATED_CIRCUIT_MV.getStackForm(), "RCP", "CDC", "PCR", 'R', new UnificationEntry(cableGtSingle, RedAlloy), diff --git a/src/main/resources/assets/gregtech/textures/gui/progress_bar/progress_bar_circuit_assembler.png b/src/main/resources/assets/gregtech/textures/gui/progress_bar/progress_bar_circuit_assembler.png new file mode 100644 index 0000000000000000000000000000000000000000..2edb27dafb8312645334258a62e87644f6b89d7b GIT binary patch literal 366 zcmeAS@N?(olHy`uVBq!ia0vp^qCl*{!3-qTbRDk)DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheLIFM@u0Yz{+`PNH`~Uy{b+xrXF3&^HT|kPhB*-rqDER+B!{+@<_5(#Y z3p^r=85sBugD~Uq{1quc!ONa5jv*HQYbW03Yc}9<_T2sNzy5i^=-*xo0HdjtNeIcmc}A@=!`;I@o(kbl{z^QPaAGY**$9t zU|-JVq`9VTs)PRX>5VK4ZQB2xs(zd=Wg;@SsN|gV+(16znTz{p0lmlI>FVdQ&MBb@ E07fX1wEzGB literal 0 HcmV?d00001 From c6cec6f434da91190cb9266dc75e9ad5fea74666 Mon Sep 17 00:00:00 2001 From: DStrand1 Date: Sun, 4 Jul 2021 15:54:41 -0500 Subject: [PATCH 15/21] circuit recipes through Nano --- .../CircuitAssemblerRecipeBuilder.java | 2 +- .../api/unification/material/Materials.java | 2 +- .../api/unification/ore/OrePrefix.java | 3 - .../loaders/recipe/CircuitRecipes.java | 333 ++++++++++-------- 4 files changed, 194 insertions(+), 146 deletions(-) diff --git a/src/main/java/gregtech/api/recipes/builders/CircuitAssemblerRecipeBuilder.java b/src/main/java/gregtech/api/recipes/builders/CircuitAssemblerRecipeBuilder.java index 6d441758df6..4c7c9644e06 100644 --- a/src/main/java/gregtech/api/recipes/builders/CircuitAssemblerRecipeBuilder.java +++ b/src/main/java/gregtech/api/recipes/builders/CircuitAssemblerRecipeBuilder.java @@ -54,7 +54,7 @@ public ValidationResult build() { public void buildAndRegister() { if (fluidInputs.isEmpty()) { recipeMap.addRecipe(this.copy() - .fluidInputs(Materials.SolderingAlloy.getFluid(Math.max(1, GTValues.L / 2 * solderMultiplier))) + .fluidInputs(Materials.SolderingAlloy.getFluid(Math.max(1, (GTValues.L / 2) * solderMultiplier))) .build()); recipeMap.addRecipe(this.copy() .fluidInputs(Materials.Tin.getFluid(Math.max(1, GTValues.L * solderMultiplier))) diff --git a/src/main/java/gregtech/api/unification/material/Materials.java b/src/main/java/gregtech/api/unification/material/Materials.java index 632089e70f7..028cf0e2bd5 100644 --- a/src/main/java/gregtech/api/unification/material/Materials.java +++ b/src/main/java/gregtech/api/unification/material/Materials.java @@ -492,7 +492,7 @@ public static void register() { public static IngotMaterial BlueSteel = new IngotMaterial(276, "blue_steel", 0x64648C, METALLIC, 2, of(new MaterialStack(RoseGold, 1), new MaterialStack(Brass, 1), new MaterialStack(Steel, 2), new MaterialStack(BlackSteel, 4)), EXT_METAL | GENERATE_FRAME, null, 7.5F, 5.0f, 1024, 1400); public static IngotMaterial DamascusSteel = new IngotMaterial(277, "damascus_steel", 0x6E6E6E, METALLIC, 2, of(new MaterialStack(Steel, 1)), EXT_METAL, null, 8.0F, 5.0f, 1280, 1500); public static IngotMaterial TungstenSteel = new IngotMaterial(278, "tungsten_steel", 0x6464A0, METALLIC, 4, of(new MaterialStack(Steel, 1), new MaterialStack(Tungsten, 1)), EXT2_METAL | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | GENERATE_LONG_ROD | GENERATE_DENSE | GENERATE_FRAME| GENERATE_SPRING, null, 8.0F, 4.0f, 2560, 3000); - public static IngotMaterial RedAlloy = new IngotMaterial(279, "red_alloy", 0xC80000, DULL, 0, of(new MaterialStack(Copper, 1), new MaterialStack(Redstone, 1)), GENERATE_PLATE | GENERATE_FINE_WIRE); + public static IngotMaterial RedAlloy = new IngotMaterial(279, "red_alloy", 0xC80000, DULL, 0, of(new MaterialStack(Copper, 1), new MaterialStack(Redstone, 1)), GENERATE_PLATE | GENERATE_FINE_WIRE | GENERATE_BOLT_SCREW); public static IngotMaterial CobaltBrass = new IngotMaterial(280, "cobalt_brass", 0xB4B4A0, METALLIC, 2, of(new MaterialStack(Brass, 7), new MaterialStack(Aluminium, 1), new MaterialStack(Cobalt, 1)), EXT2_METAL, null, 8.0F, 2.0f, 256); public static DustMaterial TricalciumPhosphate = new DustMaterial(281, "tricalcium_phosphate", 0xFFFF00, FLINT, 2, of(new MaterialStack(Calcium, 3), new MaterialStack(Phosphate, 2)), GENERATE_ORE | NO_SMASHING | NO_SMELTING | FLAMMABLE | EXPLOSIVE | DECOMPOSITION_BY_CENTRIFUGING); public static DustMaterial Basalt = new DustMaterial(282, "basalt", 0x1E1414, ROUGH, 1, of(new MaterialStack(Olivine, 1), new MaterialStack(Calcite, 3), new MaterialStack(Flint, 8), new MaterialStack(DarkAsh, 4)), NO_SMASHING | DECOMPOSITION_BY_CENTRIFUGING); diff --git a/src/main/java/gregtech/api/unification/ore/OrePrefix.java b/src/main/java/gregtech/api/unification/ore/OrePrefix.java index 274de867738..b2cb490acdb 100644 --- a/src/main/java/gregtech/api/unification/ore/OrePrefix.java +++ b/src/main/java/gregtech/api/unification/ore/OrePrefix.java @@ -434,9 +434,6 @@ public void processOreRegistration(@Nullable IMaterial material) { material = materialType; //append default material for self-referencing OrePrefix } if (material != null) { - if (material.getMaterialClass() == SimpleDustMaterial.class) { - GTLog.logger.info("HERE!!!!!"); - } generatedMaterials.add(material); } } diff --git a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java index 4ff933f95f5..cb5c2af6337 100644 --- a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java @@ -1,11 +1,9 @@ package gregtech.loaders.recipe; import gregtech.api.recipes.ModHandler; -import gregtech.api.recipes.ingredients.IntCircuitIngredient; import gregtech.api.unification.material.MarkerMaterials.Component; import gregtech.api.unification.material.MarkerMaterials.Tier; import gregtech.api.unification.material.MarkerMaterials.Color; -import gregtech.api.unification.material.MarkerMaterials.Tier; import gregtech.api.unification.material.type.IngotMaterial; import gregtech.api.unification.stack.MaterialStack; import gregtech.api.unification.stack.UnificationEntry; @@ -24,6 +22,7 @@ public class CircuitRecipes { private CircuitRecipes() { } + // TODO Remove private static final MaterialStack[] solderingList = { new MaterialStack(Tin, 2L), new MaterialStack(SolderingAlloy, 1L) @@ -862,8 +861,10 @@ private static void boardRecipes() { private static void circuitRecipes() { - // T1: Electronic - ModHandler.addShapedRecipe("basic_circuit", ELECTRONIC_CIRCUIT_LV.getStackForm(), + // T1: Electronic ============================================================================================== + + // LV + ModHandler.addShapedRecipe("electronic_circuit_lv", ELECTRONIC_CIRCUIT_LV.getStackForm(), "RPR", "VBV", "CCC", 'R', RESISTOR.getStackForm(), 'P', new UnificationEntry(plate, Steel), @@ -879,159 +880,209 @@ private static void circuitRecipes() { .output(ELECTRONIC_CIRCUIT_LV, 2) .buildAndRegister(); - - - ModHandler.addShapedRecipe("good_circuit", INTEGRATED_CIRCUIT_MV.getStackForm(), - "RCP", "CDC", "PCR", - 'R', new UnificationEntry(cableGtSingle, RedAlloy), + // MV + ModHandler.addShapedRecipe("electronic_circuit_mv", ELECTRONIC_CIRCUIT_MV.getStackForm(), + "DPD", "CBC", "WWW", + 'W', new UnificationEntry(wireGtSingle, Copper), 'P', new UnificationEntry(plate, Steel), 'C', ELECTRONIC_CIRCUIT_LV.getStackForm(), + 'B', GOOD_CIRCUIT_BOARD.getStackForm(), 'D', DIODE.getStackForm()); - //circuit assembling recipes TODO - for (MaterialStack stack : solderingList) { - IngotMaterial material = (IngotMaterial) stack.material; - int multiplier = (int) stack.amount; - - // LV Circuits - ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(8) - .input(PHENOLIC_BOARD) - .input(INTEGRATED_LOGIC_CIRCUIT) - .input(RESISTOR, 2) - .input(wireFine, Copper) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(INTEGRATED_CIRCUIT_LV) - .buildAndRegister(); + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(30).duration(300) + .input(GOOD_CIRCUIT_BOARD) + .input(circuit, Tier.Basic, 2) + .input(component, Component.Diode, 2) + .input(wireGtSingle, Copper, 2) + .output(ELECTRONIC_CIRCUIT_MV, 2) + .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(8) - .input(PHENOLIC_BOARD) - .input(INTEGRATED_LOGIC_CIRCUIT) - .input(SMD_RESISTOR, 2) - .input(wireFine, Copper) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(INTEGRATED_CIRCUIT_LV) - .buildAndRegister(); + // T2: Integrated ============================================================================================== - ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(60) - .input(PLASTIC_BOARD) - .input(CENTRAL_PROCESSING_UNIT, 4) - .input(RESISTOR, 4) - .input(CAPACITOR, 4) - .input(TRANSISTOR, 4) - .input(wireFine, Copper, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(MICROPROCESSOR_LV, 4) - .buildAndRegister(); - - ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(60) - .input(PLASTIC_BOARD) - .input(CENTRAL_PROCESSING_UNIT, 4) - .input(SMD_RESISTOR, 4) - .input(SMD_CAPACITOR, 4) - .input(SMD_TRANSISTOR, 4) - .input(wireFine, Copper, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(MICROPROCESSOR_LV, 4) - .buildAndRegister(); + // LV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(16).duration(200) + .input(BASIC_CIRCUIT_BOARD) + .input(INTEGRATED_LOGIC_CIRCUIT) + .input(component, Component.Resistor, 2) + .input(component, Component.Diode, 2) + .input(wireFine, Copper, 2) + .input(bolt, Tin, 2) + .output(INTEGRATED_CIRCUIT_LV, 2) + .buildAndRegister(); + + // MV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(24).duration(400) + .input(GOOD_CIRCUIT_BOARD) + .input(INTEGRATED_CIRCUIT_LV, 2) + .input(component, Component.Resistor, 4) + .input(component, Component.Diode, 4) + .input(wireFine, Gold, 4) + .input(bolt, Silver, 4) + .output(INTEGRATED_CIRCUIT_MV) + .buildAndRegister(); + + // HV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(30).duration(800) + .input(INTEGRATED_CIRCUIT_MV) + .input(INTEGRATED_LOGIC_CIRCUIT, 2) + .input(RANDOM_ACCESS_MEMORY, 2) + .input(component, Component.Transistor, 4) + .input(wireFine, Electrum, 8) + .input(bolt, AnnealedCopper, 8) + .output(INTEGRATED_CIRCUIT_HV) + .buildAndRegister(); + + // T2.5: Misc ================================================================================================== + + // NAND Chip ULV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(30).duration(300) + .input(GOOD_CIRCUIT_BOARD) + .input(SIMPLE_SYSTEM_ON_CHIP) + .input(bolt, RedAlloy, 2) + .input(wireFine, Tin, 2) + .output(NAND_CHIP_ULV, 8) + .buildAndRegister(); + + // Microprocessor LV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(60).duration(200) + .input(PLASTIC_CIRCUIT_BOARD) + .input(CENTRAL_PROCESSING_UNIT) + .input(component, Component.Resistor, 2) + .input(component, Component.Capacitor, 2) + .input(component, Component.Transistor, 2) + .input(wireFine, Copper, 2) + .output(MICROPROCESSOR_LV, 3) + .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(50).EUt(600) - .input(PLASTIC_BOARD) - .input(SYSTEM_ON_CHIP, 4) - .input(wireFine, Copper, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(MICROPROCESSOR_LV, 4) - .buildAndRegister(); + // Microprocessor LV SoC + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(600).duration(50) + .input(PLASTIC_CIRCUIT_BOARD) + .input(SYSTEM_ON_CHIP) + .input(wireFine, Copper, 2) + .input(bolt, Tin, 2) + .output(MICROPROCESSOR_LV, 6) + .buildAndRegister(); - // MV Circuits - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(16) - .input(PHENOLIC_BOARD) - .input(INTEGRATED_CIRCUIT_LV, 3) - .input(RESISTOR, 4) - .input(wireFine, Gold, 8) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(INTEGRATED_CIRCUIT_MV) - .buildAndRegister(); + // T3: Processor =============================================================================================== - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(16) - .input(PHENOLIC_BOARD) - .input(INTEGRATED_CIRCUIT_LV, 3) - .input(SMD_RESISTOR, 4) - .input(wireFine, Gold, 8) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(INTEGRATED_CIRCUIT_MV) - .buildAndRegister(); + // MV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(60).duration(200) + .input(PLASTIC_CIRCUIT_BOARD) + .input(CENTRAL_PROCESSING_UNIT) + .input(component, Component.Resistor, 4) + .input(component, Component.Capacitor, 4) + .input(component, Component.Transistor, 4) + .input(wireFine, RedAlloy, 4) + .output(PROCESSOR_MV, 2) + .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(60) - .input(PLASTIC_BOARD) - .input(CENTRAL_PROCESSING_UNIT) - .input(RESISTOR, 2) - .input(CAPACITOR, 2) - .input(TRANSISTOR, 2) - .input(wireFine, RedAlloy, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(PROCESSOR_MV) - .buildAndRegister(); + // MV SoC + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(2400).duration(50) + .input(PLASTIC_CIRCUIT_BOARD) + .input(SYSTEM_ON_CHIP) + .input(wireFine, RedAlloy, 4) + .input(bolt, AnnealedCopper, 4) + .output(PROCESSOR_MV, 4) + .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(60) - .input(PLASTIC_BOARD) - .input(CENTRAL_PROCESSING_UNIT) - .input(SMD_RESISTOR, 2) - .input(SMD_CAPACITOR, 2) - .input(SMD_TRANSISTOR, 2) - .input(wireFine, RedAlloy, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(PROCESSOR_MV) - .buildAndRegister(); + // HV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(120).duration(400) + .input(PLASTIC_CIRCUIT_BOARD) + .input(PROCESSOR_MV, 2) + .input(SMALL_COIL, 4) + .input(component, Component.Capacitor, 8) + .input(RANDOM_ACCESS_MEMORY, 4) + .input(wireFine, RedAlloy, 8) + .output(PROCESSOR_ASSEMBLY_HV, 2) + .solderMultiplier(2) + .buildAndRegister(); + + // EV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(120).duration(400) + .input(PLASTIC_CIRCUIT_BOARD) + .input(PROCESSOR_ASSEMBLY_HV, 2) + .input(component, Component.Diode, 4) + .input(RANDOM_ACCESS_MEMORY, 4) + .input(wireFine, Electrum, 16) + .input(bolt, Platinum, 16) + .output(WORKSTATION_EV) + .solderMultiplier(2) + .buildAndRegister(); + + // IV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(480).duration(800) + .input(frameGt, Aluminium, 2) + .input(WORKSTATION_EV, 2) + .input(SMALL_COIL, 12) + .input(component, Component.Capacitor, 16) + .input(RANDOM_ACCESS_MEMORY, 16) + .input(wireGtSingle, AnnealedCopper, 16) + .output(MAINFRAME_IV) + .solderMultiplier(4) + .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(50).EUt(2400) - .input(PLASTIC_BOARD) - .input(SYSTEM_ON_CHIP) - .input(wireFine, RedAlloy, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(PROCESSOR_MV) - .buildAndRegister(); + // T4: Nano ==================================================================================================== - // HV Circuits - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(90) - .input(PLASTIC_BOARD) - .input(PROCESSOR_MV, 2) - .input(SMALL_COIL, 4) - .input(CAPACITOR, 4) - .input(RANDOM_ACCESS_MEMORY, 4) - .input(wireFine, RedAlloy, 12) - .fluidInputs(material.getFluid(L * multiplier)) - .output(PROCESSOR_ASSEMBLY_HV) - .buildAndRegister(); + // HV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(600).duration(200) + .input(ADVANCED_CIRCUIT_BOARD) + .input(NANO_CENTRAL_PROCESSING_UNIT) + .input(SMD_RESISTOR, 8) + .input(SMD_CAPACITOR, 8) + .input(SMD_TRANSISTOR, 8) + .input(wireFine, Electrum, 8) + .output(NANO_PROCESSOR_HV, 2) + .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(90) - .input(PLASTIC_BOARD) - .input(PROCESSOR_MV, 2) - .input(SMALL_COIL, 4) - .input(SMD_CAPACITOR, 4) - .input(RANDOM_ACCESS_MEMORY, 4) - .input(wireFine, RedAlloy, 12) - .fluidInputs(material.getFluid(L * multiplier)) - .output(PROCESSOR_ASSEMBLY_HV) - .buildAndRegister(); + // HV SoC + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(9600).duration(50) + .input(ADVANCED_CIRCUIT_BOARD) + .input(ADVANCED_SYSTEM_ON_CHIP) + .input(wireFine, Electrum, 4) + .input(bolt, Platinum, 4) + .output(NANO_PROCESSOR_HV, 4) + .buildAndRegister(); + + // EV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(600).duration(200) + .input(ADVANCED_CIRCUIT_BOARD) + .input(NANO_PROCESSOR_HV, 2) + .input(SMALL_COIL, 8) + .input(SMD_CAPACITOR, 8) + .input(RANDOM_ACCESS_MEMORY, 8) + .input(wireFine, Electrum, 16) + .output(NANO_PROCESSOR_ASSEMBLY_EV, 2) + .solderMultiplier(2) + .buildAndRegister(); + + // IV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(600).duration(400) + .input(ADVANCED_CIRCUIT_BOARD) + .input(NANO_PROCESSOR_ASSEMBLY_EV, 2) + .input(SMD_DIODE, 8) + .input(NOR_MEMORY_CHIP, 4) + .input(RANDOM_ACCESS_MEMORY, 16) + .input(wireFine, Electrum, 16) + .output(NANO_COMPUTER_IV) + .solderMultiplier(2) + .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(480) - .input(EPOXY_BOARD) - .input(NANO_CENTRAL_PROCESSING_UNIT) - .input(SMD_RESISTOR, 2) - .input(SMD_CAPACITOR, 2) - .input(SMD_TRANSISTOR, 2) - .input(wireFine, Electrum, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(NANO_PROCESSOR_HV) - .buildAndRegister(); + // LuV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(1920).duration(800) + .input(frameGt, Aluminium, 2) + .input(NANO_COMPUTER_IV, 2) + .input(SMALL_COIL, 16) + .input(SMD_CAPACITOR, 32) + .input(RANDOM_ACCESS_MEMORY, 16) + .input(wireGtSingle, AnnealedCopper, 32) + .output(NANO_MAINFRAME_LUV) + .solderMultiplier(4) + .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(50).EUt(9600) - .input(EPOXY_BOARD) - .input(SYSTEM_ON_CHIP) - .input(wireFine, Electrum, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(NANO_PROCESSOR_HV) - .buildAndRegister(); + //circuit assembling recipes TODO + for (MaterialStack stack : solderingList) { + IngotMaterial material = (IngotMaterial) stack.material; + int multiplier = (int) stack.amount; // EV Circuits ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(480) From d28e8406c6d6e7a060c482a7caaa6b080cc75602 Mon Sep 17 00:00:00 2001 From: DStrand1 Date: Mon, 5 Jul 2021 01:02:31 -0500 Subject: [PATCH 16/21] finish circuit recipes --- .../api/unification/material/Materials.java | 6 +- .../java/gregtech/common/items/MetaItem2.java | 22 +- .../java/gregtech/common/items/MetaItems.java | 18 +- .../loaders/recipe/AssemblyLineLoader.java | 8 +- .../loaders/recipe/CircuitRecipes.java | 618 +++++++++++------- .../loaders/recipe/MetaTileEntityLoader.java | 10 +- .../recipe/chemistry/ChemistryRecipes.java | 7 +- .../recipe/chemistry/GrowthMediumRecipes.java | 8 + .../recipe/chemistry/MixerRecipes.java | 8 - .../resources/assets/gregtech/lang/en_us.lang | 24 +- .../component.advanced_smd.capacitor.json | 6 + .../component.advanced_smd.diode.json | 6 + .../component.advanced_smd.resistor.json | 6 + .../component.advanced_smd.transistor.json | 6 + .../plate.low_power_integrated_circuit.json | 6 + ...te.ultra_low_power_integrated_circuit.json | 6 + .../wafer.low_power_integrated_circuit.json | 6 + ...er.ultra_low_power_integrated_circuit.json | 6 + .../component.advanced_smd.capacitor.png | Bin 0 -> 4084 bytes .../component.advanced_smd.diode.png | Bin 0 -> 3881 bytes .../component.advanced_smd.resistor.png | Bin 0 -> 3996 bytes .../component.advanced_smd.transistor.png | Bin 0 -> 4043 bytes .../plate.high_power_integrated_circuit.png | Bin 3824 -> 3857 bytes .../plate.low_power_integrated_circuit.png | Bin 0 -> 3824 bytes .../plate.power_integrated_circuit.png | Bin 3842 -> 3803 bytes ...ate.ultra_low_power_integrated_circuit.png | Bin 0 -> 3842 bytes .../wafer.high_power_integrated_circuit.png | Bin 4120 -> 4152 bytes .../wafer.low_power_integrated_circuit.png | Bin 0 -> 4120 bytes .../wafer.power_integrated_circuit.png | Bin 4167 -> 4098 bytes ...fer.ultra_low_power_integrated_circuit.png | Bin 0 -> 4167 bytes 30 files changed, 514 insertions(+), 263 deletions(-) create mode 100644 src/main/java/gregtech/loaders/recipe/chemistry/GrowthMediumRecipes.java create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.capacitor.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.diode.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.resistor.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.transistor.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/plate.low_power_integrated_circuit.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/plate.ultra_low_power_integrated_circuit.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/wafer.low_power_integrated_circuit.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/wafer.ultra_low_power_integrated_circuit.json create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/component.advanced_smd.capacitor.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/component.advanced_smd.diode.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/component.advanced_smd.resistor.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/component.advanced_smd.transistor.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/plate.low_power_integrated_circuit.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/plate.ultra_low_power_integrated_circuit.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/wafer.low_power_integrated_circuit.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/wafer.ultra_low_power_integrated_circuit.png diff --git a/src/main/java/gregtech/api/unification/material/Materials.java b/src/main/java/gregtech/api/unification/material/Materials.java index 028cf0e2bd5..5a7e77241b9 100644 --- a/src/main/java/gregtech/api/unification/material/Materials.java +++ b/src/main/java/gregtech/api/unification/material/Materials.java @@ -212,7 +212,7 @@ public static void register() { public static DustMaterial Obsidian = new DustMaterial(171, "obsidian", 0x503264, DULL, 3, of(new MaterialStack(Magnesium, 1), new MaterialStack(Iron, 1), new MaterialStack(Silicon, 2), new MaterialStack(Oxygen, 8)), NO_SMASHING | EXCLUDE_BLOCK_CRAFTING_RECIPES); public static DustMaterial Phosphate = new DustMaterial(172, "phosphate", 0xFFFF00, DULL, 1, of(new MaterialStack(Phosphorus, 1), new MaterialStack(Oxygen, 4)), GENERATE_ORE | NO_SMASHING | NO_SMELTING | FLAMMABLE | EXPLOSIVE); public static IngotMaterial PigIron = new IngotMaterial(173, "pig_iron", 0xC8B4B4, METALLIC, 2, of(new MaterialStack(Iron, 1)), EXT_METAL | GENERATE_RING, 6.0F, 4.0f, 384); - public static IngotMaterial Polyethylene = new IngotMaterial(174, "plastic", 0xC8C8C8, DULL, 1, of(new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 2)), GENERATE_PLATE | FLAMMABLE | NO_SMASHING | SMELT_INTO_FLUID | DISABLE_DECOMPOSITION); //todo add polyethylene oredicts + public static IngotMaterial Polyethylene = new IngotMaterial(174, "plastic", 0xC8C8C8, DULL, 1, of(new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 2)), GENERATE_PLATE | GENERATE_FOIL | FLAMMABLE | NO_SMASHING | SMELT_INTO_FLUID | DISABLE_DECOMPOSITION); //todo add polyethylene oredicts public static IngotMaterial Epoxy = new IngotMaterial(175, "epoxy", 0xC88C14, DULL, 1, of(new MaterialStack(Carbon, 21), new MaterialStack(Hydrogen, 25), new MaterialStack(Chlorine, 1), new MaterialStack(Oxygen, 5)), EXT2_METAL | DISABLE_DECOMPOSITION | NO_SMASHING); public static DustMaterial Polysiloxane = new DustMaterial(176, "polysiloxane", 0xDCDCDC, DULL, 1, of(new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 1), new MaterialStack(Silicon, 2), new MaterialStack(Oxygen, 1)), GENERATE_PLATE | FLAMMABLE | NO_SMASHING | SMELT_INTO_FLUID | DISABLE_DECOMPOSITION); public static IngotMaterial Polycaprolactam = new IngotMaterial(177, "polycaprolactam", 0x323232, DULL, 1, of(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 11), new MaterialStack(Nitrogen, 1), new MaterialStack(Oxygen, 1)), GENERATE_PLATE | DISABLE_DECOMPOSITION | NO_SMASHING); @@ -548,7 +548,7 @@ public static void register() { public static IngotMaterial NeodymiumMagnetic = new IngotMaterial(332, "neodymium_magnetic", 0x646464, MAGNETIC, 2, of(new MaterialStack(Neodymium, 1)), EXT2_METAL | GENERATE_LONG_ROD, null, 1297); public static IngotMaterial TungstenCarbide = new IngotMaterial(333, "tungsten_carbide", 0x330066, METALLIC, 4, of(new MaterialStack(Tungsten, 1), new MaterialStack(Carbon, 1)), EXT2_METAL, null, 12.0F, 4.0f, 1280, 2460); public static IngotMaterial VanadiumSteel = new IngotMaterial(334, "vanadium_steel", 0xc0c0c0, METALLIC, 3, of(new MaterialStack(Vanadium, 1), new MaterialStack(Chrome, 1), new MaterialStack(Steel, 7)), EXT2_METAL, null, 7.0F, 3.0f, 1920, 1453); - public static IngotMaterial HSSG = new IngotMaterial(335, "hssg", 0x999900, METALLIC, 3, of(new MaterialStack(TungstenSteel, 5), new MaterialStack(Chrome, 1), new MaterialStack(Molybdenum, 2), new MaterialStack(Vanadium, 1)), EXT2_METAL | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | GENERATE_LONG_ROD | GENERATE_FRAME| GENERATE_SPRING, null, 10.0F, 5.5f, 4000, 4200); + public static IngotMaterial HSSG = new IngotMaterial(335, "hssg", 0x999900, METALLIC, 3, of(new MaterialStack(TungstenSteel, 5), new MaterialStack(Chrome, 1), new MaterialStack(Molybdenum, 2), new MaterialStack(Vanadium, 1)), EXT2_METAL | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | GENERATE_LONG_ROD | GENERATE_FRAME | GENERATE_SPRING, null, 10.0F, 5.5f, 4000, 4200); public static IngotMaterial HSSE = new IngotMaterial(336, "hsse", 0x336600, METALLIC, 4, of(new MaterialStack(HSSG, 6), new MaterialStack(Cobalt, 1), new MaterialStack(Manganese, 1), new MaterialStack(Silicon, 1)), EXT2_METAL | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | GENERATE_LONG_ROD | GENERATE_FRAME, null, 10.0F, 8.0f, 5120, 5000); public static IngotMaterial HSSS = new IngotMaterial(337, "hsss", 0x660033, METALLIC, 4, of(new MaterialStack(HSSG, 6), new MaterialStack(Iridium, 2), new MaterialStack(Osmium, 1)), EXT2_METAL | GENERATE_GEAR, null, 15.0F, 7.0f, 3000, 5000); public static IngotMaterial DiamericiumTitanium = new IngotMaterial(338, "diamericium_titanium", 0x755280, METALLIC, 4, of(new MaterialStack(Americium, 2), new MaterialStack(Titanium, 1)), EXT2_METAL, null, 6.0F, 6.0F, 2200, 10400); @@ -916,6 +916,6 @@ public static void register() { Polyethylene.setFluidPipeProperties(350, 60, true); Polytetrafluoroethylene.setFluidPipeProperties(600, 80, true); + Polybenzimidazole.setFluidPipeProperties(1000, 100, true); } - } diff --git a/src/main/java/gregtech/common/items/MetaItem2.java b/src/main/java/gregtech/common/items/MetaItem2.java index 4781357edcc..fc90c9a84ba 100644 --- a/src/main/java/gregtech/common/items/MetaItem2.java +++ b/src/main/java/gregtech/common/items/MetaItem2.java @@ -101,9 +101,7 @@ public void registerSubItems() { ENERGY_FIELD_PROJECTOR = addItem(578, "energy_field_projector").addComponents(ElectricStats.createElectricItem(16000000L, GTValues.EV)).setMaxStackSize(1); SCANNER = addItem(579, "scanner").addComponents(ElectricStats.createElectricItem(200_000L, GTValues.LV), new ScannerBehavior(50)); - CARBON_FIBERS = addItem(537, "carbon.fibers"); - CARBON_MESH = addItem(538, "carbon.mesh"); - CARBON_PLATE = addItem(539, "carbon.plate"); + INGOT_MIXED_METAL = addItem(432, "ingot.mixed_metal"); ADVANCED_ALLOY_PLATE = addItem(433, "plate.advanced_alloy"); INGOT_IRIDIUM_ALLOY = addItem(434, "ingot.iridium_alloy"); @@ -202,7 +200,7 @@ public void registerSubItems() { WETWARE_PROCESSOR_LUV = addItem(523, "circuit.wetware_processor").setUnificationData(OrePrefix.circuit, Tier.Master); WETWARE_PROCESSOR_ASSEMBLY_ZPM = addItem(524, "circuit.wetware_assembly").setUnificationData(OrePrefix.circuit, Tier.Ultimate); WETWARE_SUPER_COMPUTER_UV = addItem(525, "circuit.wetware_computer").setUnificationData(OrePrefix.circuit, Tier.Superconductor); - WETWARE_MAINFRAME_MAX = addItem(526, "circuit.wetware_mainframe").setUnificationData(OrePrefix.circuit, Tier.Infinite); + WETWARE_MAINFRAME_UHV = addItem(526, "circuit.wetware_mainframe").setUnificationData(OrePrefix.circuit, Tier.Infinite); TURBINE_ROTOR = addItem(529, "turbine_rotor").addComponents(new TurbineRotorBehavior()); COVER_FACADE = addItem(530, "cover.facade").addComponents(new FacadeItem()).disableModelLoading(); @@ -229,6 +227,22 @@ public void registerSubItems() { NEURO_PROCESSOR = addItem(534, "processor.neuro"); STEM_CELLS = addItem(535, "stem_cells"); PETRI_DISH = addItem(536, "petri_dish"); + + // TODO Reorganize + CARBON_FIBERS = addItem(537, "carbon.fibers"); + CARBON_MESH = addItem(538, "carbon.mesh"); + CARBON_PLATE = addItem(539, "carbon.plate"); + + ULTRA_LOW_POWER_INTEGRATED_CIRCUIT_WAFER = addItem(540, "wafer.ultra_low_power_integrated_circuit"); + LOW_POWER_INTEGRATED_CIRCUIT_WAFER = addItem(541, "wafer.low_power_integrated_circuit"); + ULTRA_LOW_POWER_INTEGRATED_CIRCUIT = addItem(542, "plate.ultra_low_power_integrated_circuit"); + LOW_POWER_INTEGRATED_CIRCUIT = addItem(543, "plate.low_power_integrated_circuit"); + + // keep this order for smd + ADVANCED_SMD_TRANSISTOR = addItem(544, "component.advanced_smd.transistor"); + ADVANCED_SMD_RESISTOR = addItem(545, "component.advanced_smd.resistor"); + ADVANCED_SMD_CAPACITOR = addItem(546, "component.advanced_smd.capacitor"); + ADVANCED_SMD_DIODE = addItem(547, "component.advanced_smd.diode"); } public void registerRecipes() { diff --git a/src/main/java/gregtech/common/items/MetaItems.java b/src/main/java/gregtech/common/items/MetaItems.java index f3c270112d0..1567dfd8898 100644 --- a/src/main/java/gregtech/common/items/MetaItems.java +++ b/src/main/java/gregtech/common/items/MetaItems.java @@ -246,15 +246,18 @@ private MetaItems() { public static MetaItem.MetaValueItem ADVANCED_SYSTEM_ON_CHIP_WAFER; public static MetaItem.MetaValueItem INTEGRATED_LOGIC_CIRCUIT_WAFER; public static MetaItem.MetaValueItem CENTRAL_PROCESSING_UNIT_WAFER; + public static MetaItem.MetaValueItem ULTRA_LOW_POWER_INTEGRATED_CIRCUIT_WAFER; + public static MetaItem.MetaValueItem LOW_POWER_INTEGRATED_CIRCUIT_WAFER; + public static MetaItem.MetaValueItem POWER_INTEGRATED_CIRCUIT_WAFER; public static MetaItem.MetaValueItem HIGH_POWER_INTEGRATED_CIRCUIT_WAFER; public static MetaItem.MetaValueItem NAND_MEMORY_CHIP_WAFER; public static MetaItem.MetaValueItem NANO_CENTRAL_PROCESSING_UNIT_WAFER; public static MetaItem.MetaValueItem NOR_MEMORY_CHIP_WAFER; - public static MetaItem.MetaValueItem POWER_INTEGRATED_CIRCUIT_WAFER; public static MetaItem.MetaValueItem QBIT_CENTRAL_PROCESSING_UNIT_WAFER; public static MetaItem.MetaValueItem RANDOM_ACCESS_MEMORY_WAFER; 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; @@ -262,15 +265,18 @@ private MetaItems() { public static MetaItem.MetaValueItem ADVANCED_SYSTEM_ON_CHIP; public static MetaItem.MetaValueItem INTEGRATED_LOGIC_CIRCUIT; public static MetaItem.MetaValueItem CENTRAL_PROCESSING_UNIT; + public static MetaItem.MetaValueItem ULTRA_LOW_POWER_INTEGRATED_CIRCUIT; + public static MetaItem.MetaValueItem LOW_POWER_INTEGRATED_CIRCUIT; + public static MetaItem.MetaValueItem POWER_INTEGRATED_CIRCUIT; public static MetaItem.MetaValueItem HIGH_POWER_INTEGRATED_CIRCUIT; public static MetaItem.MetaValueItem NAND_MEMORY_CHIP; public static MetaItem.MetaValueItem NANO_CENTRAL_PROCESSING_UNIT; public static MetaItem.MetaValueItem NOR_MEMORY_CHIP; - public static MetaItem.MetaValueItem POWER_INTEGRATED_CIRCUIT; public static MetaItem.MetaValueItem QBIT_CENTRAL_PROCESSING_UNIT; public static MetaItem.MetaValueItem RANDOM_ACCESS_MEMORY; 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 CRYSTAL_CENTRAL_PROCESSING_UNIT; public static MetaItem.MetaValueItem CRYSTAL_SYSTEM_ON_CHIP; @@ -296,12 +302,16 @@ private MetaItems() { public static MetaItem.MetaValueItem RESISTOR; public static MetaItem.MetaValueItem DIODE; public static MetaItem.MetaValueItem CAPACITOR; + public static MetaItem.MetaValueItem TRANSISTOR; public static MetaItem.MetaValueItem SMALL_COIL; public static MetaItem.MetaValueItem SMD_CAPACITOR; public static MetaItem.MetaValueItem SMD_DIODE; public static MetaItem.MetaValueItem SMD_RESISTOR; public static MetaItem.MetaValueItem SMD_TRANSISTOR; - public static MetaItem.MetaValueItem TRANSISTOR; + public static MetaItem.MetaValueItem ADVANCED_SMD_CAPACITOR; + public static MetaItem.MetaValueItem ADVANCED_SMD_DIODE; + public static MetaItem.MetaValueItem ADVANCED_SMD_RESISTOR; + public static MetaItem.MetaValueItem ADVANCED_SMD_TRANSISTOR; // T1: Electronic public static MetaItem.MetaValueItem ELECTRONIC_CIRCUIT_LV; @@ -344,7 +354,7 @@ private MetaItems() { public static MetaItem.MetaValueItem WETWARE_PROCESSOR_LUV; public static MetaItem.MetaValueItem WETWARE_PROCESSOR_ASSEMBLY_ZPM; public static MetaItem.MetaValueItem WETWARE_SUPER_COMPUTER_UV; - public static MetaItem.MetaValueItem WETWARE_MAINFRAME_MAX; + public static MetaItem.MetaValueItem WETWARE_MAINFRAME_UHV; public static MetaItem.MetaValueItem COMPONENT_SAW_BLADE_DIAMOND; public static MetaItem.MetaValueItem COMPONENT_GRINDER_DIAMOND; diff --git a/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java b/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java index cee77779af5..ff3dcbe0866 100644 --- a/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java +++ b/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java @@ -90,21 +90,19 @@ public static void init() { RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.frameGt, Materials.HSSE, 1), OreDictUnifier.get(OrePrefix.plate, Materials.HSSE, 6), MetaItems.QUANTUM_STAR.getStackForm(4), MetaItems.EMITTER_ZPM.getStackForm(4), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.cableGtDouble, Materials.YttriumBariumCuprate, 8)).input(OrePrefix.circuit, MarkerMaterials.Tier.Master, 16).fluidInputs(Materials.SolderingAlloy.getFluid(1152)).outputs(MetaItems.FIELD_GENERATOR_ZPM.getStackForm()).duration(600).EUt(245760).buildAndRegister(); RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.frameGt, Materials.Neutronium, 1), OreDictUnifier.get(OrePrefix.plate, Materials.Neutronium, 6), MetaItems.GRAVI_STAR.getStackForm(), MetaItems.EMITTER_UV.getStackForm(4), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.cableGtQuadruple, Materials.YttriumBariumCuprate, 8)).input(OrePrefix.circuit, MarkerMaterials.Tier.Master, 64).fluidInputs(Materials.SolderingAlloy.getFluid(2304)).outputs(MetaItems.FIELD_GENERATOR_UV.getStackForm()).duration(600).EUt(491520).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaItems.WETWARE_BOARD.getStackForm(), MetaItems.STEM_CELLS.getStackForm(8), MetaItems.GLASS_TUBE.getStackForm(8), OreDictUnifier.get(OrePrefix.pipeTiny, Materials.Polyethylene, 4), OreDictUnifier.get(OrePrefix.foil, Materials.SiliconeRubber, 64)).input(OrePrefix.plate, Materials.Gold, 4).input(OrePrefix.plate, Materials.StainlessSteel, 4).fluidInputs(Materials.SterileGrowthMedium.getFluid(250), Materials.UUMatter.getFluid(100), Materials.DistilledWater.getFluid(1000)).outputs(MetaItems.NEURO_PROCESSOR.getStackForm(1)).duration(200).EUt(80000).buildAndRegister(); - ItemStack last_bat = (ConfigHolder.U.GT5u.replaceUVwithMAXBat ? MetaItems.MAX_BATTERY : MetaItems.ZPM2).getStackForm(); if (ConfigHolder.U.GT5u.enableZPMandUVBats) { RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Europium, 16), MetaItems.WETWARE_SUPER_COMPUTER_UV.getStackForm(4), MetaItems.ENERGY_LAPOTRONIC_ORB2.getStackForm(8), MetaItems.FIELD_GENERATOR_LUV.getStackForm(2), MetaItems.NANO_CENTRAL_PROCESSING_UNIT.getStackForm(64), MetaItems.NANO_CENTRAL_PROCESSING_UNIT.getStackForm(64), MetaItems.SMD_DIODE.getStackForm(8), OreDictUnifier.get(OrePrefix.cableGtSingle, Materials.Naquadah, 32)).fluidInputs(Materials.SolderingAlloy.getFluid(2880), Materials.Polybenzimidazole.getFluid(288)).outputs(MetaItems.ENERGY_MODULE.getStackForm()).duration(2000).EUt(100000).buildAndRegister(); RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Americium, 16), MetaItems.WETWARE_SUPER_COMPUTER_UV.getStackForm(4), MetaItems.ENERGY_MODULE.getStackForm(8), MetaItems.FIELD_GENERATOR_ZPM.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT.getStackForm(64), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT.getStackForm(64), MetaItems.SMD_DIODE.getStackForm(16), OreDictUnifier.get(OrePrefix.cableGtSingle, Materials.NaquadahAlloy, 32)).fluidInputs(Materials.SolderingAlloy.getFluid(2880), Materials.Polybenzimidazole.getFluid(576)).outputs(MetaItems.ENERGY_CLUSTER.getStackForm()).duration(2000).EUt(200000).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Neutronium, 16), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(), MetaItems.ENERGY_CLUSTER.getStackForm(8), MetaItems.FIELD_GENERATOR_UV.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.SMD_DIODE.getStackForm(16), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 32)).fluidInputs(Materials.SolderingAlloy.getFluid(2880), Materials.Polybenzimidazole.getFluid(1000), Materials.Naquadria.getFluid(1152)).outputs(last_bat).duration(2000).EUt(300000).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Neutronium, 16), MetaItems.WETWARE_MAINFRAME_UHV.getStackForm(), MetaItems.WETWARE_MAINFRAME_UHV.getStackForm(), MetaItems.WETWARE_MAINFRAME_UHV.getStackForm(), MetaItems.WETWARE_MAINFRAME_UHV.getStackForm(), MetaItems.ENERGY_CLUSTER.getStackForm(8), MetaItems.FIELD_GENERATOR_UV.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.SMD_DIODE.getStackForm(16), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 32)).fluidInputs(Materials.SolderingAlloy.getFluid(2880), Materials.Polybenzimidazole.getFluid(1000), Materials.Naquadria.getFluid(1152)).outputs(last_bat).duration(2000).EUt(300000).buildAndRegister(); } else { - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Neutronium, 16), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(), MetaItems.ENERGY_LAPOTRONIC_ORB2.getStackForm(8), MetaItems.FIELD_GENERATOR_UV.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.SMD_DIODE.getStackForm(16), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 32)).fluidInputs(Materials.SolderingAlloy.getFluid(2880), Materials.Polybenzimidazole.getFluid(1000)).outputs(last_bat).duration(2000).EUt(300000).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Neutronium, 16), MetaItems.WETWARE_MAINFRAME_UHV.getStackForm(), MetaItems.WETWARE_MAINFRAME_UHV.getStackForm(), MetaItems.WETWARE_MAINFRAME_UHV.getStackForm(), MetaItems.WETWARE_MAINFRAME_UHV.getStackForm(), MetaItems.ENERGY_LAPOTRONIC_ORB2.getStackForm(8), MetaItems.FIELD_GENERATOR_UV.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.SMD_DIODE.getStackForm(16), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 32)).fluidInputs(Materials.SolderingAlloy.getFluid(2880), Materials.Polybenzimidazole.getFluid(1000)).outputs(last_bat).duration(2000).EUt(300000).buildAndRegister(); } RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaBlocks.FUSION_COIL.getItemVariant(BlockFusionCoil.CoilType.FUSION_COIL), OreDictUnifier.get(OrePrefix.plate, Materials.Plutonium241), OreDictUnifier.get(OrePrefix.plate, Materials.NetherStar), MetaItems.FIELD_GENERATOR_IV.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(32), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 32)).input(OrePrefix.circuit, MarkerMaterials.Tier.Ultimate, 1).input(OrePrefix.circuit, MarkerMaterials.Tier.Ultimate, 1).input(OrePrefix.circuit, MarkerMaterials.Tier.Ultimate, 1).input(OrePrefix.circuit, MarkerMaterials.Tier.Ultimate, 1).fluidInputs(Materials.SolderingAlloy.getFluid(2880)).outputs(MetaTileEntities.FUSION_REACTOR[0].getStackForm()).duration(1000).EUt(30000).buildAndRegister(); RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaBlocks.FUSION_COIL.getItemVariant(BlockFusionCoil.CoilType.FUSION_COIL), OreDictUnifier.get(OrePrefix.plate, Materials.Europium, 4), MetaItems.FIELD_GENERATOR_LUV.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(48), OreDictUnifier.get(OrePrefix.wireGtDouble, MarkerMaterials.Tier.Superconductor, 32)).input(OrePrefix.circuit, MarkerMaterials.Tier.Superconductor, 1).input(OrePrefix.circuit, MarkerMaterials.Tier.Superconductor, 1).input(OrePrefix.circuit, MarkerMaterials.Tier.Superconductor, 1).input(OrePrefix.circuit, MarkerMaterials.Tier.Superconductor, 1).fluidInputs(Materials.SolderingAlloy.getFluid(2880)).outputs(MetaTileEntities.FUSION_REACTOR[1].getStackForm()).duration(1000).EUt(60000).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaBlocks.FUSION_COIL.getItemVariant(BlockFusionCoil.CoilType.FUSION_COIL), OreDictUnifier.get(OrePrefix.plate, Materials.Americium, 4), MetaItems.FIELD_GENERATOR_ZPM.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(1), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(1), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(1), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(1), OreDictUnifier.get(OrePrefix.wireGtQuadruple, MarkerMaterials.Tier.Superconductor, 32)).fluidInputs(Materials.SolderingAlloy.getFluid(2880)).outputs(MetaTileEntities.FUSION_REACTOR[2].getStackForm()).duration(1000).EUt(90000).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaBlocks.FUSION_COIL.getItemVariant(BlockFusionCoil.CoilType.FUSION_COIL), OreDictUnifier.get(OrePrefix.plate, Materials.Americium, 4), MetaItems.FIELD_GENERATOR_ZPM.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.WETWARE_MAINFRAME_UHV.getStackForm(1), MetaItems.WETWARE_MAINFRAME_UHV.getStackForm(1), MetaItems.WETWARE_MAINFRAME_UHV.getStackForm(1), MetaItems.WETWARE_MAINFRAME_UHV.getStackForm(1), OreDictUnifier.get(OrePrefix.wireGtQuadruple, MarkerMaterials.Tier.Superconductor, 32)).fluidInputs(Materials.SolderingAlloy.getFluid(2880)).outputs(MetaTileEntities.FUSION_REACTOR[2].getStackForm()).duration(1000).EUt(90000).buildAndRegister(); } } diff --git a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java index cb5c2af6337..f841cdf8ce0 100644 --- a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java @@ -75,7 +75,7 @@ private static void waferRecipes() { CUTTER_RECIPES.recipeBuilder().duration(1600).EUt(480) .input(NAQUADAH_BOULE) .output(NAQUADAH_WAFER, 64).buildAndRegister(); CUTTER_RECIPES.recipeBuilder().duration(2400).EUt(1920).input(NEUTRONIUM_BOULE).output(NEUTRONIUM_WAFER, 64).output(NEUTRONIUM_WAFER, 32).buildAndRegister(); - // Wafer engraving + // Wafer engraving TODO ULPIC, LPIC LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(SILICON_WAFER) .notConsumable(craftingLens, Color.Red) .output(INTEGRATED_LOGIC_CIRCUIT_WAFER) .buildAndRegister(); LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480) .input(GLOWSTONE_WAFER) .notConsumable(craftingLens, Color.Red) .output(INTEGRATED_LOGIC_CIRCUIT_WAFER, 4) .buildAndRegister(); LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER) .notConsumable(craftingLens, Color.Red) .output(INTEGRATED_LOGIC_CIRCUIT_WAFER, 8) .buildAndRegister(); @@ -144,19 +144,21 @@ private static void waferRecipes() { .buildAndRegister(); // Wafer cutting - CUTTER_RECIPES.recipeBuilder().duration(900).EUt(7680).input(HIGHLY_ADVANCED_SOC_WAFER) .output(HIGHLY_ADVANCED_SOC, 6) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(900).EUt(1920).input(ADVANCED_SYSTEM_ON_CHIP_WAFER) .output(ADVANCED_SYSTEM_ON_CHIP, 6) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(900).EUt(480) .input(SYSTEM_ON_CHIP_WAFER) .output(SYSTEM_ON_CHIP, 6) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(900).EUt(64) .input(SIMPLE_SYSTEM_ON_CHIP_WAFER) .output(SIMPLE_SYSTEM_ON_CHIP, 6) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(900).EUt(96) .input(RANDOM_ACCESS_MEMORY_WAFER) .output(RANDOM_ACCESS_MEMORY, 32) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(900).EUt(1920).input(QBIT_CENTRAL_PROCESSING_UNIT_WAFER) .output(QBIT_CENTRAL_PROCESSING_UNIT, 4) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(900).EUt(1920).input(POWER_INTEGRATED_CIRCUIT_WAFER) .output(POWER_INTEGRATED_CIRCUIT, 4) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(900).EUt(7680).input(HIGH_POWER_INTEGRATED_CIRCUIT_WAFER).output(HIGH_POWER_INTEGRATED_CIRCUIT, 2).buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(900).EUt(192) .input(NOR_MEMORY_CHIP_WAFER) .output(NOR_MEMORY_CHIP, 16) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(900).EUt(192) .input(NAND_MEMORY_CHIP_WAFER) .output(NAND_MEMORY_CHIP, 32) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(CENTRAL_PROCESSING_UNIT_WAFER) .output(CENTRAL_PROCESSING_UNIT, 8) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(900).EUt(64) .input(INTEGRATED_LOGIC_CIRCUIT_WAFER) .output(INTEGRATED_LOGIC_CIRCUIT, 8) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().duration(900).EUt(480). input(NANO_CENTRAL_PROCESSING_UNIT_WAFER) .output(NANO_CENTRAL_PROCESSING_UNIT, 8) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(7680).input(HIGHLY_ADVANCED_SOC_WAFER) .output(HIGHLY_ADVANCED_SOC, 6) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(1920).input(ADVANCED_SYSTEM_ON_CHIP_WAFER) .output(ADVANCED_SYSTEM_ON_CHIP, 6) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(480) .input(SYSTEM_ON_CHIP_WAFER) .output(SYSTEM_ON_CHIP, 6) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(64) .input(SIMPLE_SYSTEM_ON_CHIP_WAFER) .output(SIMPLE_SYSTEM_ON_CHIP, 6) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(96) .input(RANDOM_ACCESS_MEMORY_WAFER) .output(RANDOM_ACCESS_MEMORY, 32) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(1920).input(QBIT_CENTRAL_PROCESSING_UNIT_WAFER) .output(QBIT_CENTRAL_PROCESSING_UNIT, 4) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(ULTRA_LOW_POWER_INTEGRATED_CIRCUIT_WAFER).output(ULTRA_LOW_POWER_INTEGRATED_CIRCUIT, 6).buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(480) .input(LOW_POWER_INTEGRATED_CIRCUIT_WAFER) .output(POWER_INTEGRATED_CIRCUIT, 4) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(1920).input(POWER_INTEGRATED_CIRCUIT_WAFER) .output(POWER_INTEGRATED_CIRCUIT, 4) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(7680).input(HIGH_POWER_INTEGRATED_CIRCUIT_WAFER) .output(HIGH_POWER_INTEGRATED_CIRCUIT, 2) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(192) .input(NOR_MEMORY_CHIP_WAFER) .output(NOR_MEMORY_CHIP, 16) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(192) .input(NAND_MEMORY_CHIP_WAFER) .output(NAND_MEMORY_CHIP, 32) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(120) .input(CENTRAL_PROCESSING_UNIT_WAFER) .output(CENTRAL_PROCESSING_UNIT, 8) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(64) .input(INTEGRATED_LOGIC_CIRCUIT_WAFER) .output(INTEGRATED_LOGIC_CIRCUIT, 8) .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(900).EUt(480). input(NANO_CENTRAL_PROCESSING_UNIT_WAFER) .output(NANO_CENTRAL_PROCESSING_UNIT, 8) .buildAndRegister(); } private static void componentRecipes() { @@ -363,28 +365,14 @@ private static void componentRecipes() { .output(SMD_RESISTOR, 16) .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(80).EUt(1920) - .input(dust, Carbon) - .input(wireFine, Electrum, 4) - .fluidInputs(Polybenzimidazole.getFluid(L / 2)) - .output(SMD_RESISTOR, 48) - .buildAndRegister(); - // SMD Diode ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(480) .input(dust, GalliumArsenide) .input(wireFine, Platinum, 8) - .fluidInputs(Polyethylene.getFluid(288)) + .fluidInputs(Polyethylene.getFluid(L * 2)) .output(SMD_DIODE, 32) .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(100).EUt(1920) - .input(dust, GalliumArsenide) - .input(wireFine, Platinum, 8) - .fluidInputs(Polybenzimidazole.getFluid(L / 2)) - .output(SMD_DIODE, 64) - .buildAndRegister(); - // SMD Transistor ASSEMBLER_RECIPES.recipeBuilder().duration(160).EUt(480) .input(foil, Gallium) @@ -393,13 +381,6 @@ private static void componentRecipes() { .output(SMD_TRANSISTOR, 16) .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(80).EUt(1920) - .input(foil, Gallium) - .input(wireFine, AnnealedCopper, 8) - .fluidInputs(Polybenzimidazole.getFluid(L / 2)) - .output(SMD_TRANSISTOR, 48) - .buildAndRegister(); - // SMD Capacitor ASSEMBLER_RECIPES.recipeBuilder().duration(80).EUt(480) .input(foil, SiliconeRubber) @@ -429,32 +410,36 @@ private static void componentRecipes() { .output(SMD_CAPACITOR, 24) .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(40).EUt(1920) - .input(foil, SiliconeRubber) - .input(foil, Aluminium) - .fluidInputs(Polybenzimidazole.getFluid(18)) - .output(SMD_CAPACITOR, 24) + // Advanced SMD Resistor + ASSEMBLER_RECIPES.recipeBuilder().EUt(384).duration(160) + .input(dust, Graphene) + .input(wireFine, Platinum, 4) + .fluidInputs(Polybenzimidazole.getFluid(L * 2)) + .output(ADVANCED_SMD_RESISTOR, 16) .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(40).EUt(1920) - .input(foil, PolyvinylChloride, 2) - .input(foil, Aluminium) - .fluidInputs(Polybenzimidazole.getFluid(18)) - .output(SMD_CAPACITOR, 36) + // Advanced SMD Diode + ASSEMBLER_RECIPES.recipeBuilder().EUt(480).duration(150) + .input(dustSmall, IndiumGalliumPhosphide) + .input(wireFine, NiobiumTitanium, 4) + .fluidInputs(Polybenzimidazole.getFluid(L / 2)) + .output(ADVANCED_SMD_DIODE, 16) .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(60).EUt(1920) - .input(foil, SiliconeRubber) - .input(foil, Tantalum) - .fluidInputs(Polybenzimidazole.getFluid(18)) - .output(SMD_CAPACITOR, 48) + // Advanced SMD Transistor + ASSEMBLER_RECIPES.recipeBuilder().EUt(480).duration(160) + .input(foil, VanadiumGallium) + .input(wireFine, HSSG, 8) + .fluidInputs(Polybenzimidazole.getFluid(L)) + .output(ADVANCED_SMD_TRANSISTOR, 16) .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(60).EUt(1920) - .input(foil, PolyvinylChloride, 2) - .input(foil, Tantalum) - .fluidInputs(Polybenzimidazole.getFluid(18)) - .output(SMD_CAPACITOR, 64) + // Advanced SMD Capacitor + ASSEMBLER_RECIPES.recipeBuilder().EUt(480).duration(80) + .input(foil, Polybenzimidazole, 2) + .input(foil, HSSS) + .fluidInputs(Polybenzimidazole.getFluid(L / 4)) + .output(ADVANCED_SMD_CAPACITOR, 16) .buildAndRegister(); // Carbon Fibers @@ -585,7 +570,7 @@ private static void boardRecipes() { // Coated Board ModHandler.addShapedRecipe("coated_board", COATED_BOARD.getStackForm(3), - " R ", "PPP", " R ", + "RRR", "PPP", "RRR", 'R', RUBBER_DROP.getStackForm(), 'P', new UnificationEntry(plate, Wood)); @@ -747,13 +732,13 @@ private static void boardRecipes() { // Fiber Reinforced Epoxy Board CHEMICAL_BATH_RECIPES.recipeBuilder().duration(240).EUt(16) .input(GLASS_FIBER) - .fluidInputs(Epoxy.getFluid(144)) + .fluidInputs(Epoxy.getFluid(L)) .output(plate, ReinforcedEpoxyResin) .buildAndRegister(); CHEMICAL_BATH_RECIPES.recipeBuilder().duration(240).EUt(16) .input(CARBON_FIBERS) - .fluidInputs(Epoxy.getFluid(144)) + .fluidInputs(Epoxy.getFluid(L)) .output(plate, ReinforcedEpoxyResin) .buildAndRegister(); @@ -771,7 +756,7 @@ private static void boardRecipes() { CHEMICAL_RECIPES.recipeBuilder().duration(500).EUt(10) .input(plate, ReinforcedEpoxyResin) - .input(foil, Copper) + .input(foil, AnnealedCopper, 8) .fluidInputs(SulfuricAcid.getFluid(125)) .output(FIBER_BOARD) .buildAndRegister(); @@ -844,14 +829,14 @@ private static void boardRecipes() { .output(WETWARE_BOARD, 16) .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(300).EUt(7680) + CHEMICAL_RECIPES.recipeBuilder().duration(300).EUt(7680) .input(WETWARE_BOARD) .input(foil, NiobiumTitanium, 32) .fluidInputs(SodiumPersulfate.getFluid(8000)) .output(WETWARE_CIRCUIT_BOARD) .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(150).EUt(30720) + CHEMICAL_RECIPES.recipeBuilder().duration(150).EUt(30720) .input(WETWARE_BOARD) .input(foil, NiobiumTitanium, 32) .fluidInputs(Iron3Chloride.getFluid(4000)) @@ -1021,6 +1006,17 @@ private static void circuitRecipes() { .solderMultiplier(4) .buildAndRegister(); + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(480).duration(400) + .input(frameGt, Aluminium, 2) + .input(WORKSTATION_EV, 2) + .input(SMALL_COIL, 12) + .input(ADVANCED_SMD_CAPACITOR, 4) + .input(RANDOM_ACCESS_MEMORY, 16) + .input(wireGtSingle, AnnealedCopper, 16) + .output(MAINFRAME_IV) + .solderMultiplier(4) + .buildAndRegister(); + // T4: Nano ==================================================================================================== // HV @@ -1034,6 +1030,16 @@ private static void circuitRecipes() { .output(NANO_PROCESSOR_HV, 2) .buildAndRegister(); + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(600).duration(100) + .input(ADVANCED_CIRCUIT_BOARD) + .input(NANO_CENTRAL_PROCESSING_UNIT) + .input(ADVANCED_SMD_RESISTOR, 2) + .input(ADVANCED_SMD_CAPACITOR, 2) + .input(ADVANCED_SMD_TRANSISTOR, 2) + .input(wireFine, Electrum, 8) + .output(NANO_PROCESSOR_HV, 2) + .buildAndRegister(); + // HV SoC CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(9600).duration(50) .input(ADVANCED_CIRCUIT_BOARD) @@ -1044,7 +1050,7 @@ private static void circuitRecipes() { .buildAndRegister(); // EV - CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(600).duration(200) + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(600).duration(400) .input(ADVANCED_CIRCUIT_BOARD) .input(NANO_PROCESSOR_HV, 2) .input(SMALL_COIL, 8) @@ -1055,6 +1061,17 @@ private static void circuitRecipes() { .solderMultiplier(2) .buildAndRegister(); + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(600).duration(200) + .input(ADVANCED_CIRCUIT_BOARD) + .input(NANO_PROCESSOR_HV, 2) + .input(SMALL_COIL, 8) + .input(ADVANCED_SMD_CAPACITOR, 2) + .input(RANDOM_ACCESS_MEMORY, 8) + .input(wireFine, Electrum, 16) + .output(NANO_PROCESSOR_ASSEMBLY_EV, 2) + .solderMultiplier(2) + .buildAndRegister(); + // IV CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(600).duration(400) .input(ADVANCED_CIRCUIT_BOARD) @@ -1067,6 +1084,17 @@ private static void circuitRecipes() { .solderMultiplier(2) .buildAndRegister(); + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(600).duration(200) + .input(ADVANCED_CIRCUIT_BOARD) + .input(NANO_PROCESSOR_ASSEMBLY_EV, 2) + .input(ADVANCED_SMD_DIODE, 2) + .input(NOR_MEMORY_CHIP, 4) + .input(RANDOM_ACCESS_MEMORY, 16) + .input(wireFine, Electrum, 16) + .output(NANO_COMPUTER_IV) + .solderMultiplier(2) + .buildAndRegister(); + // LuV CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(1920).duration(800) .input(frameGt, Aluminium, 2) @@ -1079,182 +1107,324 @@ private static void circuitRecipes() { .solderMultiplier(4) .buildAndRegister(); - //circuit assembling recipes TODO - for (MaterialStack stack : solderingList) { - IngotMaterial material = (IngotMaterial) stack.material; - int multiplier = (int) stack.amount; - - // EV Circuits - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(480) - .input(EPOXY_BOARD) - .input(NANO_PROCESSOR_HV, 2) - .input(SMALL_COIL, 4) - .input(SMD_CAPACITOR, 4) - .input(RANDOM_ACCESS_MEMORY, 4) - .input(wireFine, Electrum, 6) - .fluidInputs(material.getFluid(L * multiplier)) - .output(NANO_PROCESSOR_ASSEMBLY_EV) - .buildAndRegister(); + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(1920).duration(400) + .input(frameGt, Aluminium, 2) + .input(NANO_COMPUTER_IV, 2) + .input(SMALL_COIL, 16) + .input(ADVANCED_SMD_CAPACITOR, 8) + .input(RANDOM_ACCESS_MEMORY, 16) + .input(wireGtSingle, AnnealedCopper, 32) + .output(NANO_MAINFRAME_LUV) + .solderMultiplier(4) + .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(1960) - .input(FIBER_BOARD) - .input(QBIT_CENTRAL_PROCESSING_UNIT) - .input(NANO_CENTRAL_PROCESSING_UNIT) - .input(SMD_CAPACITOR, 2) - .input(SMD_TRANSISTOR, 2) - .input(wireFine, Platinum, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(QUANTUM_PROCESSOR_EV) - .buildAndRegister(); + // T5: Quantum ================================================================================================= - ASSEMBLER_RECIPES.recipeBuilder().duration(50).EUt(32000) - .input(FIBER_BOARD) - .input(ADVANCED_SYSTEM_ON_CHIP) - .input(wireFine, Platinum, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(QUANTUM_PROCESSOR_EV) - .buildAndRegister(); + // EV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(2400).duration(200) + .input(EXTREME_CIRCUIT_BOARD) + .input(QBIT_CENTRAL_PROCESSING_UNIT) + .input(NANO_CENTRAL_PROCESSING_UNIT) + .input(SMD_CAPACITOR, 12) + .input(SMD_TRANSISTOR, 12) + .input(wireFine, Platinum, 12) + .output(QUANTUM_PROCESSOR_EV, 2) + .buildAndRegister(); - // IV Circuits - /* - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(1960) - .input(FIBER_BOARD) - .input(QUANTUM_PROCESSOR_EV, 2) - .input(SMALL_COIL, 4) - .input(SMD_CAPACITOR, 4) - .input(RANDOM_ACCESS_MEMORY, 4) - .input(wireFine, Platinum, 6) - .fluidInputs(material.getFluid(L * multiplier)) - .output(DATA_CONTROL_CIRCUIT_IV) - .buildAndRegister();*/ - - ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(7600) - .input(MULTILAYER_FIBER_BOARD) - .input(CRYSTAL_CENTRAL_PROCESSING_UNIT) - .input(NANO_CENTRAL_PROCESSING_UNIT) - .input(SMD_CAPACITOR, 2) - .input(SMD_TRANSISTOR, 2) - .input(wireFine, NiobiumTitanium, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(CRYSTAL_PROCESSOR_IV) - .buildAndRegister(); + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(2400).duration(100) + .input(EXTREME_CIRCUIT_BOARD) + .input(QBIT_CENTRAL_PROCESSING_UNIT) + .input(NANO_CENTRAL_PROCESSING_UNIT) + .input(ADVANCED_SMD_CAPACITOR, 3) + .input(ADVANCED_SMD_TRANSISTOR, 3) + .input(wireFine, Platinum, 12) + .output(QUANTUM_PROCESSOR_EV, 2) + .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(50).EUt(31900) - .input(MULTILAYER_FIBER_BOARD) - .input(CRYSTAL_SYSTEM_ON_CHIP) - .input(wireFine, NiobiumTitanium, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(CRYSTAL_PROCESSOR_IV) - .buildAndRegister(); + // EV SoC + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(38400).duration(50) + .input(EXTREME_CIRCUIT_BOARD) + .input(ADVANCED_SYSTEM_ON_CHIP) + .input(wireFine, Platinum, 12) + .input(bolt, NiobiumTitanium, 8) + .output(QUANTUM_PROCESSOR_EV, 4) + .buildAndRegister(); - // LuV Circuits - /* - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(7600) - .input(MULTILAYER_FIBER_BOARD) - .input(CRYSTAL_PROCESSOR_IV, 2) - .input(SMALL_COIL, 4) - .input(SMD_CAPACITOR, 4) - .input(RANDOM_ACCESS_MEMORY, 4) - .input(wireFine, NiobiumTitanium, 6) - .fluidInputs(material.getFluid(L * multiplier)) - .output(ENERGY_FLOW_CIRCUIT_LUV) - .buildAndRegister();*/ - - ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(32800) - .input(WETWARE_BOARD) - .input(CRYSTAL_CENTRAL_PROCESSING_UNIT) - .input(NANO_CENTRAL_PROCESSING_UNIT) - .input(SMD_CAPACITOR, 2) - .input(SMD_TRANSISTOR, 2) - .input(wireFine, YttriumBariumCuprate, 2) - .fluidInputs(material.getFluid(L / 2 * multiplier)) - .output(WETWARE_PROCESSOR_LUV) - .buildAndRegister(); + // IV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(2400).duration(400) + .input(EXTREME_CIRCUIT_BOARD) + .input(QUANTUM_PROCESSOR_EV, 2) + .input(SMALL_COIL, 12) + .input(SMD_CAPACITOR, 16) + .input(RANDOM_ACCESS_MEMORY, 4) + .input(wireFine, Platinum, 16) + .output(QUANTUM_ASSEMBLY_IV, 2) + .solderMultiplier(2) + .buildAndRegister(); - // ZPM Circuits - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(34400) - .input(WETWARE_BOARD) - .input(WETWARE_PROCESSOR_LUV, 2) - .input(SMALL_COIL, 4) - .input(SMD_CAPACITOR, 4) - .input(RANDOM_ACCESS_MEMORY, 4) - .input(wireFine, YttriumBariumCuprate, 6) - .fluidInputs(material.getFluid(L * multiplier)) - .output(WETWARE_PROCESSOR_ASSEMBLY_ZPM) - .buildAndRegister(); + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(2400).duration(200) + .input(EXTREME_CIRCUIT_BOARD) + .input(QUANTUM_PROCESSOR_EV, 2) + .input(SMALL_COIL, 12) + .input(ADVANCED_SMD_CAPACITOR, 4) + .input(RANDOM_ACCESS_MEMORY, 4) + .input(wireFine, Platinum, 16) + .output(QUANTUM_ASSEMBLY_IV, 2) + .solderMultiplier(2) + .buildAndRegister(); - // UV Circuits - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(34400) - .input(WETWARE_BOARD, 2) - .input(WETWARE_PROCESSOR_ASSEMBLY_ZPM, 3) - .input(SMD_DIODE, 4) - .input(NOR_MEMORY_CHIP, 4) - .input(RANDOM_ACCESS_MEMORY, 4) - .input(wireFine, YttriumBariumCuprate, 6) - .fluidInputs(material.getFluid(L * multiplier)) - .output(WETWARE_SUPER_COMPUTER_UV) - .buildAndRegister(); + // LuV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(2400).duration(400) + .input(EXTREME_CIRCUIT_BOARD) + .input(QUANTUM_ASSEMBLY_IV, 2) + .input(SMD_DIODE, 8) + .input(NOR_MEMORY_CHIP, 4) + .input(RANDOM_ACCESS_MEMORY, 16) + .input(wireFine, Platinum, 32) + .output(QUANTUM_COMPUTER_LUV) + .solderMultiplier(2) + .buildAndRegister(); - // Misc - ASSEMBLER_RECIPES.recipeBuilder().duration(512).EUt(1024) - .input(FIBER_BOARD) - .input(POWER_INTEGRATED_CIRCUIT, 4) - .input(ENGRAVED_LAPOTRON_CHIP, 18) - .input(NANO_CENTRAL_PROCESSING_UNIT) - .input(wireFine, Platinum, 16) - .fluidInputs(material.getFluid(L * multiplier)) - .output(ENERGY_LAPOTRONIC_ORB) - .buildAndRegister(); + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(2400).duration(200) + .input(EXTREME_CIRCUIT_BOARD) + .input(QUANTUM_ASSEMBLY_IV, 2) + .input(ADVANCED_SMD_DIODE, 2) + .input(NOR_MEMORY_CHIP, 4) + .input(RANDOM_ACCESS_MEMORY, 16) + .input(wireFine, Platinum, 32) + .output(QUANTUM_COMPUTER_LUV) + .solderMultiplier(2) + .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(1024).EUt(4096) - .input(FIBER_BOARD) - .input(HIGH_POWER_INTEGRATED_CIRCUIT, 4) - .input(ENERGY_LAPOTRONIC_ORB, 8) - .input(QBIT_CENTRAL_PROCESSING_UNIT) - .input(wireFine, Platinum, 16) - .input(plate, Europium, 4) - .fluidInputs(material.getFluid(L * multiplier)) - .output(ENERGY_LAPOTRONIC_ORB2) - .buildAndRegister(); + // ZPM + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(7680).duration(800) + .input(frameGt, HSSG, 2) + .input(QUANTUM_COMPUTER_LUV, 2) + .input(SMALL_COIL, 24) + .input(SMD_CAPACITOR, 48) + .input(RANDOM_ACCESS_MEMORY, 24) + .input(wireGtSingle, AnnealedCopper, 48) + .solderMultiplier(4) + .output(QUANTUM_MAINFRAME_ZPM) + .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(90) - .input(PLASTIC_BOARD) - .input(PROCESSOR_MV) - .input(NAND_MEMORY_CHIP, 32) - .input(RANDOM_ACCESS_MEMORY, 4) - .input(wireFine, RedAlloy, 8) - .input(plate, Polyethylene, 4) - .fluidInputs(material.getFluid(L * multiplier)) - .output(TOOL_DATA_STICK) - .buildAndRegister(); + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(7680).duration(400) + .input(frameGt, HSSG, 2) + .input(QUANTUM_COMPUTER_LUV, 2) + .input(SMALL_COIL, 24) + .input(ADVANCED_SMD_CAPACITOR, 12) + .input(RANDOM_ACCESS_MEMORY, 24) + .input(wireGtSingle, AnnealedCopper, 48) + .solderMultiplier(4) + .output(QUANTUM_MAINFRAME_ZPM) + .buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(1200) - .input(EPOXY_BOARD) - .input(NANO_PROCESSOR_HV) - .input(RANDOM_ACCESS_MEMORY, 4) - .input(NOR_MEMORY_CHIP, 32) - .input(NAND_MEMORY_CHIP, 64) - .input(wireFine, Platinum, 32) - .fluidInputs(material.getFluid(L * multiplier)) - .output(TOOL_DATA_ORB) - .buildAndRegister(); - } + // T6: Crystal ================================================================================================= - // UHV Circuits - ASSEMBLY_LINE_RECIPES.recipeBuilder().duration(2000).EUt(300000) - .input(frameGt, Tritanium, 4) - .input(WETWARE_SUPER_COMPUTER_UV, 8) - .input(SMALL_COIL, 4) + // IV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(9600).duration(200) + .input(ELITE_CIRCUIT_BOARD) + .input(CRYSTAL_CENTRAL_PROCESSING_UNIT) + .input(NANO_CENTRAL_PROCESSING_UNIT, 2) + .input(ADVANCED_SMD_CAPACITOR, 6) + .input(ADVANCED_SMD_TRANSISTOR, 6) + .input(wireFine, NiobiumTitanium, 8) + .output(CRYSTAL_PROCESSOR_IV, 2) + .buildAndRegister(); + + // IV SoC + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(86000).duration(100) + .input(ELITE_CIRCUIT_BOARD) + .input(CRYSTAL_SYSTEM_ON_CHIP) + .input(wireFine, NiobiumTitanium, 8) + .input(bolt, YttriumBariumCuprate, 8) + .output(CRYSTAL_PROCESSOR_IV, 4) + .buildAndRegister(); + + // LuV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(9600).duration(400) + .input(ELITE_CIRCUIT_BOARD) + .input(CRYSTAL_PROCESSOR_IV, 2) + .input(SMALL_COIL, 24) + .input(ADVANCED_SMD_CAPACITOR, 8) + .input(RANDOM_ACCESS_MEMORY, 24) + .input(wireFine, NiobiumTitanium, 16) + .output(CRYSTAL_ASSEMBLY_LUV, 2) + .solderMultiplier(2) + .buildAndRegister(); + + // ZPM + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(9600).duration(400) + .input(ELITE_CIRCUIT_BOARD) + .input(CRYSTAL_ASSEMBLY_LUV, 2) + .input(RANDOM_ACCESS_MEMORY, 4) + .input(NOR_MEMORY_CHIP, 32) + .input(NAND_MEMORY_CHIP, 64) + .input(wireFine, NiobiumTitanium, 32) + .solderMultiplier(2) + .output(CRYSTAL_COMPUTER_ZPM) + .buildAndRegister(); + + // UV + ASSEMBLY_LINE_RECIPES.recipeBuilder().EUt(30720).duration(800) + .input(frameGt, HSSE, 2) + .input(CRYSTAL_COMPUTER_ZPM, 2) + .input(RANDOM_ACCESS_MEMORY, 32) + .input(HIGH_POWER_INTEGRATED_CIRCUIT, 2) + .input(wireGtSingle, NiobiumTitanium, 8) + .input(SMALL_COIL, 32) + .input(ADVANCED_SMD_CAPACITOR, 16) + .input(ADVANCED_SMD_DIODE, 8) + .fluidInputs(SolderingAlloy.getFluid(L * 10)) + .output(CRYSTAL_MAINFRAME_UV) + .buildAndRegister(); + + // T7: Wetware ================================================================================================= + + // Neuro Processing Unit + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(80000).duration(600) + .input(WETWARE_CIRCUIT_BOARD) + .input(STEM_CELLS, 16) + .input(pipeSmall, Polybenzimidazole, 8) + .input(plate, Electrum, 8) + .input(foil, SiliconeRubber, 16) + .input(bolt, HSSE, 8) + .fluidInputs(SterileGrowthMedium.getFluid(250)) + .output(NEURO_PROCESSOR) + .buildAndRegister(); + + // LuV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(38400).duration(200) + .input(NEURO_PROCESSOR) + .input(CRYSTAL_CENTRAL_PROCESSING_UNIT) + .input(NANO_CENTRAL_PROCESSING_UNIT) + .input(ADVANCED_SMD_CAPACITOR, 8) + .input(ADVANCED_SMD_TRANSISTOR, 8) + .input(wireFine, YttriumBariumCuprate, 8) + .output(WETWARE_PROCESSOR_LUV, 2) + .buildAndRegister(); + + // SoC LuV + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(150000).duration(100) + .input(NEURO_PROCESSOR) + .input(HIGHLY_ADVANCED_SOC) + .input(wireFine, YttriumBariumCuprate, 8) + .input(bolt, Naquadah, 8) + .output(WETWARE_PROCESSOR_LUV, 4) + .buildAndRegister(); + + // ZPM + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(38400).duration(400) + .input(WETWARE_CIRCUIT_BOARD) + .input(WETWARE_PROCESSOR_LUV, 2) + .input(SMALL_COIL, 32) + .input(ADVANCED_SMD_CAPACITOR, 12) + .input(RANDOM_ACCESS_MEMORY, 24) + .input(wireFine, YttriumBariumCuprate, 16) + .solderMultiplier(2) + .output(WETWARE_PROCESSOR_ASSEMBLY_ZPM, 2) + .buildAndRegister(); + + // UV + ASSEMBLY_LINE_RECIPES.recipeBuilder().EUt(38400).duration(400) + .input(WETWARE_CIRCUIT_BOARD) + .input(WETWARE_PROCESSOR_ASSEMBLY_ZPM, 2) + .input(ADVANCED_SMD_DIODE, 8) + .input(NOR_MEMORY_CHIP, 16) + .input(RANDOM_ACCESS_MEMORY, 32) + .input(wireFine, YttriumBariumCuprate, 24) + .input(foil, SiliconeRubber, 32) + .input(plate, Europium, 4) + .fluidInputs(SolderingAlloy.getFluid(1152)) + .output(WETWARE_SUPER_COMPUTER_UV) + .buildAndRegister(); + + // UHV + ASSEMBLY_LINE_RECIPES.recipeBuilder().EUt(300000).duration(2000) + .input(frameGt, Tritanium, 2) + .input(WETWARE_SUPER_COMPUTER_UV, 2) + .input(ADVANCED_SMD_DIODE, 32) + .input(ADVANCED_SMD_CAPACITOR, 32) + .input(ADVANCED_SMD_TRANSISTOR, 32) + .input(ADVANCED_SMD_RESISTOR, 32) + .input(foil, SiliconeRubber, 64) + .input(RANDOM_ACCESS_MEMORY, 32) + .input(wireGtDouble, Tier.Superconductor, 16) + .input(plate, Europium, 8) + .fluidInputs(SolderingAlloy.getFluid(L * 20)) + .fluidInputs(Polybenzimidazole.getFluid(L * 8)) + .output(WETWARE_MAINFRAME_UHV) + .buildAndRegister(); + + // Misc ======================================================================================================== + + // Data Stick + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(90) + .input(PLASTIC_BOARD) + .input(CENTRAL_PROCESSING_UNIT, 2) + .input(NAND_MEMORY_CHIP, 32) + .input(RANDOM_ACCESS_MEMORY, 4) + .input(wireFine, RedAlloy, 16) + .input(plate, Polyethylene, 4) + .output(TOOL_DATA_STICK) + .solderMultiplier(2) + .buildAndRegister(); + + // Data Orb + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(1200) + .input(EPOXY_BOARD) + .input(circuit, Tier.Advanced, 2) + .input(RANDOM_ACCESS_MEMORY, 4) + .input(NOR_MEMORY_CHIP, 32) + .input(NAND_MEMORY_CHIP, 64) + .input(wireFine, Platinum, 32) + .solderMultiplier(2) + .output(TOOL_DATA_ORB) + .buildAndRegister(); + + // Lapotronic Energy Orb + CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().duration(512).EUt(1024) + .input(FIBER_BOARD) + .input(POWER_INTEGRATED_CIRCUIT, 4) + .input(ENGRAVED_LAPOTRON_CHIP, 24) + .input(NANO_CENTRAL_PROCESSING_UNIT, 2) + .input(wireFine, Platinum, 16) + .input(plate, Platinum, 8) + .output(ENERGY_LAPOTRONIC_ORB) + .solderMultiplier(2) + .buildAndRegister(); + + // Lapotronic Energy Cluster + ASSEMBLY_LINE_RECIPES.recipeBuilder().EUt(80000).duration(1000) + .input(MULTILAYER_FIBER_BOARD) + .input(foil, Europium, 32) + .input(circuit, Tier.Master, 4) + .input(ENGRAVED_LAPOTRON_CHIP, 36) + .input(ENGRAVED_LAPOTRON_CHIP, 36) + .input(HIGH_POWER_INTEGRATED_CIRCUIT, 64) + .input(SMD_DIODE, 32) .input(SMD_CAPACITOR, 32) .input(SMD_RESISTOR, 32) .input(SMD_TRANSISTOR, 32) - .input(SMD_DIODE, 32) - .input(RANDOM_ACCESS_MEMORY, 16) - .input(wireGtDouble, Tier.Superconductor, 16) - .input(foil, SiliconeRubber, 64) - .fluidInputs(SolderingAlloy.getFluid(L * 20)) - .fluidInputs(Polybenzimidazole.getFluid(1000)) - .output(WETWARE_MAINFRAME_MAX) + .input(wireFine, Platinum, 64) + .fluidInputs(SolderingAlloy.getFluid(L * 5)) + .output(ENERGY_LAPOTRONIC_ORB2) + .buildAndRegister(); + + ASSEMBLY_LINE_RECIPES.recipeBuilder().EUt(80000).duration(500) + .input(MULTILAYER_FIBER_BOARD) + .input(foil, Europium, 32) + .input(circuit, Tier.Master, 4) + .input(ENGRAVED_LAPOTRON_CHIP, 36) + .input(ENGRAVED_LAPOTRON_CHIP, 36) + .input(HIGH_POWER_INTEGRATED_CIRCUIT, 64) + .input(ADVANCED_SMD_DIODE, 8) + .input(ADVANCED_SMD_CAPACITOR, 8) + .input(ADVANCED_SMD_RESISTOR, 8) + .input(ADVANCED_SMD_TRANSISTOR, 8) + .input(wireFine, Platinum, 64) + .fluidInputs(SolderingAlloy.getFluid(L * 5)) + .output(ENERGY_LAPOTRONIC_ORB2) .buildAndRegister(); } } diff --git a/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java b/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java index 384013e95f4..4ba09be3b74 100644 --- a/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java @@ -147,12 +147,12 @@ public static void init() { ModHandler.addShapedRecipe("transformer_lv", MetaTileEntities.TRANSFORMER[GTValues.LV - 1].getStackForm(), " BB", "CM ", " BB", 'M', MetaTileEntities.HULL[GTValues.ULV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Tin), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Lead)); ModHandler.addShapedRecipe("transformer_mv", MetaTileEntities.TRANSFORMER[GTValues.MV - 1].getStackForm(), " BB", "CM ", " BB", 'M', MetaTileEntities.HULL[GTValues.LV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Copper), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Tin)); - ModHandler.addShapedRecipe("transformer_hv", MetaTileEntities.TRANSFORMER[GTValues.HV - 1].getStackForm(), " BB", "CM ", " BB", 'M', MetaTileEntities.HULL[GTValues.MV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Gold), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Copper)); - ModHandler.addShapedRecipe("transformer_ev", MetaTileEntities.TRANSFORMER[GTValues.EV - 1].getStackForm(), "KBB", "CM ", "KBB", 'M', MetaTileEntities.HULL[GTValues.HV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Aluminium), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Gold), 'K', MetaItems.SMALL_COIL); - ModHandler.addShapedRecipe("transformer_iv", MetaTileEntities.TRANSFORMER[GTValues.IV - 1].getStackForm(), "KBB", "CM ", "KBB", 'M', MetaTileEntities.HULL[GTValues.EV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Tungsten), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Aluminium), 'K', MetaItems.SMALL_COIL); + ModHandler.addShapedRecipe("transformer_hv", MetaTileEntities.TRANSFORMER[GTValues.HV - 1].getStackForm(), "UBB", "CM ", "UBB", 'M', MetaTileEntities.HULL[GTValues.MV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Gold), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Copper), 'U', MetaItems.ULTRA_LOW_POWER_INTEGRATED_CIRCUIT); + ModHandler.addShapedRecipe("transformer_ev", MetaTileEntities.TRANSFORMER[GTValues.EV - 1].getStackForm(), "KBB", "CM ", "KBB", 'M', MetaTileEntities.HULL[GTValues.HV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Aluminium), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Gold), 'K', MetaItems.LOW_POWER_INTEGRATED_CIRCUIT); + ModHandler.addShapedRecipe("transformer_iv", MetaTileEntities.TRANSFORMER[GTValues.IV - 1].getStackForm(), "KBB", "CM ", "KBB", 'M', MetaTileEntities.HULL[GTValues.EV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Tungsten), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Aluminium), 'K', MetaItems.POWER_INTEGRATED_CIRCUIT); ModHandler.addShapedRecipe("transformer_luv", MetaTileEntities.TRANSFORMER[GTValues.LuV - 1].getStackForm(), "KBB", "CM ", "KBB", 'M', MetaTileEntities.HULL[GTValues.IV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.VanadiumGallium), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Tungsten), 'K', MetaItems.POWER_INTEGRATED_CIRCUIT); - ModHandler.addShapedRecipe("transformer_zpm", MetaTileEntities.TRANSFORMER[GTValues.ZPM - 1].getStackForm(), "KBB", "CM ", "KBB", 'M', MetaTileEntities.HULL[GTValues.LuV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Naquadah), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.VanadiumGallium), 'K', MetaItems.POWER_INTEGRATED_CIRCUIT); - ModHandler.addShapedRecipe("transformer_uv", MetaTileEntities.TRANSFORMER[GTValues.UV - 1].getStackForm(), "KBB", "CM ", "KBB", 'M', MetaTileEntities.HULL[GTValues.ZPM].getStackForm(), 'C', new UnificationEntry(OrePrefix.wireGtQuadruple, Materials.NaquadahAlloy), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Naquadah), 'K', MetaItems.POWER_INTEGRATED_CIRCUIT); + ModHandler.addShapedRecipe("transformer_zpm", MetaTileEntities.TRANSFORMER[GTValues.ZPM - 1].getStackForm(), "KBB", "CM ", "KBB", 'M', MetaTileEntities.HULL[GTValues.LuV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Naquadah), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.VanadiumGallium), 'K', MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT); + ModHandler.addShapedRecipe("transformer_uv", MetaTileEntities.TRANSFORMER[GTValues.UV - 1].getStackForm(), "KBB", "CM ", "KBB", 'M', MetaTileEntities.HULL[GTValues.ZPM].getStackForm(), 'C', new UnificationEntry(OrePrefix.wireGtQuadruple, Materials.NaquadahAlloy), 'B', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Naquadah), 'K', MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT); ModHandler.addShapedRecipe("energy_output_hatch_ulv", MetaTileEntities.ENERGY_OUTPUT_HATCH[GTValues.ULV].getStackForm(), " MC", 'M', MetaTileEntities.HULL[GTValues.ULV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Lead)); ModHandler.addShapedRecipe("energy_output_hatch_lv", MetaTileEntities.ENERGY_OUTPUT_HATCH[GTValues.LV].getStackForm(), " MC", 'M', MetaTileEntities.HULL[GTValues.LV].getStackForm(), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Tin)); diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/ChemistryRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/ChemistryRecipes.java index c9c83e096fd..01e2ed3f698 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/ChemistryRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/ChemistryRecipes.java @@ -21,6 +21,7 @@ public static void init() { ReactorRecipes.init(); PolymerRecipes.init(); LargeReactorRecipes.init(); + GrowthMediumRecipes.init(); // A Few Random Recipes @@ -76,11 +77,5 @@ public static void init() { .output(ingot, RedAlloy, 2) .blastFurnaceTemp(1200) .duration(884).EUt(120).buildAndRegister(); - - FLUID_HEATER_RECIPES.recipeBuilder() - .fluidInputs(RawGrowthMedium.getFluid(500)) - .circuitMeta(1) - .fluidOutputs(SterileGrowthMedium.getFluid(500)) - .duration(30).EUt(24).buildAndRegister(); } } diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/GrowthMediumRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/GrowthMediumRecipes.java new file mode 100644 index 00000000000..5b49a4c6d58 --- /dev/null +++ b/src/main/java/gregtech/loaders/recipe/chemistry/GrowthMediumRecipes.java @@ -0,0 +1,8 @@ +package gregtech.loaders.recipe.chemistry; + +public class GrowthMediumRecipes { + + public static void init() { + + } +} diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java index b534d2e1999..7edfba248c2 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java @@ -97,13 +97,5 @@ public static void init() { .fluidInputs(Oxygen.getFluid(7000)) .output(dust, YttriumBariumCuprate, 13) .EUt(8).duration(8000).buildAndRegister(); - - MIXER_RECIPES.recipeBuilder() - .input(dust, Sugar, 4) - .input(dust, Meat) - .input(dustTiny, Salt) - .fluidInputs(DistilledWater.getFluid(4000)) - .fluidOutputs(RawGrowthMedium.getFluid(4000)) - .duration(160).EUt(16).buildAndRegister(); } } diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 5d6dd433adf..2d885d73c04 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -500,6 +500,14 @@ metaitem.component.smd.transistor.name=SMD Transistor metaitem.component.smd.transistor.tooltip=Electronic Component metaitem.component.smd.resistor.name=SMD Resistor metaitem.component.smd.resistor.tooltip=Electronic Component +metaitem.component.advanced_smd.diode.name=Advanced SMD Diode +metaitem.component.advanced_smd.diode.tooltip=Advanced Electronic Component +metaitem.component.advanced_smd.capacitor.name=Advanced SMD Capacitor +metaitem.component.advanced_smd.capacitor.tooltip=Advanced Electronic Component +metaitem.component.advanced_smd.transistor.name=Advanced SMD Transistor +metaitem.component.advanced_smd.transistor.tooltip=Advanced Electronic Component +metaitem.component.advanced_smd.resistor.name=Advanced SMD Resistor +metaitem.component.advanced_smd.resistor.tooltip=Advanced Electronic Component metaitem.wafer.highly_advanced_system_on_chip.name=HASoC Wafer metaitem.wafer.highly_advanced_system_on_chip.tooltip=Raw Circuit @@ -509,11 +517,15 @@ metaitem.wafer.integrated_logic_circuit.name=Integrated Logic Circuit Wafer metaitem.wafer.integrated_logic_circuit.tooltip=Raw Circuit metaitem.wafer.central_processing_unit.name=CPU Wafer metaitem.wafer.central_processing_unit.tooltip=Raw Circuit -metaitem.wafer.high_power_integrated_circuit.name=High-Power IC Wafer +metaitem.wafer.high_power_integrated_circuit.name=HPIC Wafer metaitem.wafer.high_power_integrated_circuit.tooltip=Raw Circuit metaitem.wafer.nand_memory_chip.name=NAND Wafer metaitem.wafer.nand_memory_chip.tooltip=Raw Circuit -metaitem.wafer.power_integrated_circuit.name=Power IC Wafer +metaitem.wafer.ultra_low_power_integrated_circuit.name=ULPIC Wafer +metaitem.wafer.ultra_low_power_integrated_circuit.tooltip=Raw Circuit +metaitem.wafer.low_power_integrated_circuit.name=LPIC Wafer +metaitem.wafer.low_power_integrated_circuit.tooltip=Raw Circuit +metaitem.wafer.power_integrated_circuit.name=PIC Wafer metaitem.wafer.power_integrated_circuit.tooltip=Raw Circuit metaitem.wafer.nano_central_processing_unit.name=Nano CPU Wafer metaitem.wafer.nano_central_processing_unit.tooltip=Raw Circuit @@ -543,12 +555,16 @@ metaitem.plate.highly_advanced_system_on_chip.name=HASoC metaitem.plate.highly_advanced_system_on_chip.tooltip=Highly Advanced System on a Chip metaitem.plate.integrated_logic_circuit.name=Integrated Logic Circuit metaitem.plate.central_processing_unit.name=Central Processing Unit -metaitem.plate.high_power_integrated_circuit.name=HPIC -metaitem.plate.high_power_integrated_circuit.tooltip=High-Power Integrated Circuit +metaitem.plate.high_power_integrated_circuit.name=High Power IC +metaitem.plate.high_power_integrated_circuit.tooltip=High Power Circuit metaitem.plate.nand_memory_chip.name=NAND Gate metaitem.plate.nano_central_processing_unit.name=Nano CPU metaitem.plate.nano_central_processing_unit.tooltip=Nano Central Processing Unit metaitem.plate.nor_memory_chip.name=NOR Gate +metaitem.plate.ultra_low_power_integrated_circuit.name=Ultra Low Power IC +metaitem.plate.ultra_low_power_integrated_circuit.tooltip=Ultra Low Power Circuit +metaitem.plate.low_power_integrated_circuit.name=Low Power IC +metaitem.plate.low_power_integrated_circuit.tooltip=Low Power Circuit metaitem.plate.power_integrated_circuit.name=Power IC metaitem.plate.power_integrated_circuit.tooltip=Power Integrated Circuit metaitem.plate.qbit_central_processing_unit.name=QBit CPU diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.capacitor.json b/src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.capacitor.json new file mode 100644 index 00000000000..afa6ccc51e2 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.capacitor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/component.advanced_smd.capacitor" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.diode.json b/src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.diode.json new file mode 100644 index 00000000000..9b567b0f996 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.diode.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/component.advanced_smd.diode" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.resistor.json b/src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.resistor.json new file mode 100644 index 00000000000..e8a0268ec2e --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.resistor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/component.advanced_smd.resistor" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.transistor.json b/src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.transistor.json new file mode 100644 index 00000000000..a1b89ba90e5 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/component.advanced_smd.transistor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/component.advanced_smd.transistor" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/plate.low_power_integrated_circuit.json b/src/main/resources/assets/gregtech/models/item/metaitems/plate.low_power_integrated_circuit.json new file mode 100644 index 00000000000..7f4723ced4f --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/plate.low_power_integrated_circuit.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/plate.low_power_integrated_circuit" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/plate.ultra_low_power_integrated_circuit.json b/src/main/resources/assets/gregtech/models/item/metaitems/plate.ultra_low_power_integrated_circuit.json new file mode 100644 index 00000000000..92304e4b9c5 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/plate.ultra_low_power_integrated_circuit.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/plate.ultra_low_power_integrated_circuit" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/wafer.low_power_integrated_circuit.json b/src/main/resources/assets/gregtech/models/item/metaitems/wafer.low_power_integrated_circuit.json new file mode 100644 index 00000000000..14f0a8b7b53 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/wafer.low_power_integrated_circuit.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/wafer.low_power_integrated_circuit" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/wafer.ultra_low_power_integrated_circuit.json b/src/main/resources/assets/gregtech/models/item/metaitems/wafer.ultra_low_power_integrated_circuit.json new file mode 100644 index 00000000000..de0b42f85df --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/wafer.ultra_low_power_integrated_circuit.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/wafer.ultra_low_power_integrated_circuit" + } +} diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/component.advanced_smd.capacitor.png b/src/main/resources/assets/gregtech/textures/items/metaitems/component.advanced_smd.capacitor.png new file mode 100644 index 0000000000000000000000000000000000000000..c5dedac4b53a9e7c89c6c264c15c42300e69a66e GIT binary patch literal 4084 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 mNLFlzV8{+jN20000 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/plate.high_power_integrated_circuit.png b/src/main/resources/assets/gregtech/textures/items/metaitems/plate.high_power_integrated_circuit.png index 4d146a95c55d2b6cbd4aadf280a6c5cde3ab64c6..95fe208307b963ca45881997eeec342851c31a4a 100644 GIT binary patch delta 1121 zcmV-n1fKiw9g!ZezzTmnNklF*UZAP53l#M+4hv6R;$q6H8oR4Nsz#S@ZAC2B|U7NboV0zG{_ zXtX6v00D)v_KpG;&4-Aspc2tARh-sQ2t>v}PhXD_V>1M0_Tm$YBBB4Gp>}{mh#gc> z2m1(Us(U&&+%JDe#(*U>t1YR9v9(t=I`_+STpD;65R|gjv;SSZ^*e9fxPSswJmvCe zYNk|};_~Q#t-O6OG6rmG9pN?#v*iaEL~I|}F(EA9T67Luu5uA76{heb8Hs>HwjD0E zHbyu=DwTHj`_)~KaEQkfb=*pYNtd(2!#hF&XS+;(A> zmPf@vU#?d))J)wsDfd(9mjI8!kq-d)?dC$TiH(0}5fKV^O99%@l|h+rF!SU4+EcUj;uFe-2n+8p^`W`G9cKLneII4_z5_ zu#YUo(~~oHEB2LSkL9{nb<1i%xKnK-EDvu+%3m{+i6*CNnKh7q-{X>c*S!6C7A@ko zX{mp=d}puf@Xn+gk7`D4pD!1uea%GMGeV5{FXls-Sf?kxDLUWN$p+G?g!4}rdU1cV z@dwyoz8_Hym?9zK&Y9WqEE0DI5ic@h*YovA+B7BV@Oi)+DFgX_Yp)NSv^2!*c-Au$ z`u#raOjH1wrld1PTV@<%D!x2A!2Zs2k}ZE3_MUH9kY-xh*?ML%ZEI(1a~*)T_6|1J zR{=QJ(aGBC698U&y^E(SkLl`qgFAP=J=s+J!^Az3&1dS|p*%`@zk8MU8{!v!qI-c^ zqt}M4JAuS}cL2|bF3PPVSap7LbAwWG=GAXT)t9?yG>yqL+m(ul5}i5I#^(AO0PR^F zovb}wLB(Qn{`{Nz(W8fZnP_a0m*;rpiVll3cUeg+Q n_~##Dn;MKd4jD*JWBoe-TyA5hH8#oW00000NkvXXu0mjfSXCOS delta 1088 zcmV-G1i$-{9`GHozzTmGNklZDde;9S-iz*(+z>i=}9!&2opd+q0HVZV9pYV zSOt}chL!57PD3Cy1}3K`ofyjyl-o-}D2l9pPhWhBLWoYAsM8Y!G|gjOnlH+kF<^v# zqK#C?*zA=>XT5*E!Ht>E06{6Mp1rGy5D^rhGWiydfgx&@6>cuhSmiBYY7AIwy>N@d zTKy>w5$gjR6IM}6Wn9%ls8(4aiDW7Q{@6NPtTs+KKt4a{_b1IGe_sJnCfmlXR#|Rw zRs_6L6mb3>86IK(pkcpT=Qm1I9KCysh=~V+OhAM0c0)zRFARt5N+mN(p zN>uN8AdHlma?$MdsZYzcsR!vA^>^>h2SEvift;VBJ#1%9#WxpcI5~VnZn(hln|%Xm zVT8l|*M{ln82fuW0E~`}v$wMaz}4|MUh;;{;_`X;(6DcKeHS5Y9VoqK6-nAL`paV zG+ytbq70zf-PuB-h}(;Iv<9C4`G+kKx-;tNF_2uw`gZ`^>ncI~qi4ea0000y diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/plate.low_power_integrated_circuit.png b/src/main/resources/assets/gregtech/textures/items/metaitems/plate.low_power_integrated_circuit.png new file mode 100644 index 0000000000000000000000000000000000000000..4d146a95c55d2b6cbd4aadf280a6c5cde3ab64c6 GIT binary patch literal 3824 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 delta 1106 zcmV-Y1g-nq9fBUPzzTmYNklW; zwN3v|ud8X%@KL%Iy=lBQskN0Lf~(-lE}rSd%$YN1_Z(Kz3nn2MX6L*g&-=U|BWo=u zxeO<~YS~6o<)!a`xCs(Z|9JtD1Xc(s`$O{o7_euXEL&O_s zBn#`y4{a3!l?Ker&IqsoPd1(mMd|9*F9ArCI<3`5?(D{8=)T8{G_>}hWrrFtGkeK8 z=e#F=Z@h8FpM!re#-rfRTFVZ zV`pC+mP}s0FU^9W-7C(O0kVuWngh0Wd!0x*)N1t-f70N6F1x}2cTt>~IK!L0b`Bfj zU1u+X6-^3OyY4wPY33&HA>TA@{!fp@f;DIW}^1 zJC1)-C06VSpH?T1V)8M)fh=a-#}u&(+zV)WfsH)$u5RD&zy4c2c)!+?=dPF z0UaX6{3lFR=ID7KZmppT*~2hiWiHGw&gBLcWEg}E6BR(SF&d`mtS$^4N^dM&qr3l> z(TOJa@2vr_aQiy@Z(akizW(RXg7o80i)?>wzTm=z&$)Bw=i^Pq0Q0vT#GSWo0464< zc-!6uU~=j#?cHqvJ~=zh&h{1n=cdo|a%&TS>GKyzWD3fUWk9wTZeMqA0wsNKfMRvb zOSr{a%kJ(DE6b1n|I4U%(7|FE869J<-Ik1Ob8?E^R}O(s&wa-B)+Q!Nbn)UB_W4Tl zXQerRS@~#fDuIg!aQtQ6~ Y0KV2bzKPg8Bme*a07*qoM6N<$g7V=b+W-In diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/plate.ultra_low_power_integrated_circuit.png b/src/main/resources/assets/gregtech/textures/items/metaitems/plate.ultra_low_power_integrated_circuit.png new file mode 100644 index 0000000000000000000000000000000000000000..8a91f91e74125aa7c2495ef4f86e7824a885ff69 GIT binary patch literal 3842 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 Ef+9gapa1{> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.high_power_integrated_circuit.png b/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.high_power_integrated_circuit.png index cf0360a77c5191d126455927d16dfb5a32af6b15..776233d003679571b1d36828faacfaaa8c85f49c 100644 GIT binary patch delta 1419 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 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.low_power_integrated_circuit.png b/src/main/resources/assets/gregtech/textures/items/metaitems/wafer.low_power_integrated_circuit.png new file mode 100644 index 0000000000000000000000000000000000000000..cf0360a77c5191d126455927d16dfb5a32af6b15 GIT binary patch literal 4120 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 literal 0 HcmV?d00001 From 75519cdfe2953e2fa79f0bde70caf26a5ff03493 Mon Sep 17 00:00:00 2001 From: DStrand1 Date: Mon, 5 Jul 2021 01:39:20 -0500 Subject: [PATCH 17/21] fix simple dust issues --- .../api/items/materialitem/DustMetaItem.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/gregtech/api/items/materialitem/DustMetaItem.java b/src/main/java/gregtech/api/items/materialitem/DustMetaItem.java index 8003ca1fddb..382f8799f4d 100644 --- a/src/main/java/gregtech/api/items/materialitem/DustMetaItem.java +++ b/src/main/java/gregtech/api/items/materialitem/DustMetaItem.java @@ -31,8 +31,7 @@ public DustMetaItem() { for (SimpleDustMaterial material : SimpleDustMaterial.MATERIAL_REGISTRY) { int i = SimpleDustMaterial.MATERIAL_REGISTRY.getIDForObject(material); for (int j = 0; j < orePrefixes.length; j++) { - OrePrefix orePrefix = orePrefixes[j]; - if (material.hasFlag(GENERATE_SMALL_TINY)) { + if (j == 2 || material.hasFlag(GENERATE_SMALL_TINY)) { generatedItems.add((short) (i * 3 + j)); } } @@ -58,14 +57,13 @@ public void registerModels() { TShortObjectHashMap alreadyRegistered = new TShortObjectHashMap<>(); for (short metaItem : generatedItems) { OrePrefix prefix = orePrefixes[metaItem % 3]; - MaterialIconSet materialIconSet = SimpleDustMaterial.MATERIAL_REGISTRY.getObjectById(metaItem / 3).iconSet; - short registrationKey = (short) (metaItem + materialIconSet.ordinal()); - if (!alreadyRegistered.containsKey(registrationKey)) { + MaterialIconSet materialIconSet = SimpleDustMaterial.MATERIAL_REGISTRY.getObjectById((metaItem - (metaItem % 3)) / 3).iconSet; + if (!alreadyRegistered.containsKey(metaItem)) { ResourceLocation resourceLocation = prefix.materialIconType.getItemModelPath(materialIconSet); ModelBakery.registerItemVariants(this, resourceLocation); - alreadyRegistered.put(registrationKey, new ModelResourceLocation(resourceLocation, "inventory")); + alreadyRegistered.put(metaItem, new ModelResourceLocation(resourceLocation, "inventory")); } - ModelResourceLocation resourceLocation = alreadyRegistered.get(registrationKey); + ModelResourceLocation resourceLocation = alreadyRegistered.get(metaItem); metaItemsModels.put(metaItem, resourceLocation); } } From 66dc2e96049184e1deb56df5253bbc6ec2be2e20 Mon Sep 17 00:00:00 2001 From: DStrand1 Date: Mon, 5 Jul 2021 01:48:08 -0500 Subject: [PATCH 18/21] add items and materials for Growth Medium --- .../api/unification/material/Materials.java | 22 ++++++++++++------ .../java/gregtech/common/items/MetaItem2.java | 2 ++ .../java/gregtech/common/items/MetaItems.java | 2 ++ .../recipe/chemistry/SeparationRecipes.java | 5 ---- .../resources/assets/gregtech/lang/en_us.lang | 14 +++++++++++ .../models/item/metaitems/bio_chaff.json | 6 +++++ .../textures/items/metaitems/bio_chaff.png | Bin 0 -> 621 bytes 7 files changed, 39 insertions(+), 12 deletions(-) create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/bio_chaff.json create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/bio_chaff.png diff --git a/src/main/java/gregtech/api/unification/material/Materials.java b/src/main/java/gregtech/api/unification/material/Materials.java index 5a7e77241b9..f36b3b461e3 100644 --- a/src/main/java/gregtech/api/unification/material/Materials.java +++ b/src/main/java/gregtech/api/unification/material/Materials.java @@ -405,14 +405,19 @@ public static void register() { public static SimpleFluidMaterial OilMedium = new SimpleFluidMaterial(119, "oil_medium", 0x0A0A0A, FLUID, of(), GENERATE_FLUID_BLOCK); public static SimpleFluidMaterial OilLight = new SimpleFluidMaterial(120, "oil_light", 0x0A0A0A, FLUID, of(), GENERATE_FLUID_BLOCK); public static SimpleFluidMaterial NaturalGas = new SimpleFluidMaterial(121, "natural_gas", 0xFFFFFF, FLUID, of(), STATE_GAS | GENERATE_FLUID_BLOCK); - public static final SimpleFluidMaterial DiphenylIsophtalate = new SimpleFluidMaterial(122, "diphenyl_isophthalate", 0x246E57, DULL, of(new MaterialStack(Carbon, 20), new MaterialStack(Hydrogen, 14), new MaterialStack(Oxygen, 4)), DISABLE_DECOMPOSITION); - public static final SimpleFluidMaterial PhthalicAcid = new SimpleFluidMaterial(123, "phthalic_acid", 0xD1D1D1, FLUID, of(new MaterialStack(Carbon, 8), new MaterialStack(Hydrogen, 6), new MaterialStack(Oxygen, 4)), GENERATE_FLUID_BLOCK | DISABLE_DECOMPOSITION); - public static final SimpleFluidMaterial Dimethylbenzene = new SimpleFluidMaterial(124, "dimethylbenzene", 0x669C40, FLUID, of(new MaterialStack(Carbon, 8), new MaterialStack(Hydrogen, 10)), DISABLE_DECOMPOSITION).setFormula("C6H4(CH3)2"); - public static final SimpleFluidMaterial Diaminobenzidine = new SimpleFluidMaterial(125, "diaminobenzidine", 0x337D59, DULL, of(new MaterialStack(Carbon, 12), new MaterialStack(Hydrogen, 14), new MaterialStack(Nitrogen, 4)), DISABLE_DECOMPOSITION); - public static final SimpleFluidMaterial Dichlorobenzidine = new SimpleFluidMaterial(126, "dichlorobenzidine", 0xA1DEA6, DULL, of(new MaterialStack(Carbon, 12), new MaterialStack(Hydrogen, 10), new MaterialStack(Chlorine, 2), new MaterialStack(Nitrogen, 2)), DISABLE_DECOMPOSITION); - public static final SimpleFluidMaterial Nitrochlorobenzene = new SimpleFluidMaterial(127, "nitrochlorobenzene", 0x8FB51A, DULL, of(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 4), new MaterialStack(Chlorine, 1), new MaterialStack(Nitrogen, 1), new MaterialStack(Oxygen, 2)), DISABLE_DECOMPOSITION); - public static final SimpleFluidMaterial Chlorobenzene = new SimpleFluidMaterial(128, "chlorobenzene", 0x326A3E, DULL, of(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 5), new MaterialStack(Chlorine, 1)), DISABLE_DECOMPOSITION); + public static SimpleFluidMaterial DiphenylIsophtalate = new SimpleFluidMaterial(122, "diphenyl_isophthalate", 0x246E57, DULL, of(new MaterialStack(Carbon, 20), new MaterialStack(Hydrogen, 14), new MaterialStack(Oxygen, 4)), DISABLE_DECOMPOSITION); + public static SimpleFluidMaterial PhthalicAcid = new SimpleFluidMaterial(123, "phthalic_acid", 0xD1D1D1, FLUID, of(new MaterialStack(Carbon, 8), new MaterialStack(Hydrogen, 6), new MaterialStack(Oxygen, 4)), GENERATE_FLUID_BLOCK | DISABLE_DECOMPOSITION); + public static SimpleFluidMaterial Dimethylbenzene = new SimpleFluidMaterial(124, "dimethylbenzene", 0x669C40, FLUID, of(new MaterialStack(Carbon, 8), new MaterialStack(Hydrogen, 10)), DISABLE_DECOMPOSITION).setFormula("C6H4(CH3)2"); + public static SimpleFluidMaterial Diaminobenzidine = new SimpleFluidMaterial(125, "diaminobenzidine", 0x337D59, DULL, of(new MaterialStack(Carbon, 12), new MaterialStack(Hydrogen, 14), new MaterialStack(Nitrogen, 4)), DISABLE_DECOMPOSITION); + public static SimpleFluidMaterial Dichlorobenzidine = new SimpleFluidMaterial(126, "dichlorobenzidine", 0xA1DEA6, DULL, of(new MaterialStack(Carbon, 12), new MaterialStack(Hydrogen, 10), new MaterialStack(Chlorine, 2), new MaterialStack(Nitrogen, 2)), DISABLE_DECOMPOSITION); + public static SimpleFluidMaterial Nitrochlorobenzene = new SimpleFluidMaterial(127, "nitrochlorobenzene", 0x8FB51A, DULL, of(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 4), new MaterialStack(Chlorine, 1), new MaterialStack(Nitrogen, 1), new MaterialStack(Oxygen, 2)), DISABLE_DECOMPOSITION); + public static SimpleFluidMaterial Chlorobenzene = new SimpleFluidMaterial(128, "chlorobenzene", 0x326A3E, DULL, of(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 5), new MaterialStack(Chlorine, 1)), DISABLE_DECOMPOSITION); public static SimpleFluidMaterial Iron3Chloride = new SimpleFluidMaterial(129, "iron_iii_chloride", 0x060B0B, FLUID, of(new MaterialStack(Iron, 1), new MaterialStack(Chlorine, 3)), DECOMPOSITION_BY_ELECTROLYZING); + public static SimpleFluidMaterial Bacteria = new SimpleFluidMaterial(130, "bacteria", 0x808000, FLUID, of(), 0); + public static SimpleFluidMaterial BacterialSludge = new SimpleFluidMaterial(131, "bacterial_sludge", 0x355E3B, FLUID, of(), 0); + public static SimpleFluidMaterial EnrichedBacterialSludge = new SimpleFluidMaterial(132, "enriched_bacterial_sludge", 0x7FFF00, FLUID, of(), 0); + public static SimpleFluidMaterial Mutagen = new SimpleFluidMaterial(133, "mutagen", 0x00FF7F, FLUID, of(), 0); + public static SimpleFluidMaterial GelatinMixture = new SimpleFluidMaterial(134, "gelatin_mixture", 0x588BAE, FLUID, of(), 0); public static SimpleDustMaterial SodiumHydroxide = new SimpleDustMaterial(1, "sodium_hydroxide", 0x003380, DULL, of(new MaterialStack(Sodium, 1), new MaterialStack(Oxygen, 1), new MaterialStack(Hydrogen, 1)), GENERATE_SMALL_TINY); public static SimpleDustMaterial MagnesiumChloride = new SimpleDustMaterial(2, "magnesium_chloride", 0xD40D5C, DULL, of(new MaterialStack(Magnesium, 1), new MaterialStack(Chlorine, 2)), GENERATE_SMALL_TINY); @@ -428,6 +433,9 @@ public static void register() { public static SimpleDustMaterial PlatinumGroupSludge = new SimpleDustMaterial(12, "platinum_group_sludge", 0x001E00, FINE, of(), DISABLE_DECOMPOSITION | GENERATE_SMALL_TINY); public static SimpleDustMaterial HydratedCoal = new SimpleDustMaterial(13, "hydrated_coal", 0x464664, ROUGH, of(new MaterialStack(Coal, 8), new MaterialStack(Water, 1)), GENERATE_SMALL_TINY); public static SimpleDustMaterial SodiumBicarbonate = new SimpleDustMaterial(14, "sodium_bicarbonate", 0x565b96, ROUGH, of(new MaterialStack(Sodium, 1), new MaterialStack(Hydrogen, 1), new MaterialStack(Carbon, 1), new MaterialStack(Oxygen, 3)), GENERATE_SMALL_TINY); + public static SimpleDustMaterial Collagen = new SimpleDustMaterial(15, "collagen", 0x80471C, ROUGH, of(), 0); + public static SimpleDustMaterial Gelatin = new SimpleDustMaterial(16, "gelatin", 0x588BAE, ROUGH, of(), 0); + public static SimpleDustMaterial Agar = new SimpleDustMaterial(17, "agar", 0x4F7942, ROUGH, of(), 0); /** * Organic chemistry diff --git a/src/main/java/gregtech/common/items/MetaItem2.java b/src/main/java/gregtech/common/items/MetaItem2.java index fc90c9a84ba..aecc3a3fe77 100644 --- a/src/main/java/gregtech/common/items/MetaItem2.java +++ b/src/main/java/gregtech/common/items/MetaItem2.java @@ -243,6 +243,8 @@ public void registerSubItems() { ADVANCED_SMD_RESISTOR = addItem(545, "component.advanced_smd.resistor"); ADVANCED_SMD_CAPACITOR = addItem(546, "component.advanced_smd.capacitor"); ADVANCED_SMD_DIODE = addItem(547, "component.advanced_smd.diode"); + + BIO_CHAFF = addItem(548, "bio_chaff"); } public void registerRecipes() { diff --git a/src/main/java/gregtech/common/items/MetaItems.java b/src/main/java/gregtech/common/items/MetaItems.java index 1567dfd8898..17d19e89d8a 100644 --- a/src/main/java/gregtech/common/items/MetaItems.java +++ b/src/main/java/gregtech/common/items/MetaItems.java @@ -456,6 +456,8 @@ private MetaItems() { public static MetaItem.MetaValueItem STEM_CELLS; public static MetaItem.MetaValueItem PETRI_DISH; + public static MetaItem.MetaValueItem BIO_CHAFF; + public static void init() { MetaItem1 first = new MetaItem1(); first.setRegistryName("meta_item_1"); diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java index 292b31f1f34..f16ac852dc2 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java @@ -493,10 +493,5 @@ public static void init() { .inputs(new ItemStack(Blocks.BOOKSHELF)) .outputs(new ItemStack(Items.BOOK, 3)) .duration(300).EUt(2).buildAndRegister(); - - EXTRACTOR_RECIPES.recipeBuilder() - .inputs(new ItemStack(Items.EGG)) - .chancedOutput(MetaItems.STEM_CELLS.getStackForm(), 1500, 500) - .duration(600).EUt(480).buildAndRegister(); } } diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 2d885d73c04..e5a2d7277fd 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -652,6 +652,7 @@ metaitem.processor.neuro.name=Neuro Processing Unit metaitem.processor.neuro.tooltip=Neuro CPU metaitem.petri_dish.name=Petri Dish metaitem.petri_dish.tooltip=For cultivating Cells +metaitem.bio_chaff.name=Bio Chaff metaitem.carbon.fibers.name=Raw Carbon Fibers metaitem.carbon.mesh.name=Carbon Fiber Mesh @@ -1630,6 +1631,7 @@ material.coffee=Coffee material.wheat=Wheat material.meat=Mince Meat +material.sodium_bicarbonate=Sodium Bicarbonate material.polybenzimidazole=Polybenzimidazole material.diphenyl_isophthalate=Diphenyl Isophthalate material.phthalic_acid=Phthalic Acid @@ -1642,6 +1644,18 @@ material.potassium_dichromate=Potassium Dichromate material.chromium_trioxide=Chromium Trioxide material.iron_iii_chloride=Iron III Chloride +material.bacteria=Bacteria +material.bacterial_sludge=Bacterial Sludge +material.enriched_bacterial_sludge=Enriched Bacterial Sludge +material.mutagen=Mutagen +material.gelatin_mixture=Gelatin Mixture +material.collagen=Collagen +item.collagen.dust=Collagen +material.gelatin=Gelatin +item.gelatin.dust=Gelatin +material.agar=Agar +item.agar.dust=Agar + item.nether_quartz.oreNetherrack=Nether Quartz Ore item.gunpowder.dustTiny=Tiny Pile of Gunpowder item.gunpowder.dustSmall=Small Pile of Gunpowder diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/bio_chaff.json b/src/main/resources/assets/gregtech/models/item/metaitems/bio_chaff.json new file mode 100644 index 00000000000..280d3489c75 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/bio_chaff.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/bio_chaff" + } +} diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/bio_chaff.png b/src/main/resources/assets/gregtech/textures/items/metaitems/bio_chaff.png new file mode 100644 index 0000000000000000000000000000000000000000..5e66a02ad09df3a2c595a2d8d1c495e50d72c9cc GIT binary patch literal 621 zcmV-z0+RiSP)10?beoTUH&0s2Wq zK~y-)ZBoH*Qb80wciwwIf%hn-U*{^MpDGj6lr@?&%7t+U{*Lf+wKPQt4YBEPO^>EU? z6ho+9Juma+i$??iD#3^DFS&58(a(*bLXGve6H*C|KMh4|2PfT20TAP)zLRD9=t`;w zB_;=BOvY)X@-x5_sL33&LIx&Zag(setTzKHs@rkAn;9U0^H88djcGptt(`dUxlzn| z*gBKyL5V8VP%6~e-Y(L7(Jt6~vo3{mA6h%u%x=PrX%i{~-mh)3;AD^wi_qGE<1g_2 za{|%MTvUR1Tnu7Xn@|~H?C;G>DX386+q)qPeil@MuRr^I@XtZcE5mam06?cbk|i7K z&47igAQozHJ;0)ph(%n>O|b|C1t${=>Do(_cT4y^A7ag!Vlf-T%@DLSp%Qf3BWdjV zY`1y>0Lu1sIPWb1ZT}aQ1kC(K$hd(~cNJ)2r#%we9g~k67 Date: Mon, 5 Jul 2021 02:25:35 -0500 Subject: [PATCH 19/21] growth medium/stem cells recipes --- .../api/unification/material/Materials.java | 5 +- .../recipe/chemistry/GrowthMediumRecipes.java | 215 ++++++++++++++++++ .../resources/assets/gregtech/lang/en_us.lang | 1 + 3 files changed, 219 insertions(+), 2 deletions(-) diff --git a/src/main/java/gregtech/api/unification/material/Materials.java b/src/main/java/gregtech/api/unification/material/Materials.java index f36b3b461e3..664464f56a2 100644 --- a/src/main/java/gregtech/api/unification/material/Materials.java +++ b/src/main/java/gregtech/api/unification/material/Materials.java @@ -416,8 +416,9 @@ public static void register() { public static SimpleFluidMaterial Bacteria = new SimpleFluidMaterial(130, "bacteria", 0x808000, FLUID, of(), 0); public static SimpleFluidMaterial BacterialSludge = new SimpleFluidMaterial(131, "bacterial_sludge", 0x355E3B, FLUID, of(), 0); public static SimpleFluidMaterial EnrichedBacterialSludge = new SimpleFluidMaterial(132, "enriched_bacterial_sludge", 0x7FFF00, FLUID, of(), 0); - public static SimpleFluidMaterial Mutagen = new SimpleFluidMaterial(133, "mutagen", 0x00FF7F, FLUID, of(), 0); - public static SimpleFluidMaterial GelatinMixture = new SimpleFluidMaterial(134, "gelatin_mixture", 0x588BAE, FLUID, of(), 0); + public static SimpleFluidMaterial FermentedBacterialSludge = new SimpleFluidMaterial(133, "fermented_bacterial_sludge", 0x32CD32, FLUID, of(), 0); + public static SimpleFluidMaterial Mutagen = new SimpleFluidMaterial(134, "mutagen", 0x00FF7F, FLUID, of(), 0); + public static SimpleFluidMaterial GelatinMixture = new SimpleFluidMaterial(135, "gelatin_mixture", 0x588BAE, FLUID, of(), 0); public static SimpleDustMaterial SodiumHydroxide = new SimpleDustMaterial(1, "sodium_hydroxide", 0x003380, DULL, of(new MaterialStack(Sodium, 1), new MaterialStack(Oxygen, 1), new MaterialStack(Hydrogen, 1)), GENERATE_SMALL_TINY); public static SimpleDustMaterial MagnesiumChloride = new SimpleDustMaterial(2, "magnesium_chloride", 0xD40D5C, DULL, of(new MaterialStack(Magnesium, 1), new MaterialStack(Chlorine, 2)), GENERATE_SMALL_TINY); diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/GrowthMediumRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/GrowthMediumRecipes.java index 5b49a4c6d58..9283dd35d86 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/GrowthMediumRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/GrowthMediumRecipes.java @@ -1,8 +1,223 @@ package gregtech.loaders.recipe.chemistry; +import gregtech.api.recipes.ingredients.IntCircuitIngredient; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +import static gregtech.api.recipes.RecipeMaps.*; +import static gregtech.api.unification.material.Materials.*; +import static gregtech.api.unification.ore.OrePrefix.*; +import static gregtech.common.items.MetaItems.*; + public class GrowthMediumRecipes { public static void init() { + // Bio Chaff + MACERATOR_RECIPES.recipeBuilder().EUt(30).duration(200) + .input(PLANT_BALL, 2) + .output(BIO_CHAFF) + .output(BIO_CHAFF) + .chancedOutput(BIO_CHAFF, 5000, 0) + .chancedOutput(BIO_CHAFF, 2500, 0) + .buildAndRegister(); + + MACERATOR_RECIPES.recipeBuilder().EUt(2).duration(300) + .input(BIO_CHAFF) + .outputs(new ItemStack(Blocks.DIRT)) + .buildAndRegister(); + + BREWING_RECIPES.recipeBuilder().EUt(4).duration(128) + .input(BIO_CHAFF) + .fluidInputs(Water.getFluid(750)) + .fluidOutputs(Biomass.getFluid(750)) + .buildAndRegister(); + + BREWING_RECIPES.recipeBuilder().EUt(4).duration(128) + .input(BIO_CHAFF) + .fluidInputs(DistilledWater.getFluid(750)) + .fluidOutputs(Biomass.getFluid(750)) + .buildAndRegister(); + + PYROLYSE_RECIPES.recipeBuilder().EUt(10).duration(200) + .input(BIO_CHAFF) + .circuitMeta(2) + .fluidInputs(Water.getFluid(1500)) + .fluidOutputs(FermentedBiomass.getFluid(1500)) + .buildAndRegister(); + + PYROLYSE_RECIPES.recipeBuilder().EUt(10).duration(900) + .input(BIO_CHAFF, 4) + .circuitMeta(1) + .fluidInputs(Water.getFluid(4000)) + .fluidOutputs(Biomass.getFluid(5000)) + .buildAndRegister(); + + // Bacteria + MIXER_RECIPES.recipeBuilder().EUt(480).duration(300) + .input(BIO_CHAFF, 4) + .fluidInputs(DistilledWater.getFluid(4000)) + .notConsumable(new IntCircuitIngredient(1)) + .fluidOutputs(Bacteria.getFluid(2000)) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().EUt(1920).duration(300) + .input(dust, Vinteum) + .fluidInputs(DistilledWater.getFluid(8000)) + .notConsumable(new IntCircuitIngredient(1)) + .fluidOutputs(Bacteria.getFluid(4000)) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().EUt(7680).duration(300) + .input(dustTiny, Naquadria) + .fluidInputs(DistilledWater.getFluid(16000)) + .notConsumable(new IntCircuitIngredient(1)) + .fluidOutputs(Bacteria.getFluid(8000)) + .buildAndRegister(); + + // Bacterial Sludge + MIXER_RECIPES.recipeBuilder().EUt(1920).duration(600) + .input(dust, Endstone, 16) + .fluidInputs(DistilledWater.getFluid(4000)) + .notConsumable(new IntCircuitIngredient(2)) + .fluidOutputs(BacterialSludge.getFluid(1000)) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().EUt(7680).duration(600) + .input(dust, Vinteum) + .fluidInputs(DistilledWater.getFluid(8000)) + .notConsumable(new IntCircuitIngredient(2)) + .fluidOutputs(BacterialSludge.getFluid(2000)) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().EUt(30720).duration(600) + .input(dustTiny, Naquadria) + .fluidInputs(DistilledWater.getFluid(16000)) + .notConsumable(new IntCircuitIngredient(2)) + .fluidOutputs(BacterialSludge.getFluid(4000)) + .buildAndRegister(); + + // Enriched Bacterial Sludge + BREWING_RECIPES.recipeBuilder().EUt(4).duration(128) + .input(dust, Uranium238) + .fluidInputs(BacterialSludge.getFluid(750)) + .fluidOutputs(EnrichedBacterialSludge.getFluid(750)) + .buildAndRegister(); + + BREWING_RECIPES.recipeBuilder().EUt(4).duration(128) + .input(dustTiny, Uranium235) + .fluidInputs(BacterialSludge.getFluid(750)) + .fluidOutputs(EnrichedBacterialSludge.getFluid(750)) + .buildAndRegister(); + + // Fermented Bacterial Sludge + FERMENTING_RECIPES.recipeBuilder().EUt(2).duration(2400) + .fluidInputs(EnrichedBacterialSludge.getFluid(750)) + .fluidOutputs(FermentedBacterialSludge.getFluid(75)) + .buildAndRegister(); + + // Mutagen + DISTILLERY_RECIPES.recipeBuilder().EUt(1920).duration(60) + .fluidInputs(FermentedBacterialSludge.getFluid(10)) + .notConsumable(new IntCircuitIngredient(3)) + .fluidOutputs(Mutagen.getFluid(1)) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().EUt(7680).duration(1200) + .input(dust, Vinteum, 4) + .fluidInputs(DistilledWater.getFluid(4000)) + .notConsumable(new IntCircuitIngredient(4)) + .fluidOutputs(Mutagen.getFluid(1000)) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().EUt(30720).duration(1200) + .input(dustTiny, Naquadria) + .fluidInputs(DistilledWater.getFluid(8000)) + .notConsumable(new IntCircuitIngredient(4)) + .fluidOutputs(Mutagen.getFluid(2000)) + .buildAndRegister(); + + // Collagen + CHEMICAL_RECIPES.recipeBuilder().EUt(480).duration(800) + .input(dust, Meat) + .inputs(new ItemStack(Items.DYE, 1, 15)) + .fluidInputs(SulfuricAcid.getFluid(500)) + .output(dust, Collagen) + .fluidOutputs(DilutedSulfuricAcid.getFluid(500)) + .buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder().EUt(480).duration(1600) + .input(dust, Meat, 2) + .inputs(new ItemStack(Items.BONE)) + .fluidInputs(SulfuricAcid.getFluid(1000)) + .output(dust, Collagen, 2) + .fluidOutputs(DilutedSulfuricAcid.getFluid(1000)) + .buildAndRegister(); + + // Gelatin + CHEMICAL_RECIPES.recipeBuilder().EUt(480).duration(1600) + .input(dust, Collagen, 4) + .fluidInputs(PhosphoricAcid.getFluid(1000)) + .fluidInputs(Water.getFluid(3000)) + .fluidOutputs(GelatinMixture.getFluid(4000)) + .buildAndRegister(); + + CENTRIFUGE_RECIPES.recipeBuilder().EUt(480).duration(2400) + .fluidInputs(GelatinMixture.getFluid(6000)) + .output(dust, Phosphorus) + .output(dust, Gelatin, 4) + .buildAndRegister(); + + // Agar + MIXER_RECIPES.recipeBuilder().EUt(480).duration(600) + .input(dust, Gelatin) + .fluidInputs(DistilledWater.getFluid(1000)) + .output(dust, Agar) + .buildAndRegister(); + + // Raw Growth Medium + MIXER_RECIPES.recipeBuilder().EUt(7680).duration(1200) + .input(dust, Meat, 4) + .input(dust, Salt, 4) + .input(dust, Calcium, 4) + .input(dust, Agar, 4) + .fluidInputs(Bacteria.getFluid(4000)) + .fluidOutputs(RawGrowthMedium.getFluid(1000)) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().EUt(30720).duration(1200) + .input(dust, Meat, 8) + .input(dust, Salt, 8) + .input(dust, Calcium, 8) + .input(dust, Agar, 4) + .fluidInputs(BacterialSludge.getFluid(4000)) + .fluidOutputs(RawGrowthMedium.getFluid(2000)) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().EUt(122880).duration(1200) + .input(dust, Meat, 12) + .input(dust, Salt, 12) + .input(dust, Calcium, 12) + .input(dust, Agar, 4) + .fluidInputs(Mutagen.getFluid(4000)) + .fluidOutputs(RawGrowthMedium.getFluid(4000)) + .buildAndRegister(); + + // Sterile Growth Medium + FLUID_HEATER_RECIPES.recipeBuilder().EUt(7680).duration(20) + .notConsumable(new IntCircuitIngredient(1)) + .fluidInputs(RawGrowthMedium.getFluid(100)) + .fluidOutputs(SterileGrowthMedium.getFluid(100)) + .buildAndRegister(); + + // Stem Cells + CHEMICAL_RECIPES.recipeBuilder().EUt(30720).duration(300) + .input(dust, Osmiridium) + .input(dust, Vinteum, 2) + .fluidInputs(SterileGrowthMedium.getFluid(500)) + .output(STEM_CELLS, 32) + .fluidOutputs(BacterialSludge.getFluid(500)) + .buildAndRegister(); } } diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index e5a2d7277fd..6aecb77e237 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -1647,6 +1647,7 @@ material.iron_iii_chloride=Iron III Chloride material.bacteria=Bacteria material.bacterial_sludge=Bacterial Sludge material.enriched_bacterial_sludge=Enriched Bacterial Sludge +material.fermented_bacterial_sludge=Fermented Bacterial Sludge material.mutagen=Mutagen material.gelatin_mixture=Gelatin Mixture material.collagen=Collagen From e52aaef059e54cf2a5883e96b0f23d2a688436b0 Mon Sep 17 00:00:00 2001 From: DStrand1 Date: Mon, 5 Jul 2021 02:37:35 -0500 Subject: [PATCH 20/21] rework crystal CPU duping --- .../java/gregtech/common/items/MetaItem2.java | 1 + .../java/gregtech/common/items/MetaItems.java | 1 + .../loaders/recipe/CircuitRecipes.java | 36 +++++++++++------- .../recipe/chemistry/GrowthMediumRecipes.java | 2 +- .../resources/assets/gregtech/lang/en_us.lang | 2 + .../item/metaitems/crystal.raw_chip.json | 6 +++ .../items/metaitems/crystal.raw_chip.png | Bin 0 -> 2919 bytes 7 files changed, 34 insertions(+), 14 deletions(-) create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/crystal.raw_chip.json create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/crystal.raw_chip.png diff --git a/src/main/java/gregtech/common/items/MetaItem2.java b/src/main/java/gregtech/common/items/MetaItem2.java index aecc3a3fe77..adcbf18399f 100644 --- a/src/main/java/gregtech/common/items/MetaItem2.java +++ b/src/main/java/gregtech/common/items/MetaItem2.java @@ -245,6 +245,7 @@ public void registerSubItems() { ADVANCED_SMD_DIODE = addItem(547, "component.advanced_smd.diode"); BIO_CHAFF = addItem(548, "bio_chaff"); + RAW_CRYSTAL_CHIP_PART = addItem(549, "crystal.raw_chip"); } public void registerRecipes() { diff --git a/src/main/java/gregtech/common/items/MetaItems.java b/src/main/java/gregtech/common/items/MetaItems.java index 17d19e89d8a..eefca82070c 100644 --- a/src/main/java/gregtech/common/items/MetaItems.java +++ b/src/main/java/gregtech/common/items/MetaItems.java @@ -278,6 +278,7 @@ private MetaItems() { 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; diff --git a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java index f841cdf8ce0..53304b5de72 100644 --- a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java @@ -4,8 +4,6 @@ import gregtech.api.unification.material.MarkerMaterials.Component; import gregtech.api.unification.material.MarkerMaterials.Tier; import gregtech.api.unification.material.MarkerMaterials.Color; -import gregtech.api.unification.material.type.IngotMaterial; -import gregtech.api.unification.stack.MaterialStack; import gregtech.api.unification.stack.UnificationEntry; import gregtech.common.ConfigHolder; import net.minecraft.init.Items; @@ -22,12 +20,6 @@ public class CircuitRecipes { private CircuitRecipes() { } - // TODO Remove - private static final MaterialStack[] solderingList = { - new MaterialStack(Tin, 2L), - new MaterialStack(SolderingAlloy, 1L) - }; - public static void init() { waferRecipes(); componentRecipes(); @@ -506,11 +498,6 @@ private static void componentRecipes() { .output(CRYSTAL_SYSTEM_ON_CHIP) .buildAndRegister(); - CUTTER_RECIPES.recipeBuilder().EUt(60).duration(960) - .input(CRYSTAL_CENTRAL_PROCESSING_UNIT) - .output(RAW_CRYSTAL_CHIP, 2) - .buildAndRegister(); - AUTOCLAVE_RECIPES.recipeBuilder().duration(12000).EUt(320) .input(gemExquisite, Emerald) .fluidInputs(Europium.getFluid(L / 9)) @@ -523,6 +510,29 @@ private static void componentRecipes() { .chancedOutput(RAW_CRYSTAL_CHIP, 1000, 2000) .buildAndRegister(); + FORGE_HAMMER_RECIPES.recipeBuilder().EUt(480).duration(100) + .input(RAW_CRYSTAL_CHIP) + .output(RAW_CRYSTAL_CHIP_PART, 9) + .buildAndRegister(); + + AUTOCLAVE_RECIPES.recipeBuilder().duration(12000).EUt(480) + .input(RAW_CRYSTAL_CHIP_PART) + .fluidInputs(Europium.getFluid(L / 9)) + .chancedOutput(RAW_CRYSTAL_CHIP, 8000, 250) + .buildAndRegister(); + + AUTOCLAVE_RECIPES.recipeBuilder().duration(12000).EUt(480) + .input(RAW_CRYSTAL_CHIP_PART) + .fluidInputs(Mutagen.getFluid(250)) + .chancedOutput(RAW_CRYSTAL_CHIP, 8000, 250) + .buildAndRegister(); + + AUTOCLAVE_RECIPES.recipeBuilder().duration(12000).EUt(480) + .input(RAW_CRYSTAL_CHIP_PART) + .fluidInputs(BacterialSludge.getFluid(250)) + .chancedOutput(RAW_CRYSTAL_CHIP, 8000, 250) + .buildAndRegister(); + BLAST_RECIPES.recipeBuilder().duration(900).EUt(480).blastFurnaceTemp(5000) .input(plate, Emerald) .input(RAW_CRYSTAL_CHIP) diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/GrowthMediumRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/GrowthMediumRecipes.java index 9283dd35d86..8ffb72dc838 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/GrowthMediumRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/GrowthMediumRecipes.java @@ -20,7 +20,7 @@ public static void init() { .output(BIO_CHAFF) .output(BIO_CHAFF) .chancedOutput(BIO_CHAFF, 5000, 0) - .chancedOutput(BIO_CHAFF, 2500, 0) + //.chancedOutput(BIO_CHAFF, 2500, 0) TODO Enable once macerator gets 4th slot .buildAndRegister(); MACERATOR_RECIPES.recipeBuilder().EUt(2).duration(300) diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 6aecb77e237..4144daf08b3 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -543,6 +543,8 @@ 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.engraved.lapotron_chip.name=Engraved Lapotron Crystal Chip metaitem.crystal.central_processing_unit.name=Crystal Processing Unit diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/crystal.raw_chip.json b/src/main/resources/assets/gregtech/models/item/metaitems/crystal.raw_chip.json new file mode 100644 index 00000000000..48fa3adaac2 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/crystal.raw_chip.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/crystal.raw_chip" + } +} diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/crystal.raw_chip.png b/src/main/resources/assets/gregtech/textures/items/metaitems/crystal.raw_chip.png new file mode 100644 index 0000000000000000000000000000000000000000..8e7cdee46eef2588e09fae1377363083034cae83 GIT binary patch literal 2919 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 R2#o*$002ovPDHLkV1ka|YNr4I literal 0 HcmV?d00001 From 104d0e11bb1f28d3debf9d90cfad9feb98aa7c57 Mon Sep 17 00:00:00 2001 From: DStrand1 Date: Mon, 5 Jul 2021 02:49:34 -0500 Subject: [PATCH 21/21] reorganize MetaItem2 --- .../java/gregtech/common/items/MetaItem2.java | 164 +++++++++--------- 1 file changed, 79 insertions(+), 85 deletions(-) diff --git a/src/main/java/gregtech/common/items/MetaItem2.java b/src/main/java/gregtech/common/items/MetaItem2.java index adcbf18399f..62e418b798a 100644 --- a/src/main/java/gregtech/common/items/MetaItem2.java +++ b/src/main/java/gregtech/common/items/MetaItem2.java @@ -90,6 +90,7 @@ public void registerSubItems() { } PLANT_BALL = addItem(570, "plant_ball").setBurnValue(75); + BIO_CHAFF = addItem(571, "bio_chaff").setBurnValue(200); ENERGIUM_DUST = addItem(572, "energium_dust"); POWER_UNIT_LV = addItem(573, "power_unit.lv").addComponents(ElectricStats.createElectricItem(100000L, GTValues.LV)).setMaxStackSize(8); @@ -110,97 +111,105 @@ public void registerSubItems() { VACUUM_TUBE = addItem(450, "circuit.vacuum_tube").setUnificationData(OrePrefix.circuit, Tier.Primitive); - DIODE = addItem(451, "component.diode").setUnificationData(OrePrefix.component, Component.Diode); - CAPACITOR = addItem(452, "component.capacitor").setUnificationData(OrePrefix.component, Component.Capacitor); - GLASS_FIBER = addItem(453, "component.glass.fiber"); - GLASS_TUBE = addItem(454, "component.glass.tube"); + GLASS_FIBER = addItem(451, "component.glass.fiber"); + GLASS_TUBE = addItem(452, "component.glass.tube"); + SMALL_COIL = addItem(453, "component.small_coil"); + TRANSISTOR = addItem(454, "component.transistor").setUnificationData(OrePrefix.component, Component.Transistor); RESISTOR = addItem(455, "component.resistor").setUnificationData(OrePrefix.component, Component.Resistor); - SMALL_COIL = addItem(456, "component.small_coil"); - SMD_DIODE = addItem(457, "component.smd.diode").setUnificationData(OrePrefix.component, Component.Diode); - SMD_CAPACITOR = addItem(458, "component.smd.capacitor").setUnificationData(OrePrefix.component, Component.Capacitor); + CAPACITOR = addItem(456, "component.capacitor").setUnificationData(OrePrefix.component, Component.Capacitor); + DIODE = addItem(457, "component.diode").setUnificationData(OrePrefix.component, Component.Diode); + SMD_TRANSISTOR = addItem(458, "component.smd.transistor").setUnificationData(OrePrefix.component, Component.Transistor); SMD_RESISTOR = addItem(459, "component.smd.resistor").setUnificationData(OrePrefix.component, Component.Resistor); - SMD_TRANSISTOR = addItem(460, "component.smd.transistor").setUnificationData(OrePrefix.component, Component.Transistor); - TRANSISTOR = addItem(461, "component.transistor").setUnificationData(OrePrefix.component, Component.Transistor); - - HIGHLY_ADVANCED_SOC_WAFER = addItem(462, "wafer.highly_advanced_system_on_chip"); - ADVANCED_SYSTEM_ON_CHIP_WAFER = addItem(463, "wafer.advanced_system_on_chip"); - INTEGRATED_LOGIC_CIRCUIT_WAFER = addItem(464, "wafer.integrated_logic_circuit"); - CENTRAL_PROCESSING_UNIT_WAFER = addItem(465, "wafer.central_processing_unit"); - HIGH_POWER_INTEGRATED_CIRCUIT_WAFER = addItem(466, "wafer.high_power_integrated_circuit"); - NAND_MEMORY_CHIP_WAFER = addItem(467, "wafer.nand_memory_chip"); - NANO_CENTRAL_PROCESSING_UNIT_WAFER = addItem(468, "wafer.nano_central_processing_unit"); - NOR_MEMORY_CHIP_WAFER = addItem(469, "wafer.nor_memory_chip"); - POWER_INTEGRATED_CIRCUIT_WAFER = addItem(470, "wafer.power_integrated_circuit"); - QBIT_CENTRAL_PROCESSING_UNIT_WAFER = addItem(471, "wafer.qbit_central_processing_unit"); - RANDOM_ACCESS_MEMORY_WAFER = addItem(472, "wafer.random_access_memory"); - SYSTEM_ON_CHIP_WAFER = addItem(473, "wafer.system_on_chip"); - SIMPLE_SYSTEM_ON_CHIP_WAFER = addItem(474, "wafer.simple_system_on_chip"); - - RAW_CRYSTAL_CHIP = addItem(475, "crystal.raw"); - CRYSTAL_CENTRAL_PROCESSING_UNIT = addItem(476, "crystal.central_processing_unit"); - CRYSTAL_SYSTEM_ON_CHIP = addItem(477, "crystal.system_on_chip"); - HIGHLY_ADVANCED_SOC = addItem(478, "plate.highly_advanced_system_on_chip"); - ADVANCED_SYSTEM_ON_CHIP = addItem(479, "plate.advanced_system_on_chip"); - INTEGRATED_LOGIC_CIRCUIT = addItem(480, "plate.integrated_logic_circuit"); - CENTRAL_PROCESSING_UNIT = addItem(481, "plate.central_processing_unit"); - HIGH_POWER_INTEGRATED_CIRCUIT = addItem(482, "plate.high_power_integrated_circuit"); - NAND_MEMORY_CHIP = addItem(483, "plate.nand_memory_chip"); - NANO_CENTRAL_PROCESSING_UNIT = addItem(484, "plate.nano_central_processing_unit"); - NOR_MEMORY_CHIP = addItem(485, "plate.nor_memory_chip"); - POWER_INTEGRATED_CIRCUIT = addItem(486, "plate.power_integrated_circuit"); - QBIT_CENTRAL_PROCESSING_UNIT = addItem(487, "plate.qbit_central_processing_unit"); - RANDOM_ACCESS_MEMORY = addItem(488, "plate.random_access_memory"); - SYSTEM_ON_CHIP = addItem(489, "plate.system_on_chip"); - SIMPLE_SYSTEM_ON_CHIP = addItem(490, "plate.simple_system_on_chip"); - - ENGRAVED_CRYSTAL_CHIP = addItem(491, "engraved.crystal_chip"); - ENGRAVED_LAPOTRON_CHIP = addItem(492, "engraved.lapotron_chip"); + SMD_CAPACITOR = addItem(460, "component.smd.capacitor").setUnificationData(OrePrefix.component, Component.Capacitor); + SMD_DIODE = addItem(461, "component.smd.diode").setUnificationData(OrePrefix.component, Component.Diode); + ADVANCED_SMD_TRANSISTOR = addItem(462, "component.advanced_smd.transistor"); + ADVANCED_SMD_RESISTOR = addItem(463, "component.advanced_smd.resistor"); + ADVANCED_SMD_CAPACITOR = addItem(464, "component.advanced_smd.capacitor"); + ADVANCED_SMD_DIODE = addItem(465, "component.advanced_smd.diode"); + + HIGHLY_ADVANCED_SOC_WAFER = addItem(466, "wafer.highly_advanced_system_on_chip"); + ADVANCED_SYSTEM_ON_CHIP_WAFER = addItem(467, "wafer.advanced_system_on_chip"); + INTEGRATED_LOGIC_CIRCUIT_WAFER = addItem(468, "wafer.integrated_logic_circuit"); + CENTRAL_PROCESSING_UNIT_WAFER = addItem(469, "wafer.central_processing_unit"); + ULTRA_LOW_POWER_INTEGRATED_CIRCUIT_WAFER = addItem(470, "wafer.ultra_low_power_integrated_circuit"); + LOW_POWER_INTEGRATED_CIRCUIT_WAFER = addItem(471, "wafer.low_power_integrated_circuit"); + POWER_INTEGRATED_CIRCUIT_WAFER = addItem(472, "wafer.power_integrated_circuit"); + HIGH_POWER_INTEGRATED_CIRCUIT_WAFER = addItem(473, "wafer.high_power_integrated_circuit"); + NAND_MEMORY_CHIP_WAFER = addItem(474, "wafer.nand_memory_chip"); + NANO_CENTRAL_PROCESSING_UNIT_WAFER = addItem(475, "wafer.nano_central_processing_unit"); + NOR_MEMORY_CHIP_WAFER = addItem(476, "wafer.nor_memory_chip"); + QBIT_CENTRAL_PROCESSING_UNIT_WAFER = addItem(477, "wafer.qbit_central_processing_unit"); + RANDOM_ACCESS_MEMORY_WAFER = addItem(478, "wafer.random_access_memory"); + SYSTEM_ON_CHIP_WAFER = addItem(479, "wafer.system_on_chip"); + SIMPLE_SYSTEM_ON_CHIP_WAFER = addItem(480, "wafer.simple_system_on_chip"); + + RAW_CRYSTAL_CHIP = addItem(481, "crystal.raw"); + RAW_CRYSTAL_CHIP_PART = addItem(482, "crystal.raw_chip"); + ENGRAVED_CRYSTAL_CHIP = addItem(483, "engraved.crystal_chip"); + ENGRAVED_LAPOTRON_CHIP = addItem(484, "engraved.lapotron_chip"); + CRYSTAL_CENTRAL_PROCESSING_UNIT = addItem(485, "crystal.central_processing_unit"); + CRYSTAL_SYSTEM_ON_CHIP = addItem(486, "crystal.system_on_chip"); + HIGHLY_ADVANCED_SOC = addItem(487, "plate.highly_advanced_system_on_chip"); + ADVANCED_SYSTEM_ON_CHIP = addItem(488, "plate.advanced_system_on_chip"); + INTEGRATED_LOGIC_CIRCUIT = addItem(489, "plate.integrated_logic_circuit"); + CENTRAL_PROCESSING_UNIT = addItem(490, "plate.central_processing_unit"); + ULTRA_LOW_POWER_INTEGRATED_CIRCUIT = addItem(491, "plate.ultra_low_power_integrated_circuit"); + LOW_POWER_INTEGRATED_CIRCUIT = addItem(492, "plate.low_power_integrated_circuit"); + POWER_INTEGRATED_CIRCUIT = addItem(493, "plate.power_integrated_circuit"); + HIGH_POWER_INTEGRATED_CIRCUIT = addItem(494, "plate.high_power_integrated_circuit"); + NAND_MEMORY_CHIP = addItem(495, "plate.nand_memory_chip"); + NANO_CENTRAL_PROCESSING_UNIT = addItem(496, "plate.nano_central_processing_unit"); + NOR_MEMORY_CHIP = addItem(497, "plate.nor_memory_chip"); + QBIT_CENTRAL_PROCESSING_UNIT = addItem(498, "plate.qbit_central_processing_unit"); + RANDOM_ACCESS_MEMORY = addItem(499, "plate.random_access_memory"); + SYSTEM_ON_CHIP = addItem(500, "plate.system_on_chip"); + SIMPLE_SYSTEM_ON_CHIP = addItem(501, "plate.simple_system_on_chip"); // CIRCUITS // T1: Electronic - ELECTRONIC_CIRCUIT_LV = addItem(500, "circuit.electronic").setUnificationData(OrePrefix.circuit, Tier.Basic); - ELECTRONIC_CIRCUIT_MV = addItem(501, "circuit.good_electronic").setUnificationData(OrePrefix.circuit, Tier.Good); + ELECTRONIC_CIRCUIT_LV = addItem(502, "circuit.electronic").setUnificationData(OrePrefix.circuit, Tier.Basic); + ELECTRONIC_CIRCUIT_MV = addItem(503, "circuit.good_electronic").setUnificationData(OrePrefix.circuit, Tier.Good); // T2: Integrated - INTEGRATED_CIRCUIT_LV = addItem(502, "circuit.basic_integrated").setUnificationData(OrePrefix.circuit, Tier.Basic); - INTEGRATED_CIRCUIT_MV = addItem(503, "circuit.good_integrated").setUnificationData(OrePrefix.circuit, Tier.Good); - INTEGRATED_CIRCUIT_HV = addItem(504, "circuit.advanced_integrated").setUnificationData(OrePrefix.circuit, Tier.Advanced); + INTEGRATED_CIRCUIT_LV = addItem(504, "circuit.basic_integrated").setUnificationData(OrePrefix.circuit, Tier.Basic); + INTEGRATED_CIRCUIT_MV = addItem(505, "circuit.good_integrated").setUnificationData(OrePrefix.circuit, Tier.Good); + INTEGRATED_CIRCUIT_HV = addItem(506, "circuit.advanced_integrated").setUnificationData(OrePrefix.circuit, Tier.Advanced); // Misc Unlocks - NAND_CHIP_ULV = addItem(505, "circuit.nand_chip").setUnificationData(OrePrefix.circuit, Tier.Primitive); - MICROPROCESSOR_LV = addItem(506, "circuit.microprocessor").setUnificationData(OrePrefix.circuit, Tier.Basic); + NAND_CHIP_ULV = addItem(507, "circuit.nand_chip").setUnificationData(OrePrefix.circuit, Tier.Primitive); + MICROPROCESSOR_LV = addItem(508, "circuit.microprocessor").setUnificationData(OrePrefix.circuit, Tier.Basic); // T3: Processor - PROCESSOR_MV = addItem(507, "circuit.processor").setUnificationData(OrePrefix.circuit, Tier.Good); - PROCESSOR_ASSEMBLY_HV = addItem(508, "circuit.assembly").setUnificationData(OrePrefix.circuit, Tier.Advanced); - WORKSTATION_EV = addItem(509, "circuit.workstation").setUnificationData(OrePrefix.circuit, Tier.Extreme); - MAINFRAME_IV = addItem(510, "circuit.mainframe").setUnificationData(OrePrefix.circuit, Tier.Elite); + PROCESSOR_MV = addItem(509, "circuit.processor").setUnificationData(OrePrefix.circuit, Tier.Good); + PROCESSOR_ASSEMBLY_HV = addItem(510, "circuit.assembly").setUnificationData(OrePrefix.circuit, Tier.Advanced); + WORKSTATION_EV = addItem(511, "circuit.workstation").setUnificationData(OrePrefix.circuit, Tier.Extreme); + MAINFRAME_IV = addItem(512, "circuit.mainframe").setUnificationData(OrePrefix.circuit, Tier.Elite); // T4: Nano - NANO_PROCESSOR_HV = addItem(511, "circuit.nano_processor").setUnificationData(OrePrefix.circuit, Tier.Advanced); - NANO_PROCESSOR_ASSEMBLY_EV = addItem(512, "circuit.nano_assembly").setUnificationData(OrePrefix.circuit, Tier.Extreme); - NANO_COMPUTER_IV = addItem(513, "circuit.nano_computer").setUnificationData(OrePrefix.circuit, Tier.Elite); - NANO_MAINFRAME_LUV = addItem(514, "circuit.nano_mainframe").setUnificationData(OrePrefix.circuit, Tier.Master); + NANO_PROCESSOR_HV = addItem(513, "circuit.nano_processor").setUnificationData(OrePrefix.circuit, Tier.Advanced); + NANO_PROCESSOR_ASSEMBLY_EV = addItem(514, "circuit.nano_assembly").setUnificationData(OrePrefix.circuit, Tier.Extreme); + NANO_COMPUTER_IV = addItem(515, "circuit.nano_computer").setUnificationData(OrePrefix.circuit, Tier.Elite); + NANO_MAINFRAME_LUV = addItem(516, "circuit.nano_mainframe").setUnificationData(OrePrefix.circuit, Tier.Master); // T5: Quantum - QUANTUM_PROCESSOR_EV = addItem(515, "circuit.quantum_processor").setUnificationData(OrePrefix.circuit, Tier.Extreme); - QUANTUM_ASSEMBLY_IV = addItem(516, "circuit.quantum_assembly").setUnificationData(OrePrefix.circuit, Tier.Elite); - QUANTUM_COMPUTER_LUV = addItem(517, "circuit.quantum_computer").setUnificationData(OrePrefix.circuit, Tier.Master); - QUANTUM_MAINFRAME_ZPM = addItem(518, "circuit.quantum_mainframe").setUnificationData(OrePrefix.circuit, Tier.Ultimate); + QUANTUM_PROCESSOR_EV = addItem(517, "circuit.quantum_processor").setUnificationData(OrePrefix.circuit, Tier.Extreme); + QUANTUM_ASSEMBLY_IV = addItem(518, "circuit.quantum_assembly").setUnificationData(OrePrefix.circuit, Tier.Elite); + QUANTUM_COMPUTER_LUV = addItem(519, "circuit.quantum_computer").setUnificationData(OrePrefix.circuit, Tier.Master); + QUANTUM_MAINFRAME_ZPM = addItem(520, "circuit.quantum_mainframe").setUnificationData(OrePrefix.circuit, Tier.Ultimate); // T6: Crystal - CRYSTAL_PROCESSOR_IV = addItem(519, "circuit.crystal_processor").setUnificationData(OrePrefix.circuit, Tier.Elite); - CRYSTAL_ASSEMBLY_LUV = addItem(520, "circuit.crystal_assembly").setUnificationData(OrePrefix.circuit, Tier.Master); - CRYSTAL_COMPUTER_ZPM = addItem(521, "circuit.crystal_computer").setUnificationData(OrePrefix.circuit, Tier.Ultimate); - CRYSTAL_MAINFRAME_UV = addItem(522, "circuit.crystal_mainframe").setUnificationData(OrePrefix.circuit, Tier.Superconductor); + CRYSTAL_PROCESSOR_IV = addItem(521, "circuit.crystal_processor").setUnificationData(OrePrefix.circuit, Tier.Elite); + CRYSTAL_ASSEMBLY_LUV = addItem(522, "circuit.crystal_assembly").setUnificationData(OrePrefix.circuit, Tier.Master); + CRYSTAL_COMPUTER_ZPM = addItem(523, "circuit.crystal_computer").setUnificationData(OrePrefix.circuit, Tier.Ultimate); + CRYSTAL_MAINFRAME_UV = addItem(524, "circuit.crystal_mainframe").setUnificationData(OrePrefix.circuit, Tier.Superconductor); // T7: Wetware - WETWARE_PROCESSOR_LUV = addItem(523, "circuit.wetware_processor").setUnificationData(OrePrefix.circuit, Tier.Master); - WETWARE_PROCESSOR_ASSEMBLY_ZPM = addItem(524, "circuit.wetware_assembly").setUnificationData(OrePrefix.circuit, Tier.Ultimate); - WETWARE_SUPER_COMPUTER_UV = addItem(525, "circuit.wetware_computer").setUnificationData(OrePrefix.circuit, Tier.Superconductor); - WETWARE_MAINFRAME_UHV = addItem(526, "circuit.wetware_mainframe").setUnificationData(OrePrefix.circuit, Tier.Infinite); + WETWARE_PROCESSOR_LUV = addItem(525, "circuit.wetware_processor").setUnificationData(OrePrefix.circuit, Tier.Master); + WETWARE_PROCESSOR_ASSEMBLY_ZPM = addItem(526, "circuit.wetware_assembly").setUnificationData(OrePrefix.circuit, Tier.Ultimate); + WETWARE_SUPER_COMPUTER_UV = addItem(527, "circuit.wetware_computer").setUnificationData(OrePrefix.circuit, Tier.Superconductor); + WETWARE_MAINFRAME_UHV = addItem(528, "circuit.wetware_mainframe").setUnificationData(OrePrefix.circuit, Tier.Infinite); TURBINE_ROTOR = addItem(529, "turbine_rotor").addComponents(new TurbineRotorBehavior()); COVER_FACADE = addItem(530, "cover.facade").addComponents(new FacadeItem()).disableModelLoading(); @@ -228,24 +237,9 @@ public void registerSubItems() { STEM_CELLS = addItem(535, "stem_cells"); PETRI_DISH = addItem(536, "petri_dish"); - // TODO Reorganize CARBON_FIBERS = addItem(537, "carbon.fibers"); CARBON_MESH = addItem(538, "carbon.mesh"); CARBON_PLATE = addItem(539, "carbon.plate"); - - ULTRA_LOW_POWER_INTEGRATED_CIRCUIT_WAFER = addItem(540, "wafer.ultra_low_power_integrated_circuit"); - LOW_POWER_INTEGRATED_CIRCUIT_WAFER = addItem(541, "wafer.low_power_integrated_circuit"); - ULTRA_LOW_POWER_INTEGRATED_CIRCUIT = addItem(542, "plate.ultra_low_power_integrated_circuit"); - LOW_POWER_INTEGRATED_CIRCUIT = addItem(543, "plate.low_power_integrated_circuit"); - - // keep this order for smd - ADVANCED_SMD_TRANSISTOR = addItem(544, "component.advanced_smd.transistor"); - ADVANCED_SMD_RESISTOR = addItem(545, "component.advanced_smd.resistor"); - ADVANCED_SMD_CAPACITOR = addItem(546, "component.advanced_smd.capacitor"); - ADVANCED_SMD_DIODE = addItem(547, "component.advanced_smd.diode"); - - BIO_CHAFF = addItem(548, "bio_chaff"); - RAW_CRYSTAL_CHIP_PART = addItem(549, "crystal.raw_chip"); } public void registerRecipes() {