Rotor suggestion #2469

https://github.com/GTNewHorizons/NewHorizons/issues/2469

1 files changed, 8 insertions, 6 deletions

diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 0746d1d3e6..d09df73ac5 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -800,8 +800,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
      * Op materials (draconic evolution above)

      */

     //TODO: add other op materials? maybe some new ores or new only fusion made op materials from op materials??? like neutronium bedrockium alloy etc.

-    public static Materials InfinityCatalyst        = new Materials( 394, TextureSet.SET_SHINY             ,  64.0F,1310720,  7, 1|2    |8                 , 255, 255, 255,   0,   "InfinityCatalyst"        ,   "Infinity Catalyst"             ,     5,  500000,     9000,  9000,  true, false,  4,   1,   1, Dyes.dyeLightGray    );

-    public static Materials Infinity                = new Materials( 397, TextureSet.SET_SHINY             , 128.0F,2621440,  8, 1|2    |8                 , 255, 255, 255,   0,   "Infinity"                ,   "Infinity"                      ,     5, 5000000,     9000,  9000,  true, false,  4,   1,   1, Dyes.dyeWhite        );

+    public static Materials InfinityCatalyst        = new Materials( 394, TextureSet.SET_SHINY             ,  64.0F,1310720,  7, 1|2    |8    |64|128      , 255, 255, 255,   0,   "InfinityCatalyst"        ,   "Infinity Catalyst"             ,     5,  500000,     9000,  9000,  true, false,  20,   1,   1, Dyes.dyeLightGray    );

+    public static Materials Infinity                = new Materials( 397, TextureSet.SET_SHINY             , 128.0F,2621440,  8, 1|2    |8    |64|128      , 255, 255, 255,   0,   "Infinity"                ,   "Infinity"                      ,     5, 5000000,     9000,  9000,  true, false,  40,   1,   1, Dyes.dyeWhite        );

     public static Materials Bedrockium              = new Materials( 395, TextureSet.SET_DULL              ,   8.0F, 327680,  6, 1      |8                 ,  50,  50,  50,   0,   "Bedrockium"              ,   "Bedrockium"                    ,     0,       0,     9000,  9000,  true, false,  4,   1,   1, Dyes.dyeBlack        );

     public static Materials Trinium                 = new Materials( 868, TextureSet.SET_SHINY             , 128.0F,    128,  8, 1|2          |64|128      , 200, 200, 210,   0,   "Trinium"                 ,   "Trinium"                       ,     0,       0,     7200,  7200,  true, false,  4,   1,   1, Dyes.dyeLightGray    ).disableAutoGeneratedBlastFurnaceRecipes();

     public static Materials Ichorium                = new Materials( 978, TextureSet.SET_SHINY             ,   1.0F,      0,  0, 0                         , 211, 120,   6,   0,   "Ichorium"                ,   "Ichorium"                      ,     5,  250000,       -1,     0, false, false,  4,   1,   1, Dyes.dyeOrange       );

@@ -1296,6 +1296,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
         DeepIron.mChemicalFormula="Sp\u2082Fe";

         Ichorium.mChemicalFormula="IcMa";

 //      Duralumin.mChemicalFormula="Al\u2086CuMnMg";

+        Infinity.mChemicalFormula="I*";

+        InfinityCatalyst.mChemicalFormula="IC";

     }

 

     private static void initSubTags() {

@@ -1318,7 +1320,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
                 Electrum, Invar, /**IronCompressed,**/ Kanthal, Magnalium, Nichrome, NiobiumNitride, NiobiumTitanium, PigIron, SolderingAlloy, StainlessSteel, Steel, Ultimet, VanadiumGallium, WroughtIron,

                 YttriumBariumCuprate, IronWood, Alumite, Manyullyn, ShadowIron, Shadow, ShadowSteel, Steeleaf, SterlingSilver, RoseGold, BlackBronze, BismuthBronze, BlackSteel, RedSteel, BlueSteel, DamascusSteel,

                 TungstenSteel, AstralSilver, /**Midasium,**/ Mithril, BlueAlloy, RedAlloy, CobaltBrass, Thaumium, Void, IronMagnetic, SteelMagnetic, NeodymiumMagnetic, SamariumMagnetic, Knightmetal, HSSG, HSSE, HSSS, TungstenCarbide, HeeEndium,

-                VanadiumSteel, Kalendrite, Ignatius, Trinium, Realgar, Chrysotile, BlackPlutonium, Alduorite, Adluorite, Vinteum, Rubracium, Draconium, DraconiumAwakened);

+                VanadiumSteel, Kalendrite, Ignatius, Trinium, Infinity, InfinityCatalyst, Realgar, Chrysotile, BlackPlutonium, Alduorite, Adluorite, Vinteum, Rubracium, Draconium, DraconiumAwakened);

 

         SubTag.FOOD.addTo(MeatRaw, MeatCooked, Ice, Water, Salt, Chili, Cocoa, Cheese, Coffee, Chocolate, Milk, Honey, FryingOilHot, FishOil, SeedOil, SeedOilLin, SeedOilHemp, Wheat, Sugar, FreshWater);

 

@@ -1484,9 +1486,9 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
 

         Carbon                  .add(SubTag.NO_SMELTING);

 

-        Infinity                .add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);

-        InfinityCatalyst        .add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);

-        CosmicNeutronium        .add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);

+        Infinity                .add(SubTag.NO_SMELTING);

+        InfinityCatalyst        .add(SubTag.NO_SMELTING);

+        CosmicNeutronium        .add(SubTag.NO_SMELTING);

     }

     public static void init() {

         new ProcessingConfig();