Sonorous Staff now gets registered. Still needs a texture, but otherw…

…ise works perfectly.
KyaniteMods · Nov 3, 2023 · 07c26b9 · 07c26b9
1 parent 66472e5
commit 07c26b9
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 17 deletions.
diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
@@ -1,2 +1,2 @@
-// 1.20.1	2023-11-01T14:34:17.0041112	Languages: en_us
-75d97b9e003361e541f9deb2be48c0393c5d99f6 assets/deeperdarker/lang/en_us.json
+// 1.20.1	2023-11-03T15:15:58.7101636	Languages: en_us
+e2c8f4e35948e0adf4b5147469c4d3af6a9c9c5f assets/deeperdarker/lang/en_us.json
diff --git a/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 b/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0
@@ -1,11 +1,12 @@
-// 1.20.1	2023-10-21T23:34:22.8911106	Advancements
+// 1.20.1	2023-11-03T15:15:58.7181675	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
 e35f7e028016ba746172bbef9f8469f33e99a450 data/deeperdarker/advancements/main/find_ancient_temple.json
 0025e3f26af1bd7a49bef17667fd7df05657e4c9 data/deeperdarker/advancements/main/kill_all_sculk_mobs.json
 12f0245d5431f178e2d5ac6355e49e7c8c729034 data/deeperdarker/advancements/main/kill_warden.json
-a6843dc478686746fc060953abc28acae4be33e3 data/deeperdarker/advancements/main/obtain_reinforce_echo_shard.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
 bb97859071e5fd47e387710d8c90493a84e0bf3c data/deeperdarker/advancements/main/root.json
-9a8e630b0cc290791c3883160f3fd7adec527dc7 data/deeperdarker/advancements/main/warden_armor.json
+96a4ca460a4dcf817a45737c9140feebdeb48a36 data/deeperdarker/advancements/main/warden_armor.json
diff --git a/src/generated/resources/assets/deeperdarker/lang/en_us.json b/src/generated/resources/assets/deeperdarker/lang/en_us.json
@@ -11,10 +11,12 @@
   "advancements.deeperdarker.kill_all_sculk_mobs.title": "Sculk Slayer",
   "advancements.deeperdarker.kill_warden.description": "Slay the Warden and take its heart",
   "advancements.deeperdarker.kill_warden.title": "Phantom Thief",
-  "advancements.deeperdarker.obtain_reinforce_echo_shard.description": "Reinforce an Echo Shard",
-  "advancements.deeperdarker.obtain_reinforce_echo_shard.title": "Sculk Engineer",
+  "advancements.deeperdarker.obtain_reinforced_echo_shard.description": "Reinforce an Echo Shard",
+  "advancements.deeperdarker.obtain_reinforced_echo_shard.title": "Sculk Engineer",
   "advancements.deeperdarker.obtain_sculk_transmitter.description": "Acquire a Sculk Transmitter",
   "advancements.deeperdarker.obtain_sculk_transmitter.title": "Remote Storage",
+  "advancements.deeperdarker.obtain_warden_staff.description": "Acquire a Sonorous Staff",
+  "advancements.deeperdarker.obtain_warden_staff.title": "Noise Complaint",
   "advancements.deeperdarker.root.description": "You feel something pulling you towards the source...",
   "advancements.deeperdarker.root.title": "Sculk Story",
   "advancements.deeperdarker.warden_armor.description": "Protect yourself with a full set of Warden Armor",
@@ -172,6 +174,7 @@
   "item.deeperdarker.smithing_template.warden_upgrade.applies_to": "Netherite Equipment",
   "item.deeperdarker.smithing_template.warden_upgrade.base_slot_description": "Add netherite armor, weapon, or tool",
   "item.deeperdarker.smithing_template.warden_upgrade.ingredients": "Reinforced Echo Shard",
+  "item.deeperdarker.sonorous_staff": "Sonorous Staff",
   "item.deeperdarker.soul_crystal": "Soul Crystal",
   "item.deeperdarker.soul_dust": "Soul Dust",
   "item.deeperdarker.soul_elytra": "Soul Elytra",

diff --git a/...nts/main/obtain_reinforce_echo_shard.json → ...ts/main/obtain_reinforced_echo_shard.json b/...nts/main/obtain_reinforce_echo_shard.json → ...ts/main/obtain_reinforced_echo_shard.json
@@ -1,7 +1,7 @@
 {
   "parent": "deeperdarker:main/kill_warden",
   "criteria": {
-    "reinforce_echo_shard": {
+    "reinforced_echo_shard": {
       "conditions": {
         "items": [
           {
@@ -17,7 +17,7 @@
   "display": {
     "announce_to_chat": true,
     "description": {
-      "translate": "advancements.deeperdarker.obtain_reinforce_echo_shard.description"
+      "translate": "advancements.deeperdarker.obtain_reinforced_echo_shard.description"
     },
     "frame": "task",
     "hidden": false,
@@ -26,12 +26,12 @@
     },
     "show_toast": true,
     "title": {
-      "translate": "advancements.deeperdarker.obtain_reinforce_echo_shard.title"
+      "translate": "advancements.deeperdarker.obtain_reinforced_echo_shard.title"
     }
   },
   "requirements": [
     [
-      "reinforce_echo_shard"
+      "reinforced_echo_shard"
     ]
   ],
   "sends_telemetry_event": true

diff --git a/src/generated/resources/data/deeperdarker/advancements/main/obtain_warden_staff.json b/src/generated/resources/data/deeperdarker/advancements/main/obtain_warden_staff.json
@@ -0,0 +1,38 @@
+{
+  "parent": "deeperdarker:main/enter_otherside",
+  "criteria": {
+    "warden_staff": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "deeperdarker:sonorous_staff"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "display": {
+    "announce_to_chat": true,
+    "description": {
+      "translate": "advancements.deeperdarker.obtain_warden_staff.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "deeperdarker:sonorous_staff"
+    },
+    "show_toast": true,
+    "title": {
+      "translate": "advancements.deeperdarker.obtain_warden_staff.title"
+    }
+  },
+  "requirements": [
+    [
+      "warden_staff"
+    ]
+  ],
+  "sends_telemetry_event": true
+}
diff --git a/src/generated/resources/data/deeperdarker/advancements/main/warden_armor.json b/src/generated/resources/data/deeperdarker/advancements/main/warden_armor.json
@@ -1,5 +1,5 @@
 {
-  "parent": "deeperdarker:main/obtain_reinforce_echo_shard",
+  "parent": "deeperdarker:main/obtain_reinforced_echo_shard",
   "criteria": {
     "warden_armor": {
       "conditions": {

diff --git a/src/main/java/com/kyanite/deeperdarker/content/DDItems.java b/src/main/java/com/kyanite/deeperdarker/content/DDItems.java
@@ -55,7 +55,7 @@ public class DDItems {
     public static final RegistryObject<Item> WARDEN_BOOTS = ITEMS.register("warden_boots", () -> new WardenArmorItem(DDArmorMaterials.WARDEN, ArmorItem.Type.BOOTS, new Item.Properties().rarity(Rarity.RARE).fireResistant()));
 
     public static final RegistryObject<Item> SCULK_TRANSMITTER = ITEMS.register("sculk_transmitter", () -> new SculkTransmitterItem(new Item.Properties().stacksTo(1).rarity(Rarity.RARE)));
-    // public static final RegistryObject<Item> SONOROUS_STAFF = ITEMS.register("sonorous_staff", () -> new WardenStaffItem(new Item.Properties().stacksTo(1).rarity(Rarity.RARE)));
+    public static final RegistryObject<Item> SONOROUS_STAFF = ITEMS.register("sonorous_staff", () -> new WardenStaffItem(new Item.Properties().stacksTo(1).rarity(Rarity.RARE)));
 
     public static final RegistryObject<Item> SCULK_CENTIPEDE_SPAWN_EGG = ITEMS.register("sculk_centipede_spawn_egg", () -> new ForgeSpawnEggItem(DDEntities.SCULK_CENTIPEDE, 0x1a2340, 0xded697, new Item.Properties()));
     public static final RegistryObject<Item> SCULK_LEECH_SPAWN_EGG = ITEMS.register("sculk_leech_spawn_egg", () -> new ForgeSpawnEggItem(DDEntities.SCULK_LEECH, 0x152b38, 0x47e5ed, new Item.Properties()));

diff --git a/src/main/java/com/kyanite/deeperdarker/datagen/assets/DDItemModelProvider.java b/src/main/java/com/kyanite/deeperdarker/datagen/assets/DDItemModelProvider.java
@@ -170,6 +170,7 @@ protected void registerModels() {
         itemModel(DDItems.REINFORCED_ECHO_SHARD, GENERATED);
 
         itemModelWithSuffix(DDItems.SCULK_TRANSMITTER, GENERATED, "on");
+        // itemModel(DDItems.SONOROUS_STAFF, GENERATED);
         itemModel(DDItems.WARDEN_UPGRADE_SMITHING_TEMPLATE, GENERATED);
 
         spawnEggModel(DDItems.SCULK_CENTIPEDE_SPAWN_EGG);

diff --git a/src/main/java/com/kyanite/deeperdarker/datagen/assets/ENLanguageProvider.java b/src/main/java/com/kyanite/deeperdarker/datagen/assets/ENLanguageProvider.java
@@ -45,10 +45,13 @@ protected void addTranslations() {
         add("advancements." + DeeperDarker.MOD_ID + ".explore_otherside.description", "Explore all Otherside biomes");
         add("advancements." + DeeperDarker.MOD_ID + ".kill_all_sculk_mobs.title", "Sculk Slayer");
         add("advancements." + DeeperDarker.MOD_ID + ".kill_all_sculk_mobs.description", "Kill one of every Sculk monster");
-        add("advancements." + DeeperDarker.MOD_ID + ".obtain_reinforce_echo_shard.title", "Sculk Engineer");
-        add("advancements." + DeeperDarker.MOD_ID + ".obtain_reinforce_echo_shard.description", "Reinforce an Echo Shard");
+        add("advancements." + DeeperDarker.MOD_ID + ".obtain_reinforced_echo_shard.title", "Sculk Engineer");
+        add("advancements." + DeeperDarker.MOD_ID + ".obtain_reinforced_echo_shard.description", "Reinforce an Echo Shard");
         add("advancements." + DeeperDarker.MOD_ID + ".warden_armor.title", "Cover Me with Sculk");
         add("advancements." + DeeperDarker.MOD_ID + ".warden_armor.description", "Protect yourself with a full set of Warden Armor");
+        add("advancements." + DeeperDarker.MOD_ID + ".obtain_warden_staff.title", "Noise Complaint");
+        add("advancements." + DeeperDarker.MOD_ID + ".obtain_warden_staff.description", "Acquire a Sonorous Staff");
+
 
         add("itemGroup." + DeeperDarker.MOD_ID, "Deeper and Darker");
         add("block." + DeeperDarker.MOD_ID + ".linked", "Linked transmitter");

diff --git a/src/main/java/com/kyanite/deeperdarker/datagen/data/DDAdvancements.java b/src/main/java/com/kyanite/deeperdarker/datagen/data/DDAdvancements.java
@@ -51,6 +51,9 @@ public void generate(HolderLookup.Provider registries, Consumer<Advancement> sav
         Advancement.Builder.advancement().parent(findAncientTemple).display(DDItems.SCULK_TRANSMITTER.get(), Component.translatable(id + "obtain_sculk_transmitter.title"), Component.translatable(id + "obtain_sculk_transmitter.description"), null, FrameType.TASK, true, true, false)
                 .addCriterion("sculk_transmitter", InventoryChangeTrigger.TriggerInstance.hasItems(DDItems.SCULK_TRANSMITTER.get())).save(saver, path("obtain_sculk_transmitter"), existingFileHelper);
 
+        Advancement.Builder.advancement().parent(enterOtherside).display(DDItems.SONOROUS_STAFF.get(), Component.translatable(id + "obtain_warden_staff.title"), Component.translatable(id + "obtain_warden_staff.description"), null, FrameType.TASK, true, true, false)
+                .addCriterion("warden_staff", InventoryChangeTrigger.TriggerInstance.hasItems(DDItems.SONOROUS_STAFF.get())).save(saver, path("obtain_warden_staff"), existingFileHelper);
+
         Advancement.Builder.advancement().parent(enterOtherside).display(DDItems.WARDEN_BOOTS.get(), Component.translatable(id + "explore_otherside.title"), Component.translatable(id + "explore_otherside.description"), null, FrameType.CHALLENGE, true, true, false)
                 .addCriterion("deeplands", PlayerTrigger.TriggerInstance.located(LocationPredicate.inBiome(OthersideBiomes.DEEPLANDS)))
                 .addCriterion("echoing_forest", PlayerTrigger.TriggerInstance.located(LocationPredicate.inBiome(OthersideBiomes.ECHOING_FOREST)))
@@ -69,8 +72,8 @@ public void generate(HolderLookup.Provider registries, Consumer<Advancement> sav
                 .addCriterion("stalker", KilledTrigger.TriggerInstance.playerKilledEntity(EntityPredicate.Builder.entity().of(DDEntities.STALKER.get())))
                 .requirements(RequirementsStrategy.AND).rewards(AdvancementRewards.Builder.experience(100)).save(saver, path("kill_all_sculk_mobs"), existingFileHelper);
 
-        Advancement obtainReinforcedEchoShard = Advancement.Builder.advancement().parent(killWarden).display(DDItems.REINFORCED_ECHO_SHARD.get(), Component.translatable(id + "obtain_reinforce_echo_shard.title"), Component.translatable(id + "obtain_reinforce_echo_shard.description"), null, FrameType.TASK, true, true, false)
-                .addCriterion("reinforce_echo_shard", InventoryChangeTrigger.TriggerInstance.hasItems(DDItems.REINFORCED_ECHO_SHARD.get())).save(saver, path("obtain_reinforce_echo_shard"), existingFileHelper);
+        Advancement obtainReinforcedEchoShard = Advancement.Builder.advancement().parent(killWarden).display(DDItems.REINFORCED_ECHO_SHARD.get(), Component.translatable(id + "obtain_reinforced_echo_shard.title"), Component.translatable(id + "obtain_reinforced_echo_shard.description"), null, FrameType.TASK, true, true, false)
+                .addCriterion("reinforced_echo_shard", InventoryChangeTrigger.TriggerInstance.hasItems(DDItems.REINFORCED_ECHO_SHARD.get())).save(saver, path("obtain_reinforced_echo_shard"), existingFileHelper);
 
         Advancement.Builder.advancement().parent(obtainReinforcedEchoShard).display(DDItems.WARDEN_CHESTPLATE.get(), Component.translatable(id + "warden_armor.title"), Component.translatable(id + "warden_armor.description"), null, FrameType.CHALLENGE, true, true, false)
                 .addCriterion("warden_armor", InventoryChangeTrigger.TriggerInstance.hasItems(DDItems.WARDEN_HELMET.get(), DDItems.WARDEN_CHESTPLATE.get(), DDItems.WARDEN_LEGGINGS.get(), DDItems.WARDEN_BOOTS.get()))