try to put materials in extralist

3 files changed, 12 insertions, 8 deletions

diff --git a/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java b/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java
index 9d3abe60e7..4f27d13eba 100644
--- a/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java
+++ b/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java
@@ -1,6 +1,9 @@
 package gregtech.api.enums;
 
 import gregtech.api.interfaces.IMaterialHandler;
+
+import java.util.Arrays;
+
 import static gregtech.GT_Mod.GT_FML_LOGGER;
 
 public class GTNH_ExtraMaterials implements IMaterialHandler {
@@ -39,6 +42,12 @@ public class GTNH_ExtraMaterials implements IMaterialHandler {
     public static Materials SolutionBlueVitriol     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  2, 0                         , 255, 255, 255,   0,   "SolutionBlueVitriol"     ,   "Blue Vitriol Solution"         ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL          );
     public static Materials SolutionNickelSulfate   = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  2, 0                         , 255, 255, 255,   0,   "SolutionNickelSulfate"   ,   "Nickel Sulfate Solution"       ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL          );
 
+    //GT++ materials
+    public static Materials Curium                = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                , 255,255, 255,   0,   "Curium"            ,    "Curium"                  ,     0,       0,     -1,  -1,  false,  false,  1 ,  1,   1, Dyes.dyeWhite      , Element.Cu   , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 10)));
+    public static Materials Californium           = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                , 255,255, 255,   0,   "Californium"       ,    "Californium"             ,     0,       0,     -1,  -1,  false,  false,  1 ,  1,   1, Dyes.dyeWhite      , Element.Cu   , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 10)));
+    public static Materials Flerovium             = new Materials( 984, TextureSet.SET_SHINY      ,   1.0F,      0,  0, 1|2  |8      |64|128                , 255,255, 255,   0,   "Flerovium "        ,    "Flerovium "              ,     0,       0,     -1,    -1,  false,  false,  1 ,  1,   1, Dyes.dyeWhite      , Element.Cu   , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 10)));
+
+
     private static void initSubTags() {
         SubTag.METAL.addTo(Signalum, Lumium, EnrichedCopper, DiamondCopper);
         SubTag.NO_SMASHING.addTo(TarPitch);
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 5022d71083..eb9b87b7f8 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -832,11 +832,6 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
     public static Materials SuperconductorUV      = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                , 224,210,   7,   0,   "SuperconductorUV"   ,   "Superconductor UV"       ,     0,       0,     -1,  -1,  false,  false,  1,   1,   1, Dyes.dyeYellow     , Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 48)));

     public static Materials SuperconductorUHV     = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                , 255,255, 255,   0,   "Superconductor"     ,   "Superconductor UHV"      ,     0,       0,     -1,  -1,  false,  false,  1,   1,   1, Dyes.dyeWhite      , Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 64)));

 

-    //GT++ materials

-    public static Materials Curium                = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                , 255,255, 255,   0,   "Curium"            ,    "Curium"                  ,     0,       0,     -1,  -1,  false,  false,  1 ,  1,   1, Dyes.dyeWhite      , Element.Cu   , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 10)));

-    public static Materials Californium           = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                , 255,255, 255,   0,   "Californium"       ,    "Californium"             ,     0,       0,     -1,  -1,  false,  false,  1 ,  1,   1, Dyes.dyeWhite      , Element.Cu   , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 10)));

-    public static Materials Flerovium             = new Materials( 984, TextureSet.SET_SHINY      ,   1.0F,      0,  0, 1|2  |8      |64|128                , 255,255, 255,   0,   "Flerovium "        ,    "Flerovium "              ,     0,       0,     -1,    -1,  false,  false,  1 ,  1,   1, Dyes.dyeWhite      , Element.Cu   , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 10)));

-

     /**

      * Materials which are renamed automatically

      */

diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index b0ce523e43..5a0a63b91e 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -1401,9 +1401,9 @@ public class GT_MachineRecipeLoader implements Runnable {
         //GT_Values.RA.addFusionReactorRecipe(Materials.Neutronium.getMolten(144), Materials.Neutronium.getMolten(144), Materials.Neutronium.getPlasma(72), 64, 130000, 640000000);//FT3+ - yes it is a bit troll XD
 
         //MK4
-        GT_Values.RA.addFusionReactorRecipe(Materials.Plutonium241.getMolten(144), Materials.Helium.getGas(1000), Materials.Curium.getFluid(144), 96, 98304, 500000000);
-        GT_Values.RA.addFusionReactorRecipe(Materials.Curium.getMolten(144), Materials.Helium.getPlasma(1000), Materials.Californium.getFluid(144), 128, 196608, 750000000);
-        GT_Values.RA.addFusionReactorRecipe(Materials.Plutonium241.getMolten(144), Materials.Calcium.getMolten(1000), Materials.Flerovium.getFluid(144), 160, 196608, 1000000000);
+        GT_Values.RA.addFusionReactorRecipe(Materials.Plutonium241.getMolten(144), Materials.Helium.getGas(1000), GTNH_ExtraMaterials.Curium.getFluid(144), 96, 98304, 500000000);
+        GT_Values.RA.addFusionReactorRecipe(GTNH_ExtraMaterials.Curium.getMolten(144), Materials.Helium.getPlasma(1000), GTNH_ExtraMaterials.Californium.getFluid(144), 128, 196608, 750000000);
+        GT_Values.RA.addFusionReactorRecipe(Materials.Plutonium241.getMolten(144), Materials.Calcium.getMolten(1000), GTNH_ExtraMaterials.Flerovium.getFluid(144), 160, 196608, 1000000000);