Fix more collisions (#3246)

Co-authored-by: BlueHero233 <87818077+BlueHero233@users.noreply.github.com>

12 files changed, 14 insertions, 280 deletions

diff --git a/src/main/java/bartworks/system/material/WerkstoffLoader.java b/src/main/java/bartworks/system/material/WerkstoffLoader.java
index c12a3303c9..d99cc2a197 100644
--- a/src/main/java/bartworks/system/material/WerkstoffLoader.java
+++ b/src/main/java/bartworks/system/material/WerkstoffLoader.java
@@ -110,7 +110,6 @@ import bartworks.system.material.werkstoff_loaders.recipe.GemLoader;
 import bartworks.system.material.werkstoff_loaders.recipe.MetalLoader;
 import bartworks.system.material.werkstoff_loaders.recipe.MoltenCellLoader;
 import bartworks.system.material.werkstoff_loaders.recipe.MultipleMetalLoader;
-import bartworks.system.material.werkstoff_loaders.recipe.OreLoader;
 import bartworks.system.material.werkstoff_loaders.recipe.RawOreLoader;
 import bartworks.system.material.werkstoff_loaders.recipe.SimpleMetalLoader;
 import bartworks.system.material.werkstoff_loaders.recipe.ToolLoader;
@@ -1657,7 +1656,7 @@ public class WerkstoffLoader {
             }
 
             IWerkstoffRunnable[] werkstoffRunnables = { new ToolLoader(), new DustLoader(), new GemLoader(),
-                new SimpleMetalLoader(), new CasingLoader(), new AspectLoader(), new OreLoader(), new RawOreLoader(),
+                new SimpleMetalLoader(), new CasingLoader(), new AspectLoader(), new RawOreLoader(),
                 new CrushedLoader(), new CraftingMaterialLoader(), new CellLoader(), new MoltenCellLoader(),
                 new MultipleMetalLoader(), new MetalLoader(), new BlockLoader() };
 
diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java
index db31c11f0f..1c313e7172 100644
--- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java
+++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java
@@ -30,7 +30,6 @@ import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
 import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
 import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes;
 import static gregtech.api.recipe.RecipeMaps.latheRecipes;
-import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
 import static gregtech.api.recipe.RecipeMaps.sifterRecipes;
 import static gregtech.api.util.GTRecipeBuilder.MINUTES;
 import static gregtech.api.util.GTRecipeBuilder.SECONDS;
@@ -67,13 +66,6 @@ public class GemLoader implements IWerkstoffRunnable {
                     .addTo(compressorRecipes);
 
                 GTValues.RA.stdBuilder()
-                    .itemInputs(werkstoff.get(block))
-                    .itemOutputs(werkstoff.get(gem, 9))
-                    .duration(5 * SECONDS)
-                    .eut(24)
-                    .addTo(hammerRecipes);
-
-                GTValues.RA.stdBuilder()
                     .itemInputs(werkstoff.get(crushedPurified))
                     .itemOutputs(
                         werkstoff.get(gemExquisite),
@@ -89,41 +81,6 @@ public class GemLoader implements IWerkstoffRunnable {
 
             }
 
-            GTValues.RA.stdBuilder()
-                .itemInputs(werkstoff.get(gemExquisite))
-                .itemOutputs(werkstoff.get(dust, 4))
-                .duration(20 * SECONDS)
-                .eut(2)
-                .addTo(maceratorRecipes);
-
-            GTValues.RA.stdBuilder()
-                .itemInputs(werkstoff.get(gemFlawless))
-                .itemOutputs(werkstoff.get(dust, 2))
-                .duration(20 * SECONDS)
-                .eut(2)
-                .addTo(maceratorRecipes);
-
-            GTValues.RA.stdBuilder()
-                .itemInputs(werkstoff.get(gem))
-                .itemOutputs(werkstoff.get(dust))
-                .duration(20 * SECONDS)
-                .eut(2)
-                .addTo(maceratorRecipes);
-
-            GTValues.RA.stdBuilder()
-                .itemInputs(werkstoff.get(gemFlawed))
-                .itemOutputs(werkstoff.get(dustSmall, 2))
-                .duration(20 * SECONDS)
-                .eut(2)
-                .addTo(maceratorRecipes);
-
-            GTValues.RA.stdBuilder()
-                .itemInputs(werkstoff.get(gemChipped))
-                .itemOutputs(werkstoff.get(dustSmall))
-                .duration(20 * SECONDS)
-                .eut(2)
-                .addTo(maceratorRecipes);
-
             GTModHandler.addCraftingRecipe(
                 werkstoff.get(gemFlawless, 2),
                 0,
@@ -202,13 +159,6 @@ public class GemLoader implements IWerkstoffRunnable {
                 texture,
                 new CoverLens(BWColorUtil.getDyeFromColor(werkstoff.getRGBA()).mIndex, texture));
 
-            GTValues.RA.stdBuilder()
-                .itemInputs(werkstoff.get(lens))
-                .itemOutputs(werkstoff.get(dustSmall, 3))
-                .duration(20 * SECONDS)
-                .eut(2)
-                .addTo(maceratorRecipes);
-
             for (ItemStack is : OreDictionary
                 .getOres("craftingLens" + BWColorUtil.getDyeFromColor(werkstoff.getRGBA()).mName.replace(" ", ""))) {
                 is.stackSize = 0;
diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/OreLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/OreLoader.java
deleted file mode 100644
index cd5effd0f0..0000000000
--- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/OreLoader.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2018-2020 bartimaeusnek Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following
- * conditions: The above copyright notice and this permission notice shall be included in all copies or substantial
- * portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-package bartworks.system.material.werkstoff_loaders.recipe;
-
-import static gregtech.api.enums.GTValues.RA;
-import static gregtech.api.enums.OrePrefixes.crushed;
-import static gregtech.api.enums.OrePrefixes.dust;
-import static gregtech.api.enums.OrePrefixes.gem;
-import static gregtech.api.enums.OrePrefixes.ingot;
-import static gregtech.api.enums.OrePrefixes.ore;
-import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
-import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
-import static gregtech.api.util.GTRecipeBuilder.SECONDS;
-import static gregtech.api.util.GTRecipeBuilder.TICKS;
-
-import bartworks.system.material.Werkstoff;
-import bartworks.system.material.WerkstoffLoader;
-import bartworks.system.material.werkstoff_loaders.IWerkstoffRunnable;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.SubTag;
-import gregtech.api.util.GTModHandler;
-
-public class OreLoader implements IWerkstoffRunnable {
-
-    @Override
-    public void run(Werkstoff werkstoff) {
-        if (werkstoff.hasItemType(ore) && werkstoff.hasItemType(ingot)
-            && !werkstoff.getStats()
-                .isBlastFurnace())
-            GTModHandler
-                .addSmeltingRecipe(WerkstoffLoader.getCorrespondingItemStack(ore, werkstoff), werkstoff.get(ingot));
-
-        if (werkstoff.hasItemType(ore)) {
-
-            RA.stdBuilder()
-                .itemInputs(werkstoff.get(ore))
-                .itemOutputs(werkstoff.hasItemType(gem) ? werkstoff.get(gem) : werkstoff.get(crushed))
-                .duration(16 * TICKS)
-                .eut(10)
-                .addTo(hammerRecipes);
-
-            RA.stdBuilder()
-                .itemInputs(werkstoff.get(ore))
-                .itemOutputs(
-                    werkstoff.get(crushed, 2),
-                    werkstoff.contains(SubTag.CRYSTAL) ? werkstoff.get(gem) : werkstoff.getOreByProduct(0, dust),
-                    Materials.Stone.getDust(1))
-                .outputChances(100_00, 10_00, 50_00)
-                .eut(2)
-                .duration(20 * SECONDS)
-                .addTo(maceratorRecipes);
-        }
-    }
-}
diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java
index d0b501d157..a9c1143e58 100644
--- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java
+++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java
@@ -14,7 +14,6 @@
 package bartworks.system.material.werkstoff_loaders.recipe;
 
 import static gregtech.api.enums.OrePrefixes.block;
-import static gregtech.api.enums.OrePrefixes.dust;
 import static gregtech.api.enums.OrePrefixes.dustSmall;
 import static gregtech.api.enums.OrePrefixes.foil;
 import static gregtech.api.enums.OrePrefixes.gem;
@@ -26,8 +25,6 @@ import static gregtech.api.recipe.RecipeMaps.benderRecipes;
 import static gregtech.api.recipe.RecipeMaps.extruderRecipes;
 import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
 import static gregtech.api.recipe.RecipeMaps.latheRecipes;
-import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
-import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
 import net.minecraft.item.ItemStack;
 
@@ -91,13 +88,6 @@ public class SimpleMetalLoader implements IWerkstoffRunnable {
                     false) : TextureFactory.of(texSet.mTextures[block.mTextureIndex], werkstoff.getRGBA(), false);
                 GregTechAPI.registerCover(werkstoff.get(plate), texture, null);
 
-                GTValues.RA.stdBuilder()
-                    .itemInputs(werkstoff.get(plate))
-                    .itemOutputs(werkstoff.get(dust))
-                    .duration(2 * TICKS)
-                    .eut(8)
-                    .addTo(maceratorRecipes);
-
                 return;
             }
 
diff --git a/src/main/java/gregtech/loaders/load/GTItemIterator.java b/src/main/java/gregtech/loaders/load/GTItemIterator.java
index 63ac59b7c2..dc0f951ebc 100644
--- a/src/main/java/gregtech/loaders/load/GTItemIterator.java
+++ b/src/main/java/gregtech/loaders/load/GTItemIterator.java
@@ -126,35 +126,11 @@ public class GTItemIterator implements Runnable {
         GTLog.out.println(
             "GTMod: Adding Food Recipes to the Automatic Canning Machine. (also during the following Item Iteration)");
         GTValues.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.rotten_flesh, 2, WILDCARD), ItemList.IC2_Food_Can_Empty.get(1L))
-            .itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L))
-            .duration(10 * SECONDS)
-            .eut(1)
-            .addTo(cannerRecipes);
-        GTValues.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.spider_eye, 2, WILDCARD), ItemList.IC2_Food_Can_Empty.get(1L))
-            .itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L))
-            .duration(5 * SECONDS)
-            .eut(1)
-            .addTo(cannerRecipes);
-        GTValues.RA.stdBuilder()
-            .itemInputs(ItemList.Food_Poisonous_Potato.get(2L), ItemList.IC2_Food_Can_Empty.get(1L))
-            .itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L))
-            .duration(5 * SECONDS)
-            .eut(1)
-            .addTo(cannerRecipes);
-        GTValues.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.cake, 1, WILDCARD), ItemList.IC2_Food_Can_Empty.get(12L))
             .itemOutputs(ItemList.IC2_Food_Can_Filled.get(12L))
             .duration(30 * SECONDS)
             .eut(1)
             .addTo(cannerRecipes);
-        GTValues.RA.stdBuilder()
-            .itemInputs(new ItemStack(Items.mushroom_stew, 1, WILDCARD), ItemList.IC2_Food_Can_Empty.get(6L))
-            .itemOutputs(ItemList.IC2_Food_Can_Filled.get(6L), new ItemStack(Items.bowl, 1))
-            .duration(15 * SECONDS)
-            .eut(1)
-            .addTo(cannerRecipes);
 
         GTLog.out.println("GTMod: Scanning ItemList.");
 
diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java
index ee5e1d8316..5f3bf24954 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java
@@ -104,7 +104,7 @@ public class ChemicalBathRecipes implements Runnable {
 
             // carpet cleaning recipes
             GTValues.RA.stdBuilder()
-                .itemInputs(new ItemStack(Blocks.carpet, 1, 32767))
+                .itemInputs(new ItemStack(Blocks.carpet, 1, i))
                 .itemOutputs(new ItemStack(Blocks.carpet, 1, 0))
                 .fluidInputs(Materials.Chlorine.getGas(25))
                 .duration(20 * SECONDS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java
index b17eecc748..90e9b15f56 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java
@@ -137,63 +137,6 @@ public class CircuitAssemblerRecipes implements Runnable {
                 .duration(25 * SECONDS)
                 .eut((int) TierEU.RECIPE_LV)
                 .addTo(circuitAssemblerRecipes);
-
-            GTValues.RA.stdBuilder()
-                .itemInputs(
-                    ItemList.Circuit_Board_Coated_Basic.get(1),
-                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 2),
-                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Iron, 2),
-                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 4),
-                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Iron, 1),
-                    GTUtility.getIntegratedCircuit(1))
-                .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 0))
-                .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2))
-                .duration(10 * SECONDS)
-                .eut((int) TierEU.RECIPE_LV)
-                .addTo(circuitAssemblerRecipes);
-
-            GTValues.RA.stdBuilder()
-                .itemInputs(
-                    ItemList.Circuit_Board_Coated_Basic.get(1),
-                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 2),
-                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Bronze, 2),
-                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 4),
-                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Bronze, 1),
-                    GTUtility.getIntegratedCircuit(1))
-                .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 1))
-                .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2))
-                .duration(10 * SECONDS)
-                .eut((int) TierEU.RECIPE_LV)
-                .addTo(circuitAssemblerRecipes);
-
-            GTValues.RA.stdBuilder()
-                .itemInputs(
-                    ItemList.Circuit_Board_Phenolic_Good.get(1),
-                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 2),
-                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Steel, 2),
-                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4),
-                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 1),
-                    GTUtility.getIntegratedCircuit(1))
-                .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 2))
-                .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2))
-                .duration(10 * SECONDS)
-                .eut((int) TierEU.RECIPE_LV)
-                .addTo(circuitAssemblerRecipes);
-
-            GTValues.RA.stdBuilder()
-                .itemInputs(
-                    ItemList.Circuit_Board_Phenolic_Good.get(1),
-                    GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2),
-                    GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 2),
-                    GTOreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 4),
-                    GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 1),
-                    GTUtility.getIntegratedCircuit(1))
-                .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 3))
-                .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2))
-                .duration(10 * SECONDS)
-                .eut((int) TierEU.RECIPE_LV)
-                .addTo(circuitAssemblerRecipes);
-
         }
     }
 
diff --git a/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java
index 7833b6fc5f..f998cf2f58 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java
@@ -32,7 +32,7 @@ public class CropProcessingRecipes implements Runnable {
         tCrop = ItemList.Crop_Drop_Tine.get(1);
         this.addProcess(tCrop, Materials.Tin, 100, true);
         this.addProcess(tCrop, Materials.Cassiterite, 100, false);
-        this.addProcess(tCrop, Materials.CassiteriteSand, 100, true);
+        this.addProcess(tCrop, Materials.CassiteriteSand, 100, false);
         tCrop = ItemList.Crop_Drop_Plumbilia.get(1);
         this.addProcess(tCrop, Materials.Lead, 100, true);
         this.addProcess(tCrop, Materials.Galena, 100, false); //
@@ -142,13 +142,15 @@ public class CropProcessingRecipes implements Runnable {
             .eut(24)
             .addTo(UniversalChemical);
 
-        GTValues.RA.stdBuilder()
-            .itemInputs(GTUtility.copyAmount(16, tCrop))
-            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1))
-            .fluidInputs(Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass() + 9) / 10))))
-            .duration((int) (aMaterial.getMass() * 128))
-            .eut(384)
-            .addTo(autoclaveRecipes);
+        if (aMainOutput) {
+            GTValues.RA.stdBuilder()
+                .itemInputs(GTUtility.copyAmount(16, tCrop))
+                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1))
+                .fluidInputs(Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass() + 9) / 10))))
+                .duration((int) (aMaterial.getMass() * 128))
+                .eut(384)
+                .addTo(autoclaveRecipes);
+        }
     }
 
     public void addProcess(ItemStack tCrop, Materials aMaterial, int chance) {
diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java
index a0f647198f..23cc3f223e 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java
@@ -3292,9 +3292,9 @@ public class RecipesMachines {
             aTier[i] = ItemUtils.simpleMetaStack(CoverManager.Cover_Gt_Machine_Casing, i, 7);
         }
         // Add recipes for new ones
-        for (int i = 0; i < aMaxTier; i++) {
+        for (int i = 0; i < aMaxTier - 1; i++) {
             GTValues.RA.stdBuilder()
-                .itemInputs(CI.getTieredMachineCasing(i))
+                .itemInputs(CI.getTieredMachineCasing(i), GTUtility.getIntegratedCircuit(i))
                 .itemOutputs(aTier[i])
                 .duration(i * 5 * SECONDS)
                 .eut(GTValues.VP[i])
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java
index 4b7d94f1f4..2c380e6eba 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java
@@ -1,8 +1,6 @@
 package gtPlusPlus.xmod.gregtech.loaders;
 
-import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes;
-import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
 import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
 import static gregtech.api.recipe.RecipeMaps.packagerRecipes;
 import static gregtech.api.util.GTRecipeBuilder.SECONDS;
@@ -116,28 +114,6 @@ public class RecipeGenDustGeneration extends RecipeGenBase {
         final ItemStack[] inputStacks = material.getMaterialComposites();
         final ItemStack outputStacks = material.getDust(material.smallestStackSizeWhenProcessing);
 
-        // Macerate blocks back to dusts.
-        final ItemStack materialBlock = material.getBlock(1);
-        final ItemStack materialFrameBox = material.getFrameBox(1);
-
-        if (ItemUtils.checkForInvalidItems(materialBlock)) {
-            RA.stdBuilder()
-                .itemInputs(materialBlock)
-                .itemOutputs(material.getDust(9))
-                .eut(2)
-                .duration(20 * SECONDS)
-                .addTo(maceratorRecipes);
-        }
-
-        if (ItemUtils.checkForInvalidItems(materialFrameBox)) {
-            RA.stdBuilder()
-                .itemInputs(materialFrameBox)
-                .itemOutputs(material.getDust(2))
-                .eut(2)
-                .duration(20 * SECONDS)
-                .addTo(maceratorRecipes);
-        }
-
         if (ItemUtils.checkForInvalidItems(smallDust) && ItemUtils.checkForInvalidItems(tinyDust)) {
             generatePackagerRecipes(material);
         }
@@ -145,7 +121,6 @@ public class RecipeGenDustGeneration extends RecipeGenBase {
         ItemStack ingot = material.getIngot(1);
         if (ItemUtils.checkForInvalidItems(normalDust) && ItemUtils.checkForInvalidItems(ingot)) {
             addFurnaceRecipe(material);
-            addMacerationRecipe(material);
         }
 
         // Is this a composite?
@@ -400,20 +375,6 @@ public class RecipeGenDustGeneration extends RecipeGenBase {
         return true;
     }
 
-    private void addMacerationRecipe(Material aMatInfo) {
-        try {
-            Logger.MATERIALS("Adding Maceration recipe for " + aMatInfo.getLocalizedName() + " Ingot -> Dusts");
-            RA.stdBuilder()
-                .itemInputs(aMatInfo.getIngot(1))
-                .itemOutputs(aMatInfo.getDust(1))
-                .eut(2)
-                .duration(20 * SECONDS)
-                .addTo(maceratorRecipes);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-
     private void addFurnaceRecipe(Material aMatInfo) {
 
         ItemStack aDust = aMatInfo.getDust(1);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java
index 634784952a..2272df0e2a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java
@@ -4,7 +4,6 @@ import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
 import static gregtech.api.recipe.RecipeMaps.cutterRecipes;
 import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
 import static gregtech.api.recipe.RecipeMaps.latheRecipes;
-import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes;
 import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
 import java.util.HashSet;
@@ -74,18 +73,6 @@ public class RecipeGenMetalRecipe extends RecipeGenBase {
             Logger.WARNING("Cut Bolt Recipe: " + material.getLocalizedName() + " - Success");
         }
 
-        if (ItemUtils.checkForInvalidItems(material.getIngot(1))
-            && ItemUtils.checkForInvalidItems(material.getHotIngot(1))) {
-
-            GTValues.RA.stdBuilder()
-                .itemInputs(material.getHotIngot(1))
-                .itemOutputs(material.getIngot(1))
-                .duration((int) Math.max(material.getMass() * 3L, 1L))
-                .eut(material.vVoltageMultiplier)
-                .addTo(vacuumFreezerRecipes);
-            Logger.WARNING("Cool Hot Ingot Recipe: " + material.getLocalizedName() + " - Success");
-        }
-
         if (ItemUtils.checkForInvalidItems(material.getRod(1))
             && ItemUtils.checkForInvalidItems(material.getLongRod(1))) {
             GTValues.RA.stdBuilder()
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java
index ed8f446bab..c8c1d28547 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java
@@ -194,15 +194,6 @@ public class RecipeGenOre extends RecipeGenBase {
         ItemStack matDustB = getDust(bonusB);
 
         /**
-         * Package
-         */
-        // Allow ore dusts to be packaged
-        if (ItemUtils.checkForInvalidItems(material.getSmallDust(1))
-            && ItemUtils.checkForInvalidItems(material.getTinyDust(1))) {
-            RecipeGenDustGeneration.generatePackagerRecipes(material);
-        }
-
-        /**
          * Macerate
          */
         // Macerate ore to Crushed