Modernize Rope Ladders (#1155)

* Remove unnecessary stuff

* Add offhand support

* replace minus one item modifier file with inline definition
- this isn't necessary, but I feel like it might be better to have it inline

* Modernize code

* Fix multiplayer incompatibility with rcd interactions
- and a few minor things i missed in a previous commit

* I've suffered enough

* Interaction doesn't need to check UUID actually

* Move gametime query to `find_ladder`
- where its actually used...

* Add adventure mode fail
- rope ladders has been functioning with adventure mode??

* Move adventure check to advancement

* Fix Guidebook Translation key having potion_swords ???

* Update Header in gm4_rope_ladders/data/gm4_rope_ladders/function/mechanics/right_click_detection/rcd_manager/loop.mcfunction

Co-authored-by: BPR <dev@bpr02.com>

* Update gm4_rope_ladders/data/gm4_rope_ladders/function/mechanics/right_click_detection/rcd_manager/process.mcfunction

Co-authored-by: BPR <dev@bpr02.com>

* Update gm4_rope_ladders/data/gm4_rope_ladders/function/player/set_id.mcfunction

Co-authored-by: BPR <dev@bpr02.com>

* Update gm4_rope_ladders/data/gm4_rope_ladders/function/mechanics/ladder_placement/scan_column.mcfunction

Co-authored-by: BPR <dev@bpr02.com>

* Remove score initialization for $next

* Reorder rcd_manager/process

* Adjust `find_ladder` to be more readable
- (feedback from Bloo on Lively Lily Pads)

* Adjust `right_click_detection` advancement according to review

* Condense `detect_ladder_raycast`

* Update gm4_rope_ladders/data/gm4_rope_ladders/function/mechanics/right_click_detection/detect_ladder_raycast/ray.mcfunction

Co-authored-by: BPR <dev@bpr02.com>

* Forgot to anchor eyes!

---------

Co-authored-by: BPR <dev@bpr02.com>

Author: runcows

gm4_rope_ladders/beet.yaml

@@ -31,5 +31,7 @@ meta:
     credits:
       Creator:
         - Modulorium
+      Updated By:
+        - runcows
       Icon Design:
         - BPR

gm4_rope_ladders/data/gm4_rope_ladders/advancement/id_init.json

@@ -0,0 +1,24 @@
+{
+  "criteria": {
+    "no_score": {
+      "trigger": "minecraft:location",
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:inverted",
+            "term": {
+              "condition": "minecraft:entity_scores",
+              "entity": "this",
+              "scores": {
+                "gm4_rol_id": {}
+              }
+            }
+          }
+        ]
+      }
+    }
+  },
+  "rewards": {
+    "function": "gm4_rope_ladders:player/set_id"
+  }
+}

gm4_rope_ladders/data/gm4_rope_ladders/advancement/right_click_detection.json

@@ -4,26 +4,37 @@
       "trigger": "minecraft:player_interacted_with_entity",
       "conditions": {
         "player": [
+          {
+            "condition": "minecraft:reference",
+            "name": "gm4_rope_ladders:holding_ladder"
+          },
           {
             "condition": "minecraft:entity_properties",
             "entity": "this",
             "predicate": {
-              "nbt": "{Tags:[\"gm4_rol_holding_ladder\"]}"
+              "type_specific": {
+                "type": "minecraft:player",
+                "gamemode": [
+                  "survival",
+                  "creative"
+                ]
+              }
             }
           }
         ],
-        "item": {
-          "items": [
-            "minecraft:ladder"
-          ]
-        },
         "entity": [
           {
             "condition": "minecraft:entity_properties",
             "entity": "this",
             "predicate": {
-              "type": "minecraft:interaction",
-              "nbt": "{Tags:[\"gm4_rol_rcd_ladder\"]}"
+              "type": "minecraft:interaction"
+            }
+          },
+          {
+            "condition": "minecraft:entity_scores",
+            "entity": "this",
+            "scores": {
+              "gm4_rol_id": {}
             }
           }
         ]

gm4_rope_ladders/data/gm4_rope_ladders/function/init.mcfunction

@@ -1,11 +1,12 @@
-scoreboard objectives add gm4_rol_data dummy
-scoreboard objectives add gm4_rol_break_ladder minecraft.mined:minecraft.ladder
-
-
 execute unless score rope_ladders gm4_modules matches 1 run data modify storage gm4:log queue append value {type:"install",module:"Rope Ladders"}
 execute unless score rope_ladders gm4_earliest_version < rope_ladders gm4_modules run scoreboard players operation rope_ladders gm4_earliest_version = rope_ladders gm4_modules
 scoreboard players set rope_ladders gm4_modules 1
 
+scoreboard objectives add gm4_rol_data dummy
+scoreboard objectives add gm4_rol_break_ladder minecraft.mined:minecraft.ladder
+scoreboard objectives add gm4_rol_id dummy
+
+
 schedule function gm4_rope_ladders:main 10t
 schedule function gm4_rope_ladders:tick 11t
 

gm4_rope_ladders/data/gm4_rope_ladders/function/mechanics/ladder_placement/detect_ladder_raycast/found.mcfunction

@@ -0,0 +1,13 @@
+# @s = interacted rcd
+# at player that interacts with a rcd interaction while holding ladder
+# run from function: gm4_rope_ladders:mechanics/ladder_placement/interact_right_click_detection
+
+# fail if different gametime
+execute store result score $gametime gm4_rol_data run time query gametime
+execute store result score $check_gametime gm4_rol_data run data get entity @s interaction.timestamp 1
+
+data remove entity @s interaction
+execute unless score $gametime gm4_rol_data = $check_gametime gm4_rol_data run return fail
+
+# continue
+execute at @s align xyz positioned ~.5 ~ ~.5 run function gm4_rope_ladders:mechanics/ladder_placement/scan_column

gm4_rope_ladders/data/gm4_rope_ladders/function/mechanics/ladder_placement/detect_ladder_raycast/init.mcfunction

@@ -1,12 +1,16 @@
-# @s = player that interacts with a "right click detection" villager while holding ladder
+# @s = player that interacts with a rcd interaction while holding ladder
 # at @s
 # run from advancement: gm4_rope_ladders:right_click_detection
 
 # revoke advancement
 advancement revoke @s only gm4_rope_ladders:right_click_detection
 
+# reset
+scoreboard players set $ladder_placed gm4_rol_data 0
+scoreboard players set $loop gm4_rol_data 0
+
 # find ladder block
-function gm4_rope_ladders:mechanics/ladder_placement/detect_ladder_raycast/init
+execute as @e[type=interaction,tag=gm4_rol_rcd_ladder,distance=..8] if data entity @s interaction run function gm4_rope_ladders:mechanics/ladder_placement/find_ladder
 
-# play audio if ladder placed
-execute if score $ladder_placed gm4_rol_data matches 1 run playsound minecraft:block.ladder.place ambient @a[distance=..15] ~ ~ ~
+# successful place
+execute if score $ladder_placed gm4_rol_data matches 1 run function gm4_rope_ladders:mechanics/ladder_placement/successful_place

gm4_rope_ladders/data/gm4_rope_ladders/function/mechanics/ladder_placement/detect_ladder_raycast/ray.mcfunction

@@ -1,17 +1,11 @@
 # places a ladder when the scan finds a valid location
-# @s = player that interacts with a "right click detection" villager while holding ladder
+# @s = interacted rcd
 # at location of valid spot for ladder placement
-# run from function: gm4_rope_ladders:mechanics/ladder_placement/scan_column/found
+# run from function: gm4_rope_ladders:mechanics/ladder_placement/scan_column
 
 # set scorebaord
 scoreboard players set $ladder_placed gm4_rol_data 1
 
-# remove 1 ladder from players hand
-execute if entity @s[gamemode=!creative] run item modify entity @s weapon.mainhand gm4_rope_ladders:minus_one
-
-# grant advancement
-advancement grant @s only gm4:rope_ladders
-
 # break block
 execute unless block ~ ~ ~ #gm4:water run setblock ~ ~ ~ air destroy
 execute if block ~ ~ ~ #gm4:water run setblock ~ ~ ~ water destroy