feature: Copper Sickle

.github/workflows/lint-commit.yml

@@ -14,7 +14,7 @@ jobs:
           persist-credentials: false
           ref: ${{ github.event.pull_request.head.sha }}
 
-      - uses: actions/setup-node@v5.0.0
+      - uses: actions/setup-node@v6.0.0
         with:
           node-version: 22
       - run: |

gradle/libs.versions.toml

@@ -3,7 +3,7 @@ paper = "1.21.10-R0.1-SNAPSHOT"
 bstats = "3.1.0"
 
 [libraries]
-annotations = {group = "org.jetbrains", name = "annotations", version = "26.0.2"}
+annotations = {group = "org.jetbrains", name = "annotations", version = "26.0.2-1"}
 reflections = {group = "org.reflections", name = "reflections", version = "0.10.2"}
 commonsLang = {group = "org.apache.commons", name = "commons-lang3", version = "3.19.0"}
 commonsText = {group = "org.apache.commons", name = "commons-text", version = "1.14.0"}
@@ -15,17 +15,17 @@ nightConfig = {group = "com.electronwill.night-config", name = "toml", version =
 bstatsBase = {group = "org.bstats", name = "bstats-base", version.ref = "bstats"}
 bstatsBukkit = {group = "org.bstats", name = "bstats-bukkit", version.ref = "bstats"}
 bstatsVelocity = {group = "org.bstats", name = "bstats-velocity", version.ref = "bstats"}
-protocollib = {group = "net.dmulloy2", name = "ProtocolLib", version = "5.4.0-SNAPSHOT"}
+protocollib = {group = "net.dmulloy2", name = "ProtocolLib", version = "5.4.0"}
 vault = {group = "com.github.MilkBowl", name = "VaultAPI", version = "1.7.1"}
 velocity = {group = "com.velocitypowered", name = "velocity-api", version = "3.4.0-SNAPSHOT"}
-packetEvents = {group = "com.github.retrooper", name = "packetevents-spigot", version = "2.9.5"}
+packetEvents = {group = "com.github.retrooper", name = "packetevents-spigot", version = "2.10.0"}
 
 # maps
 dynmap = {group = "us.dynmap", name = "DynmapCoreAPI", version = "3.7-beta-6"}
 bluemap = {group = "de.bluecolored", name = "bluemap-api", version = "2.7.6"}
 
 [plugins]
 paperweightUserdev = {id = "io.papermc.paperweight.userdev", version = "2.0.0-beta.19"}
-runPaper = {id = "xyz.jpenilla.run-paper", version = "3.0.0"}
+runPaper = {id = "xyz.jpenilla.run-paper", version = "3.0.2"}
 shadow = {id = "com.gradleup.shadow", version = "9.2.2"}
-blossom = {id = "net.kyori.blossom", version = "2.1.0"}
+blossom = {id = "net.kyori.blossom", version = "2.2.0"}

vane-trifles/src/main/java/org/oddlama/vane/trifles/Trifles.java

@@ -7,7 +7,7 @@
 import java.util.HashMap;
 import java.util.UUID;
 
-@VaneModule(name = "trifles", bstats = 8644, config_version = 4, lang_version = 4, storage_version = 1)
+@VaneModule(name = "trifles", bstats = 8644, config_version = 5, lang_version = 5, storage_version = 1)
 public class Trifles extends Module<Trifles> {
 
     public final HashMap<UUID, Long> last_xp_bottle_consume_time = new HashMap<>();

vane-trifles/src/main/java/org/oddlama/vane/trifles/items/Sickles.java

@@ -88,6 +88,37 @@ public RecipeList default_recipes() {
         }
     }
 
+    @VaneItem(name = "copper_sickle", base = Material.COPPER_HOE, model_data = 0x760018, version = 1)
+    public static class CopperSickle extends Sickle {
+
+        public CopperSickle(Context<Trifles> context) {
+            super(context);
+        }
+
+        public double config_attack_damage_def() {
+            return 1.5;
+        }
+
+        public double config_attack_speed_def() {
+            return 1.5;
+        }
+
+        public int config_harvest_radius_def() {
+            return 1;
+        }
+
+        @Override
+        public RecipeList default_recipes() {
+            return RecipeList.of(
+                    new ShapedRecipeDefinition("generic")
+                            .shape(" mm", "  m", " s ")
+                            .set_ingredient('m', Material.COPPER_INGOT)
+                            .set_ingredient('s', Material.STICK)
+                            .result(key().toString())
+            );
+        }
+    }
+
     @VaneItem(name = "iron_sickle", base = Material.IRON_HOE, model_data = 0x760006, version = 1)
     public static class IronSickle extends Sickle {
 
@@ -216,6 +247,7 @@ public Sickles(Context<Trifles> context) {
         super(context.group("sickles", "Several sickles that allow players to harvest crops in a radius."));
         new WoodenSickle(get_context());
         new StoneSickle(get_context());
+        new CopperSickle(get_context());
         new IronSickle(get_context());
         new GoldenSickle(get_context());
         new DiamondSickle(get_context());

vane-trifles/src/main/resources/lang-de.yml

@@ -12,7 +12,7 @@
 
 # DO NOT CHANGE! The version of this language file. Used to determine
 # if the file needs to be updated.
-version: 4
+version: 5
 # The corresponding language code used in resource packs. Used for
 # resource pack generation. Typically, this is a combination of the
 # language code (ISO 639) and the country code (ISO 3166).
@@ -78,6 +78,8 @@ sickles:
     name: "Holzsichel"
   item_stone_sickle:
     name: "Steinsichel"
+  item_copper_sickle:
+    name: "Kupfersichel"
   item_iron_sickle:
     name: "Eisensichel"
   item_golden_sickle:

vane-trifles/src/main/resources/lang-en.yml

@@ -12,7 +12,7 @@
 
 # DO NOT CHANGE! The version of this language file. Used to determine
 # if the file needs to be updated.
-version: 4
+version: 5
 # The corresponding language code used in resource packs. Used for
 # resource pack generation. Typically, this is a combination of the
 # language code (ISO 639) and the country code (ISO 3166).
@@ -96,6 +96,9 @@ sickles:
   item_iron_sickle:
     # The display name of this item variant.
     name: "Iron Sickle"
+  item_copper_sickle:
+    # The display name of this item variant.
+    name: "Copper Sickle"
   item_golden_sickle:
     # The display name of this item variant.
     name: "Golden Sickle"

vane-trifles/src/main/resources/lang-es.yml

@@ -12,7 +12,7 @@
 
 # ¡NO CAMBIAR! La versión de este archivo de idioma. Se utiliza para determinar
 # si el archivo necesita actualizarse.
-version: 4
+version: 5
 # El código de idioma correspondiente utilizado en paquetes de recursos. Se utiliza para
 # la generación de paquetes de recursos. Típicamente, esto es una combinación del código de
 # idioma (ISO 639) y el código de país (ISO 3166).
@@ -93,6 +93,9 @@ sickles:
   item_stone_sickle:
     # El nombre visual de esta variante de objeto.
     name: "Hoz de piedra"
+  item_copper_sickle:
+    # El nombre visual de esta variante de objeto.
+    name: "Hoz de cobre"
   item_iron_sickle:
     # El nombre visual de esta variante de objeto.
     name: "Hoz de hierro"

vane-trifles/src/main/resources/lang-fr-fr.yml

@@ -12,7 +12,7 @@
 
 # DO NOT CHANGE! The version of this language file. Used to determine
 # if the file needs to be updated.
-version: 4
+version: 5
 # The corresponding language code used in resource packs. Used for
 # resource pack generation. Typically, this is a combination of the
 # language code (ISO 639) and the country code (ISO 3166).
@@ -77,6 +77,8 @@ sickles:
     name: "Faucille en bois"
   item_stone_sickle:
     name: "Faucille en pierre"
+  item_copper_sickle:
+    name: "Faucille en cuivre"
   item_iron_sickle:
     name: "Faucille en fer"
   item_golden_sickle:

vane-trifles/src/main/resources/lang-ru.yml

@@ -12,7 +12,7 @@
 
 # DO NOT CHANGE! The version of this language file. Used to determine
 # if the file needs to be updated.
-version: 4
+version: 5
 # The corresponding language code used in resource packs. Used for
 # resource pack generation. Typically, this is a combination of the
 # language code (ISO 639) and the country code (ISO 3166).
@@ -77,6 +77,8 @@ sickles:
     name: "Деревянный Серп"
   item_stone_sickle:
     name: "Каменный Серп"
+  item_copper_sickle:
+    name: "медный Серп"
   item_iron_sickle:
     name: "Железный Серп"
   item_golden_sickle:

vane-trifles/src/main/resources/lang-tr.yml

@@ -12,7 +12,7 @@
 
 # DO NOT CHANGE! The version of this language file. Used to determine
 # if the file needs to be updated.
-version: 4
+version: 5
 # The corresponding language code used in resource packs. Used for
 # resource pack generation. Typically, this is a combination of the
 # language code (ISO 639) and the country code (ISO 3166).
@@ -93,6 +93,9 @@ sickles:
   item_stone_sickle:
     # The display name of this item variant.
     name: "Taş Orak"
+  item_copper_sickle:
+    # The display name of this item variant.
+    name: "Bakır Orak"
   item_iron_sickle:
     # The display name of this item variant.
     name: "Demir Orak"

vane-trifles/src/main/resources/lang-zh-cn.yml

@@ -12,7 +12,7 @@
 
 # DO NOT CHANGE! The version of this language file. Used to determine
 # if the file needs to be updated.
-version: 4
+version: 5
 # The corresponding language code used in resource packs. Used for
 # resource pack generation. Typically, this is a combination of the
 # language code (ISO 639) and the country code (ISO 3166).
@@ -77,6 +77,8 @@ sickles:
     name: "木镰刀"
   item_stone_sickle:
     name: "石镰刀"
+  item_copper_sickle:
+    name: "铜镰刀"
   item_iron_sickle:
     name: "铁镰刀"
   item_golden_sickle:

vane-trifles/src/main/resources/lang-zh-tw.yml

@@ -12,7 +12,7 @@
 
 # DO NOT CHANGE! The version of this language file. Used to determine
 # if the file needs to be updated.
-version: 4
+version: 5
 # The corresponding language code used in resource packs. Used for
 # resource pack generation. Typically, this is a combination of the
 # language code (ISO 639) and the country code (ISO 3166).
@@ -77,6 +77,8 @@ sickles:
     name: "木鐮刀"
   item_stone_sickle:
     name: "石鐮刀"
+  item_copper_sickle:
+    name: "銅鐮刀"
   item_iron_sickle:
     name: "鐵鐮刀"
   item_golden_sickle:

vane-trifles/src/main/resources/resource_pack/assets/minecraft/items/copper_hoe.json

@@ -0,0 +1,19 @@
+{
+  "model": {
+    "type": "range_dispatch",
+    "property": "minecraft:custom_model_data",
+    "fallback": {
+      "type": "model",
+      "model": "minecraft:item/copper_hoe"
+    },
+    "entries": [
+      {
+        "threshold": 7733272,
+        "model": {
+          "type": "model",
+          "model": "vane_trifles:item/copper_sickle"
+        }
+      }
+    ]
+  }
+}

vane-trifles/src/main/resources/resource_pack/assets/vane_trifles/models/item/copper_sickle.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "vane_trifles:item/copper_sickle"
+  }
+}

vane-trifles/src/main/resources/resource_pack/index

@@ -1,4 +1,5 @@
 assets/minecraft/items/compass.json
+assets/minecraft/items/copper_hoe.json
 assets/minecraft/items/diamond_hoe.json
 assets/minecraft/items/dropper.json
 assets/minecraft/items/elytra.json
@@ -14,6 +15,7 @@ assets/minecraft/items/stone_hoe.json
 assets/minecraft/items/warped_fungus_on_a_stick.json
 assets/minecraft/items/wooden_hoe.json
 assets/vane_trifles/models/item/backpack.json
+assets/vane_trifles/models/item/copper_sickle.json
 assets/vane_trifles/models/item/death_scroll.json
 assets/vane_trifles/models/item/diamond_sickle.json
 assets/vane_trifles/models/item/empty_xp_bottle.json
@@ -70,6 +72,7 @@ assets/vane_trifles/models/item/trowel.json
 assets/vane_trifles/models/item/unstable_scroll.json
 assets/vane_trifles/models/item/wooden_sickle.json
 assets/vane_trifles/textures/item/backpack.png
+assets/vane_trifles/textures/item/copper_sickle.png
 assets/vane_trifles/textures/item/death_scroll.png
 assets/vane_trifles/textures/item/diamond_sickle.png
 assets/vane_trifles/textures/item/empty_xp_bottle.png