added angler fish to "kill all sculk mobs" advancement

KyaniteMods · Apr 1, 2024 · 0edf0c7 · 0edf0c7
1 parent f1e407f
commit 0edf0c7
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 b/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0
@@ -1,9 +1,9 @@
-// 1.20.1	2024-03-31T23:06:05.6115065	Advancements
+// 1.20.1	2024-03-31T23:09:31.6211323	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
+2608568b86d9f0f55dfbfdaf5761ee156c2375ee data/deeperdarker/advancements/main/kill_all_sculk_mobs.json
 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

diff --git a/src/generated/resources/data/deeperdarker/advancements/main/kill_all_sculk_mobs.json b/src/generated/resources/data/deeperdarker/advancements/main/kill_all_sculk_mobs.json
@@ -1,6 +1,20 @@
 {
   "parent": "deeperdarker:main/enter_otherside",
   "criteria": {
+    "angler_fish": {
+      "conditions": {
+        "entity": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "type": "deeperdarker:angler_fish"
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:player_killed_entity"
+    },
     "phantom": {
       "conditions": {
         "entity": [
@@ -137,6 +151,9 @@
     [
       "warden"
     ],
+    [
+      "angler_fish"
+    ],
     [
       "sculk_centipede"
     ],

diff --git a/src/main/java/com/kyanite/deeperdarker/datagen/data/DDAdvancements.java b/src/main/java/com/kyanite/deeperdarker/datagen/data/DDAdvancements.java
@@ -64,6 +64,7 @@ public void generate(HolderLookup.Provider registries, Consumer<Advancement> sav
         Advancement.Builder.advancement().parent(enterOtherside).display(DDItems.WARDEN_SWORD.get(), Component.translatable(id + "kill_all_sculk_mobs.title"), Component.translatable(id + "kill_all_sculk_mobs.description"), null, FrameType.CHALLENGE, true, true, false)
                 .addCriterion("phantom", KilledTrigger.TriggerInstance.playerKilledEntity(EntityPredicate.Builder.entity().of(EntityType.PHANTOM)))
                 .addCriterion("warden", KilledTrigger.TriggerInstance.playerKilledEntity(EntityPredicate.Builder.entity().of(EntityType.WARDEN)))
+                .addCriterion("angler_fish", KilledTrigger.TriggerInstance.playerKilledEntity(EntityPredicate.Builder.entity().of(DDEntities.ANGLER_FISH.get())))
                 .addCriterion("sculk_centipede", KilledTrigger.TriggerInstance.playerKilledEntity(EntityPredicate.Builder.entity().of(DDEntities.SCULK_CENTIPEDE.get())))
                 .addCriterion("sculk_leech", KilledTrigger.TriggerInstance.playerKilledEntity(EntityPredicate.Builder.entity().of(DDEntities.SCULK_LEECH.get())))
                 .addCriterion("sculk_snapper", KilledTrigger.TriggerInstance.playerKilledEntity(EntityPredicate.Builder.entity().of(DDEntities.SCULK_SNAPPER.get())))