Automatic synchronization

3 files changed, 105 insertions, 23 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index a4dc366aee..68f7bdd762 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -2127,6 +2127,21 @@ public class RECIPES_GREGTECH {
 
 	private static void sifterRecipes() {		
 
+		// Rare Earth Processing
+		GT_Values.RA.addSifterRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustRareEarth", 1),
+				new ItemStack[] { 
+						ELEMENT.getInstance().YTTRIUM.getSmallDust(1),
+						ELEMENT.getInstance().NEODYMIUM.getSmallDust(1),
+						ELEMENT.getInstance().LANTHANUM.getSmallDust(1),
+						ELEMENT.getInstance().CERIUM.getSmallDust(1),
+						ELEMENT.getInstance().CADMIUM.getSmallDust(1),
+						ELEMENT.getInstance().CAESIUM.getSmallDust(1),
+						ELEMENT.getInstance().YTTERBIUM.getTinyDust(1),
+						ELEMENT.getInstance().SAMARIUM.getTinyDust(1),
+						ELEMENT.getInstance().GADOLINIUM.getTinyDust(1)
+						},
+				new int[] { 2000, 2000, 2000, 2000, 2000, 2000, 1000, 1000, 1000 }, 20 * 30, 500);
+		
 		// Zirconium
 		GT_Values.RA.addSifterRecipe(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedIlmenite", 1),
 				new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1),
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 54d9994edc..c26b01d0f7 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -702,26 +702,26 @@ public class RECIPES_Machines {
 						RECIPE_IndustrialMultiTankController);
 			}
 
-			ItemStack mSemiFluidgen = ItemUtils.simpleMetaStack("IC2:blockGenerator:7", 7, 1);
 			//Semi-Fluid Generators
-			GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_LV.get(1L, new Object[0]), CI.bitsd,
-					new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('P'),
-							ItemList.Electric_Piston_LV, Character.valueOf('E'), ItemList.Electric_Motor_LV,
-							Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('W'),
-							mSemiFluidgen, Character.valueOf('G'),
-							OrePrefixes.gearGt.get(Materials.Steel) });
-			GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_MV.get(1L, new Object[0]), CI.bitsd,
-					new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('P'),
-							ItemList.Electric_Piston_MV, Character.valueOf('E'), ItemList.Electric_Motor_MV,
-							Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good), Character.valueOf('W'),
-							mSemiFluidgen, Character.valueOf('G'),
-							OrePrefixes.gearGt.get(Materials.Aluminium) });
-			GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_HV.get(1L, new Object[0]), CI.bitsd,
-					new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('P'),
-							ItemList.Electric_Piston_HV, Character.valueOf('E'), ItemList.Electric_Motor_HV,
-							Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('W'),
-							mSemiFluidgen, Character.valueOf('G'),
-							OrePrefixes.gearGt.get(Materials.StainlessSteel) });
+			ItemStack mSemiFluidgen = ItemUtils.getItemStackFromFQRN("IC2:blockGenerator:7", 1);
+			mSemiFluidgen.setItemDamage(7);
+					//ItemUtils.simpleMetaStack("IC2:blockGenerator:7", 7, 1);			
+			ItemStack[] aSemifluids = new ItemStack[] {mSemiFluidgen, GregtechItemList.Generator_SemiFluid_LV.get(1), GregtechItemList.Generator_SemiFluid_MV.get(1), GregtechItemList.Generator_SemiFluid_HV.get(1)};
+			for (int o=1;o<4;o++) {
+				CORE.RA.addSixSlotAssemblingRecipe(
+						new ItemStack[] {
+								aSemifluids[o-1],
+								CI.getElectricPiston(o, GTNH ? 4 : 2),
+								CI.getElectricMotor(o, GTNH ? 2 : 1),
+								CI.getTieredComponent(OrePrefixes.circuit, o, GTNH ? 4 : 2),
+								CI.getPlate(o, GTNH ? 8 : 4),
+								CI.getGear(o-1, GTNH ? 4 : 2)
+						},
+						CI.getAlternativeTieredFluid(o, 144 * 4),
+						aSemifluids[o],
+						20 * 30,
+						(int) GT_Values.V[o]);
+			}			
 
 			if (CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter){
 				//Industrial Blast Smelter
@@ -849,15 +849,15 @@ public class RECIPES_Machines {
 			if (CORE.ConfigSwitches.enableMachine_SimpleWasher){
 				ItemStack plateWrought = ItemUtils.getItemStackOfAmountFromOreDict("plateWroughtIron", 1);
 				ItemStack washerPipe;
+				
+				
 				if (CORE.ConfigSwitches.enableCustom_Pipes){
 					washerPipe = ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeClay", 1);
 					RecipeUtils.addShapedGregtechRecipe(
 							plateWrought, CI.electricPump_LV, plateWrought,
 							plateWrought, washerPipe, plateWrought,
 							plateWrought, CI.machineCasing_ULV, plateWrought,
-							GregtechItemList.SimpleDustWasher.get(1));
-				}
-				else {			
+							GregtechItemList.SimpleDustWasher_ULV.get(1));
 				}
 				//Add Recipe
 				washerPipe = ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeCopper", 1);					
@@ -865,7 +865,69 @@ public class RECIPES_Machines {
 						plateWrought, CI.electricPump_LV, plateWrought,
 						plateWrought, washerPipe, plateWrought,
 						plateWrought, CI.machineCasing_ULV, plateWrought,
-						GregtechItemList.SimpleDustWasher.get(1));
+						GregtechItemList.SimpleDustWasher_ULV.get(1));
+				
+				int aSimpleWasherTier = 2;
+				int aSlot = 0;
+				ItemStack[][] aInputsForSimpleWashers = new ItemStack[4][6];
+
+				aInputsForSimpleWashers[0] = new ItemStack[] {
+						CI.getTieredMachineHull(2),
+						CI.getTieredComponent(OrePrefixes.screw, 2, GTNH ? 16 : 8),
+						CI.getTieredComponent(OrePrefixes.plate, 1, GTNH ? 8 : 4),
+						CI.getTieredComponent(OrePrefixes.rod, 2, GTNH ? 4 : 2),
+						CI.getTieredComponent(OrePrefixes.circuit, 2, GTNH ? 3 : 1),
+						
+				};
+				aInputsForSimpleWashers[1] = new ItemStack[] {
+						CI.getTieredMachineHull(4),
+						CI.getTieredComponent(OrePrefixes.screw, 4, GTNH ? 24 : 12),
+						CI.getTieredComponent(OrePrefixes.plate, 3, GTNH ? 12 : 6),
+						CI.getTieredComponent(OrePrefixes.rod, 4, GTNH ? 6 : 3),
+						CI.getTieredComponent(OrePrefixes.circuit, 4, GTNH ? 4 : 2),
+						
+				};
+				aInputsForSimpleWashers[2] = new ItemStack[] {
+						CI.getTieredMachineHull(6),
+						CI.getTieredComponent(OrePrefixes.screw, 6, GTNH ? 48 : 24),
+						CI.getTieredComponent(OrePrefixes.plate, 5, GTNH ? 16 : 8),
+						CI.getTieredComponent(OrePrefixes.rod, 6, GTNH ? 8 : 4),
+						CI.getTieredComponent(OrePrefixes.circuit, 6, GTNH ? 6 : 3),
+						
+				};
+				aInputsForSimpleWashers[3] = new ItemStack[] {
+						CI.getTieredMachineHull(8),
+						CI.getTieredComponent(OrePrefixes.screw, 8, GTNH ? 64 : 32),
+						CI.getTieredComponent(OrePrefixes.plate, 7, GTNH ? 32 : 16),
+						CI.getTieredComponent(OrePrefixes.rod, 8, GTNH ? 10 : 5),
+						CI.getTieredComponent(OrePrefixes.circuit, 8, GTNH ? 8 : 4),
+						
+				};
+				
+				
+				
+				
+				
+				
+				ItemStack[] aSimpleWashers = new ItemStack[] {GregtechItemList.SimpleDustWasher_MV.get(1), GregtechItemList.SimpleDustWasher_EV.get(1), GregtechItemList.SimpleDustWasher_LuV.get(1), GregtechItemList.SimpleDustWasher_UV.get(1)};
+				for (int i=0;i<4;i++) {
+					
+					CORE.RA.addSixSlotAssemblingRecipe(
+							aInputsForSimpleWashers[aSlot],
+							CI.getTieredFluid(aSimpleWasherTier, 144 * aSimpleWasherTier), 
+							aSimpleWashers[aSlot], 
+							20 * 15 * aSimpleWasherTier,
+							(int) GT_Values.V[aSimpleWasherTier]);
+					
+					aSimpleWasherTier += 2;
+					aSlot++;
+				}
+				
+				
+				
+				
+				
+				
 			}
 
 			if (CORE.ConfigSwitches.enableMachine_Pollution && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index ba592bcb65..ca334fe0d3 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -369,6 +369,7 @@ public class CI {
 		return Materials._NULL;
 	}
 
+	@Deprecated
 	public static String getTieredComponent(OrePrefixes type, int tier){
 		Object material = getMaterialFromTier(tier);
 		if (material != null){
@@ -769,6 +770,10 @@ public class CI {
 
 		ItemStack aTempStack = null;
 		
+		if (aPrefix == OrePrefixes.rod) {
+			aPrefix = OrePrefixes.stick;
+		}
+		
 		if (aPrefix == OrePrefixes.gear || aPrefix == OrePrefixes.gearGt) {
 			m = aMaster[0][aTier];
 		}