Add easier, lower yield route for samarium

3 files changed, 45 insertions, 2 deletions

diff --git a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
index 681260e2aa..e15c3bcf33 100644
--- a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
+++ b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
@@ -26,6 +26,7 @@ import cpw.mods.fml.common.event.FMLServerStartedEvent;
 import gregtech.api.GregTech_API;

 import gregtech.api.enums.OrePrefixes;

 import gregtech.api.util.GT_Log;

+import net.minecraftforge.oredict.OreDictionary;

 

 @Mod(modid = Tags.MODID, version = Tags.VERSION, name = Tags.MODNAME, 

     dependencies = "required-after:IC2; " + "required-after:gregtech; "

@@ -74,7 +75,7 @@ public class GTNHLanthanides {
         GT_Log.out.print(Arrays.toString(Werkstoff.werkstoffNameHashMap.keySet().toArray()));

         GT_Log.out.print(Arrays.toString(Werkstoff.werkstoffHashMap.keySet().toArray()));

         

-        

+        GT_Log.out.print("HMMM " + Arrays.toString(OreDictionary.getOreIDs(WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1))));

         

         

     }

diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
index 0c694e4240..515cd158b5 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
@@ -915,6 +915,17 @@ public class WerkstoffMaterialPool implements Runnable {
     		TextureSet.SET_DULL

     	);

     

+    public static final Werkstoff DephosphatedSamariumConcentrate = new Werkstoff(

+    		new short[] {255, 170, 220},

+    		"Dephosphated Samarium Concentrate",

+    		subscriptNumbers("??Sm??"),

+    		new Werkstoff.Stats(),

+    		Werkstoff.Types.MIXTURE,

+    		new Werkstoff.GenerationFeatures().disable().onlyDust(),

+    		offsetID2 + 29,

+    		TextureSet.SET_DULL

+    	);

+    

     

     

     // Weird/Exciting Chemicals		

diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
index 0f9c50af15..bd9d56b2d6 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
@@ -979,6 +979,8 @@ public class RecipeLoader {
         		480
         		);
         
+        
+        
         GT_Values.RA.addBlastRecipe(
         		WerkstoffMaterialPool.FluorinatedSamaricConcentrate.get(OrePrefixes.dust, 2),
         		Materials.Calcium.getDust(3),
@@ -1012,6 +1014,35 @@ public class RecipeLoader {
         		800,
         		1920
         	);
+        
+        GT_Values.RA.addChemicalRecipe(
+        		WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 2), 
+        		Materials.Calcium.getDust(3), 
+        		null,
+        		null,
+        		WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1),
+        		Materials.TricalciumPhosphate.getDust(1),
+        		300,
+        		1920
+        	);
+        
+        GT_Values.RA.addCentrifugeRecipe(
+        		WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 6),
+        		null,
+        		null,
+        		null,
+        		Materials.Samarium.getDust(1),
+        		WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 2),
+        		WerkstoffMaterialPool.Gangue.get(OrePrefixes.dust, 4),
+        		null,
+        		null,
+        		null,
+        		new int[] {
+        				9000, 8000, 10000
+        		},
+        		200,
+        		1920        		
+        	);
     }
     
     public static void addRandomChemCrafting() {
@@ -1334,7 +1365,7 @@ public class RecipeLoader {
             if (GT_Utility.isStackValid(input)) {
                 int[] oreDict = OreDictionary.getOreIDs(input);
                 for (int oreDictID : oreDict) {
-                    if (OreDictionary.getOreName(oreDictID).startsWith("dust") /*OreDictionary.getOreName(oreDictID).startsWith("dustPureCerium") || OreDictionary.getOreName(oreDictID).startsWith("dustImpureCerium") || OreDictionary.getOreName(oreDictID).startsWith("dustSpace") || OreDictionary.getOreName(oreDictID).startsWith("dustCerium")*/) {
+                    if (OreDictionary.getOreName(oreDictID).startsWith("dust") && (!OreDictionary.getOreName(oreDictID).contains("Dephosphated")) /*OreDictionary.getOreName(oreDictID).startsWith("dustPureCerium") || OreDictionary.getOreName(oreDictID).startsWith("dustImpureCerium") || OreDictionary.getOreName(oreDictID).startsWith("dustSpace") || OreDictionary.getOreName(oreDictID).startsWith("dustCerium")*/) {
                         GT_Recipe tRecipe = recipe.copy();
                         for (int i = 0; i < tRecipe.mOutputs.length; i ++) {
                             if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue;