Remove crates (#2687)

* remove crates

* Add placeholder oreprefix

To be used in cases where a prefix is removed that isnt at the end of a
list. Causes blank items for existing items

* spotless

---------

Co-authored-by: Caedis <Caedis@users.noreply.github.com>

4 files changed, 3 insertions, 181 deletions

diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java
deleted file mode 100644
index 105b5c8f13..0000000000
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package gregtech.loaders.oreprocessing;
-
-import static gregtech.api.recipe.RecipeMaps.packagerRecipes;
-import static gregtech.api.recipe.RecipeMaps.unpackagerRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.SubTag;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.common.GT_Proxy;
-
-public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegistrator {
-
-    public ProcessingCrate() {
-        OrePrefixes.crateGtDust.add(this);
-        OrePrefixes.crateGtIngot.add(this);
-        OrePrefixes.crateGtGem.add(this);
-        OrePrefixes.crateGtPlate.add(this);
-    }
-
-    @Override
-    public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
-        ItemStack aStack) {
-        boolean aSpecialRecipeReq2 = aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)
-            && !aMaterial.contains(SubTag.NO_WORKING);
-        switch (aPrefix) {
-            case crateGtDust -> {
-                if (GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(
-                            GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L),
-                            ItemList.Crate_Empty.get(1L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crateGtDust, aMaterial, 1L))
-                        .duration(5 * SECONDS)
-                        .eut(8)
-                        .addTo(packagerRecipes);
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crateGtDust, aMaterial, 1L))
-                        .itemOutputs(
-                            GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L),
-                            ItemList.Crate_Empty.get(1L))
-                        .duration(40 * SECONDS)
-                        .eut(1)
-                        .addTo(unpackagerRecipes);
-                }
-                if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L),
-                    GT_Proxy.tBits,
-                    new Object[] { "Xc", 'X', OrePrefixes.crateGtDust.get(aMaterial) });
-            }
-            case crateGtIngot -> {
-                if (GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(
-                            GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L),
-                            ItemList.Crate_Empty.get(1L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, aMaterial, 1L))
-                        .duration(5 * SECONDS)
-                        .eut(8)
-                        .addTo(packagerRecipes);
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, aMaterial, 1L))
-                        .itemOutputs(
-                            GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L),
-                            ItemList.Crate_Empty.get(1L))
-                        .duration(40 * SECONDS)
-                        .eut(1)
-                        .addTo(unpackagerRecipes);
-                }
-                if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L),
-                    GT_Proxy.tBits,
-                    new Object[] { "Xc", 'X', OrePrefixes.crateGtIngot.get(aMaterial) });
-            }
-            case crateGtGem -> {
-                if (GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(
-                            GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L),
-                            ItemList.Crate_Empty.get(1L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crateGtGem, aMaterial, 1L))
-                        .duration(5 * SECONDS)
-                        .eut(8)
-                        .addTo(packagerRecipes);
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crateGtGem, aMaterial, 1L))
-                        .itemOutputs(
-                            GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L),
-                            ItemList.Crate_Empty.get(1L))
-                        .duration(40 * SECONDS)
-                        .eut(1)
-                        .addTo(unpackagerRecipes);
-                }
-                if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L),
-                    GT_Proxy.tBits,
-                    new Object[] { "Xc", 'X', OrePrefixes.crateGtGem.get(aMaterial) });
-            }
-            case crateGtPlate -> {
-                if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) {
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(
-                            GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L),
-                            ItemList.Crate_Empty.get(1L))
-                        .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crateGtPlate, aMaterial, 1L))
-                        .duration(5 * SECONDS)
-                        .eut(8)
-                        .addTo(packagerRecipes);
-                    GT_Values.RA.stdBuilder()
-                        .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crateGtPlate, aMaterial, 1L))
-                        .itemOutputs(
-                            GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L),
-                            ItemList.Crate_Empty.get(1L))
-                        .duration(40 * SECONDS)
-                        .eut(1)
-                        .addTo(unpackagerRecipes);
-                }
-                if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L),
-                    GT_Proxy.tBits,
-                    new Object[] { "Xc", 'X', OrePrefixes.crateGtPlate.get(aMaterial) });
-            }
-            default -> {}
-        }
-    }
-}
diff --git a/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java b/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java
index 71c8d67741..00d7010790 100644
--- a/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java
@@ -359,49 +359,6 @@ public class GT_BookAndLootLoader implements Runnable {
             .addItem("strongholdCrossing", new WeightedRandomChestContent(ItemList.McGuffium_239.get(1L), 1, 1, 10));
 
         ChestGenHooks.addItem(
-            "strongholdCrossing",
-            new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, Materials.DamascusSteel, 1L),
-                4,
-                8,
-                6));
-        ChestGenHooks.addItem(
-            "strongholdCrossing",
-            new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, Materials.Steel, 1L),
-                8,
-                16,
-                12));
-        ChestGenHooks.addItem(
-            "strongholdCrossing",
-            new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, Materials.Bronze, 1L),
-                8,
-                16,
-                12));
-        ChestGenHooks.addItem(
-            "strongholdCrossing",
-            new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, Materials.Manganese, 1L),
-                4,
-                8,
-                12));
-        ChestGenHooks.addItem(
-            "strongholdCrossing",
-            new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.crateGtDust, Materials.Neodymium, 1L),
-                4,
-                8,
-                6));
-        ChestGenHooks.addItem(
-            "strongholdCrossing",
-            new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.crateGtDust, Materials.Chrome, 1L),
-                2,
-                4,
-                6));
-
-        ChestGenHooks.addItem(
             "strongholdCorridor",
             new WeightedRandomChestContent(
                 GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.DamascusSteel, 1L),
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java b/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java
index 116b6928e4..541fcbc2e5 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java
@@ -10,7 +10,6 @@ import gregtech.loaders.oreprocessing.ProcessingCell;
 import gregtech.loaders.oreprocessing.ProcessingCircuit;
 import gregtech.loaders.oreprocessing.ProcessingCompressed;
 import gregtech.loaders.oreprocessing.ProcessingCrafting;
-import gregtech.loaders.oreprocessing.ProcessingCrate;
 import gregtech.loaders.oreprocessing.ProcessingCrop;
 import gregtech.loaders.oreprocessing.ProcessingCrushedOre;
 import gregtech.loaders.oreprocessing.ProcessingCrystallized;
@@ -65,7 +64,6 @@ public class GT_Loader_OreProcessing implements Runnable {
         new ProcessingBlock();
         new ProcessingBolt();
         new ProcessingCell();
-        new ProcessingCrate();
         new ProcessingCircuit();
         new ProcessingCompressed();
         new ProcessingCrafting();
diff --git a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java
index bbbb9af59d..d7c752a199 100644
--- a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java
+++ b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java
@@ -289,8 +289,7 @@ public class GT_PreLoad {
                                     "toolHeadBuzzSaw", "turbineBlade", null, null, "wireFine", "gearGtSmall", "rotor",
                                     "stickLong", "springSmall", "spring", "arrowGtWood", "arrowGtPlastic", "gemChipped",
                                     "gemFlawed", "gemFlawless", "gemExquisite", "gearGt" };
-                                if (mIt == 3) tags = new String[] { "crateGtDust", "crateGtIngot", "crateGtGem",
-                                    "crateGtPlate", "itemCasing", "nanite" };
+                                if (mIt == 3) tags = new String[] { "itemCasing", "nanite" };
                                 if (tags.length > prefix) tag = tags[prefix];
                                 if (GregTech_API.sGeneratedMaterials[material] != null) {
                                     tag += GregTech_API.sGeneratedMaterials[material].mName;
@@ -313,8 +312,8 @@ public class GT_PreLoad {
             "toolHeadHammer", "toolHeadFile", "toolHeadSaw", "toolHeadDrill", "toolHeadChainsaw", "toolHeadWrench",
             "toolHeadUniversalSpade", "toolHeadSense", "toolHeadPlow", "toolHeadArrow", "toolHeadBuzzSaw",
             "turbineBlade", "wireFine", "gearGtSmall", "rotor", "stickLong", "springSmall", "spring", "arrowGtWood",
-            "arrowGtPlastic", "gemChipped", "gemFlawed", "gemFlawless", "gemExquisite", "gearGt", "crateGtDust",
-            "crateGtIngot", "crateGtGem", "crateGtPlate", "nanite", "cellMolten", "rawOre" };
+            "arrowGtPlastic", "gemChipped", "gemFlawed", "gemFlawless", "gemExquisite", "gearGt", "nanite",
+            "cellMolten", "rawOre" };
 
         List<String> mMTTags = new ArrayList<>();
         oreTags.stream()