Fix more collisions (#3246)

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

4 files changed, 11 insertions, 90 deletions

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) {