From 144cd9c09a2dab9461a61b8bfe4d5f4165030e54 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Wed, 17 Apr 2019 11:33:21 +1000
Subject: + Added new sifting recipe for Rare Earth, allowing more lanthanides
 to be obtained. - Removed Rare Earth centrifuge recipe. $ Corrected the
 spelling of Aluminium and Caesium.

---
 .../xmod/gregtech/recipes/RecipesToRemove.java     | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 src/Java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java

(limited to 'src/Java/gtPlusPlus/xmod/gregtech/recipes')

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java
new file mode 100644
index 0000000000..5fae1e0b52
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java
@@ -0,0 +1,22 @@
+package gtPlusPlus.xmod.gregtech.recipes;
+
+import gregtech.api.util.GT_Recipe;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
+public class RecipesToRemove {
+
+	public static void go() {
+		
+		//Remove Rare Earth Centrifuging 
+		//1 Rare Earth Dust - 25% chance for small piles of: neodymium, yttrium, lanthanum, cerium, cadmium, and caesium
+		//Replaced by advanced sifting recipe.		
+		GT_Recipe aRareEarthCentrifuging = GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.findRecipe(null, false, 20, new FluidStack[] {}, new ItemStack[] {ItemUtils.getItemStackOfAmountFromOreDict("dustRareEarth", 1)});
+		if (aRareEarthCentrifuging != null && aRareEarthCentrifuging.mEnabled) {
+			GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.remove(null);
+		}
+		
+	}
+	
+}
-- 
cgit 


From 94581e97e32bd7ecb0b4adefe6b03b6752f091a7 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Wed, 17 Apr 2019 12:52:02 +1000
Subject: % Reverted Pikyonium Alloy component Yttrium -> Ytterbium. $ Better
 handling of Rare Earth processing removal. Closes #455.

---
 .../xmod/gregtech/recipes/RecipesToRemove.java     | 26 +++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'src/Java/gtPlusPlus/xmod/gregtech/recipes')

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java
index 5fae1e0b52..06373c9e1d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java
@@ -1,6 +1,10 @@
 package gtPlusPlus.xmod.gregtech.recipes;
 
+import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.Recipe_GT;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
@@ -9,12 +13,32 @@ public class RecipesToRemove {
 
 	public static void go() {
 		
+		Logger.INFO("Processing Gregtech recipe maps, removing recipes to suit GT++.");
+		
 		//Remove Rare Earth Centrifuging 
 		//1 Rare Earth Dust - 25% chance for small piles of: neodymium, yttrium, lanthanum, cerium, cadmium, and caesium
 		//Replaced by advanced sifting recipe.		
 		GT_Recipe aRareEarthCentrifuging = GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.findRecipe(null, false, 20, new FluidStack[] {}, new ItemStack[] {ItemUtils.getItemStackOfAmountFromOreDict("dustRareEarth", 1)});
 		if (aRareEarthCentrifuging != null && aRareEarthCentrifuging.mEnabled) {
-			GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.remove(null);
+			aRareEarthCentrifuging.mEnabled = false;
+			aRareEarthCentrifuging.mHidden = true;
+			GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.remove(aRareEarthCentrifuging);
+			Recipe_GT.GT_Recipe_Map_LargeCentrifuge.sMultiblockCentrifugeRecipes.mRecipeList.remove(aRareEarthCentrifuging);
+			Recipe_GT.GT_Recipe_Map_LargeCentrifuge.sMultiblockCentrifugeRecipes_GT.mRecipeList.remove(aRareEarthCentrifuging);
+			Logger.INFO("Removed vanilla GT Rare Earth processing.");			
+			//Set the Chemical Symbol for Rare Earth now that we are giving it custom outputs
+			//Best not to set this unless the original recipe is removed.
+			Materials.RareEarth.mChemicalFormula = "("
+					+ELEMENT.getInstance().YTTRIUM.vChemicalSymbol
+					+ELEMENT.getInstance().NEODYMIUM.vChemicalSymbol
+					+ELEMENT.getInstance().LANTHANUM.vChemicalSymbol
+					+ELEMENT.getInstance().CERIUM.vChemicalSymbol
+					+ELEMENT.getInstance().CADMIUM.vChemicalSymbol
+					+ELEMENT.getInstance().CAESIUM.vChemicalSymbol
+					+ELEMENT.getInstance().YTTERBIUM.vChemicalSymbol
+					+ELEMENT.getInstance().SAMARIUM.vChemicalSymbol
+					+ELEMENT.getInstance().GADOLINIUM.vChemicalSymbol+
+					")";	
 		}
 		
 	}
-- 
cgit