Rename the 'Sunken Skeleton' to 'Sunken' (#190)

DawnTeamMC · Apr 6, 2024 · b208444 · b208444
2 parents 29d07b9 + 393ceba
commit b208444
Show file tree

Hide file tree

Showing 27 changed files with 9 additions and 9 deletions.
diff --git a/...romenade/entity/SunkenSkeletonEntity.java → ...hugman/promenade/entity/SunkenEntity.java b/...romenade/entity/SunkenSkeletonEntity.java → ...hugman/promenade/entity/SunkenEntity.java
diff --git a/...odels/item/sunken_skeleton_spawn_egg.json → ...omenade/models/item/sunken_spawn_egg.json b/...odels/item/sunken_skeleton_spawn_egg.json → ...omenade/models/item/sunken_spawn_egg.json
diff --git a/...unds/entity/sunken_skeleton/ambient/1.ogg → ...menade/sounds/entity/sunken/ambient/1.ogg b/...unds/entity/sunken_skeleton/ambient/1.ogg → ...menade/sounds/entity/sunken/ambient/1.ogg
diff --git a/...unds/entity/sunken_skeleton/ambient/2.ogg → ...menade/sounds/entity/sunken/ambient/2.ogg b/...unds/entity/sunken_skeleton/ambient/2.ogg → ...menade/sounds/entity/sunken/ambient/2.ogg
diff --git a/...unds/entity/sunken_skeleton/ambient/3.ogg → ...menade/sounds/entity/sunken/ambient/3.ogg b/...unds/entity/sunken_skeleton/ambient/3.ogg → ...menade/sounds/entity/sunken/ambient/3.ogg
diff --git a/...sounds/entity/sunken_skeleton/death/1.ogg → ...romenade/sounds/entity/sunken/death/1.ogg b/...sounds/entity/sunken_skeleton/death/1.ogg → ...romenade/sounds/entity/sunken/death/1.ogg
diff --git a/...sounds/entity/sunken_skeleton/death/2.ogg → ...romenade/sounds/entity/sunken/death/2.ogg b/...sounds/entity/sunken_skeleton/death/2.ogg → ...romenade/sounds/entity/sunken/death/2.ogg
diff --git a/...sounds/entity/sunken_skeleton/death/3.ogg → ...romenade/sounds/entity/sunken/death/3.ogg b/...sounds/entity/sunken_skeleton/death/3.ogg → ...romenade/sounds/entity/sunken/death/3.ogg
diff --git a/.../sounds/entity/sunken_skeleton/hurt/1.ogg → ...promenade/sounds/entity/sunken/hurt/1.ogg b/.../sounds/entity/sunken_skeleton/hurt/1.ogg → ...promenade/sounds/entity/sunken/hurt/1.ogg
diff --git a/.../sounds/entity/sunken_skeleton/hurt/2.ogg → ...promenade/sounds/entity/sunken/hurt/2.ogg b/.../sounds/entity/sunken_skeleton/hurt/2.ogg → ...promenade/sounds/entity/sunken/hurt/2.ogg
diff --git a/.../sounds/entity/sunken_skeleton/hurt/3.ogg → ...promenade/sounds/entity/sunken/hurt/3.ogg b/.../sounds/entity/sunken_skeleton/hurt/3.ogg → ...promenade/sounds/entity/sunken/hurt/3.ogg
diff --git a/.../sounds/entity/sunken_skeleton/hurt/4.ogg → ...promenade/sounds/entity/sunken/hurt/4.ogg b/.../sounds/entity/sunken_skeleton/hurt/4.ogg → ...promenade/sounds/entity/sunken/hurt/4.ogg
diff --git a/...sounds/entity/sunken_skeleton/shoot/1.ogg → ...romenade/sounds/entity/sunken/shoot/1.ogg b/...sounds/entity/sunken_skeleton/shoot/1.ogg → ...romenade/sounds/entity/sunken/shoot/1.ogg
diff --git a/...sounds/entity/sunken_skeleton/shoot/2.ogg → ...romenade/sounds/entity/sunken/shoot/2.ogg b/...sounds/entity/sunken_skeleton/shoot/2.ogg → ...romenade/sounds/entity/sunken/shoot/2.ogg
diff --git a/...sounds/entity/sunken_skeleton/shoot/3.ogg → ...romenade/sounds/entity/sunken/shoot/3.ogg b/...sounds/entity/sunken_skeleton/shoot/3.ogg → ...romenade/sounds/entity/sunken/shoot/3.ogg
diff --git a/.../sounds/entity/sunken_skeleton/step/1.ogg → ...promenade/sounds/entity/sunken/step/1.ogg b/.../sounds/entity/sunken_skeleton/step/1.ogg → ...promenade/sounds/entity/sunken/step/1.ogg
diff --git a/.../sounds/entity/sunken_skeleton/step/2.ogg → ...promenade/sounds/entity/sunken/step/2.ogg b/.../sounds/entity/sunken_skeleton/step/2.ogg → ...promenade/sounds/entity/sunken/step/2.ogg
diff --git a/.../sounds/entity/sunken_skeleton/step/3.ogg → ...promenade/sounds/entity/sunken/step/3.ogg b/.../sounds/entity/sunken_skeleton/step/3.ogg → ...promenade/sounds/entity/sunken/step/3.ogg
diff --git a/.../sounds/entity/sunken_skeleton/step/4.ogg → ...promenade/sounds/entity/sunken/step/4.ogg b/.../sounds/entity/sunken_skeleton/step/4.ogg → ...promenade/sounds/entity/sunken/step/4.ogg
diff --git a/...extures/entity/sunken_skeleton/bubble.png → ...omenade/textures/entity/sunken/bubble.png b/...extures/entity/sunken_skeleton/bubble.png → ...omenade/textures/entity/sunken/bubble.png
diff --git a/.../textures/entity/sunken_skeleton/fire.png → ...promenade/textures/entity/sunken/fire.png b/.../textures/entity/sunken_skeleton/fire.png → ...promenade/textures/entity/sunken/fire.png
diff --git a/.../textures/entity/sunken_skeleton/horn.png → ...promenade/textures/entity/sunken/horn.png b/.../textures/entity/sunken_skeleton/horn.png → ...promenade/textures/entity/sunken/horn.png
diff --git a/src/main/resources/data/c/tags/entity_types/monsters/skeletons.json b/src/main/resources/data/c/tags/entity_types/monsters/skeletons.json
@@ -4,6 +4,6 @@
     "minecraft:skeleton",
     "minecraft:stray",
     "minecraft:wither_skeleton",
-    "promenade:sunken_skeleton"
+    "promenade:sunken"
   ]
 }
diff --git a/src/main/resources/data/promenade/advancements/adventure/coral_bleacher_sniping.json b/src/main/resources/data/promenade/advancements/adventure/coral_bleacher_sniping.json
@@ -12,7 +12,7 @@
   },
   "parent": "minecraft:adventure/ol_betsy",
   "criteria": {
-    "kill_sunken_skeleton": {
+    "kill_sunken": {
       "trigger": "minecraft:killed_by_crossbow",
       "conditions": {
         "player": [
@@ -31,7 +31,7 @@
               "condition": "minecraft:entity_properties",
               "entity": "this",
               "predicate": {
-                "type": "promenade:sunken_skeleton",
+                "type": "promenade:sunken",
                 "location": {
                   "fluid": {
                     "fluids": "#minecraft:water"
@@ -46,7 +46,7 @@
   },
   "requirements": [
     [
-      "kill_sunken_skeleton"
+      "kill_sunken"
     ]
   ]
 }
diff --git a/src/main/resources/data/promenade/advancements/adventure/coral_reef_savior.json b/src/main/resources/data/promenade/advancements/adventure/coral_reef_savior.json
@@ -14,7 +14,7 @@
   },
   "parent": "promenade:adventure/coral_bleacher_sniping",
   "criteria": {
-    "kill_sunken_skeletons": {
+    "kill_sunkens": {
       "trigger": "minecraft:killed_by_crossbow",
       "conditions": {
         "player": [
@@ -33,7 +33,7 @@
               "condition": "minecraft:entity_properties",
               "entity": "this",
               "predicate": {
-                "type": "promenade:sunken_skeleton",
+                "type": "promenade:sunken",
                 "nbt": "{Type:bubble}",
                 "location": {
                   "fluid": {
@@ -48,7 +48,7 @@
               "condition": "minecraft:entity_properties",
               "entity": "this",
               "predicate": {
-                "type": "promenade:sunken_skeleton",
+                "type": "promenade:sunken",
                 "nbt": "{Type:fire}",
                 "location": {
                   "fluid": {
@@ -63,7 +63,7 @@
               "condition": "minecraft:entity_properties",
               "entity": "this",
               "predicate": {
-                "type": "promenade:sunken_skeleton",
+                "type": "promenade:sunken",
                 "nbt": "{Type:horn}",
                 "location": {
                   "fluid": {
@@ -79,7 +79,7 @@
   },
   "requirements": [
     [
-      "kill_sunken_skeletons"
+      "kill_sunkens"
     ]
   ],
   "rewards": {

diff --git a/...loot_tables/entities/sunken_skeleton.json → ...romenade/loot_tables/entities/sunken.json b/...loot_tables/entities/sunken_skeleton.json → ...romenade/loot_tables/entities/sunken.json
diff --git a/...orldgen/biome/spawns/sunken_skeleton.json → ...de/tags/worldgen/biome/spawns/sunken.json b/...orldgen/biome/spawns/sunken_skeleton.json → ...de/tags/worldgen/biome/spawns/sunken.json