Orb of Ankou 1.21.5 (#1128)

* fix attribute-based pneumas

* fix blasting

* fix dashing by using player motion library

* fix feigning jump

* use attribute for agile

NOTE: breaks old agile items, need an upgrade path

* fix typo in comment

* fix pricking

NOTE: breaks old pricking soul essence

* fix soaring

* make shard and orb equippable into offhand

* fix beet.yaml formatting

* add loot tables for shards

* add smithed item ignore functionality

* refactor some entity functions

- inline functions that aren't called from multiple places
- use random
- shard and essence entities grab loot table item instead of copying exact item (to act as an upgrade path)
- TODO: orb upgrade path using data from shard loot tables

* fix spawn positions of entities

* restore orb based on shard loot tables

* set max stack size of shards and orb to 1

* fix formatting

* fix function rename

* fix weapon.mainhand slot call for loot command

* keep pneuma order intact when restoring an orb

* fix congealed shard data

* implement lib_player_motion

- adds the player motion library as a namespaced and versioned GM4 library with proper call function tags

* implement custom version of player motion

- basically a fork that is renamespaced, version-checked, and uses the GM4 forceloaded chunk
- licensing might not be correct in the release download

* fix ooa to use proper player motion version

* prevent wither rose particle from generating on obsidian

* update random position to use random command and macro

* Move original player motion license to main license

* properly remove rose particle markers

* properly kill striding markers

* make items fire resistant

* fix withering pneuma

* fix expeditious

* fix soaring

* actually fix soaring

- no longer need to look up for the first no-gravity
- picking up or dropping items no longer resets the no-gravity
- first sneak when equipping will activate the no-gravity

Author: BPR02

gm4/contributors.json

@@ -130,5 +130,9 @@
     {
         "name": "Venomousbirds",
         "links": ["https://venomousbirds.artstation.com/"]
+    },
+    {
+        "name": "MulverineX",
+        "links": ["https://modrinth.com/user/MulverineX"]
     }
 ]

gm4_orb_of_ankou/beet.yaml

@@ -16,13 +16,15 @@ pipeline:
   - gm4_metallurgy.shamir_model_template
   - gm4.plugins.extend.module
   - gm4.plugins.include.lib_custom_crafters
+  - gm4.plugins.include.lib_player_motion
 
 meta:
   gm4:
     versioning:
       required:
         gm4_metallurgy: 1.5.0
         lib_custom_crafters: 3.4.0
+        lib_player_motion: 1.0.0
       schedule_loops:
         - main
         - tick

gm4_orb_of_ankou/data/gm4_orb_of_ankou/advancement/triggers/shoot_crossbow.json

@@ -2,17 +2,7 @@
   "criteria": {
     "crossbow_shot": {
       "trigger": "minecraft:shot_crossbow",
-      "conditions": {
-        "item": {
-          "components": {
-            "minecraft:charged_projectiles": [
-              {
-                "id": "minecraft:arrow"
-              }
-            ]
-          }
-        }
-      }
+      "conditions": {}
     }
   },
   "rewards": {

gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/init.mcfunction

@@ -21,6 +21,7 @@ scoreboard objectives add gm4_oa_snk_num dummy
 scoreboard objectives add gm4_oa_marker dummy
 scoreboard objectives add gm4_oa_feign_t dummy
 scoreboard objectives add gm4_oa_sniff dummy
+scoreboard objectives add gm4_oa_jump_stop dummy
 scoreboard objectives add gm4_health health
 scoreboard objectives add gm4_oa_sneak minecraft.custom:minecraft.sneak_time
 scoreboard objectives add gm4_oa_swim minecraft.custom:minecraft.swim_one_cm

gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/main.mcfunction

@@ -10,8 +10,7 @@ effect give @a[gamemode=!spectator,tag=gm4_pneuma_gliding,scores={gm4_oa_swim=1.
 scoreboard players reset @a gm4_oa_swim
 
 # soaring
-tag @a[tag=gm4_oa_soaring_off_ground,nbt={OnGround:1b}] remove gm4_oa_soaring_off_ground
-effect give @a[gamemode=!spectator,tag=gm4_oa_soaring_off_ground] jump_boost 2 255 true
+execute as @a[tag=gm4_oa_soaring_off_ground,nbt={OnGround:1b}] run function gm4_orb_of_ankou:pneumas/soaring/remove_fall_protection
 
 # sniffing
 scoreboard players remove @a[scores={gm4_oa_sniff=1..}] gm4_oa_sniff 1

gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/player.mcfunction

@@ -10,3 +10,6 @@ execute at @s[tag=gm4_pneuma_synergetic] run function gm4_orb_of_ankou:pneumas/s
 # soaring
 execute at @s[tag=gm4_oa_soaring_active] run function gm4_orb_of_ankou:pneumas/soaring/apply
 
+# disable jump revert
+scoreboard players remove @a[scores={gm4_oa_jump_stop=1..}] gm4_oa_jump_stop 1
+execute as @a[scores={gm4_oa_jump_stop=1}] run attribute @s minecraft:jump_strength modifier remove gm4_orb_of_ankou:prevent_jump

gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/advancement_triggers/player_damaged.mcfunction

@@ -10,5 +10,3 @@ effect give @s[tag=gm4_pneuma_aggressive] strength 3 1 true
 execute if entity @s[tag=gm4_pneuma_volatile] run function gm4_orb_of_ankou:pneumas/volatile
 
 execute if entity @s[tag=gm4_pneuma_feigning,scores={gm4_health=..10}] run function gm4_orb_of_ankou:pneumas/feigning/apply
-
-execute if entity @s[tag=gm4_oa_soaring_off_ground] run function gm4_orb_of_ankou:pneumas/soaring/damaged

gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/advancement_triggers/shot_crossbow.mcfunction

@@ -2,4 +2,4 @@
 # run from advancement "trigers/shoot_crossbow"
 
 advancement revoke @s only gm4_orb_of_ankou:triggers/shoot_crossbow
-execute if entity @s[tag=gm4_pneuma_blasting,nbt={Inventory:[{id:"minecraft:blaze_powder"}]}] run function gm4_orb_of_ankou:pneumas/blasting
+execute if entity @s[tag=gm4_pneuma_blasting,nbt={Inventory:[{id:"minecraft:blaze_powder"}]}] if entity @e[type=minecraft:arrow,limit=1,distance=..2] run function gm4_orb_of_ankou:pneumas/blasting

gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/agile.mcfunction

@@ -2,10 +2,10 @@
 # run from advancement_triggers/shoot_crossbow
 
 # summon fireball at player's location
-summon minecraft:small_fireball ~ ~1 ~ {Tags:["gm4_oa_fireball"],power:[0.0,0.0,0.0],Motion:[0.0,0.0,0.0]}
+summon minecraft:small_fireball ~ ~1 ~ {Tags:["gm4_oa_fireball"],Motion:[0.0,0.0,0.0]}
 
 # copy motion of arrow to fireball
-data modify entity @e[type=small_fireball,tag=gm4_oa_fireball,distance=..2,limit=1] power set from entity @e[type=minecraft:arrow,limit=1,distance=..2] Motion
+data modify entity @e[type=small_fireball,tag=gm4_oa_fireball,distance=..2,limit=1] Motion set from entity @e[type=minecraft:arrow,limit=1,distance=..2] Motion
 kill @e[type=arrow,distance=..2,limit=1]
 
 # clear blaze powder from player