Ash-material stuff fixed and repairable, and some other stuff

.gradle/8.2.1/fileHashes/fileHashes.lock

@@ -1 +1 @@
-�[�i5�￾Ž
+�[�i5�ï¿Ä.

src/main/java/com/zivilon/cinder_loe/CinderLoE.java

@@ -582,12 +582,11 @@ public class CinderLoE {
             daggerAsh = (new LOTRItemDagger(MATERIAL_ASH)).addWeaponDamage(6.75F).setUnlocalizedName("lotr:daggerAsh").setTextureName("lotr:daggerAsh");
             hammerAsh = (new LOTRItemHammer(MATERIAL_ASH)).addWeaponDamage(5.5F).setUnlocalizedName("lotr:hammerAsh").setTextureName("lotr:hammerAsh");
             battleaxeAsh = (new LOTRItemBattleaxe(MATERIAL_ASH)).addWeaponDamage(5.5F).setUnlocalizedName("lotr:battleaxeAsh").setTextureName("lotr:battleaxeAsh");
-            bowAsh = (new LOTRItemBow(MATERIAL_ASH, 1.5)).setDrawTime(16).setUnlocalizedName("lotr:bowAsh").setTextureName("lotr:bowAsh");
+            bowAsh = (new CinderBow(MATERIAL_ASH, 1.5)).setDrawTime(16).setUnlocalizedName("lotr:bowAsh").setTextureName("lotr:bowAsh");
             pikeAsh = (new LOTRItemPike(MATERIAL_ASH)).addWeaponDamage(5.0F).setUnlocalizedName("lotr:pikeAsh").setTextureName("lotr:pikeAsh");
             spearAsh = (new LOTRItemSpear(MATERIAL_ASH)).addWeaponDamage(5.0F).setUnlocalizedName("lotr:spearAsh").setTextureName("lotr:spearAsh");
 
             ItemRegistration.registerItem(ingotAsh, "ingotAsh", 74);
-
             ItemRegistration.registerItem(swordAsh, "swordAsh", 75);
             ItemRegistration.registerItem(daggerAsh, "daggerAsh", 76);
             ItemRegistration.registerItem(hammerAsh, "hammerAsh", 77);

src/main/java/com/zivilon/cinder_loe/items/CinderBow.java

@@ -0,0 +1,38 @@
+package com.zivilon.cinder_loe.items;
+
+import com.zivilon.cinder_loe.CinderLoE;
+import cpw.mods.fml.common.network.simpleimpl.IMessage;
+import lotr.common.LOTRLevelData;
+import lotr.common.LOTRMod;
+import lotr.common.fac.LOTRFaction;
+import lotr.common.item.LOTRItemBow;
+import lotr.common.item.LOTRMaterial;
+import lotr.common.network.LOTRPacketHandler;
+import lotr.common.network.LOTRPacketWeaponFX;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Overwrite;
+
+import java.util.List;
+
+public class CinderBow extends LOTRItemBow {
+
+
+    public CinderBow(LOTRMaterial material, double d) {
+        super(material, d);
+    }
+
+    @Override
+    public boolean getIsRepairable(ItemStack itemstack, ItemStack repairItem) {
+        return repairItem.getItem() == CinderLoE.ingotAsh || super.getIsRepairable(itemstack, repairItem);
+    }
+
+}

src/main/java/com/zivilon/cinder_loe/recipes.java

@@ -37,6 +37,8 @@ public class recipes {
                 Character.valueOf('X'), CinderLoE.ingotAsh, Character.valueOf('Y'), "stickWood" }));
         GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.swordAsh), new Object[] { " X ", " X ", " Y ",
                 Character.valueOf('X'), CinderLoE.ingotAsh, Character.valueOf('Y'), "stickWood" }));
+        GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.staffAsh), new Object[] { "  X", " Y ", "X  ",
+                Character.valueOf('X'), CinderLoE.ingotAsh, Character.valueOf('Y'), "stickWood" }));
         GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.battleaxeAsh), new Object[] { "XXX", "XYX", " Y ",
                 Character.valueOf('X'), CinderLoE.ingotAsh, Character.valueOf('Y'), "stickWood" }));
         GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.pikeAsh), new Object[] { "  X", " YX", "Y  ",

src/main/resources/assets/cinder_loe/lang/en_US.lang

@@ -83,6 +83,7 @@ item.lotr:maceArnor.name=Arnorian Mace
 
 item.lotr:ingotAsh.name=Ashen Ingot
 item.lotr:swordAsh.name=Ash-Forged Sword
+item.lotr:staffAsh.name=Ash-Forged Bardiche
 item.lotr:daggerAsh.name=Ash-Forged Dagger
 item.lotr:hammerAsh.name=Ash-Forged Mace
 item.lotr:battleaxeAsh.name=Ash-Forged Axe

src/main/resources/assets/lotr/textures/items/large/staffAsh.png.mcmeta

@@ -0,0 +1,52 @@
+{
+  "animation": {
+    "frames": [
+          11,
+	  11,
+	  11,
+	  10,
+	  10,
+	  10,
+          9,
+	  9,
+	  9,
+	  8,
+	  8,
+	  8,
+	  7,
+	  7,
+	  7,
+	  6,
+	  6,
+	  6,
+      	  5,
+	  5,
+	  5,
+      	  4,
+	  4,
+	  4,
+          3,
+	  3,
+	  3,
+          2,
+	  2,
+	  2,
+          1,
+	  1,
+	  1,
+          0,
+	  0,
+	  0,
+	  0,
+	  0,
+	  0,
+	  0,
+	  0,
+	  0,
+	  0,
+	  0,
+	  0,
+	  0
+    ]
+  }
+}