From eeeafe097fe59640bdf98642e8bc007c9c1c3dd5 Mon Sep 17 00:00:00 2001
From: Me <135455255+IcarussOne@users.noreply.github.com>
Date: Mon, 10 Jun 2024 04:14:16 -0500
Subject: [PATCH] Add livingmetal shears

---
 .../events/HSItemTooltipEvent.java            |   5 ++
 .../mod/emt/harkenscythe/init/HSItems.java    |   5 ++
 .../harkenscythe/items/tools/HSShears.java    |  50 ++++++++++++++++++
 .../assets/harkenscythe/lang/en_us.lang       |   2 +
 .../models/item/livingmetal_shears.json       |   6 +++
 .../recipes/livingmetal_shears.json           |  15 ++++++
 .../textures/entities/necronomicon_book.png   | Bin 0 -> 773 bytes
 .../textures/items/livingmetal_shears.png     | Bin 0 -> 259 bytes
 8 files changed, 83 insertions(+)
 create mode 100644 src/main/java/mod/emt/harkenscythe/items/tools/HSShears.java
 create mode 100644 src/main/resources/assets/harkenscythe/models/item/livingmetal_shears.json
 create mode 100644 src/main/resources/assets/harkenscythe/recipes/livingmetal_shears.json
 create mode 100644 src/main/resources/assets/harkenscythe/textures/entities/necronomicon_book.png
 create mode 100644 src/main/resources/assets/harkenscythe/textures/items/livingmetal_shears.png

diff --git a/src/main/java/mod/emt/harkenscythe/events/HSItemTooltipEvent.java b/src/main/java/mod/emt/harkenscythe/events/HSItemTooltipEvent.java
index 56268b9..445777d 100644
--- a/src/main/java/mod/emt/harkenscythe/events/HSItemTooltipEvent.java
+++ b/src/main/java/mod/emt/harkenscythe/events/HSItemTooltipEvent.java
@@ -18,6 +18,7 @@ public class HSItemTooltipEvent
     private static final ResourceLocation SOUL_ALTAR = new ResourceLocation(HarkenScythe.MOD_ID, "soul_altar");
     private static final ResourceLocation BLUNT_HARKEN_BLADE = new ResourceLocation(HarkenScythe.MOD_ID, "blunt_harken_blade");
     private static final ResourceLocation HARKEN_ATHAME = new ResourceLocation(HarkenScythe.MOD_ID, "harken_athame");
+    private static final ResourceLocation LIVINGMETAL_SHEARS = new ResourceLocation(HarkenScythe.MOD_ID, "livingmetal_shears");
     private static final ResourceLocation SOUL_CAKE = new ResourceLocation(HarkenScythe.MOD_ID, "soul_cake");
     private static final ResourceLocation SOUL_COOKIE = new ResourceLocation(HarkenScythe.MOD_ID, "soul_cookie");
 
@@ -38,6 +39,10 @@ else if (ForgeRegistries.ITEMS.getKey(item).equals(BLUNT_HARKEN_BLADE))
         {
             event.getToolTip().add(1, I18n.format("tooltip.harkenscythe.blunt_blade"));
         }
+        else if (ForgeRegistries.ITEMS.getKey(item).equals(LIVINGMETAL_SHEARS))
+        {
+            event.getToolTip().add(1, I18n.format("tooltip.harkenscythe.shears"));
+        }
         else if (ForgeRegistries.ITEMS.getKey(item).equals(SOUL_CAKE))
         {
             event.getToolTip().add(1, I18n.format("tooltip.harkenscythe.soul_cake"));
diff --git a/src/main/java/mod/emt/harkenscythe/init/HSItems.java b/src/main/java/mod/emt/harkenscythe/init/HSItems.java
index 8a6df25..9565fd8 100644
--- a/src/main/java/mod/emt/harkenscythe/init/HSItems.java
+++ b/src/main/java/mod/emt/harkenscythe/init/HSItems.java
@@ -21,6 +21,7 @@
 import mod.emt.harkenscythe.items.tools.HSHoe;
 import mod.emt.harkenscythe.items.tools.HSPickaxe;
 import mod.emt.harkenscythe.items.tools.HSScythe;
+import mod.emt.harkenscythe.items.tools.HSShears;
 import mod.emt.harkenscythe.items.tools.HSShovel;
 import mod.emt.harkenscythe.items.tools.HSSword;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
@@ -30,6 +31,7 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.Item.ToolMaterial;
 import net.minecraft.item.ItemArmor.ArmorMaterial;
+import net.minecraft.item.crafting.Ingredient;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.client.event.ModelRegistryEvent;
@@ -137,6 +139,8 @@ public class HSItems
     public static HSAxe livingmetal_axe;
     @GameRegistry.ObjectHolder("livingmetal_hoe")
     public static HSHoe livingmetal_hoe;
+    @GameRegistry.ObjectHolder("livingmetal_shears")
+    public static HSShears livingmetal_shears;
     @GameRegistry.ObjectHolder("livingmetal_helmet")
     public static HSArmor livingmetal_helmet;
     @GameRegistry.ObjectHolder("livingmetal_chestplate")
@@ -215,6 +219,7 @@ public static void onRegisterItemsEvent(@Nonnull final RegistryEvent.Register<It
                 HSRegistry.setup(new HSPickaxe(TOOL_LIVINGMETAL, EnumRarity.UNCOMMON), "livingmetal_pickaxe").setCreativeTab(HarkenScythe.TAB),
                 HSRegistry.setup(new HSAxe(TOOL_LIVINGMETAL, 8.0F, -3.0F, EnumRarity.UNCOMMON), "livingmetal_axe").setCreativeTab(HarkenScythe.TAB),
                 HSRegistry.setup(new HSHoe(TOOL_LIVINGMETAL, EnumRarity.UNCOMMON), "livingmetal_hoe").setCreativeTab(HarkenScythe.TAB),
+                HSRegistry.setup(new HSShears(481, EnumRarity.UNCOMMON, Ingredient.fromStacks(new ItemStack(livingmetal_ingot))), "livingmetal_shears").setCreativeTab(HarkenScythe.TAB),
                 HSRegistry.setup(new HSArmor(ARMOR_LIVINGMETAL, 4, EntityEquipmentSlot.HEAD, EnumRarity.UNCOMMON), "livingmetal_helmet").setCreativeTab(HarkenScythe.TAB),
                 HSRegistry.setup(new HSArmor(ARMOR_LIVINGMETAL, 4, EntityEquipmentSlot.CHEST, EnumRarity.UNCOMMON), "livingmetal_chestplate").setCreativeTab(HarkenScythe.TAB),
                 HSRegistry.setup(new HSArmor(ARMOR_LIVINGMETAL, 4, EntityEquipmentSlot.LEGS, EnumRarity.UNCOMMON), "livingmetal_leggings").setCreativeTab(HarkenScythe.TAB),
diff --git a/src/main/java/mod/emt/harkenscythe/items/tools/HSShears.java b/src/main/java/mod/emt/harkenscythe/items/tools/HSShears.java
new file mode 100644
index 0000000..04522c5
--- /dev/null
+++ b/src/main/java/mod/emt/harkenscythe/items/tools/HSShears.java
@@ -0,0 +1,50 @@
+package mod.emt.harkenscythe.items.tools;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.ItemShears;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.Ingredient;
+
+public class HSShears extends ItemShears
+{
+    private final EnumRarity rarity;
+	public Ingredient repairMaterial;
+
+    public HSShears(int durability, EnumRarity rarity, Ingredient repairMaterial)
+    {
+    	this.maxStackSize = 1;
+        this.rarity = rarity;
+        this.repairMaterial = repairMaterial;
+        this.setMaxDamage(durability);
+    }
+    
+    // Hardcoded blocks...
+    @Override
+    public float getDestroySpeed(ItemStack stack, IBlockState state)
+    {
+        Material material = state.getMaterial();
+
+        if (material != Material.WEB && material != Material.LEAVES)
+        {
+            return material == Material.CLOTH ? 5.0F : super.getDestroySpeed(stack, state);
+        }
+        else
+        {
+            return 15.0F;
+        }
+    }
+
+    @Override
+    public EnumRarity getRarity(ItemStack stack)
+    {
+        return rarity;
+    }
+    
+    @Override
+    public boolean getIsRepairable(ItemStack toRepair, ItemStack repair)
+    {
+        return repairMaterial.test(repair) || super.getIsRepairable(toRepair, repair);
+    }
+}
diff --git a/src/main/resources/assets/harkenscythe/lang/en_us.lang b/src/main/resources/assets/harkenscythe/lang/en_us.lang
index 1c8c30a..9ba05db 100644
--- a/src/main/resources/assets/harkenscythe/lang/en_us.lang
+++ b/src/main/resources/assets/harkenscythe/lang/en_us.lang
@@ -56,6 +56,7 @@ item.harkenscythe.livingmetal_ingot.name=Livingmetal Ingot
 item.harkenscythe.livingmetal_leggings.name=Livingmetal Leggings
 item.harkenscythe.livingmetal_pickaxe.name=Livingmetal Pickaxe
 item.harkenscythe.livingmetal_scythe.name=Livingmetal Scythe
+item.harkenscythe.livingmetal_shears.name=Livingmetal Shears
 item.harkenscythe.livingmetal_shovel.name=Livingmetal Shovel
 item.harkenscythe.livingmetal_sword.name=Livingmetal Sword
 item.harkenscythe.shadow_book.name=Book of Shadows
@@ -74,5 +75,6 @@ message.harkenscythe.hs_reap=%s was reaped
 tooltip.harkenscythe.altar=Requires a Harken Athame for rituals
 tooltip.harkenscythe.athame=A Blunt Harken Blade could develop magical abilities if it comes into contact with blood or souls...
 tooltip.harkenscythe.blunt_blade=It could develop magical abilities if it comes into contact with blood or souls...
+tooltip.harkenscythe.shears=Effective on any types of cloth, leaves, and web
 tooltip.harkenscythe.soul_cake=Gives Regeneration (0:06) when a slice is eaten and will drop itself when no slice is eaten
 tooltip.harkenscythe.soul_cookie=Gives Regeneration (0:04) when eaten
diff --git a/src/main/resources/assets/harkenscythe/models/item/livingmetal_shears.json b/src/main/resources/assets/harkenscythe/models/item/livingmetal_shears.json
new file mode 100644
index 0000000..deacf5e
--- /dev/null
+++ b/src/main/resources/assets/harkenscythe/models/item/livingmetal_shears.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "harkenscythe:items/livingmetal_shears"
+  }
+}
diff --git a/src/main/resources/assets/harkenscythe/recipes/livingmetal_shears.json b/src/main/resources/assets/harkenscythe/recipes/livingmetal_shears.json
new file mode 100644
index 0000000..3df2918
--- /dev/null
+++ b/src/main/resources/assets/harkenscythe/recipes/livingmetal_shears.json
@@ -0,0 +1,15 @@
+{
+  "type": "forge:ore_shaped",
+  "pattern": [
+    " M",
+    "M "
+  ],
+  "key": {
+    "M": {
+      "item": "harkenscythe:livingmetal_ingot"
+    }
+  },
+  "result": {
+    "item": "harkenscythe:livingmetal_shears"
+  }
+}
diff --git a/src/main/resources/assets/harkenscythe/textures/entities/necronomicon_book.png b/src/main/resources/assets/harkenscythe/textures/entities/necronomicon_book.png
new file mode 100644
index 0000000000000000000000000000000000000000..7811362c919ef36b5ae32a41720cdc138b37e1b0
GIT binary patch
literal 773
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`_XhZcxJG-}x|->DS{Z~ooBP=s1v^{Ddf9th>SqNxX9hXvhkKUC1w?z=
z<wST@CI-j**azAhyIbf-xmmhd=;w!fwC2V+=qcw!c&GV0CVAV&c-p!cswVh27%7UC
z#rd16NV*!TdYEX$xLL$|S{tj%CHgr}tjuyYR8RMJjP-Je^|Vd!v3EDoXv~VLOAGh3
z&`k^R$cy%?ObiONGxRjqiTAJyb+&Lf)3(!B4YV`v?oNF5>iD&5)7;z)fj;oCzf%gN
z>`Q|Dg8x$l82Z#|#DPX}7I;J!GcfS&2Vq7F)?gK2AhvnBIEHw5znyTqtjR#Y^{^_J
zBa2dmWAf5%QLO88b5|ewUmvDkGVQ7Ai&vYg4;r*gHdYr{l({Q0XzsRKY$ZSbMW2>d
zn3Zb0{PC{X^ZYr-H}2qmzc*`Z`z$vO&c*+n%LO(sS<36a@M`H^jfE~f$D0-{6MSUv
zcWL>{DI0(MZ2dg*^`?}6yFMJfA;x{h#OcgAqtoH9D|5D*uP!lT*lfByn(@vI1)j~Z
zr+)s^z42uChWXF5?M(hebo|)H@?MTR-PrC=g>}ucNVAD~%E29m5et?He%ksxETjL8
zhUJ%Elb;$f@1Aj}rfjieLg70L+4jn1FI_H{XWTZ7W(ngFHSHBxd{@cJls9&9Tip$*
zf7?V~h=eT!x-Uphf6CW?C5%(KJnE*&td4r$zkKqZ2X0H5CW${UW}MAcajp6W_w1#t
zTA~h3Okaw!0<Zkmss-{i`We_KNIq~{$~2SVnQSU!^M1MG%qv0`{Oh#%U&Ul$Hb*+o
zBj9zRO@kNfDV869wOHo=f0kEZKH(1UsZZ<+WA=;O;ACF~j3x$8S3j3^P6<r_)vr&B

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/harkenscythe/textures/items/livingmetal_shears.png b/src/main/resources/assets/harkenscythe/textures/items/livingmetal_shears.png
new file mode 100644
index 0000000000000000000000000000000000000000..78bb9b47fa1040f3d813fdf5fa437b36df80182c
GIT binary patch
literal 259
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC
z{oH>NS%G}H0G|-oP%8shBkfQdW463D`Pn<d*Y8MnGG%axU{)~)D&brv%nPKrN`m}?
z|HA;orZYO{L6QX?k;M!Qd>cTR(eLzMJD^~Mr;B5VMsVr5Xubmq94>(ZtIz#2kCAwB
zdP&WS?=HfuxBoPEJUe&wd)nUzjghjG0`C45b!^-8mbD{~H7CVh;gs5$r~4)LxEZLQ
of78IZM*DT=Wn0GiHyJD#uQ#%Xy0*@m2egC1)78&qol`;+0IfGz;Q#;t

literal 0
HcmV?d00001