Fix more collisions (#3246)

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

src/main/java/bartworks/system/material/WerkstoffLoader.java

@@ -110,7 +110,6 @@
 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 static void run() {
  }
 
  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() };
 

src/main/java/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java

@@ -30,7 +30,6 @@
 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;
@@ -66,13 +65,6 @@ public void run(Werkstoff werkstoff) {
  .eut(2)
  .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(
@@ -89,41 +81,6 @@ public void run(Werkstoff werkstoff) {
 
  }
 
- 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 void run(Werkstoff werkstoff) {
  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;

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.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 void run(Werkstoff werkstoff) {
  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;
  }
 

src/main/java/gregtech/loaders/load/GTItemIterator.java

@@ -125,36 +125,12 @@ public void run() {
 
  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.");
 

src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java

@@ -104,7 +104,7 @@ public void run() {
 
  // 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)

src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java

@@ -137,63 +137,6 @@ public void registerRailcraftRecipes() {
  .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);
-
  }
  }
 

src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java

@@ -32,7 +32,7 @@ public void run() {
  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 void addProcess(ItemStack tCrop, Materials aMaterial, Materials aMaterial
  .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) {

src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java

@@ -3292,9 +3292,9 @@ private static void fakeMachineCasingCovers() {
  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])