+ Added a config for Pollution related devices.

+ Added a recipe for the basic air filter.

5 files changed, 59 insertions, 50 deletions

diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index 83fcb2be16..d8c1d38498 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -117,6 +117,8 @@ public class GTplusplus implements ActionListener {
 				"gregtech", true, "Tesseracts for wireless item/fluid movement.");
 		CORE.configSwitches.enableMachine_SimpleWasher = config.getBoolean("enableMachineSimpleWasher",
 				"gregtech", true, "Very basic automated cauldron for dust washing.");
+		CORE.configSwitches.enableMachine_Pollution = config.getBoolean("enableMachinePollution",
+				"gregtech", true, "Pollution Detector & Scrubbers.");
 
 		// Multi machines
 		CORE.configSwitches.enableMultiblock_AlloyBlastSmelter = config.getBoolean("enableMultiblockAlloyBlastSmelter",
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index 71056adaff..ffe8ef6a43 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -126,6 +126,7 @@ public class CORE {
 		public static boolean enableMachine_WorldAccelerators = true;
 		public static boolean enableMachine_Tesseracts = true;
 		public static boolean enableMachine_SimpleWasher = true;
+		public static boolean enableMachine_Pollution = true;
 		public static boolean enableCustom_Pipes = true;
 		public static boolean enableCustom_Cables = true;
 
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index b834755998..de6feb8950 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -1,6 +1,7 @@
 package gtPlusPlus.core.recipe;
 
 import gregtech.api.enums.*;
+import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.recipe.common.CI;
@@ -768,6 +769,14 @@ public class RECIPES_Machines {
 						plateWrought, CI.machineCasing_ULV, plateWrought,
 						GregtechItemList.SimpleDustWasher.get(1));
 			}
+			
+			if (CORE.configSwitches.enableMachine_Pollution){
+				RecipeUtils.addShapedGregtechRecipe(
+						"plateCarbon", "plateCarbon", "plateCarbon",
+						"dustCarbon", "dustCarbon", "dustCarbon",
+						"plateCarbon", "plateCarbon", "plateCarbon",
+						ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1));
+			}
 
 	
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java
index 3e9f0a7361..05fdfdd95f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java
@@ -3,9 +3,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaAtmosphericReconditioner;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaPollutionCreator;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaPollutionDetector;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.*;
 
 public class GregtechPollutionDevices {
 
@@ -19,36 +17,35 @@ public class GregtechPollutionDevices {
 	}
 
 	private static void run1() {
-		// 759
-		GregtechItemList.Pollution_Detector.set(
-				new GregtechMetaPollutionDetector(756, "pollutiondetector.01.tier.single", "Pollution Detection Device",
-						0, "Tells you if you're living in Gwalior yet.", 0).getStackForm(1L));
-		GregtechItemList.Pollution_Creator.set(new GregtechMetaPollutionCreator(951, "pollutioncreator.01.tier.single",
-				"Smog Device", 4, "Polluting the skies.", 0).getStackForm(1L));
+		if (CORE.configSwitches.enableMachine_Pollution){
+			// 759
+			GregtechItemList.Pollution_Detector.set(
+					new GregtechMetaPollutionDetector(756, "pollutiondetector.01.tier.single", "Pollution Detection Device",
+							0, "Tells you if you're living in Gwalior yet.", 0).getStackForm(1L));
+			GregtechItemList.Pollution_Creator.set(new GregtechMetaPollutionCreator(951, "pollutioncreator.01.tier.single",
+					"Smog Device", 4, "Polluting the skies.", 0).getStackForm(1L));
 
-		GregtechItemList.Pollution_Cleaner_ULV.set(new GregtechMetaAtmosphericReconditioner(757,
-				"pollutioncleaner.01.tier.single", "Pollution Scrubber", 0).getStackForm(1L));
-		GregtechItemList.Pollution_Cleaner_LV.set(new GregtechMetaAtmosphericReconditioner(758,
-				"pollutioncleaner.02.tier.single", "Upgraded Pollution Scrubber", 1).getStackForm(1L));
-		GregtechItemList.Pollution_Cleaner_MV.set(new GregtechMetaAtmosphericReconditioner(759,
-				"pollutioncleaner.03.tier.single", "Advanced Pollution Scrubber", 2).getStackForm(1L));
-		GregtechItemList.Pollution_Cleaner_HV.set(new GregtechMetaAtmosphericReconditioner(760,
-				"pollutioncleaner.04.tier.single", "Precision Pollution Scrubber", 3).getStackForm(1L));
-		GregtechItemList.Pollution_Cleaner_EV
-				.set(new GregtechMetaAtmosphericReconditioner(761, "pollutioncleaner.05.tier.single", "Air Recycler", 4)
-						.getStackForm(1L));
-		GregtechItemList.Pollution_Cleaner_IV.set(new GregtechMetaAtmosphericReconditioner(762,
-				"pollutioncleaner.06.tier.single", "Upgraded Air Recycler", 5).getStackForm(1L));
-		GregtechItemList.Pollution_Cleaner_LuV.set(new GregtechMetaAtmosphericReconditioner(763,
-				"pollutioncleaner.07.tier.single", "Advanced Air Recycler", 6).getStackForm(1L));
-		GregtechItemList.Pollution_Cleaner_ZPM.set(new GregtechMetaAtmosphericReconditioner(764,
-				"pollutioncleaner.08.tier.single", "Precision Air Recycler", 7).getStackForm(1L));
-		GregtechItemList.Pollution_Cleaner_UV.set(new GregtechMetaAtmosphericReconditioner(765,
-				"pollutioncleaner.09.tier.single", "Atmospheric Cleaner", 8).getStackForm(1L));
-		GregtechItemList.Pollution_Cleaner_MAX.set(new GregtechMetaAtmosphericReconditioner(766,
-				"pollutioncleaner.10.tier.single", "Biosphere Cleanser", 9).getStackForm(1L));
-
-		// 767 is free but not 768
+			GregtechItemList.Pollution_Cleaner_ULV.set(new GregtechMetaAtmosphericReconditioner(757,
+					"pollutioncleaner.01.tier.single", "Pollution Scrubber", 0).getStackForm(1L));
+			GregtechItemList.Pollution_Cleaner_LV.set(new GregtechMetaAtmosphericReconditioner(758,
+					"pollutioncleaner.02.tier.single", "Upgraded Pollution Scrubber", 1).getStackForm(1L));
+			GregtechItemList.Pollution_Cleaner_MV.set(new GregtechMetaAtmosphericReconditioner(759,
+					"pollutioncleaner.03.tier.single", "Advanced Pollution Scrubber", 2).getStackForm(1L));
+			GregtechItemList.Pollution_Cleaner_HV.set(new GregtechMetaAtmosphericReconditioner(760,
+					"pollutioncleaner.04.tier.single", "Precision Pollution Scrubber", 3).getStackForm(1L));
+			GregtechItemList.Pollution_Cleaner_EV.set(new GregtechMetaAtmosphericReconditioner(761,
+					"pollutioncleaner.05.tier.single", "Air Recycler", 4).getStackForm(1L));
+			GregtechItemList.Pollution_Cleaner_IV.set(new GregtechMetaAtmosphericReconditioner(762,
+					"pollutioncleaner.06.tier.single", "Upgraded Air Recycler", 5).getStackForm(1L));
+			GregtechItemList.Pollution_Cleaner_LuV.set(new GregtechMetaAtmosphericReconditioner(763,
+					"pollutioncleaner.07.tier.single", "Advanced Air Recycler", 6).getStackForm(1L));
+			GregtechItemList.Pollution_Cleaner_ZPM.set(new GregtechMetaAtmosphericReconditioner(764,
+					"pollutioncleaner.08.tier.single", "Precision Air Recycler", 7).getStackForm(1L));
+			GregtechItemList.Pollution_Cleaner_UV.set(new GregtechMetaAtmosphericReconditioner(765,
+					"pollutioncleaner.09.tier.single", "Atmospheric Cleaner", 8).getStackForm(1L));
+			GregtechItemList.Pollution_Cleaner_MAX.set(new GregtechMetaAtmosphericReconditioner(766,
+					"pollutioncleaner.10.tier.single", "Biosphere Cleanser", 9).getStackForm(1L));
+		}
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java
index d911b2eb7d..87da39b54b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java
@@ -4,10 +4,8 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.Recipe_GT;
-import gtPlusPlus.core.recipe.common.CI;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.fluid.FluidUtils;
-import gtPlusPlus.core.util.item.ItemUtils;
-import gtPlusPlus.core.util.recipe.RecipeUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntity_BasicWasher;
 import net.minecraft.item.ItemStack;
@@ -16,24 +14,26 @@ import net.minecraftforge.fluids.FluidStack;
 public class GregtechSimpleWasher {
 
 	public static void run() {
+		if (CORE.configSwitches.enableMachine_SimpleWasher){
 
-		// Generate Recipe Map for the Dust Washer.
-		ItemStack dustClean;
-		ItemStack dustDirty;
-		for (Materials v : Materials.values()) {
-			dustClean = GT_OreDictUnificator.get(OrePrefixes.dust, v, 1L);
-			dustDirty = GT_OreDictUnificator.get(OrePrefixes.dustImpure, v, 1L);
-			if (dustClean != null && dustDirty != null) {
-				Recipe_GT.Gregtech_Recipe_Map.sSimpleWasherRecipes.addRecipe(false, new ItemStack[] { dustDirty },
-						new ItemStack[] { dustClean }, null,
-						new FluidStack[] { FluidUtils.getFluidStack("water", 100) }, null, 20, 8, 0);
+			// Generate Recipe Map for the Dust Washer.
+			ItemStack dustClean;
+			ItemStack dustDirty;
+			for (Materials v : Materials.values()) {
+				dustClean = GT_OreDictUnificator.get(OrePrefixes.dust, v, 1L);
+				dustDirty = GT_OreDictUnificator.get(OrePrefixes.dustImpure, v, 1L);
+				if (dustClean != null && dustDirty != null) {
+					Recipe_GT.Gregtech_Recipe_Map.sSimpleWasherRecipes.addRecipe(false, new ItemStack[] { dustDirty },
+							new ItemStack[] { dustClean }, null,
+							new FluidStack[] { FluidUtils.getFluidStack("water", 100) }, null, 20, 8, 0);
+				}
 			}
-		}
 
-		// Register the Simple Washer Entity.
-		GregtechItemList.SimpleDustWasher
-				.set(new GregtechMetaTileEntity_BasicWasher(767, "simplewasher.01.tier.00", "Simple Washer", 0)
-						.getStackForm(1L));
+			// Register the Simple Washer Entity.
+			GregtechItemList.SimpleDustWasher
+			.set(new GregtechMetaTileEntity_BasicWasher(767, "simplewasher.01.tier.00", "Simple Washer", 0)
+					.getStackForm(1L));
 
+		}
 	}
 }