register spear items

Author: DerToaster98

src/main/java/de/dertoaster/kerkercraft/init/KCItems.java

@@ -2,13 +2,16 @@
 
 import de.dertoaster.kerkercraft.common.services.KCServices;
 import de.dertoaster.kerkercraft.world.item.KCItemProperties;
+import de.dertoaster.kerkercraft.world.item.weapon.melee.SpearItem;
 import net.minecraft.world.item.Item;
+import net.minecraft.world.item.Items;
 import net.minecraft.world.item.ToolMaterial;
 import net.neoforged.neoforge.registries.DeferredItem;
 
 public class KCItems {
 
     // region Daggers
+    // Pass it the sword values, it will calculate itself!
     public static DeferredItem<Item> STONE_DAGGER = KCServices.ITEM.registerSimpleItem(
             "stone_dagger",
             new KCItemProperties().dagger(ToolMaterial.STONE, 3.0F, -2.4F)
@@ -32,5 +35,30 @@ public class KCItems {
     // endregion Daggers
 
     // region Spears
+    public static DeferredItem<SpearItem> STONE_SPEAR = KCServices.ITEM.registerItem(
+            "stone_spear",
+            SpearItem::new,
+            new KCItemProperties().spear(ToolMaterial.STONE, 2.5F, -2.7F)
+    );
+    public static DeferredItem<SpearItem> GOLDEN_SPEAR = KCServices.ITEM.registerItem(
+            "golden_spear",
+            SpearItem::new,
+            new KCItemProperties().spear(ToolMaterial.GOLD, 2.5F, -2.7F)
+    );
+    public static DeferredItem<SpearItem> IRON_SPEAR = KCServices.ITEM.registerItem(
+            "iron_spear",
+            SpearItem::new,
+            new KCItemProperties().spear(ToolMaterial.IRON, 2.5F, -2.7F)
+    );
+    public static DeferredItem<SpearItem> DIAMOND_SPEAR = KCServices.ITEM.registerItem(
+            "diamond_spear",
+            SpearItem::new,
+            new KCItemProperties().spear(ToolMaterial.DIAMOND, 2.5F, -2.7F)
+    );
+    public static DeferredItem<SpearItem> NETHERITE_SPEAR = KCServices.ITEM.registerItem(
+            "netherite_spear",
+            SpearItem::new,
+            new KCItemProperties().spear(ToolMaterial.NETHERITE, 2.5F, -2.7F).fireResistant()
+    );
     // endregion Spears
 }

src/main/java/de/dertoaster/kerkercraft/world/item/KCItemProperties.java

@@ -1,6 +1,7 @@
 package de.dertoaster.kerkercraft.world.item;
 
 import de.dertoaster.kerkercraft.init.KCAttributeModifiers;
+import de.dertoaster.kerkercraft.world.item.weapon.melee.SpearItem;
 import net.minecraft.core.HolderGetter;
 import net.minecraft.core.HolderSet;
 import net.minecraft.core.component.DataComponents;
@@ -10,7 +11,9 @@
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
 import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.item.Item;
+import net.minecraft.world.item.Rarity;
 import net.minecraft.world.item.ToolMaterial;
+import net.minecraft.world.item.TridentItem;
 import net.minecraft.world.item.component.ItemAttributeModifiers;
 import net.minecraft.world.item.component.Tool;
 import net.minecraft.world.item.component.Weapon;
@@ -25,7 +28,22 @@ public Item.Properties dagger(ToolMaterial material, float attackDamage, float a
         return applyDaggerProperties(material, new Item.Properties(), attackDamage, attackSpeed);
     }
 
-    public Item.Properties applyDaggerProperties(ToolMaterial material, Item.Properties properties, float attackDamage, float attackSpeed) {
+    public Item.Properties spear(ToolMaterial material, float attackDamage, float attackSpeed) {
+        return applySpearProperties(material, new Item.Properties(), attackDamage, attackSpeed);
+    }
+
+    private Item.Properties applySpearProperties(ToolMaterial material, Item.Properties properties, float attackDamage, float attackSpeed) {
+        HolderGetter<Block> holdergetter = BuiltInRegistries.acquireBootstrapRegistrationLookup(BuiltInRegistries.BLOCK);
+        return material.applyCommonProperties(properties)
+                .component(
+                        DataComponents.TOOL,
+                        TridentItem.createToolProperties()
+                )
+                .attributes(SpearItem.createAttributes(material, attackDamage, attackSpeed))
+                .component(DataComponents.WEAPON, new Weapon(1));
+    }
+
+    private Item.Properties applyDaggerProperties(ToolMaterial material, Item.Properties properties, float attackDamage, float attackSpeed) {
         HolderGetter<Block> holdergetter = BuiltInRegistries.acquireBootstrapRegistrationLookup(BuiltInRegistries.BLOCK);
         return material.applyCommonProperties(properties)
                 .component(