diff options
author | Mary <33456283+FourIsTheNumber@users.noreply.github.com> | 2024-10-22 03:29:33 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-10-22 09:29:33 +0200 |
commit | 9288097b3783f04aef27a0d7713021f0659b6d8b (patch) | |
tree | d41d42f4674d62d9520c90d6dd3c5425bd914c7c | |
parent | 2fc1d3c347f259bc14d511e12253459ae82ab22d (diff) | |
download | GT5-Unofficial-9288097b3783f04aef27a0d7713021f0659b6d8b.tar.gz GT5-Unofficial-9288097b3783f04aef27a0d7713021f0659b6d8b.tar.bz2 GT5-Unofficial-9288097b3783f04aef27a0d7713021f0659b6d8b.zip |
Superdense plate integration (#3400)
8 files changed, 31 insertions, 27 deletions
diff --git a/src/main/java/bwcrossmod/tectech/TecTechResearchLoader.java b/src/main/java/bwcrossmod/tectech/TecTechResearchLoader.java index 2a1a66d6e0..43e152a16a 100644 --- a/src/main/java/bwcrossmod/tectech/TecTechResearchLoader.java +++ b/src/main/java/bwcrossmod/tectech/TecTechResearchLoader.java @@ -73,7 +73,8 @@ public class TecTechResearchLoader { 48, (int) TierEU.RECIPE_UV, 8, - new Object[] { ItemList.Machine_Multi_ImplosionCompressor.get(1L), Materials.Neutronium.getBlocks(5), + new Object[] { ItemList.Machine_Multi_ImplosionCompressor.get(1L), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.Neutronium, 1), GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Osmium, 64), GTOreDictUnificator.get(OrePrefixes.ring, Materials.Osmium, 64), GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 64), diff --git a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java index 36a22a928d..1fb69d6700 100644 --- a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java +++ b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java @@ -75,7 +75,7 @@ public class ComponentAssemblyLineMiscRecipes { ComponentType.Electric_Motor.getComponent(7) .get(32), GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Polybenzimidazole, 16), - GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 32), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.Iridium, 4), ItemList.FluidSolidifierZPM.get(16L), getALCircuit(8, 16), getALCircuit(7, 20), @@ -234,7 +234,7 @@ public class ComponentAssemblyLineMiscRecipes { .metadata(RESEARCH_TIME, (2250 << t) * TICKS) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1), - GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 6), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.Iridium, 1), ComponentType.Robot_Arm.getComponent(t) .get(8), ComponentType.Electric_Piston.getComponent(t) @@ -263,7 +263,7 @@ public class ComponentAssemblyLineMiscRecipes { .metadata(RESEARCH_TIME, (2250 << t) * TICKS) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmium, 1), - GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmium, 6), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.Osmium, 1), ComponentType.Robot_Arm.getComponent(t) .get(8), ComponentType.Electric_Piston.getComponent(t) @@ -293,7 +293,7 @@ public class ComponentAssemblyLineMiscRecipes { (int) TierEU.RECIPE_UV, 1, new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1), - GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.CosmicNeutronium, 6), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.CosmicNeutronium, 1), ComponentType.Robot_Arm.getComponent(t) .get(8), ComponentType.Electric_Piston.getComponent(t) @@ -319,7 +319,7 @@ public class ComponentAssemblyLineMiscRecipes { (int) TierEU.RECIPE_UHV, 1, new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), - GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 6), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.Infinity, 1), ComponentType.Robot_Arm.getComponent(t) .get(8), ComponentType.Electric_Piston.getComponent(t) @@ -344,7 +344,7 @@ public class ComponentAssemblyLineMiscRecipes { (int) TierEU.RECIPE_UEV, 1, new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.ProtoHalkonite, 1), - GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 6), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, MaterialsUEVplus.TranscendentMetal, 1), ComponentType.Robot_Arm.getComponent(t) .get(8), ComponentType.Electric_Piston.getComponent(t) @@ -370,7 +370,7 @@ public class ComponentAssemblyLineMiscRecipes { (int) TierEU.RECIPE_UIV, 1, new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1), - GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 6), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, MaterialsUEVplus.SpaceTime, 1), ComponentType.Robot_Arm.getComponent(t) .get(8), ComponentType.Electric_Piston.getComponent(t) diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 76a626744e..bf4c397b7e 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -2518,7 +2518,6 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Carbon.add(SubTag.NO_SMELTING); Boron.add(SubTag.SMELTING_TO_FLUID); - Infinity.add(SubTag.BLACK_HOLE); MaterialsUEVplus.TranscendentMetal.add(SubTag.BLACK_HOLE); } diff --git a/src/main/java/gregtech/loaders/postload/chains/NaniteChain.java b/src/main/java/gregtech/loaders/postload/chains/NaniteChain.java index ab1981ee98..eb51d85280 100644 --- a/src/main/java/gregtech/loaders/postload/chains/NaniteChain.java +++ b/src/main/java/gregtech/loaders/postload/chains/NaniteChain.java @@ -53,7 +53,8 @@ public class NaniteChain { ItemList.Conveyor_Module_UV.get(16), ItemList.Electric_Motor_UV.get(32), new Object[] { OrePrefixes.circuit.get(Materials.LuV), 16 }, - GTOreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 32)) + GTOreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 32), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.NaquadahAlloy, 4)) .fluidInputs( new FluidStack(solderIndalloy, 144 * 32), Materials.HSSS.getMolten(144L * 32), diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java index 28630668c0..1c91dcd786 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java @@ -739,7 +739,7 @@ public class AssemblyLineRecipes implements Runnable { new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 }, new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 }, new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 }, - GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Europium, 4), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.Europium, 1), ItemList.Field_Generator_ZPM.get(2), ItemList.Circuit_Wafer_PPIC.get(48), GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 32)) @@ -759,7 +759,7 @@ public class AssemblyLineRecipes implements Runnable { new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1 }, new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1 }, new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1 }, - GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Americium, 4), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.Americium, 1), ItemList.Field_Generator_UV.get(2), ItemList.Circuit_Wafer_QPIC.get(64), GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 32)) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderChemicalSkips.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderChemicalSkips.java index 4782ce7138..e0f97f018d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderChemicalSkips.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderChemicalSkips.java @@ -749,7 +749,7 @@ public class RecipeLoaderChemicalSkips { 32, new ItemStack[] { MaterialsAlloy.QUANTUM.getFrameBox(1), GTOreDictUnificator.get("plateDensePreciousMetalsAlloy", 4), - GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 16), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.Neutronium, 2), ItemList.Field_Generator_UV.get(1), MaterialsElements.STANDALONE.CHRONOMATIC_GLASS.getScrew(16) }, new FluidStack[] { MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(144 * 10), }, GregtechItemList.NeutronShieldingCore.get(1), @@ -764,7 +764,7 @@ public class RecipeLoaderChemicalSkips { 32, new ItemStack[] { MaterialsAlloy.QUANTUM.getFrameBox(2), GTOreDictUnificator.get("plateDenseEnrichedNaquadahAlloy", 4), - GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 16), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.Infinity, 2), ItemList.Field_Generator_UEV.get(1), // Radox polymer screw. GTOreDictUnificator.get(OrePrefixes.screw, Materials.get("RadoxPoly"), 16), @@ -782,7 +782,7 @@ public class RecipeLoaderChemicalSkips { 32, new ItemStack[] { MaterialsAlloy.QUANTUM.getFrameBox(4), MaterialsElements.STANDALONE.HYPOGEN.getPlateDense(4), - GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.ProtoHalkonite, 16), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, MaterialsUEVplus.ProtoHalkonite, 2), ItemList.Field_Generator_UIV.get(1), GTOreDictUnificator.get("screwMetastableOganesson", 16), ItemList.SuperconductorComposite.get(4) }, new FluidStack[] { MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(144 * 40), }, @@ -797,7 +797,7 @@ public class RecipeLoaderChemicalSkips { (int) TierEU.RECIPE_UEV, 32, new ItemStack[] { MaterialsAlloy.QUANTUM.getFrameBox(8), GTOreDictUnificator.get("plateDenseShirabon", 4), - GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 16), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, MaterialsUEVplus.SpaceTime, 2), ItemList.Field_Generator_UMV.get(1), GTOreDictUnificator.get(OrePrefixes.screw, Materials.Dilithium, 16), ItemList.NaquadriaSupersolid.get(4) }, diff --git a/src/main/java/tectech/loader/recipe/AssemblyLine.java b/src/main/java/tectech/loader/recipe/AssemblyLine.java index ec619df163..3850025927 100644 --- a/src/main/java/tectech/loader/recipe/AssemblyLine.java +++ b/src/main/java/tectech/loader/recipe/AssemblyLine.java @@ -114,7 +114,9 @@ public class AssemblyLine implements Runnable { ItemList.Tool_DataOrb.get(1), ItemList.Cover_Screen.get(1), new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 8) }, - CustomItemList.DATApipe.get(8)) + CustomItemList.DATApipe.get(8), + new ItemStack[] { + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.Polybenzimidazole, 2) }) .fluidInputs( Materials.UUMatter.getFluid(1000), Materials.Iridium.getMolten(1296), diff --git a/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java index 4ace69f1b3..00f56a997b 100644 --- a/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java +++ b/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java @@ -749,7 +749,7 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { OrePrefixes.circuit.get(Materials.UIV), 20L }, ItemList.Field_Generator_UEV.get(4), getModItem(EternalSingularity.ID, "eternal_singularity", 4L), GregtechItemList.Laser_Lens_Special.get(1), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 64L), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.Osmiridium, 4L), ItemList.Electric_Pump_UEV.get(4), ItemList.ZPM3.get(1), getModItem(IndustrialCraft2.ID, "blockMachine2", 1, 0) }, new FluidStack[] { new FluidStack(FluidRegistry.getFluid("oganesson"), 128000), @@ -991,7 +991,7 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1L }, new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1L }, new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1L }, - GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 4), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.Neutronium, 1), ItemList.Field_Generator_UHV.get(2), ItemList.Circuit_Wafer_QPIC.get(64), GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 32) }, new FluidStack[] { Materials.UUMatter.getFluid(50000), CINOBITE.getFluidStack(9216), @@ -1115,7 +1115,8 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Robot_Arm_UHV.get(4L), new Object[] { OrePrefixes.circuit.get(Materials.UHV), 4 }, ItemList.Gravistar.get(4, new Object() {}), getModItem(Thaumcraft.ID, "ItemEldritchObject", 1, 3), getModItem(BloodMagic.ID, "bloodMagicBaseItems", 8, 29), - getModItem(BloodMagic.ID, "bloodMagicBaseItems", 8, 28), }, + getModItem(BloodMagic.ID, "bloodMagicBaseItems", 8, 28), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.Void, 1) }, new FluidStack[] { new FluidStack(solderIndalloy, 2880), Materials.Void.getMolten(2880L), Materials.DraconiumAwakened.getMolten(1440), }, DraconicEvolutionFusionCrafter.get(1), @@ -3177,7 +3178,7 @@ public class ResearchStationAssemblyLine implements Runnable { 256, new Object[] { CustomItemList.Godforge_MagneticConfinementCasing.get(1), ItemRefer.Field_Restriction_Coil_T4.get(4), - GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.Creon, 64), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, MaterialsUEVplus.Creon, 8), GTOreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.Mellion, 64), GregtechItemList.SpaceTimeContinuumRipper.get(8), GregtechItemList.Battery_Gem_4.get(8), GregtechItemList.Laser_Lens_Special.get(8), ItemList.Emitter_UXV.get(4), @@ -3273,9 +3274,9 @@ public class ResearchStationAssemblyLine implements Runnable { GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUIV, 32), ItemList.Robot_Arm_UIV.get(16), ItemList.Conveyor_Module_UIV.get(32), ItemList.Electric_Pump_UIV.get(64), ItemList.Relativistic_Heat_Capacitor.get(8), - GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SixPhasedCopper, 16), - GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.Creon, 8), - GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.Mellion, 8), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, MaterialsUEVplus.SixPhasedCopper, 2), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, MaterialsUEVplus.Creon, 1), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, MaterialsUEVplus.Mellion, 1), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UIV, 32) }, new FluidStack[] { MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(1024 * 144), MaterialsUEVplus.ExcitedDTEC.getFluid(2_048_000), MaterialsUEVplus.PhononMedium.getFluid(32000), @@ -3296,9 +3297,9 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.ZPM4.get(4), GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUIV, 64), ItemList.Robot_Arm_UIV.get(16), ItemList.Conveyor_Module_UIV.get(32), ItemList.Electric_Pump_UIV.get(64), CustomItemList.Godforge_HarmonicPhononTransmissionConduit.get(8), - GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SixPhasedCopper, 32), - GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.Creon, 16), - GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.Mellion, 16), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, MaterialsUEVplus.SixPhasedCopper, 4), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, MaterialsUEVplus.Creon, 2), + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, MaterialsUEVplus.Mellion, 2), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UIV, 64) }, new FluidStack[] { MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(1024 * 144), MaterialsUEVplus.ExcitedDTEC.getFluid(2_048_000), MaterialsUEVplus.PhononMedium.getFluid(64000), |