Fix more collisions (#3246)

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

4 files changed, 1 insertions, 127 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;
             }