Merge pull request #68 from GTNewHorizons/Multi-fix

Multi fix

4 files changed, 47 insertions, 149 deletions

diff --git a/src/Java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java b/src/Java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java
index bd8159eb01..2b7b98640e 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java
@@ -42,7 +42,7 @@ public class ItemBasicScrubberTurbine extends Item {
 
 	@Override
 	public void getSubItems(Item item, CreativeTabs tab, List list) {
-		for (int i = 0; i < 2; i ++) {
+		for (int i = 0; i < 3; i ++) {
 			list.add(new ItemStack(item, 1, i));
 		}
 	}
@@ -69,6 +69,9 @@ public class ItemBasicScrubberTurbine extends Item {
 		if (meta == 1){
 			HEX_OxFFFFFF = Utils.rgbtoHexValue(255,128,0);
 		}
+		if (meta == 2){
+			HEX_OxFFFFFF = Utils.rgbtoHexValue(128,128,128);
+		}
 		return HEX_OxFFFFFF;
 	}
 	
@@ -111,10 +114,13 @@ public class ItemBasicScrubberTurbine extends Item {
 		if (aStack != null) {
 			int aMeta = aStack.getItemDamage();
 			if (aMeta == 0) {
-				return 2500;
+				return 2000;
 			}
 			if (aMeta == 1) {
-				return 5000;
+				return 4000;
+			}
+			if (aMeta == 2) {
+				return 6000;
 			}
 		}
 		return 0;		
diff --git a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
index 0b93e7dd9c..19e8499f02 100644
--- a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
+++ b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
@@ -134,7 +134,7 @@ public final class MISC_MATERIALS {
 					new MaterialStack(ORES.GREENOCKITE, 1),
 					new MaterialStack(ORES.LANTHANITE_CE, 1),					
 					new MaterialStack(ORES.AGARDITE_CD, 1),					
-					new MaterialStack(ORES.XENOTIME, 1),
+					new MaterialStack(ORES.YTTRIALITE, 1),
 					new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.NetherQuartz), 1),
 					new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Galena), 1),
 					new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Chalcopyrite), 1),
@@ -182,7 +182,7 @@ public final class MISC_MATERIALS {
 					new MaterialStack(ORES.LAUTARITE, 1),
 					new MaterialStack(ORES.DEMICHELEITE_BR, 1),					
 					new MaterialStack(ORES.ALBURNITE, 1),
-					new MaterialStack(ORES.KASHINITE, 1),
+					new MaterialStack(ORES.SAMARSKITE_Y, 1),
 					new MaterialStack(ORES.AGARDITE_LA, 1),
 			});
 
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index 08d8dda039..1c95467770 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -194,6 +194,12 @@ public class RECIPES_General {
 					"stickBronze", "plateBronze", CI.craftingToolHammer_Hard, 
 					ItemUtils.simpleMetaStack(ModItems.itemBasicTurbine, 1, 1)
 					);
+			RecipeUtils.addShapedRecipe(
+					CI.craftingToolFile, "plateSteel", "stickSteel", 
+					"plateSteel", "ringSteel", "plateSteel", 
+					"stickSteel", "plateSteel", CI.craftingToolHammer_Hard, 
+					ItemUtils.simpleMetaStack(ModItems.itemBasicTurbine, 2, 1)
+					);
 		}
 
 		if (Meta_GT_Proxy.sDoesVolumetricFlaskExist) {
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
index 2ae2a9f1de..242a63c712 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
@@ -2,17 +2,13 @@ package gtPlusPlus.core.util.minecraft.gregtech;
 
 import static gtPlusPlus.core.lib.CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
 import org.apache.commons.lang3.ArrayUtils;
 
 import gregtech.GT_Mod;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords;
-import gregtech.common.GT_Proxy;
+import gregtech.common.GT_Pollution;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.item.base.cell.BaseItemCell;
@@ -21,7 +17,6 @@ import gtPlusPlus.core.material.MISC_MATERIALS;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraftforge.fluids.FluidStack;
@@ -30,12 +25,6 @@ public class PollutionUtils {
 
 	private static boolean mIsPollutionEnabled = true;
 
-	private static Method mAddPollution;
-	private static Method mAddPollution2;
-
-	private static Method mGetPollution;
-	private static Method mGetPollution2;
-
 	public static AutoMap<FluidStack> mPollutionFluidStacks = new AutoMap<FluidStack>();
 
 	static {
@@ -45,85 +34,37 @@ public class PollutionUtils {
 			mIsPollutionEnabled = false;
 		}
 	}
-	
+
 	public static boolean isPollutionEnabled() {
 		return mIsPollutionEnabled;
 	}
 
-	public static boolean mPollution() {
-		try {
-			GT_Proxy GT_Pollution = GT_Mod.gregtechproxy;
-			if (GT_Pollution != null) {
-				Field mPollution = ReflectionUtils.getField(GT_Pollution.getClass(), "mPollution");
-				if (mPollution != null) {
-					return mPollution.getBoolean(GT_Pollution);
-				}
-			}
-		} catch (SecurityException | IllegalArgumentException | IllegalAccessException e) {
-		}
-		return false;
+	private static boolean mPollution() {
+		return GT_Mod.gregtechproxy.mPollution;
 	}
 
 	public static boolean addPollution(IGregTechTileEntity te, int pollutionValue) {
-		if (mIsPollutionEnabled)
-			try {
-				if (te == null) {
-					return false;
-				}
-				if (mAddPollution != null) {
-					mAddPollution.invoke(null, te, pollutionValue);
-				}
-				Class<?> GT_Pollution = ReflectionUtils.getClass("gregtech.common.GT_Pollution");
-				if (GT_Pollution != null) {
-					Method addPollution = ReflectionUtils.getMethod(GT_Pollution, "addPollution", IGregTechTileEntity.class, int.class);
-					if (addPollution != null) {
-						mAddPollution = addPollution;
-						addPollution.invoke(null, te, pollutionValue);
-						return true;
-					}
-				}
-			} catch (SecurityException | IllegalAccessException
-					| IllegalArgumentException | InvocationTargetException e) {
-			}
+		if (mIsPollutionEnabled) {
+			GT_Pollution.addPollution(te, pollutionValue);
+			return true;
+		}
 		return false;
 	}
 
 	public static boolean addPollution(IHasWorldObjectAndCoords aTileOfSomeSort, int pollutionValue) {
-		if (mIsPollutionEnabled)
-			try {
-				if (aTileOfSomeSort == null) {
-					return false;
-				}
-				IHasWorldObjectAndCoords j = (IHasWorldObjectAndCoords) aTileOfSomeSort;
-				Chunk c = j.getWorld().getChunkFromBlockCoords(j.getXCoord(), j.getZCoord());
-				return addPollution(c, pollutionValue);
-			} catch (SecurityException | IllegalArgumentException e) {
-			}
+		if (mIsPollutionEnabled) {
+			IHasWorldObjectAndCoords j = (IHasWorldObjectAndCoords) aTileOfSomeSort;
+			Chunk c = j.getWorld().getChunkFromBlockCoords(j.getXCoord(), j.getZCoord());
+			return addPollution(c, pollutionValue);
+		}
 		return false;
 	}
 
 	public static boolean addPollution(Chunk aChunk, int pollutionValue) {
-		if (mIsPollutionEnabled)
-			try {
-				if (aChunk == null) {
-					return false;
-				}
-				if (mAddPollution2 != null) {
-					mAddPollution2.invoke(null, aChunk, pollutionValue);
-					return true;
-				}
-				Class<?> GT_Pollution = ReflectionUtils.getClass("gregtech.common.GT_Pollution");
-				if (GT_Pollution != null) {
-					Method addPollution = ReflectionUtils.getMethod(GT_Pollution, "addPollution", Chunk.class, int.class);
-					if (addPollution != null) {
-						mAddPollution2 = addPollution;
-						mAddPollution2.invoke(null, aChunk, pollutionValue);
-						return true;
-					}
-				}
-			} catch (SecurityException | IllegalAccessException
-					| IllegalArgumentException | InvocationTargetException e) {
-			}
+		if (mIsPollutionEnabled) {
+			GT_Pollution.addPollution(aChunk, pollutionValue);
+			return true;
+		}
 		return false;
 	}
 
@@ -155,85 +96,30 @@ public class PollutionUtils {
 		return nullifyPollution(c);
 	}
 
-	public static boolean nullifyPollution(Chunk aChunk) {		
-		try {
+	public static boolean nullifyPollution(Chunk aChunk) {
+		if (mIsPollutionEnabled) {
 			if (aChunk == null) {
 				return false;
 			}
-			long getCurrentPollution = getPollution(aChunk);
+			int getCurrentPollution = getPollution(aChunk);
 			if (getCurrentPollution <= 0) {
 				return false;
 			}
 			else {
-				if (mAddPollution2 != null) {
-					mAddPollution2.invoke(null, aChunk, -getCurrentPollution);
-					return true;
-				}
-				else {
-					Class<?> GT_Pollution = ReflectionUtils.getClass("gregtech.common.GT_Pollution");
-					if (GT_Pollution != null) {
-						Method addPollution = ReflectionUtils.getMethod(GT_Pollution, "addPollution", Chunk.class, int.class);
-						if (addPollution != null) {
-							mAddPollution2 = addPollution;
-							mAddPollution2.invoke(null, aChunk, 0);
-							return true;
-						}
-					}
-				}				
+				return removePollution(aChunk, getCurrentPollution);
 			}
-			
-		} catch (SecurityException | IllegalAccessException
-				| IllegalArgumentException | InvocationTargetException e) {
-		}		
+		}
 		return false;
 	}
 
 	public static int getPollution(IGregTechTileEntity te) {
-		if (MAIN_GREGTECH_5U_EXPERIMENTAL_FORK)
-			try {
-				if (te == null) {
-					return 0;
-				}
-				if (mGetPollution != null) {
-					mGetPollution.invoke(null, te);
-				}
-				Class<?> GT_Pollution = ReflectionUtils.getClass("gregtech.common.GT_Pollution");
-				if (GT_Pollution != null) {
-					Method addPollution = ReflectionUtils.getMethod(GT_Pollution, "getPollution", IGregTechTileEntity.class);
-					if (addPollution != null) {
-						mGetPollution = addPollution;
-						return (int) addPollution.invoke(null, te);
-					}
-				}
-			} catch (SecurityException | IllegalAccessException
-					| IllegalArgumentException | InvocationTargetException e) {
-			}
-		return 0;
+		return GT_Pollution.getPollution(te);
 	}
 
 	public static int getPollution(Chunk te) {
-		if (MAIN_GREGTECH_5U_EXPERIMENTAL_FORK)
-			try {
-				if (te == null) {
-					return 0;
-				}
-				if (mGetPollution2 != null) {
-					mGetPollution2.invoke(null, te);
-				}
-				Class<?> GT_Pollution = ReflectionUtils.getClass("gregtech.common.GT_Pollution");
-				if (GT_Pollution != null) {
-					Method addPollution = ReflectionUtils.getMethod(GT_Pollution, "getPollution", Chunk.class);
-					if (addPollution != null) {
-						mGetPollution2 = addPollution;
-						return (int) addPollution.invoke(null, te);
-					}
-				}
-			} catch (SecurityException | IllegalAccessException
-					| IllegalArgumentException | InvocationTargetException e) {
-			}
-		return 0;
+		return GT_Pollution.getPollution(te);
 	}
-	
+
 	public static boolean setPollutionFluids() {		
 		if (mPollutionFluidStacks.isEmpty()) {
 			FluidStack CD, CM, SD;
@@ -258,7 +144,7 @@ public class PollutionUtils {
 				else {
 					MaterialGenerator.generate(MISC_MATERIALS.CARBON_DIOXIDE, false, false);
 				}
-				
+
 				if (CM != null) {
 					Logger.INFO("[PollutionCompat] Found carbon monoxide fluid, registering it.");
 					PollutionUtils.mPollutionFluidStacks.put(CM);
@@ -276,7 +162,7 @@ public class PollutionUtils {
 				else {
 					MaterialGenerator.generate(MISC_MATERIALS.CARBON_MONOXIDE, false, false);
 				}
-				
+
 				if (SD != null) {
 					Logger.INFO("[PollutionCompat] Found sulfur dioxide fluid, registering it.");
 					PollutionUtils.mPollutionFluidStacks.put(SD);
@@ -297,9 +183,9 @@ public class PollutionUtils {
 				return true;
 			}
 		}
-		
-		
-		
+
+
+
 	}
 
 }