+ Added Strontium processing chains.

+ Added cutting machine recipes for Blocks -> Plates for GT++ materials.
% Adjusted Rare Earth Sifting to no longer give Gd, Yb, Sm instead now provides small ore dust, which can be processed for Yb, Sm and Sr.
% Adjusted Strontium RGB and texture set slightly.
% Arceus Alloy 2B now requires Strontium as a component.

5 files changed, 61 insertions, 65 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java
index ef3e06086e..9f50cf6d91 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java
@@ -1,9 +1,6 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.generators;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-
-import net.minecraft.item.ItemStack;
-
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.ConfigCategories;
 import gregtech.api.enums.ItemList;
@@ -11,7 +8,6 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator;
 import gregtech.api.objects.GT_ItemStack;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
@@ -19,8 +15,8 @@ import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.custom.power.GTPP_MTE_BasicLosslessGenerator;
+import net.minecraft.item.ItemStack;
 
 public class GT_MetaTileEntity_SemiFluidGenerator extends GTPP_MTE_BasicLosslessGenerator{
 
@@ -65,7 +61,7 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GTPP_MTE_BasicLossless
 
 	@Override
 	public GT_Recipe.GT_Recipe_Map getRecipes() {
-		//Logger.INFO("Fuel Count: "+Gregtech_Recipe_Map.sSemiFluidLiquidFuels.mRecipeList.size());
+		//Logger.WARNING("Fuel Count: "+Gregtech_Recipe_Map.sSemiFluidLiquidFuels.mRecipeList.size());
 		return Gregtech_Recipe_Map.sSemiFluidLiquidFuels;
 	}
 	
@@ -95,14 +91,14 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GTPP_MTE_BasicLossless
 	@Override
 	public int getFuelValue(ItemStack aStack) {
 		if ((GT_Utility.isStackInvalid(aStack)) || (getRecipes() == null)) {
-			Logger.INFO("Bad Fuel?");
+			Logger.WARNING("Bad Fuel?");
 			return 0;
 		}
 		int rValue = Math.max(GT_ModHandler.getFuelCanValue(aStack) * 6 / 5, super.getFuelValue(aStack));
 		if (ItemList.Fuel_Can_Plastic_Filled.isStackEqual(aStack, false, true)) {
 			rValue = Math.max(rValue, GameRegistry.getFuelValue(aStack) * 3);
 		}
-		Logger.INFO("Good Fuel: "+rValue);
+		Logger.WARNING("Good Fuel: "+rValue);
 		return rValue;
 	}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java
index f3fd95f0c1..6f18b89c53 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java
@@ -338,22 +338,22 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
 				this.mNewTier = mTier2;
 				//ReflectionUtils.setFinalStatic(mTier2, GT_Values.V[0]);
 			} catch (Exception e) {
-				Logger.INFO("Failed setting mTier.");
+				Logger.WARNING("Failed setting mTier.");
 				e.printStackTrace();
 			}
 
 			this.mTicksToBurnFor = getTotalEUGenerated(convertDaysToTicks(tFuel.mSpecialValue), voltage);
 			if (mTicksToBurnFor >= Integer.MAX_VALUE){
 				mTicksToBurnFor = Integer.MAX_VALUE;
-				Logger.INFO("Fuel went over Int limit, setting to MAX_VALUE.");
+				Logger.WARNING("Fuel went over Int limit, setting to MAX_VALUE.");
 			}
 			this.mDaysRemaining = MathUtils.roundToClosestInt(mTicksToBurnFor/20/60/3);
-			Logger.INFO("step | "+(int) (mTicksToBurnFor * getEfficiency() / 100L));
+			Logger.WARNING("step | "+(int) (mTicksToBurnFor * getEfficiency() / 100L));
 			return (int) (mTicksToBurnFor * getEfficiency() / 100L);
 			//return (int) (tFuel.mSpecialValue * 365L * getEfficiency() / 100L);
 			//return tFuel.mEUt;
 		}
-		Logger.INFO("Not sure");
+		Logger.WARNING("Not sure");
 		return 0;
 	}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java
index c7f63e3bc2..4e5c296629 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java
@@ -379,7 +379,7 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity {
 		else {
 			returnValue = getCurrentChunkPollution();
 		}
-		Logger.INFO("| DEBUG: "+returnValue +" | ArrayPos:"+this.mArrayPos+" | Counter:"+counter+" | Total:"+total+" |");
+		//Logger.INFO("| DEBUG: "+returnValue +" | ArrayPos:"+this.mArrayPos+" | Counter:"+counter+" | Total:"+total+" |");
 		return returnValue;
 	}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java
index b4e819a459..477848a90f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java
@@ -131,15 +131,15 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti
 
 	@Override
 	public int checkRecipe() {
-		Logger.INFO("Recipe Tick 1.");
+		Logger.MACHINE_INFO("Recipe Tick 1.");
 		if (!this.mCanProcessRecipe) {
-			Logger.INFO("Recipe Tick 1.1 - Cannot Process Recipe.");
+			Logger.MACHINE_INFO("Recipe Tick 1.1 - Cannot Process Recipe.");
 			if (this.mChargeConsumed < mFusionPoint) {
-				Logger.INFO("Recipe Tick 1.2 - Cannot Ignite Fusion, Charge too low.");
+				Logger.MACHINE_INFO("Recipe Tick 1.2 - Cannot Ignite Fusion, Charge too low.");
 				this.mCharging = true;
 				this.mCanProcessRecipe = false;
 				if (this.getBaseMetaTileEntity().decreaseStoredEnergyUnits((mFusionPoint / 100), false)) {
-					Logger.INFO("Recipe Tick 1.3 - Charging Internal storage. " + (mFusionPoint / 100) + "/"
+					Logger.MACHINE_INFO("Recipe Tick 1.3 - Charging Internal storage. " + (mFusionPoint / 100) + "/"
 							+ mFusionPoint);
 					mChargeConsumed += (mFusionPoint / 100);
 				}
@@ -152,13 +152,13 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti
 			}
 		}
 		else {
-			Logger.INFO("Recipe Tick 1.1 - Try to Process Recipe.");
+			Logger.MACHINE_INFO("Recipe Tick 1.1 - Try to Process Recipe.");
 			if (checkRecipeMulti()) {
-				Logger.INFO("Recipe Tick 1.2 - Process Recipe was Successful.");
+				Logger.MACHINE_INFO("Recipe Tick 1.2 - Process Recipe was Successful.");
 				return 2;
 			}
 		}
-		Logger.INFO("Recipe Tick 2. - Process Recipe failed.");
+		Logger.MACHINE_INFO("Recipe Tick 2. - Process Recipe failed.");
 		return 0;
 	}
 
@@ -196,7 +196,7 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti
 			}
 			if ((tRecipe == null && !mRunningOnLoad) || (tRecipe != null && maxEUStore() < tRecipe.mSpecialValue)) {
 				this.mLastRecipe = null;
-				Logger.INFO("Just plain bad.");
+				Logger.MACHINE_INFO("Just plain bad.");
 				return false;
 			}
 			if (mRunningOnLoad || tRecipe.isRecipeInputEqual(true, tFluids, new ItemStack[] {})) {
@@ -397,38 +397,38 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti
 	public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
 		// super.onPostTick(aBaseMetaTileEntity, aTick);
 		if (aBaseMetaTileEntity.isServerSide()) {
-			// Logger.INFO("1");
+			// Logger.MACHINE_INFO("1");
 			if (mEfficiency < 0)
 				mEfficiency = 0;
 			if (mRunningOnLoad) {
-				Logger.INFO("2");
+				Logger.MACHINE_INFO("2");
 				this.mEUStore = (int) aBaseMetaTileEntity.getStoredEU();
 				checkRecipeMulti();
 			}
 			if (--mUpdate == 0 || --mStartUpCheck == 0) {
-				Logger.INFO("3");
+				Logger.MACHINE_INFO("3");
 				mMachine = true;
 			}
 			if (mStartUpCheck < 0) {
-				//Logger.INFO("4");
+				//Logger.MACHINE_INFO("4");
 				if (mMachine) {
-					//Logger.INFO("5");
+					//Logger.MACHINE_INFO("5");
 
 					if (aBaseMetaTileEntity.getStoredEU() + (2048 * tierOverclock()) < maxEUStore()) {
 						if (aBaseMetaTileEntity.increaseStoredEnergyUnits(2048 * tierOverclock(), true)) {
-							//Logger.INFO("5.5 A");							
+							//Logger.MACHINE_INFO("5.5 A");							
 						}
 						else {
-							//Logger.INFO("5.5 B");							
+							//Logger.MACHINE_INFO("5.5 B");							
 						}
 					}
 					if (this.mEUStore <= 0 && mMaxProgresstime > 0) {
-						Logger.INFO("6");
+						Logger.MACHINE_INFO("6");
 						stopMachine();
 						this.mLastRecipe = null;
 					}
 					if (mMaxProgresstime > 0) {
-						Logger.INFO("7");
+						Logger.MACHINE_INFO("7");
 						this.getBaseMetaTileEntity().decreaseStoredEnergyUnits(mEUt, true);
 						if (mMaxProgresstime > 0 && ++mProgresstime >= mMaxProgresstime) {
 							if (mOutputFluids != null)
@@ -448,18 +448,18 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti
 						}
 					}
 					else {
-						//Logger.INFO("8");
+						//Logger.MACHINE_INFO("8");
 						this.mEUStore = (int) aBaseMetaTileEntity.getStoredEU();
 						if (aTick % 100 == 0 || aBaseMetaTileEntity.hasWorkJustBeenEnabled()
 								|| aBaseMetaTileEntity.hasInventoryBeenModified()) {
-							Logger.INFO("9");
+							Logger.MACHINE_INFO("9");
 							// turnCasingActive(mMaxProgresstime > 0);
 							if (aBaseMetaTileEntity.isAllowedToWork()) {
-								Logger.INFO("10");
+								Logger.MACHINE_INFO("10");
 								if (checkRecipeMulti()) {
-									Logger.INFO("11");
+									Logger.MACHINE_INFO("11");
 									if (this.mEUStore < this.mLastRecipe.mSpecialValue) {
-										Logger.INFO("12");
+										Logger.MACHINE_INFO("12");
 										mMaxProgresstime = 0;
 										// turnCasingActive(false);
 									}
@@ -473,12 +473,12 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti
 				}
 				else {
 					// turnCasingActive(false);
-					Logger.INFO("Bad");
+					Logger.MACHINE_INFO("Bad");
 					this.mLastRecipe = null;
 					stopMachine();
 				}
 			}
-			Logger.INFO("Good | "+mMaxProgresstime);
+			Logger.MACHINE_INFO("Good | "+mMaxProgresstime);
 			aBaseMetaTileEntity.setActive(mMaxProgresstime > 0);
 		}
 	}
@@ -489,14 +489,14 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti
 				if (!drainEnergyInput(((long) -mEUt * 10000) / Math.max(1000, mEfficiency))) {
 					this.mLastRecipe = null;
 					stopMachine();
-					Logger.INFO("a1");
+					Logger.MACHINE_INFO("a1");
 					return false;
 				}
 			}
 			if (this.mEUStore <= 0) {
 				this.mLastRecipe = null;
 				stopMachine();
-				Logger.INFO("a2");
+				Logger.MACHINE_INFO("a2");
 				return false;
 			}
 		}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java
index 5a0f888ddb..8b3ada610d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java
@@ -131,15 +131,15 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux
 
 	@Override
 	public int checkRecipe() {
-		Logger.INFO("Recipe Tick 1.");
+		Logger.MACHINE_INFO("Recipe Tick 1.");
 		if (!this.mCanProcessRecipe) {
-			Logger.INFO("Recipe Tick 1.1 - Cannot Process Recipe.");
+			Logger.MACHINE_INFO("Recipe Tick 1.1 - Cannot Process Recipe.");
 			if (this.mChargeConsumed < mFusionPoint) {
-				Logger.INFO("Recipe Tick 1.2 - Cannot Ignite Fusion, Charge too low.");
+				Logger.MACHINE_INFO("Recipe Tick 1.2 - Cannot Ignite Fusion, Charge too low.");
 				this.mCharging = true;
 				this.mCanProcessRecipe = false;
 				if (this.getBaseMetaTileEntity().decreaseStoredEnergyUnits((mFusionPoint / 100), false)) {
-					Logger.INFO("Recipe Tick 1.3 - Charging Internal storage. " + (mFusionPoint / 100) + "/"
+					Logger.MACHINE_INFO("Recipe Tick 1.3 - Charging Internal storage. " + (mFusionPoint / 100) + "/"
 							+ mFusionPoint);
 					mChargeConsumed += (mFusionPoint / 100);
 				}
@@ -152,13 +152,13 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux
 			}
 		}
 		else {
-			Logger.INFO("Recipe Tick 1.1 - Try to Process Recipe.");
+			Logger.MACHINE_INFO("Recipe Tick 1.1 - Try to Process Recipe.");
 			if (checkRecipeMulti()) {
-				Logger.INFO("Recipe Tick 1.2 - Process Recipe was Successful.");
+				Logger.MACHINE_INFO("Recipe Tick 1.2 - Process Recipe was Successful.");
 				return 2;
 			}
 		}
-		Logger.INFO("Recipe Tick 2. - Process Recipe failed.");
+		Logger.MACHINE_INFO("Recipe Tick 2. - Process Recipe failed.");
 		return 0;
 	}
 
@@ -198,7 +198,7 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux
 			
 			if ((tRecipe == null && !mRunningOnLoad) || (tRecipe != null && maxEUStore() < tRecipe.mSpecialValue)) {
 				this.mLastRecipe = null;
-				Logger.INFO("Just plain bad.");
+				Logger.MACHINE_INFO("Just plain bad.");
 				return false;
 			}
 			if (mRunningOnLoad || tRecipe.isRecipeInputEqual(true, tFluids, new ItemStack[] {})) {
@@ -399,38 +399,38 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux
 	public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
 		// super.onPostTick(aBaseMetaTileEntity, aTick);
 		if (aBaseMetaTileEntity.isServerSide()) {
-			// Logger.INFO("1");
+			// Logger.MACHINE_INFO("1");
 			if (mEfficiency < 0)
 				mEfficiency = 0;
 			if (mRunningOnLoad) {
-				Logger.INFO("2");
+				Logger.MACHINE_INFO("2");
 				this.mEUStore = (int) aBaseMetaTileEntity.getStoredEU();
 				checkRecipeMulti();
 			}
 			if (--mUpdate == 0 || --mStartUpCheck == 0) {
-				Logger.INFO("3");
+				Logger.MACHINE_INFO("3");
 				mMachine = true;
 			}
 			if (mStartUpCheck < 0) {
-				//Logger.INFO("4");
+				//Logger.MACHINE_INFO("4");
 				if (mMachine) {
-					//Logger.INFO("5");
+					//Logger.MACHINE_INFO("5");
 
 					if (aBaseMetaTileEntity.getStoredEU() + (2048 * tierOverclock()) < maxEUStore()) {
 						if (aBaseMetaTileEntity.increaseStoredEnergyUnits(2048 * tierOverclock(), true)) {
-							//Logger.INFO("5.5 A");							
+							//Logger.MACHINE_INFO("5.5 A");							
 						}
 						else {
-							//Logger.INFO("5.5 B");							
+							//Logger.MACHINE_INFO("5.5 B");							
 						}
 					}
 					if (this.mEUStore <= 0 && mMaxProgresstime > 0) {
-						Logger.INFO("6");
+						Logger.MACHINE_INFO("6");
 						stopMachine();
 						this.mLastRecipe = null;
 					}
 					if (mMaxProgresstime > 0) {
-						Logger.INFO("7");
+						Logger.MACHINE_INFO("7");
 						this.getBaseMetaTileEntity().decreaseStoredEnergyUnits(mEUt, true);
 						if (mMaxProgresstime > 0 && ++mProgresstime >= mMaxProgresstime) {
 							if (mOutputFluids != null)
@@ -450,18 +450,18 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux
 						}
 					}
 					else {
-						//Logger.INFO("8");
+						//Logger.MACHINE_INFO("8");
 						this.mEUStore = (int) aBaseMetaTileEntity.getStoredEU();
 						if (aTick % 100 == 0 || aBaseMetaTileEntity.hasWorkJustBeenEnabled()
 								|| aBaseMetaTileEntity.hasInventoryBeenModified()) {
-							Logger.INFO("9");
+							Logger.MACHINE_INFO("9");
 							// turnCasingActive(mMaxProgresstime > 0);
 							if (aBaseMetaTileEntity.isAllowedToWork()) {
-								Logger.INFO("10");
+								Logger.MACHINE_INFO("10");
 								if (checkRecipeMulti()) {
-									Logger.INFO("11");
+									Logger.MACHINE_INFO("11");
 									if (this.mEUStore < this.mLastRecipe.mSpecialValue) {
-										Logger.INFO("12");
+										Logger.MACHINE_INFO("12");
 										mMaxProgresstime = 0;
 										// turnCasingActive(false);
 									}
@@ -475,12 +475,12 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux
 				}
 				else {
 					// turnCasingActive(false);
-					Logger.INFO("Bad");
+					Logger.MACHINE_INFO("Bad");
 					this.mLastRecipe = null;
 					stopMachine();
 				}
 			}
-			Logger.INFO("Good | "+mMaxProgresstime);
+			Logger.MACHINE_INFO("Good | "+mMaxProgresstime);
 			aBaseMetaTileEntity.setActive(mMaxProgresstime > 0);
 		}
 	}
@@ -491,14 +491,14 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux
 				if (!drainEnergyInput(((long) -mEUt * 10000) / Math.max(1000, mEfficiency))) {
 					this.mLastRecipe = null;
 					stopMachine();
-					Logger.INFO("a1");
+					Logger.MACHINE_INFO("a1");
 					return false;
 				}
 			}
 			if (this.mEUStore <= 0) {
 				this.mLastRecipe = null;
 				stopMachine();
-				Logger.INFO("a2");
+				Logger.MACHINE_INFO("a2");
 				return false;
 			}
 		}