aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Java/gtPlusPlus/GTplusplus.java2
-rw-r--r--src/Java/gtPlusPlus/core/lib/CORE.java1
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java32
3 files changed, 21 insertions, 14 deletions
diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index dfe87b7808..83fcb2be16 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -115,6 +115,8 @@ public class GTplusplus implements ActionListener {
"gregtech", true, "These allow boosting Block/TileEntity Tick times [OP].");
CORE.configSwitches.enableMachine_Tesseracts = config.getBoolean("enableMachineTesseracts",
"gregtech", true, "Tesseracts for wireless item/fluid movement.");
+ CORE.configSwitches.enableMachine_SimpleWasher = config.getBoolean("enableMachineSimpleWasher",
+ "gregtech", true, "Very basic automated cauldron for dust washing.");
// 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 847a06bf33..71056adaff 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -125,6 +125,7 @@ public class CORE {
public static boolean enableMachine_GeothermalEngines = true;
public static boolean enableMachine_WorldAccelerators = true;
public static boolean enableMachine_Tesseracts = true;
+ public static boolean enableMachine_SimpleWasher = 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 e90193b496..b834755998 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -751,21 +751,25 @@ public class RECIPES_Machines {
"plateTitanium",CI.machineHull_EV,"plateTitanium",
RECIPE_TesseractTerminal);
}
-
- ItemStack plateWrought = ItemUtils.getItemStackOfAmountFromOreDict("plateWroughtIron", 1);
- ItemStack washerPipe;
- if (CORE.configSwitches.enableCustom_Pipes){
- washerPipe = ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeClay", 1);
- }
- else {
- washerPipe = ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeCopper", 1);
+
+ if (CORE.configSwitches.enableMachine_SimpleWasher){
+ ItemStack plateWrought = ItemUtils.getItemStackOfAmountFromOreDict("plateWroughtIron", 1);
+ ItemStack washerPipe;
+ if (CORE.configSwitches.enableCustom_Pipes){
+ washerPipe = ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeClay", 1);
+ }
+ else {
+ washerPipe = ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeCopper", 1);
+ }
+ //Add Recipe
+ RecipeUtils.addShapedGregtechRecipe(
+ plateWrought, CI.electricPump_LV, plateWrought,
+ plateWrought, washerPipe, plateWrought,
+ plateWrought, CI.machineCasing_ULV, plateWrought,
+ GregtechItemList.SimpleDustWasher.get(1));
}
- //Add Recipe
- RecipeUtils.addShapedGregtechRecipe(
- plateWrought, CI.electricPump_LV, plateWrought,
- plateWrought, washerPipe, plateWrought,
- plateWrought, CI.machineCasing_ULV, plateWrought,
- GregtechItemList.SimpleDustWasher.get(1));
+
+
}