diff options
Diffstat (limited to 'src/main/java')
4 files changed, 70 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index af7b1a69f9..c90176d0c5 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -1894,6 +1894,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { MaterialsUEVplus.SpaceTime.mChemicalFormula = "Reality itself distilled into physical form"; MaterialsUEVplus.Universium.mChemicalFormula = "A tear into the space beyond space"; MaterialsUEVplus.Eternity.mChemicalFormula = "En\u29BC"; + MaterialsUEVplus.MagMatter.mChemicalFormula = "M\u238B"; Longasssuperconductornameforuvwire.mChemicalFormula = "Nq*\u2084(Ir\u2083Os)\u2083EuSm"; Longasssuperconductornameforuhvwire.mChemicalFormula = "D\u2086(SpNt)\u2087Tn\u2085Am\u2086"; SuperconductorUEVBase.mChemicalFormula = "D*\u2085If*\u2085(\u2726\u25C6\u2726)(\u26B7\u2699\u26B7 Ni4Ti6)"; @@ -2175,7 +2176,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { EnrichedHolmium, TengamPurified, TengamAttuned, - MaterialsUEVplus.Eternity); + MaterialsUEVplus.Eternity, + MaterialsUEVplus.MagMatter); SubTag.FOOD.addTo( MeatRaw, @@ -2449,6 +2451,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { CosmicNeutronium.renderer = new CosmicNeutroniumRenderer(); MaterialsUEVplus.Universium.renderer = new UniversiumRenderer(); MaterialsUEVplus.Eternity.renderer = new InfinityRenderer(); + MaterialsUEVplus.MagMatter.renderer = new InfinityRenderer(); } private static void fillGeneratedMaterialsMap() { @@ -2546,6 +2549,10 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { if (aMaterial == MaterialsUEVplus.Eternity) { aMaterial.mHandleMaterial = MaterialsUEVplus.SpaceTime; } + + if (aMaterial == MaterialsUEVplus.MagMatter) { + aMaterial.mHandleMaterial = MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter; + } } private static void addEnchantmentValues(Materials aMaterial, String aConfigPath) { diff --git a/src/main/java/gregtech/api/enums/MaterialsUEVplus.java b/src/main/java/gregtech/api/enums/MaterialsUEVplus.java index bb385a1c73..1ff8cc2fb0 100644 --- a/src/main/java/gregtech/api/enums/MaterialsUEVplus.java +++ b/src/main/java/gregtech/api/enums/MaterialsUEVplus.java @@ -540,6 +540,56 @@ public class MaterialsUEVplus { 1, Dyes.dyeBlue); + public static Materials MagMatter = new Materials( + 143, + new TextureSet("magmatter", true), + 1.0F, + 64 * 2621440, + 26, + 1 | 2 | 64 | 128, + 255, + 255, + 255, + 0, + "Magmatter", + "Magmatter", + -1, + -1, + 0, + 25000, + true, + false, + 2, + 1, + 1, + Dyes._NULL, + Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))) + .setProcessingMaterialTierEU(TierEU.RECIPE_UMV); + + public static Materials QuarkGluonPlasma = new Materials( + 144, + TextureSet.SET_FLUID, + 1.0F, + 0, + 2, + 16, + 255, + 255, + 255, + 0, + "QuarkGluonPlasma", + "Degenerate Quark Gluon Plasma", + -1, + -1, + 2_000_000_000, + 1, + false, + true, + 1, + 1, + 1, + Dyes._NULL); + /** * called by Materials. Can be safely called multiple times. exists to allow Materials ensure this class is * initialized diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index e497eb48af..dd741a564f 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -1125,6 +1125,7 @@ public class Textures { BLOCK_TRANSCENDENTMETAL, BLOCK_UNIVERSIUM, BLOCK_ETERNITY, + BLOCK_MAGMATTER, BLOCK_ORIHARUKON, @@ -1500,7 +1501,7 @@ public class Textures { BLOCK_BLAZE }, STORAGE_BLOCKS12 = { BLOCK_CRYOLITE, BLOCK_SILICONSG, BLOCK_NICKELALUMINIUM, BLOCK_SPACETIME, BLOCK_TRANSCENDENTMETAL, BLOCK_ORIHARUKON, BLOCK_WHITEDWARFMATTER, BLOCK_BLACKDWARFMATTER, - BLOCK_UNIVERSIUM, BLOCK_ETERNITY }; + BLOCK_UNIVERSIUM, BLOCK_ETERNITY, BLOCK_MAGMATTER }; public static final ITexture[] HIDDEN_TEXTURE = { TextureFactory.builder() .addIcon(HIDDEN_FACE) diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 9373e4b12f..738bac3540 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -649,7 +649,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { new Materials[] { Materials.Cryolite, Materials.SiliconSG, MaterialsKevlar.NickelAluminide, MaterialsUEVplus.SpaceTime, MaterialsUEVplus.TranscendentMetal, Materials.Oriharukon, MaterialsUEVplus.WhiteDwarfMatter, MaterialsUEVplus.BlackDwarfMatter, MaterialsUEVplus.Universium, - MaterialsUEVplus.Eternity }, + MaterialsUEVplus.Eternity, MaterialsUEVplus.MagMatter }, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS12); @@ -1244,6 +1244,15 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.PrimordialMatter, 1L), ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("QuarkGluonPlasma") + .withLocalizedName(MaterialsUEVplus.QuarkGluonPlasma.mLocalizedName) + .withStateAndTemperature(LIQUID, 2_000_000_000) + .buildAndRegister() + .configureMaterials(MaterialsUEVplus.QuarkGluonPlasma) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.QuarkGluonPlasma, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("fieryblood") .withLocalizedName("Fiery Blood") .withStateAndTemperature(LIQUID, 6400) |