Fix more collisions (#3246)

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

4 files changed, 2 insertions, 63 deletions

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