Merge remote-tracking branch 'origin/eternity' into dev

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,

src/main/java/gregtech/api/enums/Materials.java

@@ -1882,6 +1882,7 @@ private static void overrideChemicalFormulars() {
         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 @@ private static void initSubTags() {
             Bedrockium,
             EnrichedHolmium,
             TengamPurified,
-            TengamAttuned);
+            TengamAttuned,
+            MaterialsUEVplus.Eternity);
 
         SubTag.FOOD.addTo(
             MeatRaw,
@@ -2429,6 +2431,7 @@ public static void initClient() {
         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 @@ private static void addToolValues(Materials aMaterial, String aConfigPath) {
         if (aMaterial == MaterialsUEVplus.TranscendentMetal) {
             aMaterial.mHandleMaterial = Materials.DraconiumAwakened;
         }
+
+        if (aMaterial == MaterialsUEVplus.Eternity) {
+            aMaterial.mHandleMaterial = MaterialsUEVplus.SpaceTime;
+        }
     }
 
     private static void addEnchantmentValues(Materials aMaterial, String aConfigPath) {

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

src/main/java/gregtech/api/enums/OrePrefixes.java

@@ -1352,8 +1352,8 @@ public static void initMaterialComponents() {
                     || 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

src/main/java/gregtech/api/enums/Textures.java

@@ -1119,6 +1119,8 @@ public enum BlockIcons implements IIconContainer, Runnable {
         BLOCK_SILICONSG,
         BLOCK_TRANSCENDENTMETAL,
         BLOCK_UNIVERSIUM,
+        BLOCK_ETERNITY,
+
         BLOCK_ORIHARUKON,
 
         BLOCK_WHITEDWARFMATTER,
@@ -1489,7 +1491,7 @@ public enum BlockIcons implements IIconContainer, Runnable {
                 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)

src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java

@@ -900,6 +900,8 @@ public GT_MetaGenerated_Item_03() {
         ItemList.Optically_Perfected_CPU.set(addItem(726, "Optically Perfected CPU", "Perfected CPU!", o));
         ItemList.Optically_Compatible_Memory.set(addItem(725, "Optically Compatible Memory", "Its in the name!", o));
 
+        ItemList.Timepiece.set(addItem(757, "Timepiece", "Beware of the kid with the hat", o));
+
         int whiteDwarfIDs = 729;
         ItemList.White_Dwarf_Shape_Extruder_Plate.set(
             addItem(

src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java

@@ -631,7 +631,8 @@ public void run() {
             "gt.blockmetal9",
             new Materials[] { Materials.Cryolite, Materials.SiliconSG, MaterialsKevlar.NickelAluminide,
                 MaterialsUEVplus.SpaceTime, MaterialsUEVplus.TranscendentMetal, Materials.Oriharukon,
-                MaterialsUEVplus.WhiteDwarfMatter, MaterialsUEVplus.BlackDwarfMatter, MaterialsUEVplus.Universium },
+                MaterialsUEVplus.WhiteDwarfMatter, MaterialsUEVplus.BlackDwarfMatter, MaterialsUEVplus.Universium,
+                MaterialsUEVplus.Eternity },
             OrePrefixes.block,
             gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS12);
 

src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.eternity.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ETERNITY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/eternity/foil.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/eternity/frameGt.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/eternity/void.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/757.png.mcmeta

@@ -0,0 +1 @@
+{ "animation": { "frametime": 20, "frames": [ 0, 1, 2, 3, { "index": 4, "time": 80 } ] } }

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/TURBINE_BLADE.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/arrowGtPlastic.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/arrowGtWood.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/bolt.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/casingSmall.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/cell.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/cellPlasma.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/crateGtDust.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/crateGtGem.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/crateGtIngot.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/crateGtPlate.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/crushed.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/crushedCentrifuged.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/crushedPurified.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/dust.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/dustImpure.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/dustPure.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/dustSmall.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/dustTiny.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/foil.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/gearGt.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/gearGtSmall.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/gem.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/gemChipped.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/gemExquisite.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/gemFlawed.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/gemFlawless.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/handleMallet.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingot.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotDouble.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotHot.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotQuadruple.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotQuintuple.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotTriple.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/lens.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/nugget.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/plate.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/plateDense.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/plateDouble.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/plateQuadruple.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/plateQuintuple.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/plateTriple.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ring.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/rotor.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/round.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/screw.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/spring.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/springSmall.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/stick.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/stickLong.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/toolHeadArrow.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/toolHeadAxe.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/toolHeadBuzzSaw.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/toolHeadChainsaw.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/toolHeadDrill.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/toolHeadFile.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/toolHeadHammer.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/toolHeadHoe.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/toolHeadMallet.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/toolHeadPickaxe.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/toolHeadPlow.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/toolHeadSaw.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/toolHeadScrewdriver.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/toolHeadSense.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/toolHeadShovel.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/toolHeadSoldering.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/toolHeadSword.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/toolHeadUniversalSpade.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/toolHeadWrench.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/turbineBlade.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/void.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/wireFine.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}