sonorous staff now changes texture depending on its charge

src/generated/resources/.cache/2cdab8a05c139b60806a3879962e52a7f2933554

@@ -1,4 +1,4 @@
-// 1.20.1	2024-03-31T12:15:13.7568623	Item Models: deeperdarker
+// 1.20.1	2024-03-31T22:17:05.5946628	Item Models: deeperdarker
 b36185a1f9e1c105ef9ef404ee0483eedd9ecd79 assets/deeperdarker/models/item/ancient_vase.json
 63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/deeperdarker/models/item/angler_fish_spawn_egg.json
 f2fe62e9aa1b817d10053a94259d530922d39562 assets/deeperdarker/models/item/blooming_moss_block.json
@@ -139,7 +139,8 @@ a486e0567f9d7ed81cc982dc986042fa09f181d8 assets/deeperdarker/models/item/smooth_
 a1f22e43599c4d3bbd8648c65b9ad06dbb5e9c31 assets/deeperdarker/models/item/smooth_sculk_stone_slab.json
 ecdd52a3fde66627f40bb6f2727b1f39e8227cda assets/deeperdarker/models/item/smooth_sculk_stone_stairs.json
 ae8bb988e24dd1b2fc704b8e6b9e0e2bd9768190 assets/deeperdarker/models/item/smooth_sculk_stone_wall.json
-4acd4ef5e49dfa4b6300e7b862159d117d28ebb6 assets/deeperdarker/models/item/sonorous_staff.json
+b2ae613daab1455a4ca75d5a9236e890273ff98d assets/deeperdarker/models/item/sonorous_staff_charged.json
+94253382ef867d3a104f61fd254dcf2c4d27ac1f assets/deeperdarker/models/item/sonorous_staff_charging.json
 276ee6aa65e11bc12857f29c799269d6fa1d05e2 assets/deeperdarker/models/item/soul_crystal.json
 dfa96b7647fd60a7cbf8f12e16e854cd0773ba0c assets/deeperdarker/models/item/soul_dust.json
 7fa6b2d8c37ca5af719a2aeea3c2c4311b735068 assets/deeperdarker/models/item/soul_elytra_broken.json

src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0

@@ -1,4 +1,4 @@
-// 1.20.1	2023-11-03T15:15:58.7181675	Advancements
+// 1.20.1	2024-03-31T22:17:05.6043485	Advancements
 a76845401466a58c8f341ce586f131a1d31c123e data/deeperdarker/advancements/main/enter_otherside.json
 8b124d675dec747cdc32486c1d7098eb8bce594d data/deeperdarker/advancements/main/explore_otherside.json
 cf318040575219b02ae94941e0fb33c02f196203 data/deeperdarker/advancements/main/find_ancient_city.json
@@ -7,6 +7,6 @@ e35f7e028016ba746172bbef9f8469f33e99a450 data/deeperdarker/advancements/main/fin
 12f0245d5431f178e2d5ac6355e49e7c8c729034 data/deeperdarker/advancements/main/kill_warden.json
 7900a37a8e06c23dd7b3a659f04d6412cf42451c data/deeperdarker/advancements/main/obtain_reinforced_echo_shard.json
 bcc957ddb06cfce6c593c7065f0442333200594d data/deeperdarker/advancements/main/obtain_sculk_transmitter.json
-f53723b815feada7f9b49dcd7dfa0785d0de0a31 data/deeperdarker/advancements/main/obtain_warden_staff.json
+3e75ead8084f5dac02dcebecd191fc441fac668e data/deeperdarker/advancements/main/obtain_warden_staff.json
 bb97859071e5fd47e387710d8c90493a84e0bf3c data/deeperdarker/advancements/main/root.json
 96a4ca460a4dcf817a45737c9140feebdeb48a36 data/deeperdarker/advancements/main/warden_armor.json

src/generated/resources/assets/deeperdarker/models/item/sonorous_staff.json → src/generated/resources/assets/deeperdarker/models/item/sonorous_staff_charged.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "deeperdarker:item/sonorous_staff"
+    "layer0": "deeperdarker:item/sonorous_staff_charged"
   }
 }

src/generated/resources/assets/deeperdarker/models/item/sonorous_staff_charging.json

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

src/generated/resources/data/deeperdarker/advancements/main/obtain_warden_staff.json

@@ -22,7 +22,8 @@
     "frame": "task",
     "hidden": false,
     "icon": {
-      "item": "deeperdarker:sonorous_staff"
+      "item": "deeperdarker:sonorous_staff",
+      "nbt": "{Damage:0}"
     },
     "show_toast": true,
     "title": {

src/main/java/com/kyanite/deeperdarker/DeeperDarker.java

@@ -232,6 +232,7 @@ public static void clientSetup(final FMLClientSetupEvent event) {
                 Sheets.addWoodType(DDBlocks.BLOOM);
                 ItemProperties.register(DDItems.SOUL_ELYTRA.get(), new ResourceLocation("broken"), (pStack, pLevel, pEntity, pSeed) -> SoulElytraItem.isFlyEnabled(pStack) ? 0 : 1);
                 ItemProperties.register(DDItems.SCULK_TRANSMITTER.get(), new ResourceLocation(MOD_ID, "linked"), (pStack, pLevel, pEntity, pSeed) -> pStack.hasTag() && pStack.getTag().contains("blockPos") ? 1 : 0);
+                ItemProperties.register(DDItems.SONOROUS_STAFF.get(), new ResourceLocation(MOD_ID, "charge"), (pStack, pLevel, pEntity, pSeed) -> pEntity != null && pEntity.getUseItem() == pStack ? (pStack.getUseDuration() - pEntity.getUseItemRemainingTicks()) / 668f : 0);
             });
 
             BlockEntityRenderers.register(DDBlockEntities.DEEPER_DARKER_SIGNS.get(), SignRenderer::new);

src/main/java/com/kyanite/deeperdarker/datagen/assets/DDItemModelProvider.java

@@ -187,7 +187,8 @@ protected void registerModels() {
         itemModel(DDItems.REINFORCED_ECHO_SHARD, GENERATED);
 
         itemModelWithSuffix(DDItems.SCULK_TRANSMITTER, GENERATED, "on");
-         itemModel(DDItems.SONOROUS_STAFF, HANDHELD);
+        itemModelWithSuffix(DDItems.SONOROUS_STAFF, HANDHELD, "charged");
+        itemModelWithSuffix(DDItems.SONOROUS_STAFF, HANDHELD, "charging");
         itemModel(DDItems.WARDEN_UPGRADE_SMITHING_TEMPLATE, GENERATED);
 
         spawnEggModel(DDItems.ANGLER_FISH_SPAWN_EGG);

src/main/resources/assets/deeperdarker/models/item/sonorous_staff.json

@@ -0,0 +1,20 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "deeperdarker:item/sonorous_staff"
+  },
+  "overrides": [
+    {
+      "predicate": {
+        "deeperdarker:charge": 0.001
+      },
+      "model": "deeperdarker:item/sonorous_staff_charging"
+    },
+    {
+      "predicate": {
+        "deeperdarker:charge": 1
+      },
+      "model": "deeperdarker:item/sonorous_staff_charged"
+    }
+  ]
+}