diff options
Diffstat (limited to 'src/main/java/gregtech/api')
5 files changed, 42 insertions, 4 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 59b094c4c0..15f2e4bcb6 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -456,6 +456,7 @@ public enum ItemList implements IItemContainer { Tesseract, EnergisedTesseract, + Timepiece, Steam_Valve_LV, Steam_Valve_MV, diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index df8c5d162d..dc8d878e95 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -1882,6 +1882,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { CertusQuartzCharged.mChemicalFormula = "SiO\u2082"; MaterialsUEVplus.SpaceTime.mChemicalFormula = "Reality itself distilled into physical form"; MaterialsUEVplus.Universium.mChemicalFormula = "A tear into the space beyond space"; + MaterialsUEVplus.Eternity.mChemicalFormula = "En\u29BC"; 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)"; @@ -2160,7 +2161,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Bedrockium, EnrichedHolmium, TengamPurified, - TengamAttuned); + TengamAttuned, + MaterialsUEVplus.Eternity); SubTag.FOOD.addTo( MeatRaw, @@ -2429,6 +2431,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Infinity.renderer = new InfinityRenderer(); CosmicNeutronium.renderer = new CosmicNeutroniumRenderer(); MaterialsUEVplus.Universium.renderer = new UniversiumRenderer(); + MaterialsUEVplus.Eternity.renderer = new InfinityRenderer(); } private static void fillGeneratedMaterialsMap() { @@ -2522,6 +2525,10 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { if (aMaterial == MaterialsUEVplus.TranscendentMetal) { aMaterial.mHandleMaterial = Materials.DraconiumAwakened; } + + if (aMaterial == MaterialsUEVplus.Eternity) { + aMaterial.mHandleMaterial = MaterialsUEVplus.SpaceTime; + } } 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 2546349369..37bf63031a 100644 --- a/src/main/java/gregtech/api/enums/MaterialsUEVplus.java +++ b/src/main/java/gregtech/api/enums/MaterialsUEVplus.java @@ -488,6 +488,34 @@ public class MaterialsUEVplus { Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))) .setProcessingMaterialTierEU(TierEU.RECIPE_UMV); + public static Materials Eternity = new Materials( + 141, + new TextureSet("eternity", true), + 1.0F, + 8 * 2621440, + 26, + 1 | 2 | 64 | 128, + 255, + 255, + 255, + 0, + "Eternity", + "Eternity", + -1, + -1, + 0, + 14000, + true, + false, + 2, + 1, + 1, + Dyes._NULL, + Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))) + .disableAutoGeneratedBlastFurnaceRecipes() + .disableAutoGeneratedVacuumFreezerRecipe() + .setProcessingMaterialTierEU(TierEU.RECIPE_UMV); + /** * 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/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index ac518f4bd0..502cd06b25 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -1352,8 +1352,8 @@ public enum OrePrefixes { || aMaterial == Materials.YttriumBariumCuprate || aMaterial == Materials.BloodInfusedIron || aMaterial == MaterialsUEVplus.Universium - || aMaterial == MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter)) - wireFine.mDisabledItems.add(aMaterial); + || aMaterial == MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter + || aMaterial == MaterialsUEVplus.Eternity)) wireFine.mDisabledItems.add(aMaterial); // Gears if (!enableUnusedGears && !(aMaterial == Materials.Aluminium || aMaterial == Materials.Titanium || aMaterial == Materials.Iron diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index fc2f0bb8e0..d8271e86ed 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -1119,6 +1119,8 @@ public class Textures { BLOCK_SILICONSG, BLOCK_TRANSCENDENTMETAL, BLOCK_UNIVERSIUM, + BLOCK_ETERNITY, + BLOCK_ORIHARUKON, BLOCK_WHITEDWARFMATTER, @@ -1489,7 +1491,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_UNIVERSIUM, BLOCK_ETERNITY }; public static final ITexture[] HIDDEN_TEXTURE = { TextureFactory.builder() .addIcon(HIDDEN_FACE) |