Add undead players and animi shamir compatibility

gm4_animi_shamir/beet.yaml

@@ -7,12 +7,14 @@ data_pack:
 
 pipeline:
   - gm4.plugins.extend.module
+  - gm4.plugins.include.lib_player_death
 
 meta:
   gm4:
     versioning:
       required:
         gm4_metallurgy: 1.2.0
+        lib_player_death: 1.0.0
       schedule_loops: [main]
     website:
       description: Adds the Animi Shamir to Metallurgy. Items with Animi will respawn with you when you die!

gm4_animi_shamir/data/gm4_animi_shamir/advancements/join.json

@@ -8,7 +8,9 @@
                         "condition": "minecraft:entity_scores",
                         "entity": "this",
                         "scores": {
-                            "gm4_animi_leave": 1
+                            "gm4_animi_leave": {
+                                "min": 1
+                            }
                         }
                     }
                 ]

gm4_animi_shamir/data/gm4_animi_shamir/functions/player/upon_death.mcfunction

@@ -1,6 +1,6 @@
 # @s = player who has died
 # at @s
-# run from gm4_animi_shamir:death advancement
+# run from #gm4_player_death:soul_bound
 
 # compile item list
 data remove storage gm4_animi_shamir:cache prepared_entry

gm4_animi_shamir/data/gm4_player_death/tags/functions/soul_bound.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "gm4_animi_shamir:player/upon_death"
+  ]
+}

gm4_undead_players/beet.yaml

@@ -7,10 +7,13 @@ data_pack:
 
 pipeline:
   - gm4.plugins.extend.module
+  - gm4.plugins.include.lib_player_death
 
 meta:
   gm4:
     versioning:
+      required:
+        lib_player_death: 1.0.0
       schedule_loops: [main]
     website:
       description: You'll find your death point faster, but you'll have to fight your corpse for your stuff back!

gm4_undead_players/data/gm4_player_death/tags/functions/grave.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "gm4_undead_players:died"
+  ]
+}

gm4_undead_players/data/gm4_undead_players/functions/died.mcfunction

@@ -1,9 +1,5 @@
-#run from gm4_undead_players:death advancement
+#run from #gm4_player_death:grave
 #@s = player who took fatal damage
 
-# Reset death tracking scoreboard and advancement to allow for the player to die again.
-advancement revoke @s only gm4_undead_players:death
-scoreboard players reset @s gm4_undead
-
 # Summon undead player unless player has ignore tag or is in creative/spectator.
 execute if entity @s[tag=!gm4_undead_ignore,gamemode=!creative,gamemode=!spectator] run function gm4_undead_players:summon_zombie

gm4_undead_players/data/gm4_undead_players/functions/init.mcfunction

@@ -1,7 +1,3 @@
-# Add death tracking scoreboard and reset in case player died while module was disabled.
-scoreboard objectives add gm4_undead minecraft.custom:minecraft.deaths
-scoreboard players reset * gm4_undead
-
 # Add scoreboard used to implement custom logic for undead player drowned conversion.
 scoreboard objectives add gm4_undead_drown dummy
 

lib_player_death/LICENSE.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Gamemode 4 Development
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

lib_player_death/README.md

@@ -0,0 +1 @@
+# lib_player_death

lib_player_death/beet.yaml

@@ -0,0 +1,20 @@
+id: gm4_player_death
+name: Gamemode 4 Player Death
+version: 1.0.X
+
+data_pack:
+  load: 
+    data: data
+
+pipeline:
+  - gm4.plugins.extend.library
+
+meta:
+  gm4:
+    versioning:
+      extra_version_injections:
+        advancements:
+          - death
+    credits:
+      Creator:
+        - Misode

gm4_undead_players/data/gm4_undead_players/advancements/death.json → lib_player_death/data/gm4_player_death/advancements/death.json

@@ -1,21 +1,23 @@
 {
   "criteria": {
-    "death": {
+    "die": {
       "trigger": "minecraft:entity_hurt_player",
       "conditions": {
         "player": [
           {
             "condition": "minecraft:entity_scores",
             "entity": "this",
             "scores": {
-              "gm4_undead": 1
+              "gm4_player_death_count": {
+                "min": 1
+              }
             }
           }
         ]
       }
     }
   },
   "rewards": {
-    "function": "gm4_undead_players:died"
+    "function": "gm4_player_death:death"
   }
 }

lib_player_death/data/gm4_player_death/functions/death.mcfunction

@@ -0,0 +1,7 @@
+# @s = player that just died
+# run from advancement player_death
+
+advancement revoke @s only gm4_player_death:death
+scoreboard players reset @s gm4_player_death_count
+
+function #gm4_player_death:_private/death

lib_player_death/data/gm4_player_death/functions/load.mcfunction

@@ -0,0 +1,3 @@
+# Add death tracking and reset objective in case the player died while the data pack was disabled
+scoreboard objectives add gm4_player_death_count deathCount
+scoreboard objectives reset * gm4_player_death_count

lib_player_death/data/gm4_player_death/tags/functions/_private/death.json

@@ -0,0 +1,20 @@
+{
+  "values": [
+    {
+      "id": "#gm4_player_death:soul_bound",
+      "required": false
+    },
+    {
+      "id": "#gm4_player_death:relocate",
+      "required": false
+    },
+    {
+      "id": "#gm4_player_death:grave",
+      "required": false
+    },
+    {
+      "id": "#gm4_player_death:death",
+      "required": false
+    }
+  ]
+}