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>

5 files changed, 3 insertions, 642 deletions

diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
index 6b9ee54767..dbd6d7404b 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
@@ -52,33 +52,6 @@ import static gregtech.client.GT_TooltipHandler.Tier.UV;
 import static gregtech.client.GT_TooltipHandler.Tier.UXV;
 import static gregtech.client.GT_TooltipHandler.Tier.ZPM;
 import static gregtech.client.GT_TooltipHandler.registerTieredTooltip;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Head_Glass_Empty;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Head_Glass_Holy_Water;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Head_Glass_Poison;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Head_Glass_Poison_Long;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Head_Glass_Poison_Strong;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Head_Glass_Slowness;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Head_Glass_Slowness_Long;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Head_Glass_Weakness;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Head_Glass_Weakness_Long;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Plastic_Glass_Empty;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Plastic_Glass_Holy_Water;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Plastic_Glass_Poison;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Plastic_Glass_Poison_Long;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Plastic_Glass_Poison_Strong;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Plastic_Glass_Slowness;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Plastic_Glass_Slowness_Long;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Plastic_Glass_Weakness;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Plastic_Glass_Weakness_Long;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Wooden_Glass_Empty;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Wooden_Glass_Holy_Water;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Wooden_Glass_Poison;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Wooden_Glass_Poison_Long;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Wooden_Glass_Poison_Strong;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Wooden_Glass_Slowness;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Wooden_Glass_Slowness_Long;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Wooden_Glass_Weakness;
-import static gregtech.common.items.ID_MetaItem_01.Arrow_Wooden_Glass_Weakness_Long;
 import static gregtech.common.items.ID_MetaItem_01.Battery_Hull_HV;
 import static gregtech.common.items.ID_MetaItem_01.Battery_Hull_LV;
 import static gregtech.common.items.ID_MetaItem_01.Battery_Hull_MV;
@@ -520,7 +493,6 @@ import gregtech.common.covers.GT_Cover_Shutter;
 import gregtech.common.covers.GT_Cover_SolarPanel;
 import gregtech.common.covers.GT_Cover_SteamRegulator;
 import gregtech.common.covers.GT_Cover_SteamValve;
-import gregtech.common.items.behaviors.Behaviour_Arrow_Potion;
 import gregtech.common.items.behaviors.Behaviour_Cover_Tool;
 import gregtech.common.items.behaviors.Behaviour_DataOrb;
 import gregtech.common.items.behaviors.Behaviour_DataStick;
@@ -698,216 +670,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
         ItemList.CompressedFireclay.set(addItem(Compressed_Fireclay.ID, "Compressed Fireclay", "Brick-shaped"));
         ItemList.Firebrick.set(addItem(Firebrick.ID, "Firebrick", "Heat resistant"));
 
-        ItemList.Arrow_Head_Glass_Emtpy.set(
-            addItem(
-                Arrow_Head_Glass_Empty.ID,
-                "Empty Glass Arrow Head",
-                "Fill with Potions before use",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 1L)));
-        ItemList.Arrow_Head_Glass_Poison.set(
-            addItem(
-                Arrow_Head_Glass_Poison.ID,
-                "Poison Glass Arrow Head",
-                "Glass Arrow filled with Poison",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L)));
-        ItemList.Arrow_Head_Glass_Poison_Long.set(
-            addItem(
-                Arrow_Head_Glass_Poison_Long.ID,
-                "Poison Glass Arrow Head",
-                "Glass Arrow filled with stretched Poison",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L)));
-        ItemList.Arrow_Head_Glass_Poison_Strong.set(
-            addItem(
-                Arrow_Head_Glass_Poison_Strong.ID,
-                "Poison Glass Arrow Head",
-                "Glass Arrow filled with strong Poison",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L)));
-        ItemList.Arrow_Head_Glass_Slowness.set(
-            addItem(
-                Arrow_Head_Glass_Slowness.ID,
-                "Slowness Glass Arrow Head",
-                "Glass Arrow filled with Laming Brew",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L)));
-        ItemList.Arrow_Head_Glass_Slowness_Long.set(
-            addItem(
-                Arrow_Head_Glass_Slowness_Long.ID,
-                "Slowness Glass Arrow Head",
-                "Glass Arrow filled with stretched Laming Brew",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L)));
-        ItemList.Arrow_Head_Glass_Weakness.set(
-            addItem(
-                Arrow_Head_Glass_Weakness.ID,
-                "Weakness Glass Arrow Head",
-                "Glass Arrow filled with Weakening Brew",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L)));
-        ItemList.Arrow_Head_Glass_Weakness_Long.set(
-            addItem(
-                Arrow_Head_Glass_Weakness_Long.ID,
-                "Weakness Glass Arrow Head",
-                "Glass Arrow filled with stretched Weakening Brew",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L)));
-        ItemList.Arrow_Head_Glass_Holy_Water.set(
-            addItem(
-                Arrow_Head_Glass_Holy_Water.ID,
-                "Holy Water Glass Arrow Head",
-                "Glass Arrow filled with Holy Water",
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AURAM, 1L)));
-
-        ItemList.Arrow_Wooden_Glass_Emtpy.set(
-            addItem(
-                Arrow_Wooden_Glass_Empty.ID,
-                "Regular Glass Vial Arrow",
-                "Empty Glass Arrow",
-                new Behaviour_Arrow_Potion(1.0F, 6.0F),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 1L)));
-        ItemList.Arrow_Wooden_Glass_Poison.set(
-            addItem(
-                Arrow_Wooden_Glass_Poison.ID,
-                "Regular Poison Arrow",
-                "Glass Arrow filled with Poison",
-                new Behaviour_Arrow_Potion(1.0F, 6.0F, Potion.poison.id, 450, 0, 100),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L)));
-        ItemList.Arrow_Wooden_Glass_Poison_Long.set(
-            addItem(
-                Arrow_Wooden_Glass_Poison_Long.ID,
-                "Regular Poison Arrow",
-                "Glass Arrow filled with stretched Poison",
-                new Behaviour_Arrow_Potion(1.0F, 6.0F, Potion.poison.id, 900, 0, 100),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L)));
-        ItemList.Arrow_Wooden_Glass_Poison_Strong.set(
-            addItem(
-                Arrow_Wooden_Glass_Poison_Strong.ID,
-                "Regular Poison Arrow",
-                "Glass Arrow filled with strong Poison",
-                new Behaviour_Arrow_Potion(1.0F, 6.0F, Potion.poison.id, 450, 1, 100),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L)));
-        ItemList.Arrow_Wooden_Glass_Slowness.set(
-            addItem(
-                Arrow_Wooden_Glass_Slowness.ID,
-                "Regular Slowness Arrow",
-                "Glass Arrow filled with Laming Brew",
-                new Behaviour_Arrow_Potion(1.0F, 6.0F, Potion.moveSlowdown.id, 900, 0, 100),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L)));
-        ItemList.Arrow_Wooden_Glass_Slowness_Long.set(
-            addItem(
-                Arrow_Wooden_Glass_Slowness_Long.ID,
-                "Regular Slowness Arrow",
-                "Glass Arrow filled with stretched Laming Brew",
-                new Behaviour_Arrow_Potion(1.0F, 6.0F, Potion.moveSlowdown.id, 1800, 0, 100),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L)));
-        ItemList.Arrow_Wooden_Glass_Weakness.set(
-            addItem(
-                Arrow_Wooden_Glass_Weakness.ID,
-                "Regular Weakness Arrow",
-                "Glass Arrow filled with Weakening Brew",
-                new Behaviour_Arrow_Potion(1.0F, 6.0F, Potion.weakness.id, 900, 0, 100),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L)));
-        ItemList.Arrow_Wooden_Glass_Weakness_Long.set(
-            addItem(
-                Arrow_Wooden_Glass_Weakness_Long.ID,
-                "Regular Weakness Arrow",
-                "Glass Arrow filled with stretched Weakening Brew",
-                new Behaviour_Arrow_Potion(1.0F, 6.0F, Potion.weakness.id, 1800, 0, 100),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L)));
-        ItemList.Arrow_Wooden_Glass_Holy_Water.set(
-            addItem(
-                Arrow_Wooden_Glass_Holy_Water.ID,
-                "Regular Holy Water Arrow",
-                "Glass Arrow filled with Holy Water",
-                new Behaviour_Arrow_Potion(1.0F, 6.0F, Enchantment.smite, 10),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AURAM, 1L)));
-
-        ItemList.Arrow_Plastic_Glass_Emtpy.set(
-            addItem(
-                Arrow_Plastic_Glass_Empty.ID,
-                "Light Glass Vial Arrow",
-                "Empty Glass Arrow",
-                new Behaviour_Arrow_Potion(1.5F, 6.0F),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 1L)));
-        ItemList.Arrow_Plastic_Glass_Poison.set(
-            addItem(
-                Arrow_Plastic_Glass_Poison.ID,
-                "Light Poison Arrow",
-                "Glass Arrow filled with Poison",
-                new Behaviour_Arrow_Potion(1.5F, 6.0F, Potion.poison.id, 450, 0, 100),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L)));
-        ItemList.Arrow_Plastic_Glass_Poison_Long.set(
-            addItem(
-                Arrow_Plastic_Glass_Poison_Long.ID,
-                "Light Poison Arrow",
-                "Glass Arrow filled with stretched Poison",
-                new Behaviour_Arrow_Potion(1.5F, 6.0F, Potion.poison.id, 900, 0, 100),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L)));
-        ItemList.Arrow_Plastic_Glass_Poison_Strong.set(
-            addItem(
-                Arrow_Plastic_Glass_Poison_Strong.ID,
-                "Light Poison Arrow",
-                "Glass Arrow filled with strong Poison",
-                new Behaviour_Arrow_Potion(1.5F, 6.0F, Potion.poison.id, 450, 1, 100),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L)));
-        ItemList.Arrow_Plastic_Glass_Slowness.set(
-            addItem(
-                Arrow_Plastic_Glass_Slowness.ID,
-                "Light Slowness Arrow",
-                "Glass Arrow filled with Laming Brew",
-                new Behaviour_Arrow_Potion(1.5F, 6.0F, Potion.moveSlowdown.id, 900, 0, 100),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L)));
-        ItemList.Arrow_Plastic_Glass_Slowness_Long.set(
-            addItem(
-                Arrow_Plastic_Glass_Slowness_Long.ID,
-                "Light Slowness Arrow",
-                "Glass Arrow filled with stretched Laming Brew",
-                new Behaviour_Arrow_Potion(1.5F, 6.0F, Potion.moveSlowdown.id, 1800, 0, 100),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L)));
-        ItemList.Arrow_Plastic_Glass_Weakness.set(
-            addItem(
-                Arrow_Plastic_Glass_Weakness.ID,
-                "Light Weakness Arrow",
-                "Glass Arrow filled with Weakening Brew",
-                new Behaviour_Arrow_Potion(1.5F, 6.0F, Potion.weakness.id, 900, 0, 100),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L)));
-        ItemList.Arrow_Plastic_Glass_Weakness_Long.set(
-            addItem(
-                Arrow_Plastic_Glass_Weakness_Long.ID,
-                "Light Weakness Arrow",
-                "Glass Arrow filled with stretched Weakening Brew",
-                new Behaviour_Arrow_Potion(1.5F, 6.0F, Potion.weakness.id, 1800, 0, 100),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L)));
-        ItemList.Arrow_Plastic_Glass_Holy_Water.set(
-            addItem(
-                Arrow_Plastic_Glass_Holy_Water.ID,
-                "Light Holy Water Arrow",
-                "Glass Arrow filled with Holy Water",
-                new Behaviour_Arrow_Potion(1.5F, 6.0F, Enchantment.smite, 10),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L),
-                new TC_Aspects.TC_AspectStack(TC_Aspects.AURAM, 1L)));
-
         ItemList.Shape_Empty.set(
             addItem(
                 Shape_Empty.ID,
@@ -4744,117 +4506,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
             new Object[] { "PSP", "PCP", "PBP", 'P', OrePrefixes.plate.get(Materials.Aluminium), 'S',
                 ItemList.Tool_DataStick.get(1L), 'C', ItemList.Cover_Screen.get(1L), 'B',
                 ItemList.Battery_RE_MV_Lithium.get(1L) });
-
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Arrow_Wooden_Glass_Emtpy.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { aTextArrow, aTextStick, aTextFeather, 'A', ItemList.Arrow_Head_Glass_Emtpy, 'F',
-                OreDictNames.craftingFeather, 'S', OrePrefixes.stick.get(Materials.Wood) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Arrow_Wooden_Glass_Poison.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { aTextArrow, aTextStick, aTextFeather, 'A', ItemList.Arrow_Head_Glass_Poison, 'F',
-                OreDictNames.craftingFeather, 'S', OrePrefixes.stick.get(Materials.Wood) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Arrow_Wooden_Glass_Poison_Long.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { aTextArrow, aTextStick, aTextFeather, 'A', ItemList.Arrow_Head_Glass_Poison_Long, 'F',
-                OreDictNames.craftingFeather, 'S', OrePrefixes.stick.get(Materials.Wood) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Arrow_Wooden_Glass_Poison_Strong.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { aTextArrow, aTextStick, aTextFeather, 'A', ItemList.Arrow_Head_Glass_Poison_Strong, 'F',
-                OreDictNames.craftingFeather, 'S', OrePrefixes.stick.get(Materials.Wood) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Arrow_Wooden_Glass_Slowness.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { aTextArrow, aTextStick, aTextFeather, 'A', ItemList.Arrow_Head_Glass_Slowness, 'F',
-                OreDictNames.craftingFeather, 'S', OrePrefixes.stick.get(Materials.Wood) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Arrow_Wooden_Glass_Slowness_Long.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { aTextArrow, aTextStick, aTextFeather, 'A', ItemList.Arrow_Head_Glass_Slowness_Long, 'F',
-                OreDictNames.craftingFeather, 'S', OrePrefixes.stick.get(Materials.Wood) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Arrow_Wooden_Glass_Weakness.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { aTextArrow, aTextStick, aTextFeather, 'A', ItemList.Arrow_Head_Glass_Weakness, 'F',
-                OreDictNames.craftingFeather, 'S', OrePrefixes.stick.get(Materials.Wood) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Arrow_Wooden_Glass_Weakness_Long.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { aTextArrow, aTextStick, aTextFeather, 'A', ItemList.Arrow_Head_Glass_Weakness_Long, 'F',
-                OreDictNames.craftingFeather, 'S', OrePrefixes.stick.get(Materials.Wood) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Arrow_Wooden_Glass_Holy_Water.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { aTextArrow, aTextStick, aTextFeather, 'A', ItemList.Arrow_Head_Glass_Holy_Water, 'F',
-                OreDictNames.craftingFeather, 'S', OrePrefixes.stick.get(Materials.Wood) });
-
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Arrow_Plastic_Glass_Emtpy.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { aTextArrow, aTextStick, aTextFeather, 'A', ItemList.Arrow_Head_Glass_Emtpy, 'F',
-                OreDictNames.craftingFeather, 'S', OrePrefixes.stick.get(Materials.Plastic) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Arrow_Plastic_Glass_Poison.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { aTextArrow, aTextStick, aTextFeather, 'A', ItemList.Arrow_Head_Glass_Poison, 'F',
-                OreDictNames.craftingFeather, 'S', OrePrefixes.stick.get(Materials.Plastic) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Arrow_Plastic_Glass_Poison_Long.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { aTextArrow, aTextStick, aTextFeather, 'A', ItemList.Arrow_Head_Glass_Poison_Long, 'F',
-                OreDictNames.craftingFeather, 'S', OrePrefixes.stick.get(Materials.Plastic) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Arrow_Plastic_Glass_Poison_Strong.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { aTextArrow, aTextStick, aTextFeather, 'A', ItemList.Arrow_Head_Glass_Poison_Strong, 'F',
-                OreDictNames.craftingFeather, 'S', OrePrefixes.stick.get(Materials.Plastic) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Arrow_Plastic_Glass_Slowness.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { aTextArrow, aTextStick, aTextFeather, 'A', ItemList.Arrow_Head_Glass_Slowness, 'F',
-                OreDictNames.craftingFeather, 'S', OrePrefixes.stick.get(Materials.Plastic) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Arrow_Plastic_Glass_Slowness_Long.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { aTextArrow, aTextStick, aTextFeather, 'A', ItemList.Arrow_Head_Glass_Slowness_Long, 'F',
-                OreDictNames.craftingFeather, 'S', OrePrefixes.stick.get(Materials.Plastic) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Arrow_Plastic_Glass_Weakness.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { aTextArrow, aTextStick, aTextFeather, 'A', ItemList.Arrow_Head_Glass_Weakness, 'F',
-                OreDictNames.craftingFeather, 'S', OrePrefixes.stick.get(Materials.Plastic) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Arrow_Plastic_Glass_Weakness_Long.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { aTextArrow, aTextStick, aTextFeather, 'A', ItemList.Arrow_Head_Glass_Weakness_Long, 'F',
-                OreDictNames.craftingFeather, 'S', OrePrefixes.stick.get(Materials.Plastic) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Arrow_Plastic_Glass_Holy_Water.get(1L),
-            GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { aTextArrow, aTextStick, aTextFeather, 'A', ItemList.Arrow_Head_Glass_Holy_Water, 'F',
-                OreDictNames.craftingFeather, 'S', OrePrefixes.stick.get(Materials.Plastic) });
-
     }
 
     private void craftingShapelessRecipes() {
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
index 3bfc99a18d..f7a2a37a2d 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
@@ -211,20 +211,16 @@ import static gregtech.common.items.ID_MetaItem_02.ThermosCan_Lait_au_cafe;
 import static gregtech.common.items.ID_MetaItem_02.ThermosCan_Sweet_Tea;
 import static gregtech.common.items.ID_MetaItem_02.ThermosCan_Tea;
 
-import net.minecraft.dispenser.IBlockSource;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnumEnchantmentType;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.projectile.EntityArrow;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.potion.Potion;
-import net.minecraft.world.World;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Dyes;
@@ -252,7 +248,6 @@ import gregtech.common.covers.redstone.GT_Cover_WirelessDoesWorkDetector;
 import gregtech.common.covers.redstone.GT_Cover_WirelessFluidDetector;
 import gregtech.common.covers.redstone.GT_Cover_WirelessItemDetector;
 import gregtech.common.covers.redstone.GT_Cover_WirelessMaintenanceDetector;
-import gregtech.common.items.behaviors.Behaviour_Arrow;
 import ic2.api.crops.CropCard;
 import ic2.api.crops.Crops;
 
@@ -278,7 +273,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
             OrePrefixes.toolHeadUniversalSpade,
             OrePrefixes.toolHeadSense,
             OrePrefixes.toolHeadPlow,
-            OrePrefixes.toolHeadArrow,
+            OrePrefixes.___placeholder___,
             OrePrefixes.toolHeadBuzzSaw,
             OrePrefixes.turbineBlade,
             null,
@@ -289,8 +284,8 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
             OrePrefixes.stickLong,
             OrePrefixes.springSmall,
             OrePrefixes.spring,
-            OrePrefixes.arrowGtWood,
-            OrePrefixes.arrowGtPlastic,
+            OrePrefixes.___placeholder___,
+            OrePrefixes.___placeholder___,
             OrePrefixes.gemChipped,
             OrePrefixes.gemFlawed,
             OrePrefixes.gemFlawless,
@@ -2424,13 +2419,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
     @Override
     public boolean onLeftClickEntity(ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) {
         super.onLeftClickEntity(aStack, aPlayer, aEntity);
-        int aDamage = aStack.getItemDamage();
-        if ((aDamage >= 25000) && (aDamage < 27000)) {
-            if (aDamage >= 26000) {
-                return Behaviour_Arrow.DEFAULT_PLASTIC.onLeftClickEntity(this, aStack, aPlayer, aEntity);
-            }
-            return Behaviour_Arrow.DEFAULT_WOODEN.onLeftClickEntity(this, aStack, aPlayer, aEntity);
-        }
         return false;
     }
 
@@ -2441,33 +2429,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
     }
 
     @Override
-    public EntityArrow getProjectile(SubTag aProjectileType, ItemStack aStack, World aWorld, double aX, double aY,
-        double aZ) {
-        int aDamage = aStack.getItemDamage();
-        if ((aDamage >= 25000) && (aDamage < 27000)) {
-            if (aDamage >= 26000) {
-                return Behaviour_Arrow.DEFAULT_PLASTIC.getProjectile(this, aProjectileType, aStack, aWorld, aX, aY, aZ);
-            }
-            return Behaviour_Arrow.DEFAULT_WOODEN.getProjectile(this, aProjectileType, aStack, aWorld, aX, aY, aZ);
-        }
-        return super.getProjectile(aProjectileType, aStack, aWorld, aX, aY, aZ);
-    }
-
-    @Override
-    public EntityArrow getProjectile(SubTag aProjectileType, ItemStack aStack, World aWorld, EntityLivingBase aEntity,
-        float aSpeed) {
-        int aDamage = aStack.getItemDamage();
-        if ((aDamage >= 25000) && (aDamage < 27000)) {
-            if (aDamage >= 26000) {
-                return Behaviour_Arrow.DEFAULT_PLASTIC
-                    .getProjectile(this, aProjectileType, aStack, aWorld, aEntity, aSpeed);
-            }
-            return Behaviour_Arrow.DEFAULT_WOODEN.getProjectile(this, aProjectileType, aStack, aWorld, aEntity, aSpeed);
-        }
-        return super.getProjectile(aProjectileType, aStack, aWorld, aEntity, aSpeed);
-    }
-
-    @Override
     public boolean isItemStackUsable(ItemStack aStack) {
         int aDamage = aStack.getItemDamage();
         Materials aMaterial = GregTech_API.sGeneratedMaterials[(aDamage % 1000)];
@@ -3045,18 +3006,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
     }
 
     @Override
-    public ItemStack onDispense(IBlockSource aSource, ItemStack aStack) {
-        int aDamage = aStack.getItemDamage();
-        if ((aDamage >= 25000) && (aDamage < 27000)) {
-            if (aDamage >= 26000) {
-                return Behaviour_Arrow.DEFAULT_PLASTIC.onDispense(this, aSource, aStack);
-            }
-            return Behaviour_Arrow.DEFAULT_WOODEN.onDispense(this, aSource, aStack);
-        }
-        return super.onDispense(aSource, aStack);
-    }
-
-    @Override
     public final ItemStack getContainerItem(ItemStack aStack) {
         int aDamage = aStack.getItemDamage();
         if (aDamage < 32000) {
diff --git a/src/main/java/gregtech/common/items/ID_MetaItem_01.java b/src/main/java/gregtech/common/items/ID_MetaItem_01.java
index f0af6f30f2..ba479f399c 100644
--- a/src/main/java/gregtech/common/items/ID_MetaItem_01.java
+++ b/src/main/java/gregtech/common/items/ID_MetaItem_01.java
@@ -57,33 +57,6 @@ public enum ID_MetaItem_01 {
     Firebrick(111),
     ZPM5(145),
     ZPM6(146),
-    Arrow_Head_Glass_Empty(200),
-    Arrow_Head_Glass_Poison(201),
-    Arrow_Head_Glass_Poison_Long(202),
-    Arrow_Head_Glass_Poison_Strong(203),
-    Arrow_Head_Glass_Slowness(204),
-    Arrow_Head_Glass_Slowness_Long(205),
-    Arrow_Head_Glass_Weakness(206),
-    Arrow_Head_Glass_Weakness_Long(207),
-    Arrow_Head_Glass_Holy_Water(208),
-    Arrow_Wooden_Glass_Empty(225),
-    Arrow_Wooden_Glass_Poison(226),
-    Arrow_Wooden_Glass_Poison_Long(227),
-    Arrow_Wooden_Glass_Poison_Strong(228),
-    Arrow_Wooden_Glass_Slowness(229),
-    Arrow_Wooden_Glass_Slowness_Long(230),
-    Arrow_Wooden_Glass_Weakness(231),
-    Arrow_Wooden_Glass_Weakness_Long(232),
-    Arrow_Wooden_Glass_Holy_Water(233),
-    Arrow_Plastic_Glass_Empty(250),
-    Arrow_Plastic_Glass_Poison(251),
-    Arrow_Plastic_Glass_Poison_Long(252),
-    Arrow_Plastic_Glass_Poison_Strong(253),
-    Arrow_Plastic_Glass_Slowness(254),
-    Arrow_Plastic_Glass_Slowness_Long(255),
-    Arrow_Plastic_Glass_Weakness(256),
-    Arrow_Plastic_Glass_Weakness_Long(257),
-    Arrow_Plastic_Glass_Holy_Water(258),
     ItemFilter_Export(270),
     ItemFilter_Import(271),
     Cover_FluidLimiter(272),
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java
deleted file mode 100644
index 8005009d14..0000000000
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package gregtech.common.items.behaviors;
-
-import net.minecraft.block.BlockDispenser;
-import net.minecraft.dispenser.IBlockSource;
-import net.minecraft.dispenser.IPosition;
-import net.minecraft.enchantment.Enchantment;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.projectile.EntityArrow;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.world.World;
-
-import gregtech.api.enums.SubTag;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.entities.GT_Entity_Arrow;
-
-public class Behaviour_Arrow extends Behaviour_None {
-
-    public static Behaviour_Arrow DEFAULT_WOODEN = new Behaviour_Arrow(GT_Entity_Arrow.class, 1.0F, 6.0F);
-    public static Behaviour_Arrow DEFAULT_PLASTIC = new Behaviour_Arrow(GT_Entity_Arrow.class, 1.5F, 6.0F);
-    private final int mLevel;
-    private final Enchantment mEnchantment;
-    private final float mSpeedMultiplier;
-    private final float mPrecision;
-    private final Class<? extends GT_Entity_Arrow> mArrow;
-
-    public Behaviour_Arrow(Class<? extends GT_Entity_Arrow> aArrow, float aSpeed, float aPrecision) {
-        this(aArrow, aSpeed, aPrecision, null, 0);
-    }
-
-    public Behaviour_Arrow(Class<? extends GT_Entity_Arrow> aArrow, float aSpeed, float aPrecision,
-        Enchantment aEnchantment, int aLevel) {
-        this.mArrow = aArrow;
-        this.mSpeedMultiplier = aSpeed;
-        this.mPrecision = aPrecision;
-        this.mEnchantment = aEnchantment;
-        this.mLevel = aLevel;
-    }
-
-    @Override
-    public boolean onLeftClickEntity(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) {
-        if ((aEntity instanceof EntityLivingBase)) {
-            GT_Utility.GT_EnchantmentHelper.applyBullshitA((EntityLivingBase) aEntity, aPlayer, aStack);
-            GT_Utility.GT_EnchantmentHelper.applyBullshitB(aPlayer, aEntity, aStack);
-            if (!aPlayer.capabilities.isCreativeMode) {
-                aStack.stackSize -= 1;
-            }
-            if (aStack.stackSize <= 0) {
-                aPlayer.destroyCurrentEquippedItem();
-            }
-            return false;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean isItemStackUsable(GT_MetaBase_Item aItem, ItemStack aStack) {
-        if ((this.mEnchantment != null) && (this.mLevel > 0)) {
-            NBTTagCompound tNBT = GT_Utility.ItemNBT.getNBT(aStack);
-            if (!tNBT.getBoolean("GT.HasBeenUpdated")) {
-                tNBT.setBoolean("GT.HasBeenUpdated", true);
-                GT_Utility.ItemNBT.setNBT(aStack, tNBT);
-                GT_Utility.ItemNBT.addEnchantment(aStack, this.mEnchantment, this.mLevel);
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public boolean canDispense(GT_MetaBase_Item aItem, IBlockSource aSource, ItemStack aStack) {
-        return true;
-    }
-
-    @Override
-    public ItemStack onDispense(GT_MetaBase_Item aItem, IBlockSource aSource, ItemStack aStack) {
-        World aWorld = aSource.getWorld();
-        IPosition tPosition = BlockDispenser.func_149939_a(aSource);
-        EnumFacing tFacing = BlockDispenser.func_149937_b(aSource.getBlockMetadata());
-        GT_Entity_Arrow tEntityArrow = (GT_Entity_Arrow) getProjectile(
-            aItem,
-            SubTag.PROJECTILE_ARROW,
-            aStack,
-            aWorld,
-            tPosition.getX(),
-            tPosition.getY(),
-            tPosition.getZ());
-        if (tEntityArrow != null) {
-            tEntityArrow.setThrowableHeading(
-                tFacing.getFrontOffsetX(),
-                tFacing.getFrontOffsetY() + 0.1F,
-                tFacing.getFrontOffsetZ(),
-                this.mSpeedMultiplier * 1.1F,
-                this.mPrecision);
-            tEntityArrow.setArrowItem(aStack);
-            tEntityArrow.canBePickedUp = 1;
-            aWorld.spawnEntityInWorld(tEntityArrow);
-            if (aStack.stackSize < 100) {
-                aStack.stackSize -= 1;
-            }
-            return aStack;
-        }
-        return super.onDispense(aItem, aSource, aStack);
-    }
-
-    @Override
-    public boolean hasProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack) {
-        return aProjectileType == SubTag.PROJECTILE_ARROW;
-    }
-
-    @Override
-    public EntityArrow getProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack, World aWorld,
-        double aX, double aY, double aZ) {
-        if (!hasProjectile(aItem, aProjectileType, aStack)) {
-            return null;
-        }
-        GT_Entity_Arrow rArrow = (GT_Entity_Arrow) GT_Utility
-            .callConstructor(this.mArrow.getName(), -1, null, true, new Object[] { aWorld, aX, aY, aZ });
-        rArrow.setArrowItem(aStack);
-        return rArrow;
-    }
-
-    @Override
-    public EntityArrow getProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack, World aWorld,
-        EntityLivingBase aEntity, float aSpeed) {
-        if (!hasProjectile(aItem, aProjectileType, aStack)) {
-            return null;
-        }
-        GT_Entity_Arrow rArrow = (GT_Entity_Arrow) GT_Utility.callConstructor(
-            this.mArrow.getName(),
-            -1,
-            null,
-            true,
-            new Object[] { aWorld, aEntity, this.mSpeedMultiplier * aSpeed });
-        rArrow.setArrowItem(aStack);
-        return rArrow;
-    }
-}
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow_Potion.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow_Potion.java
deleted file mode 100644
index 3643de7b77..0000000000
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow_Potion.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package gregtech.common.items.behaviors;
-
-import net.minecraft.enchantment.Enchantment;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.projectile.EntityArrow;
-import net.minecraft.item.ItemStack;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.world.World;
-
-import gregtech.api.enums.SubTag;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.common.entities.GT_Entity_Arrow_Potion;
-
-public class Behaviour_Arrow_Potion extends Behaviour_Arrow {
-
-    private final int[] mPotions;
-
-    public Behaviour_Arrow_Potion(float aSpeed, float aPrecision, int... aPotions) {
-        super(GT_Entity_Arrow_Potion.class, aSpeed, aPrecision);
-        this.mPotions = aPotions;
-    }
-
-    public Behaviour_Arrow_Potion(float aSpeed, float aPrecision, Enchantment aEnchantment, int aLevel,
-        int... aPotions) {
-        super(GT_Entity_Arrow_Potion.class, aSpeed, aPrecision, aEnchantment, aLevel);
-        this.mPotions = aPotions;
-    }
-
-    @Override
-    public boolean onLeftClickEntity(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) {
-        if ((aEntity instanceof EntityLivingBase)) {
-            for (int i = 3; i < this.mPotions.length; i += 4) {
-                if (aEntity.worldObj.rand.nextInt(100) < this.mPotions[i]) {
-                    ((EntityLivingBase) aEntity).addPotionEffect(
-                        new PotionEffect(
-                            this.mPotions[(i - 3)],
-                            this.mPotions[(i - 2)],
-                            this.mPotions[(i - 1)],
-                            false));
-                }
-            }
-        }
-        return super.onLeftClickEntity(aItem, aStack, aPlayer, aEntity);
-    }
-
-    @Override
-    public EntityArrow getProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack, World aWorld,
-        double aX, double aY, double aZ) {
-        if (!hasProjectile(aItem, aProjectileType, aStack)) {
-            return null;
-        }
-        GT_Entity_Arrow_Potion rArrow = new GT_Entity_Arrow_Potion(aWorld, aX, aY, aZ);
-        rArrow.setArrowItem(aStack);
-        rArrow.setPotions(this.mPotions);
-        return rArrow;
-    }
-
-    @Override
-    public EntityArrow getProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack, World aWorld,
-        EntityLivingBase aEntity, float aSpeed) {
-        if (!hasProjectile(aItem, aProjectileType, aStack)) {
-            return null;
-        }
-        GT_Entity_Arrow_Potion rArrow = new GT_Entity_Arrow_Potion(aWorld, aEntity, aSpeed);
-        rArrow.setArrowItem(aStack);
-        rArrow.setPotions(this.mPotions);
-        return rArrow;
-    }
-}