Fix disstank, fix NEI issues, fix localization

2 files changed, 41 insertions, 3 deletions

diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java
index e0cf247b51..fcb0b0d0da 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java
@@ -25,7 +25,7 @@ public class RecipeAdder {
 			1,
 			"K",
 			false,
-			true	
+			false	
 		);
 	
 	public final DissolutionTankMap DissolutionTankRecipes = new DissolutionTankMap(
@@ -35,11 +35,11 @@ public class RecipeAdder {
 			null,
 			"gtnhlanth:textures/gui/Disstank",
 			1, 1, 1, 1, 1,
-			StatCollector.translateToLocal("value.disstank") + ": ",
+			StatCollector.translateToLocal("value.disstank") + ": ", // Ratio
 			1,
 			":1",
 			false,
-			true			
+			false		
 		);
 	
 	
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
index 9c87289a66..ebb6385558 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
@@ -918,6 +918,17 @@ public class RecipeLoader {
         		480
         	);
         
+        GT_Values.RA.addChemicalRecipe(
+        		WerkstoffMaterialPool.SamaricRareEarthConcentrate.get(OrePrefixes.dust, 1),
+        		WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1),
+        		Materials.HydrofluoricAcid.getFluid(2000),
+        		null,
+        		WerkstoffMaterialPool.FluorinatedSamaricConcentrate.get(OrePrefixes.dust, 2),
+        		null,
+        		350,
+        		480
+        		);
+        
         GT_Values.RA.addBlastRecipe(
         		WerkstoffMaterialPool.FluorinatedSamaricConcentrate.get(OrePrefixes.dust, 2),
         		Materials.Calcium.getDust(3),
@@ -1126,6 +1137,9 @@ public class RecipeLoader {
                             if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) {
                                 tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
                             }
+                            else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1)) ) {
+                            	tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
+                            }
                         }
                         if (!tRecipe.equals(recipe)){
                             reAdd.add(tRecipe);
@@ -1160,6 +1174,9 @@ public class RecipeLoader {
                             if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) {
                                 tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
                             }
+                            else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1)) ) {
+                            	tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
+                            }
                         }
                         if (!tRecipe.equals(recipe)){
                             reAdd.add(tRecipe);
@@ -1194,6 +1211,9 @@ public class RecipeLoader {
                             if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) {
                                 tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
                             }
+                            else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1)) ) {
+                            	tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
+                            }
                         }
                         if (!tRecipe.equals(recipe)){
                             reAdd.add(tRecipe);
@@ -1235,6 +1255,15 @@ public class RecipeLoader {
                             } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDustSmall(1))) {
                                 tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dustSmall, 1));
                             }
+                            else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDustTiny(1)) ) {
+                            	tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dustTiny, 1));
+                            }
+                            else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1)) ) {
+                            	tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
+                            }
+                            else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDustSmall(1)) ) {
+                            	tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dustSmall, 1));
+                            }
                         }
                         if (!tRecipe.equals(recipe)){
                             reAdd.add(tRecipe);
@@ -1278,6 +1307,9 @@ public class RecipeLoader {
                             if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) {
                                 tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));                            
                             }
+                            else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1)) ) {
+                            	tRecipe.mOutputs[i] = GT_Utility.copyAmount(tRecipe.mOutputs[i].stackSize * 2, WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
+                            }
                         }
                         if (!tRecipe.equals(recipe)){
                             reAdd.add(tRecipe);
@@ -1315,6 +1347,9 @@ public class RecipeLoader {
         					else if (tRecipe.mOutputs[i].isItemEqual(WerkstoffMaterialPool.Zirconium.get(OrePrefixes.dust, 1))) { //TODO: Does not work and I have zero clue why
         						tRecipe.mOutputs[i] = null;
         					}
+        					else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1)) ) {
+                            	tRecipe.mOutputs[i] = null;
+                            }
         					
         				}
         				if (!tRecipe.equals(recipe)){
@@ -1434,6 +1469,9 @@ public class RecipeLoader {
                             if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) {
                                 remove.add(tRecipe);                         
                             }
+                            else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1)) ) {
+                            	remove.add(tRecipe);
+                            }
                         }
                         break;
                     }