Removal of the GT Arrows (#2692)

* remove arrows

* remove arrow classes

* remove arrow usages in ItemList

* less bullshit

* sa

---------

Co-authored-by: Martin Robertz <dream-master@gmx.net>

7 files changed, 0 insertions, 317 deletions

diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java
deleted file mode 100644
index 11d1b1e1b8..0000000000
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package gregtech.loaders.oreprocessing;
-
-import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-
-import net.minecraft.enchantment.Enchantment;
-import net.minecraft.enchantment.EnchantmentHelper;
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OreDictNames;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.SubTag;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.GT_Proxy;
-
-public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegistrator {
-
-    public ProcessingArrows() {
-        OrePrefixes.arrowGtWood.add(this);
-        OrePrefixes.arrowGtPlastic.add(this);
-    }
-
-    @Override
-    public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
-        ItemStack aStack) {
-        ItemStack tOutput = GT_Utility.copyAmount(1, aStack);
-        GT_Utility.updateItemStack(tOutput);
-        GT_Utility.ItemNBT.addEnchantment(
-            tOutput,
-            Enchantment.smite,
-            EnchantmentHelper.getEnchantmentLevel(Enchantment.smite.effectId, tOutput) + 3);
-
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, aStack))
-            .itemOutputs(tOutput)
-            .fluidInputs(Materials.HolyWater.getFluid(25L))
-            .duration(5 * SECONDS)
-            .eut(2)
-            .addTo(chemicalBathRecipes);
-
-        tOutput = GT_Utility.copyAmount(1, aStack);
-        GT_Utility.updateItemStack(tOutput);
-        GT_Utility.ItemNBT.addEnchantment(
-            tOutput,
-            Enchantment.fireAspect,
-            EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, tOutput) + 3);
-
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, aStack))
-            .itemOutputs(tOutput)
-            .fluidInputs(Materials.FierySteel.getFluid(25L))
-            .duration(5 * SECONDS)
-            .eut(2)
-            .addTo(chemicalBathRecipes);
-
-        tOutput = GT_Utility.copyAmount(1, aStack);
-        GT_Utility.updateItemStack(tOutput);
-        GT_Utility.ItemNBT.addEnchantment(
-            tOutput,
-            Enchantment.fireAspect,
-            EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, tOutput) + 1);
-
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, aStack))
-            .itemOutputs(tOutput)
-            .fluidInputs(Materials.Blaze.getMolten(18L))
-            .duration(5 * SECONDS)
-            .eut(2)
-            .addTo(chemicalBathRecipes);
-
-        tOutput = GT_Utility.copyAmount(1, aStack);
-        GT_Utility.updateItemStack(tOutput);
-        GT_Utility.ItemNBT.addEnchantment(
-            tOutput,
-            Enchantment.knockback,
-            EnchantmentHelper.getEnchantmentLevel(Enchantment.knockback.effectId, tOutput) + 1);
-
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, aStack))
-            .itemOutputs(tOutput)
-            .fluidInputs(Materials.Rubber.getMolten(18L))
-            .duration(5 * SECONDS)
-            .eut(2)
-            .addTo(chemicalBathRecipes);
-
-        tOutput = GT_Utility.copyAmount(1, aStack);
-        GT_Utility.updateItemStack(tOutput);
-        GT_Utility.ItemNBT.addEnchantment(
-            tOutput,
-            gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE,
-            EnchantmentHelper
-                .getEnchantmentLevel(gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE.effectId, tOutput) + 1);
-
-        GT_Values.RA.stdBuilder()
-            .itemInputs(GT_Utility.copyAmount(1, aStack))
-            .itemOutputs(tOutput)
-            .fluidInputs(Materials.Mercury.getFluid(25L))
-            .duration(5 * SECONDS)
-            .eut(2)
-            .addTo(chemicalBathRecipes);
-
-        if (!aMaterial.mUnificatable) {
-            return;
-        }
-        if (aMaterial.mMaterialInto != aMaterial) {
-            return;
-        }
-
-        if (aMaterial.contains(SubTag.NO_WORKING)) {
-            return;
-        }
-
-        switch (aPrefix) {
-            case arrowGtWood:
-                GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, aMaterial, 1L),
-                    GT_Proxy.tBits,
-                    new Object[] { "  A", " S ", "F  ", 'S', OrePrefixes.stick.get(Materials.Wood), 'F',
-                        OreDictNames.craftingFeather, 'A', OrePrefixes.toolHeadArrow.get(aMaterial) });
-            case arrowGtPlastic:
-                GT_ModHandler.addCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.arrowGtPlastic, aMaterial, 1L),
-                    GT_Proxy.tBits,
-                    new Object[] { "  A", " S ", "F  ", 'S', OrePrefixes.stick.get(Materials.Plastic), 'F',
-                        OreDictNames.craftingFeather, 'A', OrePrefixes.toolHeadArrow.get(aMaterial) });
-            default:
-                break;
-        }
-
-    }
-}
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java
index 9b6e4edc68..db3175279d 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java
@@ -6,7 +6,6 @@ import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes;
 import static gregtech.api.recipe.RecipeMaps.formingPressRecipes;
 import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
 import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
 import static gregtech.api.util.GT_Utility.calculateRecipeEU;
 
 import net.minecraft.item.ItemStack;
@@ -29,7 +28,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg
                                                                                            // HEAD??? generator
 
     public ProcessingToolHead() {
-        OrePrefixes.toolHeadArrow.add(this);
         OrePrefixes.toolHeadAxe.add(this);
         OrePrefixes.toolHeadBuzzSaw.add(this);
         OrePrefixes.toolHeadChainsaw.add(this);
@@ -59,29 +57,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg
         boolean aProducesSoftMallet = aMaterial.contains(SubTag.BOUNCY) || aMaterial.contains(SubTag.WOOD)
             || aMaterial.contains(SubTag.SOFT);
         switch (aPrefix) {
-            case toolHeadArrow -> {
-                if (aMaterial.mStandardMoltenFluid != null)
-                    if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) {
-                        GT_Values.RA.stdBuilder()
-                            .itemInputs(ItemList.Shape_Mold_Arrow.get(0L))
-                            .itemOutputs(GT_Utility.copyAmount(1, aStack))
-                            .fluidInputs(aMaterial.getMolten(36L))
-                            .duration(16 * TICKS)
-                            .eut(8)
-                            .addTo(fluidSolidifierRecipes);
-                    }
-                if (aSpecialRecipeReq2) {
-                    GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.toolHeadArrow, aMaterial, 1L),
-                        GT_Proxy.tBits,
-                        new Object[] { "Xf", 'X', OrePrefixes.gemChipped.get(aMaterial) });
-                    GT_ModHandler.addCraftingRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.toolHeadArrow, aMaterial, 3L),
-                        GT_Proxy.tBits,
-                        new Object[] { (aMaterial.contains(SubTag.WOOD) ? 115 : 'x') + "Pf", 'P',
-                            OrePrefixes.plate.get(aMaterial) });
-                }
-            }
             case toolHeadAxe -> {
                 GT_ModHandler.addShapelessCraftingRecipe(
                     GT_MetaGenerated_Tool_01.INSTANCE
diff --git a/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java b/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java
index 00d7010790..a30962631e 100644
--- a/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java
@@ -233,13 +233,6 @@ public class GT_BookAndLootLoader implements Runnable {
         ChestGenHooks.addItem(
             "pyramidJungleDispenser",
             new WeightedRandomChestContent(new ItemStack(Items.fire_charge, 1), 2, 8, 30));
-        ChestGenHooks.addItem(
-            "pyramidJungleDispenser",
-            new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, Materials.DamascusSteel, 1L),
-                8,
-                16,
-                20));
 
         ChestGenHooks.addItem(
             "mineshaftCorridor",
@@ -372,19 +365,5 @@ public class GT_BookAndLootLoader implements Runnable {
                 1,
                 4,
                 6));
-        ChestGenHooks.addItem(
-            "strongholdCorridor",
-            new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, Materials.DamascusSteel, 1L),
-                16,
-                48,
-                6));
-        ChestGenHooks.addItem(
-            "strongholdCorridor",
-            new WeightedRandomChestContent(
-                GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, Materials.SterlingSilver, 1L),
-                8,
-                24,
-                6));
     }
 }
diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
index 8f12f840c0..4fb30345d1 100644
--- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
@@ -690,10 +690,6 @@ public class GT_CraftingRecipeLoader implements Runnable {
             GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Rubber, 1L),
             bits_no_remove_buffered,
             new Object[] { "k", "X", 'X', OrePrefixes.plate.get(Materials.Rubber) });
-        GT_ModHandler.addCraftingRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.toolHeadArrow, Materials.Flint, 1L),
-            bits_no_remove_buffered,
-            new Object[] { "f", "X", 'X', new ItemStack(Items.flint, 1, 32767) });
 
         GT_ModHandler.addCraftingRecipe(
             new ItemStack(Items.arrow, 1),
diff --git a/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java
index 80a34561e6..2003b9e516 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java
@@ -7,7 +7,6 @@ import static gregtech.api.util.GT_ModHandler.getModItem;
 import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
 import static gregtech.api.util.GT_RecipeBuilder.TICKS;
 
-import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
@@ -142,13 +141,6 @@ public class FormingPressRecipes implements Runnable {
             .addTo(formingPressRecipes);
 
         GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Blocks.glass, 1, 32767), ItemList.Shape_Mold_Arrow.get(0L))
-            .itemOutputs(ItemList.Arrow_Head_Glass_Emtpy.get(1L))
-            .duration(3 * SECONDS + 4 * TICKS)
-            .eut(4)
-            .addTo(formingPressRecipes);
-
-        GT_Values.RA.stdBuilder()
             .itemInputs(
                 GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Cupronickel, 1L),
                 ItemList.Shape_Mold_Credit.get(0L))
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
index a0abf686f8..7a0c7cfb84 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
@@ -1946,128 +1946,6 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                 ItemList.IC2_Spray_WeedEx.get(1L),
                 ItemList.Spray_Empty.get(1L)));
 
-        FluidContainerRegistry.registerFluidContainer(
-            new FluidContainerRegistry.FluidContainerData(
-                FluidRegistry.getFluidStack("potion.poison", 125),
-                ItemList.Arrow_Head_Glass_Poison.get(1L),
-                ItemList.Arrow_Head_Glass_Emtpy.get(1L)));
-        FluidContainerRegistry.registerFluidContainer(
-            new FluidContainerRegistry.FluidContainerData(
-                FluidRegistry.getFluidStack("potion.poison.long", 125),
-                ItemList.Arrow_Head_Glass_Poison_Long.get(1L),
-                ItemList.Arrow_Head_Glass_Emtpy.get(1L)));
-        FluidContainerRegistry.registerFluidContainer(
-            new FluidContainerRegistry.FluidContainerData(
-                FluidRegistry.getFluidStack("potion.poison.strong", 125),
-                ItemList.Arrow_Head_Glass_Poison_Strong.get(1L),
-                ItemList.Arrow_Head_Glass_Emtpy.get(1L)));
-        FluidContainerRegistry.registerFluidContainer(
-            new FluidContainerRegistry.FluidContainerData(
-                FluidRegistry.getFluidStack("potion.slowness", 125),
-                ItemList.Arrow_Head_Glass_Slowness.get(1L),
-                ItemList.Arrow_Head_Glass_Emtpy.get(1L)));
-        FluidContainerRegistry.registerFluidContainer(
-            new FluidContainerRegistry.FluidContainerData(
-                FluidRegistry.getFluidStack("potion.slowness.long", 125),
-                ItemList.Arrow_Head_Glass_Slowness_Long.get(1L),
-                ItemList.Arrow_Head_Glass_Emtpy.get(1L)));
-        FluidContainerRegistry.registerFluidContainer(
-            new FluidContainerRegistry.FluidContainerData(
-                FluidRegistry.getFluidStack("potion.weakness", 125),
-                ItemList.Arrow_Head_Glass_Weakness.get(1L),
-                ItemList.Arrow_Head_Glass_Emtpy.get(1L)));
-        FluidContainerRegistry.registerFluidContainer(
-            new FluidContainerRegistry.FluidContainerData(
-                FluidRegistry.getFluidStack("potion.weakness.long", 125),
-                ItemList.Arrow_Head_Glass_Weakness_Long.get(1L),
-                ItemList.Arrow_Head_Glass_Emtpy.get(1L)));
-        FluidContainerRegistry.registerFluidContainer(
-            new FluidContainerRegistry.FluidContainerData(
-                FluidRegistry.getFluidStack("holywater", 125),
-                ItemList.Arrow_Head_Glass_Holy_Water.get(1L),
-                ItemList.Arrow_Head_Glass_Emtpy.get(1L)));
-
-        FluidContainerRegistry.registerFluidContainer(
-            new FluidContainerRegistry.FluidContainerData(
-                FluidRegistry.getFluidStack("potion.poison", 125),
-                ItemList.Arrow_Wooden_Glass_Poison.get(1L),
-                ItemList.Arrow_Wooden_Glass_Emtpy.get(1L)));
-        FluidContainerRegistry.registerFluidContainer(
-            new FluidContainerRegistry.FluidContainerData(
-                FluidRegistry.getFluidStack("potion.poison.long", 125),
-                ItemList.Arrow_Wooden_Glass_Poison_Long.get(1L),
-                ItemList.Arrow_Wooden_Glass_Emtpy.get(1L)));
-        FluidContainerRegistry.registerFluidContainer(
-            new FluidContainerRegistry.FluidContainerData(
-                FluidRegistry.getFluidStack("potion.poison.strong", 125),
-                ItemList.Arrow_Wooden_Glass_Poison_Strong.get(1L),
-                ItemList.Arrow_Wooden_Glass_Emtpy.get(1L)));
-        FluidContainerRegistry.registerFluidContainer(
-            new FluidContainerRegistry.FluidContainerData(
-                FluidRegistry.getFluidStack("potion.slowness", 125),
-                ItemList.Arrow_Wooden_Glass_Slowness.get(1L),
-                ItemList.Arrow_Wooden_Glass_Emtpy.get(1L)));
-        FluidContainerRegistry.registerFluidContainer(
-            new FluidContainerRegistry.FluidContainerData(
-                FluidRegistry.getFluidStack("potion.slowness.long", 125),
-                ItemList.Arrow_Wooden_Glass_Slowness_Long.get(1L),
-                ItemList.Arrow_Wooden_Glass_Emtpy.get(1L)));
-        FluidContainerRegistry.registerFluidContainer(
-            new FluidContainerRegistry.FluidContainerData(
-                FluidRegistry.getFluidStack("potion.weakness", 125),
-                ItemList.Arrow_Wooden_Glass_Weakness.get(1L),
-                ItemList.Arrow_Wooden_Glass_Emtpy.get(1L)));
-        FluidContainerRegistry.registerFluidContainer(
-            new FluidContainerRegistry.FluidContainerData(
-                FluidRegistry.getFluidStack("potion.weakness.long", 125),
-                ItemList.Arrow_Wooden_Glass_Weakness_Long.get(1L),
-                ItemList.Arrow_Wooden_Glass_Emtpy.get(1L)));
-        FluidContainerRegistry.registerFluidContainer(
-            new FluidContainerRegistry.FluidContainerData(
-                FluidRegistry.getFluidStack("holywater", 125),
-                ItemList.Arrow_Wooden_Glass_Holy_Water.get(1L),
-                ItemList.Arrow_Wooden_Glass_Emtpy.get(1L)));
-
-        FluidContainerRegistry.registerFluidContainer(
-            new FluidContainerRegistry.FluidContainerData(
-                FluidRegistry.getFluidStack("potion.poison", 125),
-                ItemList.Arrow_Plastic_Glass_Poison.get(1L),
-                ItemList.Arrow_Plastic_Glass_Emtpy.get(1L)));
-        FluidContainerRegistry.registerFluidContainer(
-            new FluidContainerRegistry.FluidContainerData(
-                FluidRegistry.getFluidStack("potion.poison.long", 125),
-                ItemList.Arrow_Plastic_Glass_Poison_Long.get(1L),
-                ItemList.Arrow_Plastic_Glass_Emtpy.get(1L)));
-        FluidContainerRegistry.registerFluidContainer(
-            new FluidContainerRegistry.FluidContainerData(
-                FluidRegistry.getFluidStack("potion.poison.strong", 125),
-                ItemList.Arrow_Plastic_Glass_Poison_Strong.get(1L),
-                ItemList.Arrow_Plastic_Glass_Emtpy.get(1L)));
-        FluidContainerRegistry.registerFluidContainer(
-            new FluidContainerRegistry.FluidContainerData(
-                FluidRegistry.getFluidStack("potion.slowness", 125),
-                ItemList.Arrow_Plastic_Glass_Slowness.get(1L),
-                ItemList.Arrow_Plastic_Glass_Emtpy.get(1L)));
-        FluidContainerRegistry.registerFluidContainer(
-            new FluidContainerRegistry.FluidContainerData(
-                FluidRegistry.getFluidStack("potion.slowness.long", 125),
-                ItemList.Arrow_Plastic_Glass_Slowness_Long.get(1L),
-                ItemList.Arrow_Plastic_Glass_Emtpy.get(1L)));
-        FluidContainerRegistry.registerFluidContainer(
-            new FluidContainerRegistry.FluidContainerData(
-                FluidRegistry.getFluidStack("potion.weakness", 125),
-                ItemList.Arrow_Plastic_Glass_Weakness.get(1L),
-                ItemList.Arrow_Plastic_Glass_Emtpy.get(1L)));
-        FluidContainerRegistry.registerFluidContainer(
-            new FluidContainerRegistry.FluidContainerData(
-                FluidRegistry.getFluidStack("potion.weakness.long", 125),
-                ItemList.Arrow_Plastic_Glass_Weakness_Long.get(1L),
-                ItemList.Arrow_Plastic_Glass_Emtpy.get(1L)));
-        FluidContainerRegistry.registerFluidContainer(
-            new FluidContainerRegistry.FluidContainerData(
-                FluidRegistry.getFluidStack("holywater", 125),
-                ItemList.Arrow_Plastic_Glass_Holy_Water.get(1L),
-                ItemList.Arrow_Plastic_Glass_Emtpy.get(1L)));
         if (!GT_Values.D1) {
             try {
                 Class.forName("codechicken.nei.api.API");
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 541fcbc2e5..598d9e882a 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java
@@ -2,7 +2,6 @@ package gregtech.loaders.preload;
 
 import gregtech.api.util.GT_Log;
 import gregtech.loaders.oreprocessing.ProcessingAll;
-import gregtech.loaders.oreprocessing.ProcessingArrows;
 import gregtech.loaders.oreprocessing.ProcessingBeans;
 import gregtech.loaders.oreprocessing.ProcessingBlock;
 import gregtech.loaders.oreprocessing.ProcessingBolt;
@@ -59,7 +58,6 @@ public class GT_Loader_OreProcessing implements Runnable {
     public void run() {
         GT_Log.out.println("GT_Mod: Register Ore processing.");
         new ProcessingAll();
-        new ProcessingArrows();
         new ProcessingBeans();
         new ProcessingBlock();
         new ProcessingBolt();