From 78e37f755b8c452e3c18ccd81c871697fb9354cb Mon Sep 17 00:00:00 2001 From: Tech22 Date: Fri, 20 Aug 2021 03:53:31 -0400 Subject: [PATCH] add tiered superconductors --- .../gregtech/api/unification/Elements.java | 2 +- .../unification/material/MarkerMaterials.java | 1 - .../api/unification/material/Materials.java | 9 ++ .../material/materials/ElementMaterials.java | 2 +- .../materials/FirstDegreeMaterials.java | 89 ++++++++++++++++++- .../loaders/recipe/AssemblyLineLoader.java | 15 ++-- .../loaders/recipe/CircuitRecipes.java | 2 +- .../loaders/recipe/MachineRecipeLoader.java | 20 ----- .../recipe/chemistry/MixerRecipes.java | 86 ++++++++++++++++++ .../recipe/chemistry/ReactorRecipes.java | 6 ++ .../resources/assets/gregtech/lang/en_us.lang | 10 +++ 11 files changed, 208 insertions(+), 34 deletions(-) diff --git a/src/main/java/gregtech/api/unification/Elements.java b/src/main/java/gregtech/api/unification/Elements.java index ea489397cc1..6368e567277 100644 --- a/src/main/java/gregtech/api/unification/Elements.java +++ b/src/main/java/gregtech/api/unification/Elements.java @@ -57,7 +57,7 @@ private Elements() { public static final Element Kr = add(36, 48, -1, null, "Krypton", "Kr", false); public static final Element Rb = add(37, 48, -1, null, "Rubidium", "Rb", false); public static final Element Sr = add(38, 49, -1, null, "Strontium", "Sr", false); - public static final Element Yt = add(39, 50, -1, null, "Yttrium", "Yt", false); + public static final Element Y = add(39, 50, -1, null, "Yttrium", "Y", false); public static final Element Zr = add(40, 51, -1, null, "Zirconium", "Zr", false); public static final Element Nb = add(41, 53, -1, null, "Niobium", "Nb", false); public static final Element Mo = add(42, 53, -1, null, "Molybdenum", "Mo", false); diff --git a/src/main/java/gregtech/api/unification/material/MarkerMaterials.java b/src/main/java/gregtech/api/unification/material/MarkerMaterials.java index a05ed42eae2..91cb012a0b6 100644 --- a/src/main/java/gregtech/api/unification/material/MarkerMaterials.java +++ b/src/main/java/gregtech/api/unification/material/MarkerMaterials.java @@ -92,7 +92,6 @@ public static class Tier { public static final Material Master = new MarkerMaterial("master"); public static final Material Ultimate = new MarkerMaterial("ultimate"); public static final Material Superconductor = new MarkerMaterial("superconductor"); - //new Material(387, "superconductor", 0xFFFFFF, MaterialIconSet.NONE, of(), 0L, null) {}; public static final Material Infinite = new MarkerMaterial("infinite"); public static Material Ultra = new MarkerMaterial("ultra"); diff --git a/src/main/java/gregtech/api/unification/material/Materials.java b/src/main/java/gregtech/api/unification/material/Materials.java index 0d617b08d01..8e847627341 100644 --- a/src/main/java/gregtech/api/unification/material/Materials.java +++ b/src/main/java/gregtech/api/unification/material/Materials.java @@ -415,6 +415,15 @@ public static void register() { public static Material DistilledWater; public static Material SodiumPotassium; public static Material SamariumMagnetic; + public static Material ManganesePhosphide; + public static Material MagnesiumDiboride; + public static Material MercuryBariumCalciumCuprate; + public static Material UraniumTriplatinum; + public static Material SamariumIronArsenicOxide; + public static Material IndiumTinBariumTitaniumCuprate; + public static Material UraniumRhodiumDinaquadide; + public static Material EnrichedNaquadahTriniumEuropiumDuranide; + public static Material RutheniumTriniumAmericiumNeutronate; /** * Organic chemistry diff --git a/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java b/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java index d621b915c12..c6b40c99054 100644 --- a/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java @@ -873,7 +873,7 @@ public static void register() { .ingot().fluid() .color(0xDCFADC).iconSet(METALLIC) .flags(STD_METAL) - .element(Elements.Yt) + .element(Elements.Y) .blastTemp(1799) .build(); diff --git a/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java b/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java index d86e3b45936..7cffc37bc28 100644 --- a/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java @@ -342,6 +342,7 @@ public static void register() { .color(0x1D291D) .flags(EXT_METAL) .components(Niobium, 1, Nitrogen, 1) + .cableProperties(GTValues.V[6], 1, 1) .blastTemp(2573) .build(); @@ -643,7 +644,7 @@ public static void register() { .color(0x80808C).iconSet(SHINY) .flags(STD_METAL, GENERATE_FOIL, GENERATE_SPRING, GENERATE_SPRING_SMALL) .components(Vanadium, 3, Gallium, 1) - .cableProperties(GTValues.V[6], 4, 2) + .cableProperties(GTValues.V[7], 4, 2) .blastTemp(4500) .build(); @@ -656,6 +657,7 @@ public static void register() { .fluidPipeProperties(2387, 30, true) .build(); Iron.getProperty(PropertyKey.INGOT).setSmeltingInto(WroughtIron); + Iron.getProperty(PropertyKey.INGOT).setArcSmeltingInto(WroughtIron); Wulfenite = new Material.Builder(336, "wulfenite") .dust(3).ore() @@ -675,7 +677,7 @@ public static void register() { .color(0x504046).iconSet(METALLIC) .flags(EXT_METAL, GENERATE_FINE_WIRE, GENERATE_SPRING, GENERATE_SPRING_SMALL) .components(Yttrium, 1, Barium, 2, Copper, 3, Oxygen, 7) - .cableProperties(GTValues.V[6], 4, 4) + .cableProperties(GTValues.V[8], 4, 4) .build(); NetherQuartz = new Material.Builder(339, "nether_quartz") @@ -1242,5 +1244,88 @@ public static void register() { .blastTemp(1345) .build(); Samarium.getProperty(PropertyKey.INGOT).setMagneticMaterial(SamariumMagnetic); + + ManganesePhosphide = new Material.Builder(424, "manganese_phosphide") + .ingot() + .color(0xE1B454).iconSet(METALLIC) + .flags(DECOMPOSITION_BY_ELECTROLYZING) + .components(Manganese, 1, Phosphorus, 1) + .cableProperties(GTValues.V[GTValues.LV], 2, 0, true) + .blastTemp(1200) + .build(); + + MagnesiumDiboride = new Material.Builder(425, "magnesium_diboride") + .ingot() + .color(0x331900).iconSet(METALLIC) + .flags(DECOMPOSITION_BY_ELECTROLYZING) + .components(Magnesium, 1, Boron, 2) + .cableProperties(GTValues.V[GTValues.MV], 4, 0, true) + .blastTemp(2500) + .build(); + + MercuryBariumCalciumCuprate = new Material.Builder(426, "mercury_barium_calcium_cuprate") + .ingot() + .color(0x555555).iconSet(SHINY) + .flags(DECOMPOSITION_BY_ELECTROLYZING) + .components(Mercury, 1, Barium, 2, Calcium, 2, Copper, 3, Oxygen, 8) + .cableProperties(GTValues.V[GTValues.HV], 4, 0, true) + .blastTemp(3300) + .build(); + + UraniumTriplatinum = new Material.Builder(427, "uranium_triplatinum") + .ingot() + .color(0x008700).iconSet(SHINY) + .flags(DECOMPOSITION_BY_CENTRIFUGING) + .components(Uranium238, 1, Platinum, 3) + .cableProperties(GTValues.V[GTValues.EV], 6, 0, true) + .blastTemp(4400) + .build() + .setFormula("UPt3", true); + + SamariumIronArsenicOxide = new Material.Builder(428, "samarium_iron_arsenic_oxide") + .ingot() + .color(0x330033).iconSet(SHINY) + .flags(DECOMPOSITION_BY_CENTRIFUGING) + .components(Samarium, 1, Iron, 1, Arsenic, 1, Oxygen, 1) + .cableProperties(GTValues.V[GTValues.IV], 6, 0, true) + .blastTemp(5200) + .build(); + + IndiumTinBariumTitaniumCuprate = new Material.Builder(429, "indium_tin_barium_titanium_cuprate") + .ingot() + .color(0x994C00).iconSet(METALLIC) + .flags(DECOMPOSITION_BY_ELECTROLYZING) + .components(Indium, 4, Tin, 2, Barium, 2, Titanium, 1, Copper, 7, Oxygen, 14) + .cableProperties(GTValues.V[GTValues.LuV], 8, 0, true) + .blastTemp(6000) + .build(); + + UraniumRhodiumDinaquadide = new Material.Builder(430, "uranium_rhodium_dinaquadide") + .ingot() + .color(0x0A0A0A) + .flags(DECOMPOSITION_BY_CENTRIFUGING) + .components(Uranium238, 1, Rhodium, 1, Naquadah, 2) + .cableProperties(GTValues.V[GTValues.ZPM], 8, 0, true) + .blastTemp(9000) + .build() + .setFormula("URhNq2", true); + + EnrichedNaquadahTriniumEuropiumDuranide = new Material.Builder(431, "enriched_naquadah_trinium_europium_duranide") + .ingot() + .color(0x7D9673).iconSet(METALLIC) + .flags(DECOMPOSITION_BY_CENTRIFUGING) + .components(NaquadahEnriched, 4, Trinium, 3, Europium, 2, Duranium, 1) + .cableProperties(GTValues.V[GTValues.UV], 16, 0, true) + .blastTemp(9900) + .build(); + + RutheniumTriniumAmericiumNeutronate = new Material.Builder(432, "ruthenium_trinium_americium_neutronate") + .ingot() + .color(0xFFFFFF).iconSet(BRIGHT) + .flags(DECOMPOSITION_BY_ELECTROLYZING) + .components(Ruthenium, 1, Trinium, 2, Americium, 1, Neutronium, 2, Oxygen, 8) + .cableProperties(GTValues.V[GTValues.MAX], 24, 0, true) + .blastTemp(10800) + .build(); } } diff --git a/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java b/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java index 1e2218a060c..b332d009e18 100644 --- a/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java +++ b/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java @@ -5,7 +5,6 @@ import gregtech.api.unification.material.MarkerMaterials; import gregtech.api.unification.material.Materials; import gregtech.api.unification.ore.OrePrefix; -import gregtech.common.ConfigHolder; import gregtech.common.blocks.BlockFusionCoil; import gregtech.common.blocks.MetaBlocks; import gregtech.common.items.MetaItems; @@ -59,7 +58,7 @@ public static void init() { .buildAndRegister(); RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.stickLong, Materials.NeodymiumMagnetic, 2), OreDictUnifier.get(OrePrefix.stickLong, Materials.HSSE, 4), OreDictUnifier.get(OrePrefix.ring, Materials.HSSE, 4), OreDictUnifier.get(OrePrefix.round, Materials.HSSE, 16), OreDictUnifier.get(OrePrefix.wireFine, Materials.Platinum, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Platinum, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Platinum, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Platinum, 64), OreDictUnifier.get(OrePrefix.cableGtDouble, Materials.VanadiumGallium, 2)).fluidInputs(Materials.SolderingAlloy.getFluid(288), Materials.Lubricant.getFluid(750)).outputs(MetaItems.ELECTRIC_MOTOR_ZPM.getStackForm()).duration(600).EUt(40960).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.block, Materials.NeodymiumMagnetic, 1), OreDictUnifier.get(OrePrefix.stickLong, Materials.Neutronium, 4), OreDictUnifier.get(OrePrefix.ring, Materials.Neutronium, 4), OreDictUnifier.get(OrePrefix.round, Materials.Neutronium, 16), /* OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 64), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 64), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 64), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 64), */ OreDictUnifier.get(OrePrefix.cableGtQuadruple, Materials.NiobiumTitanium, 2)).fluidInputs(Materials.SolderingAlloy.getFluid(1296), Materials.Lubricant.getFluid(2000)).outputs(MetaItems.ELECTRIC_MOTOR_UV.getStackForm()).duration(600).EUt(163840).buildAndRegister(); // todo fix + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.block, Materials.NeodymiumMagnetic, 1), OreDictUnifier.get(OrePrefix.stickLong, Materials.Neutronium, 4), OreDictUnifier.get(OrePrefix.ring, Materials.Neutronium, 4), OreDictUnifier.get(OrePrefix.round, Materials.Neutronium, 16), OreDictUnifier.get(OrePrefix.wireGtSingle, Materials.EnrichedNaquadahTriniumEuropiumDuranide, 64), OreDictUnifier.get(OrePrefix.wireGtSingle, Materials.EnrichedNaquadahTriniumEuropiumDuranide, 64), OreDictUnifier.get(OrePrefix.wireGtSingle, Materials.EnrichedNaquadahTriniumEuropiumDuranide, 64), OreDictUnifier.get(OrePrefix.wireGtSingle, Materials.EnrichedNaquadahTriniumEuropiumDuranide, 64), OreDictUnifier.get(OrePrefix.cableGtQuadruple, Materials.NiobiumTitanium, 2)).fluidInputs(Materials.SolderingAlloy.getFluid(1296), Materials.Lubricant.getFluid(2000)).outputs(MetaItems.ELECTRIC_MOTOR_UV.getStackForm()).duration(600).EUt(163840).buildAndRegister(); RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaItems.ELECTRIC_MOTOR_LUV.getStackForm(), OreDictUnifier.get(OrePrefix.plate, Materials.HSSG, 2), OreDictUnifier.get(OrePrefix.pipeSmallFluid, Materials.Naquadah, 2), OreDictUnifier.get(OrePrefix.screw, Materials.HSSG, 8), OreDictUnifier.get(OrePrefix.ring, Materials.SiliconeRubber, 4), OreDictUnifier.get(OrePrefix.rotor, Materials.HSSG, 2), OreDictUnifier.get(OrePrefix.cableGtSingle, Materials.YttriumBariumCuprate, 2)).fluidInputs(Materials.SolderingAlloy.getFluid(144), Materials.Lubricant.getFluid(250)).outputs(MetaItems.ELECTRIC_PUMP_LUV.getStackForm()).duration(600).EUt(15360).buildAndRegister(); RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaItems.ELECTRIC_MOTOR_ZPM.getStackForm(), OreDictUnifier.get(OrePrefix.plate, Materials.HSSE, 2), OreDictUnifier.get(OrePrefix.pipeNormalFluid, Materials.Naquadah, 2), OreDictUnifier.get(OrePrefix.screw, Materials.HSSE, 8), OreDictUnifier.get(OrePrefix.ring, Materials.SiliconeRubber, 16), OreDictUnifier.get(OrePrefix.rotor, Materials.HSSE, 2), OreDictUnifier.get(OrePrefix.cableGtDouble, Materials.VanadiumGallium, 2)).fluidInputs(Materials.SolderingAlloy.getFluid(288), Materials.Lubricant.getFluid(750)).outputs(MetaItems.ELECTRIC_PUMP_ZPM.getStackForm()).duration(600).EUt(61440).buildAndRegister(); @@ -89,12 +88,12 @@ 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(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_LAPOTRONIC_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_LAPOTRONIC_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_LAPOTRONIC_CLUSTER.getStackForm()).duration(2000).EUt(200000).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_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(MetaItems.ULTIMATE_BATTERY.getStackForm()).duration(2000).EUt(300000).buildAndRegister(); + 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_LAPOTRONIC_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_LAPOTRONIC_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_LAPOTRONIC_CLUSTER.getStackForm()).duration(2000).EUt(200000).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_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, Materials.EnrichedNaquadahTriniumEuropiumDuranide, 32)).fluidInputs(Materials.SolderingAlloy.getFluid(2880), Materials.Polybenzimidazole.getFluid(1000), Materials.Naquadria.getFluid(1152)).outputs(MetaItems.ULTIMATE_BATTERY.getStackForm()).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(); //todo fix - 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(); //todo fix - 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(); //todo fix + 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, Materials.IndiumTinBariumTitaniumCuprate, 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)).input(OrePrefix.wireGtDouble, Materials.UraniumRhodiumDinaquadide, 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), OreDictUnifier.get(OrePrefix.circuit, MarkerMaterials.Tier.Infinite), OreDictUnifier.get(OrePrefix.circuit, MarkerMaterials.Tier.Infinite), OreDictUnifier.get(OrePrefix.circuit, MarkerMaterials.Tier.Infinite), OreDictUnifier.get(OrePrefix.circuit, MarkerMaterials.Tier.Infinite), OreDictUnifier.get(OrePrefix.wireGtQuadruple, Materials.EnrichedNaquadahTriniumEuropiumDuranide, 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 dba4f9350c8..8ae1c678b01 100644 --- a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java @@ -1360,7 +1360,7 @@ private static void circuitRecipes() { .input(ADVANCED_SMD_RESISTOR, 32) .input(foil, SiliconeRubber, 64) .input(RANDOM_ACCESS_MEMORY, 32) - .input(wireGtDouble, Tier.Superconductor, 16) + .input(wireGtDouble, EnrichedNaquadahTriniumEuropiumDuranide, 16) .input(plate, Europium, 8) .fluidInputs(SolderingAlloy.getFluid(L * 20)) .fluidInputs(Polybenzimidazole.getFluid(L * 8)) diff --git a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java index 0e60ab09d4c..5d8ba636ae9 100644 --- a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java @@ -245,14 +245,6 @@ private static void registerStoneBricksRecipes() { private static void registerMixingCrystallizationRecipes() { - RecipeMaps.MIXER_RECIPES.recipeBuilder() - .input(OrePrefix.dust, Materials.Lead, 2) - .input(OrePrefix.dust, Materials.Bronze, 2) - .input(OrePrefix.dust, Materials.Tin, 1) - .output(OrePrefix.dust, Materials.Potin, 5) - .duration(500).EUt(8) - .buildAndRegister(); - RecipeMaps.MIXER_RECIPES.recipeBuilder() .input(OrePrefix.dust, Materials.Stone, 1) .fluidInputs(Materials.Lubricant.getFluid(20), Materials.Water.getFluid(4980)) @@ -413,18 +405,6 @@ private static void registerAssemblerRecipes() { .buildAndRegister(); } - //todo fix -// for (Material cableMaterial : new Material[]{Materials.YttriumBariumCuprate, Materials.NiobiumTitanium, Materials.VanadiumGallium, Materials.Naquadah}) { -// RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() -// .input(OrePrefix.wireGtSingle, cableMaterial, 3) -// .input(OrePrefix.pipeTinyFluid, Materials.TungstenSteel, 2) -// .inputs(MetaItems.ELECTRIC_PUMP_LV.getStackForm(2)) -// .fluidInputs(Materials.Nitrogen.getFluid(2000)) -// .outputs(OreDictUnifier.get(OrePrefix.wireGtSingle, Tier.Superconductor, 3)) -// .duration(20).EUt(512) -// .buildAndRegister(); -// } - Material[] coverMaterials = new Material[]{Materials.Iron, Materials.WroughtIron, Materials.Aluminium}; for (Material material : coverMaterials) { diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java index 3c741fc80e0..4474b7fda52 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java @@ -184,6 +184,14 @@ public static void init() { .output(dust, Bronze, 4) .buildAndRegister(); + MIXER_RECIPES.recipeBuilder().duration(400).EUt(8) + .input(dust, Lead, 2) + .input(dust, Bronze, 2) + .input(dust, Tin, 1) + .notConsumable(new IntCircuitIngredient(1)) + .output(dust, Potin, 5) + .buildAndRegister(); + MIXER_RECIPES.recipeBuilder().duration(200).EUt(24) .input(dust, Copper) .input(dust, Nickel) @@ -369,5 +377,83 @@ public static void init() { .notConsumable(new IntCircuitIngredient(1)) .output(dust, Graphene) .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().duration(600).EUt(24) + .input(dust, Manganese) + .input(dust, Phosphorus) + .notConsumable(new IntCircuitIngredient(2)) + .output(dust, ManganesePhosphide, 2) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().duration(600).EUt(120) + .input(dust, Magnesium) + .input(dust, Boron, 2) + .notConsumable(new IntCircuitIngredient(2)) + .output(dust, MagnesiumDiboride, 2) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().duration(400).EUt(480) + .input(dust, Barium, 2) + .input(dust, Calcium, 2) + .input(dust, Copper, 3) + .fluidInputs(Mercury.getFluid(1000)) + .fluidInputs(Oxygen.getFluid(8000)) + .notConsumable(new IntCircuitIngredient(2)) + .output(dust, MercuryBariumCalciumCuprate, 16) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().duration(200).EUt(1920) + .input(dust, Uranium238) + .input(dust, Platinum, 3) + .notConsumable(new IntCircuitIngredient(2)) + .output(dust, UraniumTriplatinum, 4) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().duration(100).EUt(7680) + .input(dust, Samarium) + .input(dust, Iron) + .input(dust, Arsenic) + .fluidInputs(Oxygen.getFluid(1000)) + .notConsumable(new IntCircuitIngredient(2)) + .output(dust, SamariumIronArsenicOxide, 4) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().duration(600).EUt(30720) + .input(dust, Indium, 4) + .input(dust, Tin, 2) + .input(dust, Barium, 2) + .input(dust, Titanium) + .input(dust, Copper, 7) + .fluidInputs(Oxygen.getFluid(14000)) + .notConsumable(new IntCircuitIngredient(2)) + .output(dust, IndiumTinBariumTitaniumCuprate, 16) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().duration(150).EUt(122880) + .input(dust, Uranium238) + .input(dust, Rhodium) + .input(dust, Naquadah, 2) + .notConsumable(new IntCircuitIngredient(2)) + .output(dust, UraniumRhodiumDinaquadide, 4) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().duration(175).EUt(491520) + .input(dust, NaquadahEnriched, 4) + .input(dust, Trinium, 3) + .input(dust, Europium, 2) + .input(dust, Duranium) + .notConsumable(new IntCircuitIngredient(2)) + .output(dust, EnrichedNaquadahTriniumEuropiumDuranide, 10) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder().duration(400).EUt(491520) + .input(dust, Ruthenium) + .input(dust, Trinium, 2) + .input(dust, Americium) + .input(dust, Neutronium, 2) + .fluidInputs(Oxygen.getFluid(8000)) + .notConsumable(new IntCircuitIngredient(2)) + .output(dust, RutheniumTriniumAmericiumNeutronate, 14) + .buildAndRegister(); } } diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java index edcfb326e4f..f548b7d358d 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java @@ -1098,5 +1098,11 @@ public static void init() { .fluidInputs(GlycerylTrinitrate.getFluid(500)) .output(MetaItems.DYNAMITE) .duration(160).EUt(4).buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder() + .input(dust, Niobium) + .fluidInputs(Nitrogen.getFluid(1000)) + .output(dust, NiobiumNitride, 2) + .duration(200).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 8002fba8c01..30819be970c 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -1675,6 +1675,16 @@ material.coal_tar=Coal Tar material.ethylbenzene=Ethylbenzene material.naphthalene=Naphthalene +material.manganese_phosphide=Manganese Phosphide +material.magnesium_diboride=Magnesium Diboride +material.mercury_barium_calcium_cuprate=Mercury Barium Calcium Cuprate +material.uranium_triplatinum=Uranium Triplatinum +material.samarium_iron_arsenic_oxide=Samarium Iron Arsenic Oxide +material.indium_tin_barium_titanium_cuprate=Indium Tin Barium Titanium Cuprate +material.uranium_rhodium_dinaquadide=Uranium Rhodium Dinaquadide +material.enriched_naquadah_trinium_europium_duranide=Enriched Naquadah Trinium Europium Duranide +material.ruthenium_trinium_americium_neutronate=Ruthenium Trinium Americium Neutronate + item.nether_quartz.oreNetherrack=Nether Quartz Ore item.gunpowder.dustTiny=Tiny Pile of Gunpowder item.gunpowder.dustSmall=Small Pile of Gunpowder