diff options
author | Maya <10861407+serenibyss@users.noreply.github.com> | 2024-09-12 13:01:25 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-09-12 20:01:25 +0200 |
commit | 544a7b3aa81a0478faa9de670d12af60ed830d89 (patch) | |
tree | 55b27e5aba3ea40aab15f635e26fe852b36d3346 /src/main/java/gregtech/loaders | |
parent | e003cddca9a3ac0a2d7b5a0b7be79f3cf6e03481 (diff) | |
download | GT5-Unofficial-544a7b3aa81a0478faa9de670d12af60ed830d89.tar.gz GT5-Unofficial-544a7b3aa81a0478faa9de670d12af60ed830d89.tar.bz2 GT5-Unofficial-544a7b3aa81a0478faa9de670d12af60ed830d89.zip |
2.7 Stargate (#3105)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: NotAPenguin <michiel.vandeginste@gmail.com>
Diffstat (limited to 'src/main/java/gregtech/loaders')
7 files changed, 104 insertions, 18 deletions
diff --git a/src/main/java/gregtech/loaders/materials/MaterialsInit1.java b/src/main/java/gregtech/loaders/materials/MaterialsInit1.java index 7bf3b1937d..66cd413027 100644 --- a/src/main/java/gregtech/loaders/materials/MaterialsInit1.java +++ b/src/main/java/gregtech/loaders/materials/MaterialsInit1.java @@ -403,7 +403,7 @@ public class MaterialsInit1 { Materials.Naquadah = new Materials( 324, TextureSet.SET_METALLIC , 6.0F, 1280, 4, 1|2 |8 |32|64|128 , 50, 50, 50, 0, "Naquadah" , "Naquadah" , 0, 0, 5400, 5400, true, false, 10, 1, 1, Dyes.dyeBlack , Element.Nq, Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 3), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1), new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); Materials.NaquadahAlloy = new Materials( 325, TextureSet.SET_METALLIC , 8.0F, 5120, 5, 1|2 |64|128 , 40, 40, 40, 0, "NaquadahAlloy" , "Naquadah Alloy" , 0, 0, 7200, 7200, true, false, 10, 1, 1, Dyes.dyeBlack , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4), new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); Materials.NaquadahEnriched = new Materials( 326, TextureSet.SET_METALLIC , 6.0F, 1280, 4, 1|2 |8 |64 , 50, 50, 50, 0, "NaquadahEnriched" , "Enriched Naquadah" , 0, 0, 4500, 4500, true, false, 15, 1, 1, Dyes.dyeBlack , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 3), new TCAspects.TC_AspectStack(TCAspects.RADIO, 2), new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 2))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); - Materials.Naquadria = new Materials( 327, TextureSet.SET_SHINY , 1.0F, 512, 4, 1|2 |8 |64 , 30, 30, 30, 0, "Naquadria" , "Naquadria" , 0, 0, 9000, 9000, true, false, 20, 1, 1, Dyes.dyeBlack , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4), new TCAspects.TC_AspectStack(TCAspects.RADIO, 3), new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 3))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); + Materials.Naquadria = new Materials( 327, TextureSet.SET_SHINY , 1.0F, 512, 4, 1|2 |8 |32|64 , 30, 30, 30, 0, "Naquadria" , "Naquadria" , 0, 0, 9000, 9000, true, false, 20, 1, 1, Dyes.dyeBlack , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4), new TCAspects.TC_AspectStack(TCAspects.RADIO, 3), new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 3))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe().setHasCorrespondingPlasma(true); Materials.Nether = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 0 , 255, 255, 255, 0, "Nether" , "Nether" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ); Materials.NetherBrick = new Materials( 814, TextureSet.SET_DULL , 1.0F, 0, 1, 1 , 100, 0, 0, 0, "NetherBrick" , "Nether Brick" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeRed , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1))); Materials.NetherQuartz = new Materials( 522, TextureSet.SET_QUARTZ , 1.0F, 32, 1, 1 |4|8 |64 , 230, 210, 210, 0, "NetherQuartz" , "Nether Quartz" , 0, 0, -1, 0, false, false, 2, 1, 1, Dyes.dyeWhite , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 1), new TCAspects.TC_AspectStack(TCAspects.VITREUS, 1))); @@ -901,8 +901,8 @@ public class MaterialsInit1 { Materials.AstralSilver = new Materials( 333, TextureSet.SET_SHINY , 10.0F, 64, 2, 1|2 |64 , 230, 230, 255, 0, "AstralSilver" , "Astral Silver" , 0, 0, -1, 0, false, false, 4, 3, 2, Dyes.dyeWhite , 2, Arrays.asList(new MaterialStack(Silver, 2), new MaterialStack(Thaumium, 1))); Materials.InfinityCatalyst = new Materials( 394, TextureSet.SET_SHINY , 64.0F,1310720, 10, 1|2 |8 |64|128 , 255, 255, 255, 0, "InfinityCatalyst" , "Infinity Catalyst" , 5, 500000, 10800, 10800, true, false, 20, 1, 1, Dyes.dyeLightGray ).setProcessingMaterialTierEU(TierEU.RECIPE_UV).disableAutoGeneratedVacuumFreezerRecipe(); - Materials.Infinity = new Materials( 397, new TextureSet("infinity", true), 256.0F,2621440, 17, 1|2 |64|128 , 255, 255, 255, 0, "Infinity" , "Infinity" , 5, 5000000, 10800, 10800, true, false, 40, 1, 1, Dyes.dyeLightGray ).setProcessingMaterialTierEU(TierEU.RECIPE_UV).disableAutoGeneratedVacuumFreezerRecipe(); - Materials.Bedrockium = new MaterialBuilder(395,TextureSet.SET_DULL, "Bedrockium").addOreItems().addDustItems().addMetalItems().setDurability(327680).setToolSpeed(8f).setToolQuality(9).setRGB(50,50,50).setName("Bedrockium").setBlastFurnaceRequired(true).setBlastFurnaceTemp(9900).setMeltingPoint(9900).setMaterialList(new MaterialStack(Materials.SiliconDioxide, 26244), new MaterialStack(Materials.Diamond, 9)).setColor(Dyes.dyeBlack).setOreValue(4).setDensityDivider(1).setDensityMultiplier(1).constructMaterial().setProcessingMaterialTierEU(TierEU.RECIPE_EV).disableAutoGeneratedVacuumFreezerRecipe(); + Materials.Infinity = new Materials( 397, new TextureSet("infinity", true), 256.0F,2621440, 17, 1|2|32|64|128 , 255, 255, 255, 0, "Infinity" , "Infinity" , 5, 5000000, 10800, 10800, true, false, 40, 1, 1, Dyes.dyeLightGray ).setProcessingMaterialTierEU(TierEU.RECIPE_UV).disableAutoGeneratedVacuumFreezerRecipe().setHasCorrespondingPlasma(true); + Materials.Bedrockium = new MaterialBuilder(395,TextureSet.SET_DULL, "Bedrockium").addOreItems().addDustItems().addPlasma().addMetalItems().setDurability(327680).setToolSpeed(8f).setToolQuality(9).setRGB(50,50,50).setName("Bedrockium").setBlastFurnaceRequired(true).setBlastFurnaceTemp(9900).setMeltingPoint(9900).setMaterialList(new MaterialStack(Materials.SiliconDioxide, 26244), new MaterialStack(Materials.Diamond, 9)).setColor(Dyes.dyeBlack).setOreValue(4).setDensityDivider(1).setDensityMultiplier(1).constructMaterial().setProcessingMaterialTierEU(TierEU.RECIPE_EV).disableAutoGeneratedVacuumFreezerRecipe().setHasCorrespondingPlasma(true); Materials.Trinium = new Materials( 868, TextureSet.SET_SHINY , 128.0F, 51200, 8, 1|2 |8 |64|128 , 200, 200, 210, 0, "Trinium" , "Trinium" , 0, 0, 7200, 7200, true, false, 4, 1, 1, Dyes.dyeLightGray ).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); Materials.Ichorium = new Materials( 978, TextureSet.SET_SHINY , 32.0F, 850000, 12, 1|2 |8 |32|64|128 , 211, 120, 6, 0, "Ichorium" , "Ichorium" , 5, 250000, 9000, 9000, true, false, 4, 1, 1, Dyes.dyeOrange ).setTurbineMultipliers(6, 6, 3).setHasCorrespondingPlasma(true); Materials.CosmicNeutronium = new Materials( 982, TextureSet.SET_SHINY , 96.0F, 163840, 12, 1|2 |8 |32|64|128 , 50, 50, 50, 0, "CosmicNeutronium" , "Cosmic Neutronium" , 0, 0, 9900, 9900, true, false, 4, 1, 1, Dyes.dyeBlack ).setProcessingMaterialTierEU(TierEU.RECIPE_ZPM).disableAutoGeneratedVacuumFreezerRecipe().setHasCorrespondingPlasma(true); diff --git a/src/main/java/gregtech/loaders/postload/chains/NaniteChain.java b/src/main/java/gregtech/loaders/postload/chains/NaniteChain.java index 9be7e1b6b6..ab1981ee98 100644 --- a/src/main/java/gregtech/loaders/postload/chains/NaniteChain.java +++ b/src/main/java/gregtech/loaders/postload/chains/NaniteChain.java @@ -262,5 +262,23 @@ public class NaniteChain { .eut(TierEU.RECIPE_MAX) .addTo(nanoForgeRecipes); + // MagMatter nanites, currently only used in the production of Stargates. + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.lens, Materials.Forcicium, 0, false), + GTOreDictUnificator.get(OrePrefixes.lens, Materials.Forcillium, 0, false), + MaterialsUEVplus.Universium.getNanite(1), + MaterialsUEVplus.MagMatter.getBlocks(8), + getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 64), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, 1)) + .itemOutputs(MaterialsUEVplus.MagMatter.getNanite(1)) + .fluidInputs( + MaterialsUEVplus.QuarkGluonPlasma.getFluid(100_000), + MaterialsUEVplus.PhononMedium.getFluid(64_000), + MaterialsUEVplus.PrimordialMatter.getFluid(128_000)) + .metadata(NANO_FORGE_TIER, 3) + .duration(16 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_MAX) + .addTo(nanoForgeRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java index 5972d2d072..f4563a60ce 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java @@ -35,6 +35,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import bartworks.common.loaders.ItemRegistry; import gregtech.GTMod; import gregtech.api.enums.Dyes; import gregtech.api.enums.GTValues; @@ -3600,6 +3601,28 @@ public class AssemblerRecipes implements Runnable { .duration(5 * SECONDS) .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + ItemList.Hull_UV.get(1), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.Americium, 2), + ItemList.Field_Generator_UV.get(2), + GTOreDictUnificator.get(OrePrefixes.wireGt12, Materials.Longasssuperconductornameforuhvwire, 2), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 2)) + .itemOutputs(ItemList.Generator_Plasma_UV.get(1)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(assemblerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + ItemList.Hull_UIV.get(1), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.BlackPlutonium, 4), + GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.NetherStar, 4)) + .itemOutputs(ItemRegistry.energyDistributor[11]) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(assemblerRecipes); } /** @@ -7115,18 +7138,6 @@ public class AssemblerRecipes implements Runnable { .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMVBase, 33), - GTOreDictUnificator.get(OrePrefixes.pipeTiny, MaterialsUEVplus.SpaceTime, 22), - ItemList.Electric_Pump_UMV.get(1), - GTUtility.getIntegratedCircuit(9)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMV, 33)) - .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 36000)) - .duration(2 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_UMV) - .addTo(assemblerRecipes); } public void withGTNHLanthAndGTPP() { diff --git a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java index 67719803d5..6d864f56d3 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java @@ -4,6 +4,7 @@ import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.recipe.RecipeMaps.compressorRecipes; import static gregtech.api.util.GTModHandler.getModItem; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator.sapling_Rainforest; @@ -297,6 +298,19 @@ public class CompressorRecipes implements Runnable { .addTo(compressorRecipes); GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator + .get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 64)) + .itemOutputs( + GTOreDictUnificator + .get(OrePrefixes.plateSuperdense, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 1)) + // Require stabilized black hole + .metadata(CompressionTierKey.INSTANCE, 2) + .duration(15 * MINUTES) + .eut(TierEU.RECIPE_UXV) + .addTo(compressorRecipes); + + GTValues.RA.stdBuilder() .itemInputs(WerkstoffLoader.MagnetoResonaticDust.get(OrePrefixes.gem, 9)) .itemOutputs(WerkstoffLoader.MagnetoResonaticDust.get(OrePrefixes.block, 1)) .duration(15 * SECONDS) diff --git a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java index de86455665..c311ecd532 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java @@ -1693,7 +1693,7 @@ public class MixerRecipes implements Runnable { MaterialsUEVplus.DimensionallyTranscendentExoticCatalyst.getFluid(1000L), Materials.Lead.getPlasma(1000), Materials.Thorium.getPlasma(1000), - Materials.Plutonium241.getPlasma(1000L), + Materials.Naquadria.getPlasma(1000L), MaterialsUEVplus.RawStarMatter.getFluid(25L)) .fluidOutputs(MaterialsUEVplus.DimensionallyTranscendentStellarCatalyst.getFluid(1000L)) .duration(41 * MINUTES + 40 * SECONDS) diff --git a/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java index 07e6f0c4b1..ab40600d49 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java @@ -8,6 +8,8 @@ import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.TierEU; +import gregtech.api.util.GTRecipeBuilder; +import gregtech.api.util.GTRecipeConstants; import gregtech.api.util.GTUtility; import gtPlusPlus.core.material.MaterialsElements; @@ -121,11 +123,12 @@ public class TranscendentPlasmaMixerRecipes implements Runnable { Materials.Tin.getPlasma(1000), Materials.Lead.getPlasma(1000), Materials.Thorium.getPlasma(1000), - Materials.Plutonium241.getPlasma(1000L), + Materials.Naquadria.getPlasma(1000L), MaterialsUEVplus.RawStarMatter.getFluid(25L)) .fluidOutputs(MaterialsUEVplus.ExcitedDTSC.getFluid(1000L)) - .duration(200) + .duration(100) .eut(STELLAR_EU_PER_HALF_L) + .metadata(GTRecipeConstants.EU_MULTIPLIER, 20) .noOptimize() .addTo(transcendentPlasmaMixerRecipes); @@ -156,5 +159,35 @@ public class TranscendentPlasmaMixerRecipes implements Runnable { .noOptimize() .addTo(transcendentPlasmaMixerRecipes); + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(24)) + .fluidInputs( + Materials.Infinity.getPlasma(1000), + Materials.Neutronium.getPlasma(1000), + Materials.Flerovium.getPlasma(1000), + new FluidStack(MaterialsElements.STANDALONE.CHRONOMATIC_GLASS.getPlasma(), 1000), + new FluidStack(MaterialsElements.STANDALONE.HYPOGEN.getPlasma(), 1000), + Materials.Ichorium.getPlasma(1000), + MaterialsUEVplus.SixPhasedCopper.getPlasma(1000), + Materials.DraconiumAwakened.getPlasma(1000), + new FluidStack(MaterialsElements.STANDALONE.DRAGON_METAL.getPlasma(), 1000), + new FluidStack(MaterialsElements.STANDALONE.RHUGNOR.getPlasma(), 1000), + Materials.Draconium.getPlasma(1000), + MaterialsUEVplus.Creon.getPlasma(1000), + Materials.Tritanium.getPlasma(1000), + Materials.CosmicNeutronium.getPlasma(1000), + Materials.Bedrockium.getPlasma(1000), + MaterialsUEVplus.ExcitedDTCC.getFluid(1000), + MaterialsUEVplus.ExcitedDTPC.getFluid(1000), + MaterialsUEVplus.ExcitedDTRC.getFluid(1000), + MaterialsUEVplus.ExcitedDTEC.getFluid(1000), + MaterialsUEVplus.ExcitedDTSC.getFluid(1000)) + .fluidOutputs(MaterialsUEVplus.StargateCrystalSlurry.getFluid(1000L)) + .duration(100 * GTRecipeBuilder.TICKS) + // 1 Trillion EU/t + .metadata(GTRecipeConstants.EU_MULTIPLIER, 1000) + .eut(1_000_000_000L) + .noOptimize() + .addTo(transcendentPlasmaMixerRecipes); } } diff --git a/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java b/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java index f46256e2c5..c4fc6bea26 100644 --- a/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java +++ b/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java @@ -3,6 +3,7 @@ package gregtech.loaders.preload; import static gregtech.api.enums.FluidState.GAS; import static gregtech.api.enums.FluidState.LIQUID; import static gregtech.api.enums.FluidState.MOLTEN; +import static gregtech.api.enums.FluidState.PLASMA; import static gregtech.api.enums.FluidState.SLURRY; import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.enums.Mods.PamsHarvestCraft; @@ -1315,6 +1316,15 @@ public class LoaderGTBlockFluid implements Runnable { GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.Protomatter, 1L), ItemList.Cell_Empty.get(1L)); + GTFluidFactory.builder("InfinityPlasma") + .withLocalizedName("Infinity Plasma") + .withStateAndTemperature(PLASMA, 10000) + .buildAndRegister() + .configureMaterials(Materials.Infinity) + .registerBContainers( + GTOreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Infinity, 1L), + ItemList.Cell_Empty.get(1L)); + GTFluidFactory.builder("fieryblood") .withLocalizedName("Fiery Blood") .withStateAndTemperature(LIQUID, 6400) |