Cleanup basic machines and textures (#779)

* Cleanup dehydrator

* Cleanup reactor processing unit

* Cleanup cold trap

* Cleanup simple washer

* Cleanup unused textures

* updateBuildScript

3 files changed, 278 insertions, 146 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
index 54d94407db..1fd4e17b03 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
@@ -1,23 +1,27 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
+import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT;
+import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL;
+import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM;
 import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes;
 import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
 
 import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.TierEU;
-import gregtech.api.util.GT_ModHandler;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects;
+import gregtech.api.util.GTPP_Recipe;
+import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.ALLOY;
-import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Dehydrator;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialDehydrator;
 
 public class GregtechDehydrator {
@@ -30,169 +34,162 @@ public class GregtechDehydrator {
     }
 
     private static void run1() {
+        ItemStack coilT1 = new ItemStack(ModItems.itemDehydratorCoil, 1, 0);
+        ItemStack coilT2 = new ItemStack(ModItems.itemDehydratorCoil, 1, 1);
+        ItemStack coilT3 = new ItemStack(ModItems.itemDehydratorCoil, 1, 2);
+        ItemStack coilT4 = new ItemStack(ModItems.itemDehydratorCoil, 1, 3);
 
-        /*
-         * public GT_MetaTileEntity_BasicMachine_GT_Recipe( int aID, String aName, String aNameRegional, int aTier,
-         * String aDescription, GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, int
-         * aGUIParameterA, int aGUIParameterB, String aGUIName, String aSound, boolean aSharedTank, boolean
-         * aRequiresFluidForFiltering, int aSpecialEffect, String aOverlays, Object[] aRecipe) {
-         */
+        // Make some coils by wrapping wire around a spool.
+        GT_Values.RA.stdBuilder()
+                .itemInputs(
+                        new ItemStack(ModItems.itemDehydratorCoilWire, 4, 0),
+                        GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Bronze, 1))
+                .itemOutputs(coilT1).duration(8 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes);
+        GT_Values.RA.stdBuilder()
+                .itemInputs(
+                        new ItemStack(ModItems.itemDehydratorCoilWire, 4, 1),
+                        GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Steel, 1))
+                .itemOutputs(coilT2).duration(8 * SECONDS).eut(TierEU.RECIPE_HV / 2).addTo(sAssemblerRecipes);
+        GT_Values.RA.stdBuilder()
+                .itemInputs(
+                        new ItemStack(ModItems.itemDehydratorCoilWire, 4, 2),
+                        GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 1))
+                .itemOutputs(coilT3).duration(8 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes);
+        GT_Values.RA.stdBuilder()
+                .itemInputs(
+                        new ItemStack(ModItems.itemDehydratorCoilWire, 4, 3),
+                        GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Titanium, 1))
+                .itemOutputs(coilT4).duration(8 * SECONDS).eut(TierEU.RECIPE_EV / 2).addTo(sAssemblerRecipes);
 
         // Basic
         GregtechItemList.GT_Dehydrator_MV.set(
-                new GT_MetaTileEntity_Dehydrator(
+                new GT_MetaTileEntity_BasicMachine_GT_Recipe(
                         911,
                         "machine.dehydrator.tier.00",
                         "Basic Dehydrator I",
                         2,
-                        "This dehydrates your Grapes into Raisins.",
-                        16000).getStackForm(1L));
+                        new String[] { "This dehydrates your Grapes into Raisins.", CORE.GT_Tooltip.get() },
+                        GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes,
+                        2,
+                        9,
+                        true,
+                        SoundResource.NONE,
+                        false,
+                        false,
+                        SpecialEffects.NONE,
+                        "DEHYDRATOR",
+                        new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E',
+                                OrePrefixes.wireFine.get(Materials.RedAlloy), 'C', CIRCUIT, 'W',
+                                OrePrefixes.cableGt04.get(Materials.Copper), 'G',
+                                OrePrefixes.gearGt.get(Materials.Steel) }).getStackForm(1L));
 
         GregtechItemList.GT_Dehydrator_HV.set(
-                new GT_MetaTileEntity_Dehydrator(
+                new GT_MetaTileEntity_BasicMachine_GT_Recipe(
                         912,
                         "machine.dehydrator.tier.01",
                         "Basic Dehydrator II",
                         3,
-                        "This dehydrates your Grapes into Raisins.",
-                        32000).getStackForm(1L));
+                        new String[] { "This dehydrates your Grapes into Raisins.", CORE.GT_Tooltip.get() },
+                        GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes,
+                        2,
+                        9,
+                        true,
+                        SoundResource.NONE,
+                        false,
+                        false,
+                        SpecialEffects.NONE,
+                        "DEHYDRATOR",
+                        new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E',
+                                OrePrefixes.wireFine.get(Materials.Electrum), 'C', CIRCUIT, 'W',
+                                OrePrefixes.cableGt04.get(Materials.Silver), 'G', ALLOY.POTIN.getGear(1) })
+                                        .getStackForm(1L));
 
         // Chemical
-
         GregtechItemList.GT_Dehydrator_EV.set(
-                new GT_MetaTileEntity_Dehydrator(
+                new GT_MetaTileEntity_BasicMachine_GT_Recipe(
                         813,
                         "advancedmachine.dehydrator.tier.01",
                         "Chemical Dehydrator I",
                         4,
-                        "A hangover is the way your body reacts to dehydration.",
-                        48000).getStackForm(1L));
+                        new String[] { "A hangover is the way your body reacts to dehydration.",
+                                CORE.GT_Tooltip.get() },
+                        GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes,
+                        2,
+                        9,
+                        true,
+                        SoundResource.NONE,
+                        false,
+                        false,
+                        SpecialEffects.NONE,
+                        "DEHYDRATOR",
+                        new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', coilT1, 'C', CIRCUIT, 'W',
+                                OrePrefixes.cableGt04.get(Materials.Aluminium), 'G', ALLOY.TUMBAGA.getGear(1) })
+                                        .getStackForm(1L));
 
         GregtechItemList.GT_Dehydrator_IV.set(
-                new GT_MetaTileEntity_Dehydrator(
+                new GT_MetaTileEntity_BasicMachine_GT_Recipe(
                         814,
                         "advancedmachine.dehydrator.tier.02",
                         "Chemical Dehydrator II",
                         5,
-                        "A hangover is the way your body reacts to dehydration.",
-                        48000).getStackForm(1L));
+                        new String[] { "A hangover is the way your body reacts to dehydration.",
+                                CORE.GT_Tooltip.get() },
+                        GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes,
+                        2,
+                        9,
+                        true,
+                        SoundResource.NONE,
+                        false,
+                        false,
+                        SpecialEffects.NONE,
+                        "DEHYDRATOR",
+                        new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', coilT2, 'C', CIRCUIT, 'W',
+                                OrePrefixes.cableGt04.get(Materials.Tungsten), 'G', ALLOY.INCONEL_690.getGear(1) })
+                                        .getStackForm(1L));
 
         GregtechItemList.GT_Dehydrator_LuV.set(
-                new GT_MetaTileEntity_Dehydrator(
+                new GT_MetaTileEntity_BasicMachine_GT_Recipe(
                         815,
                         "advancedmachine.dehydrator.tier.03",
                         "Chemical Dehydrator III",
                         6,
-                        "You could probably make space icecream with this..",
-                        64000).getStackForm(1L));
+                        new String[] { "You could probably make space icecream with this..", CORE.GT_Tooltip.get() },
+                        GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes,
+                        2,
+                        9,
+                        true,
+                        SoundResource.NONE,
+                        false,
+                        false,
+                        SpecialEffects.NONE,
+                        "DEHYDRATOR",
+                        new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', coilT3, 'C', CIRCUIT, 'W',
+                                OrePrefixes.cableGt04.get(Materials.Naquadah), 'G', ALLOY.HASTELLOY_N.getGear(1) })
+                                        .getStackForm(1L));
 
         GregtechItemList.GT_Dehydrator_ZPM.set(
-                new GT_MetaTileEntity_Dehydrator(
+                new GT_MetaTileEntity_BasicMachine_GT_Recipe(
                         816,
                         "advancedmachine.dehydrator.tier.04",
                         "Chemical Dehydrator IV",
                         7,
-                        "You can definitely make space icecream with this..",
-                        64000).getStackForm(1L));
+                        new String[] { "You can definitely make space icecream with this..", CORE.GT_Tooltip.get() },
+                        GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes,
+                        2,
+                        9,
+                        true,
+                        SoundResource.NONE,
+                        false,
+                        false,
+                        SpecialEffects.NONE,
+                        "DEHYDRATOR",
+                        new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', coilT4, 'C', CIRCUIT, 'W',
+                                OrePrefixes.cableGt04.get(Materials.Osmium), 'G', ALLOY.ZERON_100.getGear(1) })
+                                        .getStackForm(1L));
 
         // Advanced
         GregtechItemList.Controller_Vacuum_Furnace.set(
                 new GregtechMetaTileEntity_IndustrialDehydrator(995, "multimachine.adv.vacuumfurnace", "Utupu-Tanuri")
                         .getStackForm(1L));
-
-        ItemStack coilWire1 = ItemUtils
-                .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire", "coilWire1", 0, 4);
-        ItemStack coilWire2 = ItemUtils
-                .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:1", "coilWire2", 1, 4);
-        ItemStack coilWire3 = ItemUtils
-                .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:2", "coilWire3", 2, 4);
-        ItemStack coilWire4 = ItemUtils
-                .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:3", "coilWire4", 3, 4);
-        ItemStack coilT1 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil", "coil1", 0, 1);
-        ItemStack coilT2 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil:1", "coil2", 1, 1);
-        ItemStack coilT3 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil:2", "coil3", 2, 1);
-        ItemStack coilT4 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil:3", "coil4", 3, 1);
-        ItemStack spoolT1 = ItemUtils.getItemStackOfAmountFromOreDict("pipeMediumBronze", 1);
-        ItemStack spoolT2 = ItemUtils.getItemStackOfAmountFromOreDict("pipeMediumSteel", 1);
-        ItemStack spoolT3 = ItemUtils.getItemStackOfAmountFromOreDict("pipeMediumStainlessSteel", 1);
-        ItemStack spoolT4 = ItemUtils.getItemStackOfAmountFromOreDict("pipeMediumTitanium", 1);
-
-        // Make some coils by wrapping wire around a spool.
-        GT_Values.RA.stdBuilder().itemInputs(coilWire1, spoolT1).itemOutputs(coilT1).duration(8 * SECONDS)
-                .eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes);
-        GT_Values.RA.stdBuilder().itemInputs(coilWire2, spoolT2).itemOutputs(coilT2).duration(8 * SECONDS)
-                .eut(TierEU.RECIPE_HV / 2).addTo(sAssemblerRecipes);
-        GT_Values.RA.stdBuilder().itemInputs(coilWire3, spoolT3).itemOutputs(coilT3).duration(8 * SECONDS)
-                .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes);
-        GT_Values.RA.stdBuilder().itemInputs(coilWire4, spoolT4).itemOutputs(coilT4).duration(8 * SECONDS)
-                .eut(TierEU.RECIPE_EV / 2).addTo(sAssemblerRecipes);
-
-        // Add recipes for the Dehydrators.
-
-        // Basic
-        GT_ModHandler.addCraftingRecipe(
-                GregtechItemList.GT_Dehydrator_MV.get(1L, new Object[0]),
-                GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                        | GT_ModHandler.RecipeBits.REVERSIBLE
-                        | GT_ModHandler.RecipeBits.BUFFERED,
-                new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('P'),
-                        ItemList.Robot_Arm_MV, Character.valueOf('E'), OrePrefixes.wireFine.get(Materials.RedAlloy),
-                        Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good), Character.valueOf('W'),
-                        OrePrefixes.cableGt04.get(Materials.Copper), Character.valueOf('G'),
-                        OrePrefixes.gearGt.get(Materials.Steel) });
-        GT_ModHandler.addCraftingRecipe(
-                GregtechItemList.GT_Dehydrator_HV.get(1L, new Object[0]),
-                GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                        | GT_ModHandler.RecipeBits.REVERSIBLE
-                        | GT_ModHandler.RecipeBits.BUFFERED,
-                new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('P'),
-                        ItemList.Robot_Arm_HV, Character.valueOf('E'), OrePrefixes.wireFine.get(Materials.Electrum),
-                        Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('W'),
-                        OrePrefixes.cableGt04.get(Materials.Silver), Character.valueOf('G'), ALLOY.POTIN.getGear(1) });
-
-        // Chemical
-        GT_ModHandler.addCraftingRecipe(
-                GregtechItemList.GT_Dehydrator_EV.get(1L, new Object[0]),
-                GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                        | GT_ModHandler.RecipeBits.REVERSIBLE
-                        | GT_ModHandler.RecipeBits.BUFFERED,
-                new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('P'),
-                        ItemList.Robot_Arm_EV, Character.valueOf('E'), coilT1, Character.valueOf('C'),
-                        OrePrefixes.circuit.get(Materials.Data), Character.valueOf('W'),
-                        OrePrefixes.cableGt04.get(Materials.Aluminium), Character.valueOf('G'),
-                        ALLOY.TUMBAGA.getGear(1) });
-
-        GT_ModHandler.addCraftingRecipe(
-                GregtechItemList.GT_Dehydrator_IV.get(1L, new Object[0]),
-                GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                        | GT_ModHandler.RecipeBits.REVERSIBLE
-                        | GT_ModHandler.RecipeBits.BUFFERED,
-                new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('P'),
-                        ItemList.Robot_Arm_IV, Character.valueOf('E'), coilT2, Character.valueOf('C'),
-                        OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('W'),
-                        OrePrefixes.cableGt04.get(Materials.Tungsten), Character.valueOf('G'),
-                        ALLOY.INCONEL_690.getGear(1) });
-
-        GT_ModHandler.addCraftingRecipe(
-                GregtechItemList.GT_Dehydrator_LuV.get(1L, new Object[0]),
-                GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                        | GT_ModHandler.RecipeBits.REVERSIBLE
-                        | GT_ModHandler.RecipeBits.BUFFERED,
-                new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('P'),
-                        CI.robotArm_LuV, Character.valueOf('E'), coilT3, Character.valueOf('C'),
-                        OrePrefixes.circuit.get(Materials.Master), Character.valueOf('W'),
-                        OrePrefixes.cableGt04.get(Materials.Naquadah), Character.valueOf('G'),
-                        ALLOY.HASTELLOY_N.getGear(1) });
-
-        GT_ModHandler.addCraftingRecipe(
-                GregtechItemList.GT_Dehydrator_ZPM.get(1L, new Object[0]),
-                GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                        | GT_ModHandler.RecipeBits.REVERSIBLE
-                        | GT_ModHandler.RecipeBits.BUFFERED,
-                new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_ZPM, Character.valueOf('P'),
-                        CI.robotArm_ZPM, Character.valueOf('E'), coilT4, Character.valueOf('C'),
-                        OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('W'),
-                        OrePrefixes.cableGt04.get(Materials.Osmium), Character.valueOf('G'),
-                        ALLOY.ZERON_100.getGear(1) });
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java
index df032a35a1..b16c4bcb34 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java
@@ -1,10 +1,12 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
+import gregtech.api.enums.SoundResource;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects;
+import gregtech.api.util.GTPP_Recipe;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntity_ReactorColdTrap;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntity_ReactorProcessingUnit;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_SpargeTower;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMTE_NuclearReactor;
 
@@ -24,18 +26,74 @@ public class GregtechLFTR {
                         .getStackForm(1L));
         // Reactor Processing Units
         GregtechItemList.ReactorProcessingUnit_IV.set(
-                new GregtechMetaTileEntity_ReactorProcessingUnit(31031, "rpu.tier.01", "Reactor Processing Unit I", 5)
-                        .getStackForm(1L));
+                new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+                        31031,
+                        "rpu.tier.01",
+                        "Reactor Processing Unit I",
+                        5,
+                        new String[] { "Processes Nuclear things", CORE.GT_Tooltip.get() },
+                        GTPP_Recipe.GTPP_Recipe_Map.sReactorProcessingUnitRecipes,
+                        2,
+                        9,
+                        true,
+                        SoundResource.NONE,
+                        false,
+                        false,
+                        SpecialEffects.NONE,
+                        "REACTOR_PROCESSING_UNIT",
+                        null).getStackForm(1L));
         GregtechItemList.ReactorProcessingUnit_ZPM.set(
-                new GregtechMetaTileEntity_ReactorProcessingUnit(31032, "rpu.tier.02", "Reactor Processing Unit II", 7)
-                        .getStackForm(1L));
+                new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+                        31032,
+                        "rpu.tier.02",
+                        "Reactor Processing Unit II",
+                        7,
+                        new String[] { "Processes Nuclear things", CORE.GT_Tooltip.get() },
+                        GTPP_Recipe.GTPP_Recipe_Map.sReactorProcessingUnitRecipes,
+                        2,
+                        9,
+                        true,
+                        SoundResource.NONE,
+                        false,
+                        false,
+                        SpecialEffects.NONE,
+                        "REACTOR_PROCESSING_UNIT",
+                        null).getStackForm(1L));
         // Cold Traps
         GregtechItemList.ColdTrap_IV.set(
-                new GregtechMetaTileEntity_ReactorColdTrap(31033, "coldtrap.tier.01", "Cold Trap I", 5)
-                        .getStackForm(1L));
+                new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+                        31033,
+                        "coldtrap.tier.01",
+                        "Cold Trap I",
+                        5,
+                        new String[] { "Just like the Arctic", "Does not require ice cubes", CORE.GT_Tooltip.get() },
+                        GTPP_Recipe.GTPP_Recipe_Map.sColdTrapRecipes,
+                        2,
+                        9,
+                        true,
+                        SoundResource.NONE,
+                        false,
+                        false,
+                        SpecialEffects.NONE,
+                        "COLD_TRAP",
+                        null).getStackForm(1L));
         GregtechItemList.ColdTrap_ZPM.set(
-                new GregtechMetaTileEntity_ReactorColdTrap(31034, "coldtrap.tier.02", "Cold Trap II", 7)
-                        .getStackForm(1L));
+                new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+                        31034,
+                        "coldtrap.tier.02",
+                        "Cold Trap II",
+                        7,
+                        new String[] { "Just like the Arctic", "Does not require ice cubes", CORE.GT_Tooltip.get() },
+                        GTPP_Recipe.GTPP_Recipe_Map.sColdTrapRecipes,
+                        2,
+                        9,
+                        true,
+                        SoundResource.NONE,
+                        false,
+                        false,
+                        SpecialEffects.NONE,
+                        "COLD_TRAP",
+                        null).getStackForm(1L));
         // Sparge Tower
         GregtechItemList.Controller_Sparge_Tower.set(
                 new GregtechMetaTileEntity_SpargeTower(31035, "sparge.controller.single", "Sparge Tower Controller")
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java
index ee4de6ae0b..d366482812 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java
@@ -7,12 +7,14 @@ import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
 
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.SoundResource;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects;
 import gregtech.api.util.GTPP_Recipe;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntity_BasicWasher;
 
 public class GregtechSimpleWasher {
 
@@ -22,22 +24,97 @@ public class GregtechSimpleWasher {
             generateDirtyCrushedRecipes();
             // Register the Simple Washer Entity.
             GregtechItemList.SimpleDustWasher_ULV.set(
-                    new GregtechMetaTileEntity_BasicWasher(767, "simplewasher.01.tier.01", "Simple Washer I", 0)
-                            .getStackForm(1L));
+                    new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+                            767,
+                            "simplewasher.01.tier.01",
+                            "Simple Washer I",
+                            0,
+                            new String[] { "It's like an automatic Cauldron for washing dusts.",
+                                    CORE.GT_Tooltip.get() },
+                            GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes,
+                            1,
+                            1,
+                            true,
+                            SoundResource.NONE,
+                            false,
+                            false,
+                            SpecialEffects.NONE,
+                            "SIMPLE_WASHER",
+                            null).getStackForm(1L));
 
             // People want them in higher tiers apparently
             GregtechItemList.SimpleDustWasher_MV.set(
-                    new GregtechMetaTileEntity_BasicWasher(31017, "simplewasher.01.tier.02", "Simple Washer II", 2)
-                            .getStackForm(1L));
+                    new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+                            31017,
+                            "simplewasher.01.tier.02",
+                            "Simple Washer II",
+                            2,
+                            new String[] { "It's like an automatic Cauldron for washing dusts.",
+                                    CORE.GT_Tooltip.get() },
+                            GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes,
+                            1,
+                            1,
+                            true,
+                            SoundResource.NONE,
+                            false,
+                            false,
+                            SpecialEffects.NONE,
+                            "SIMPLE_WASHER",
+                            null).getStackForm(1L));
             GregtechItemList.SimpleDustWasher_EV.set(
-                    new GregtechMetaTileEntity_BasicWasher(31018, "simplewasher.01.tier.03", "Simple Washer III", 4)
-                            .getStackForm(1L));
+                    new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+                            31018,
+                            "simplewasher.01.tier.03",
+                            "Simple Washer III",
+                            4,
+                            new String[] { "It's like an automatic Cauldron for washing dusts.",
+                                    CORE.GT_Tooltip.get() },
+                            GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes,
+                            1,
+                            1,
+                            true,
+                            SoundResource.NONE,
+                            false,
+                            false,
+                            SpecialEffects.NONE,
+                            "SIMPLE_WASHER",
+                            null).getStackForm(1L));
             GregtechItemList.SimpleDustWasher_LuV.set(
-                    new GregtechMetaTileEntity_BasicWasher(31019, "simplewasher.01.tier.04", "Simple Washer IV", 6)
-                            .getStackForm(1L));
+                    new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+                            31019,
+                            "simplewasher.01.tier.04",
+                            "Simple Washer IV",
+                            6,
+                            new String[] { "It's like an automatic Cauldron for washing dusts.",
+                                    CORE.GT_Tooltip.get() },
+                            GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes,
+                            1,
+                            1,
+                            true,
+                            SoundResource.NONE,
+                            false,
+                            false,
+                            SpecialEffects.NONE,
+                            "SIMPLE_WASHER",
+                            null).getStackForm(1L));
             GregtechItemList.SimpleDustWasher_UV.set(
-                    new GregtechMetaTileEntity_BasicWasher(31020, "simplewasher.01.tier.05", "Simple Washer V", 8)
-                            .getStackForm(1L));
+                    new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+                            31020,
+                            "simplewasher.01.tier.05",
+                            "Simple Washer V",
+                            8,
+                            new String[] { "It's like an automatic Cauldron for washing dusts.",
+                                    CORE.GT_Tooltip.get() },
+                            GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes,
+                            1,
+                            1,
+                            true,
+                            SoundResource.NONE,
+                            false,
+                            false,
+                            SpecialEffects.NONE,
+                            "SIMPLE_WASHER",
+                            null).getStackForm(1L));
         }
     }