Merge remote-tracking branch 'upstream/master'

TheThanathor · Nov 29, 2023 · 9d7d421 · 9d7d421
2 parents 9484d91 + e2e875c
commit 9d7d421
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/gm4_bookshelf_inspector/beet.yaml b/gm4_bookshelf_inspector/beet.yaml
@@ -15,9 +15,14 @@ meta:
     website:
       description: See what's in your Chiseled Bookshelves without having to take all the books out!
       recommended: []
-      notes: []
+      notes: 
+      - Requires version 1.20.2+
     video: null
     wiki: https://wiki.gm4.co/wiki/Bookshelf_Inspector
     credits:
       Creator:
         - Thanathor
+  modrinth:
+    project_id: hI6pAf86
+  smithed:
+    pack_id: gm4_bookshelf_inspector
diff --git a/gm4_bookshelf_inspector/data/gm4_bookshelf_inspector/functions/evaluate/get_pos.mcfunction b/gm4_bookshelf_inspector/data/gm4_bookshelf_inspector/functions/evaluate/get_pos.mcfunction
@@ -1,6 +1,6 @@
 # spawn marker to get player position and rotation
 # @s = marker
-# at unspecified
+# at @s
 # run from evaluate/position
 
 tp @s @p[tag=gm4_bookshelf_inspector_target]

diff --git a/gm4_bookshelf_inspector/data/gm4_bookshelf_inspector/functions/evaluate/position.mcfunction b/gm4_bookshelf_inspector/data/gm4_bookshelf_inspector/functions/evaluate/position.mcfunction
@@ -5,7 +5,7 @@
 
 # store player position and rotation using a marker to avoid reading player NBT
 tag @s add gm4_bookshelf_inspector_target
-execute summon marker run function gm4_bookshelf_inspector:evaluate/get_pos
+execute at @s summon marker run function gm4_bookshelf_inspector:evaluate/get_pos
 tag @s remove gm4_bookshelf_inspector_target
 
 # calculate how far player has moved since last check

diff --git a/gm4_bookshelf_inspector/images/bookshelf_inspector.png b/gm4_bookshelf_inspector/images/bookshelf_inspector.png
diff --git a/gm4_cozy_campfires/beet.yaml b/gm4_cozy_campfires/beet.yaml
@@ -15,8 +15,7 @@ meta:
     website:
       description: Allows Campfires to grant you up to 4 extra hearts that last for more than half of a Minecraft day. Perfect for those scary first nights in a Minecraft world.
       recommended: []
-      notes: 
-      - Requires version 1.20.2+
+      notes: []
     video: https://www.youtube.com/watch?v=nvAbzAtDFhw
     wiki: https://wiki.gm4.co/wiki/Cozy_Campfires
     credits: