1.19 Update

removed patch because its broken for some unknown very strange reason
InfamousMusicify · Mar 11, 2023 · 37ec988 · 37ec988
1 parent a1db9a1
commit 37ec988
Show file tree

Hide file tree

Showing 80 changed files with 18 additions and 14 deletions.
diff --git a/MarkRec_V3.1.19/LICENSE → MarkRec_V3.2.19/LICENSE b/MarkRec_V3.1.19/LICENSE → MarkRec_V3.2.19/LICENSE
diff --git a/.../data/inhauspacks/advancements/death.json → .../data/inhauspacks/advancements/death.json b/.../data/inhauspacks/advancements/death.json → .../data/inhauspacks/advancements/death.json
diff --git a/...ta/inhauspacks/advancements/mark_rec.json → ...ta/inhauspacks/advancements/mark_rec.json b/...ta/inhauspacks/advancements/mark_rec.json → ...ta/inhauspacks/advancements/mark_rec.json
diff --git a/...packs/advancements/mark_rec/mark_rec.json → ...packs/advancements/mark_rec/mark_rec.json b/...packs/advancements/mark_rec/mark_rec.json → ...packs/advancements/mark_rec/mark_rec.json
diff --git a/...acks/advancements/mark_rec/mark_rec2.json → ...acks/advancements/mark_rec/mark_rec2.json b/...acks/advancements/mark_rec/mark_rec2.json → ...acks/advancements/mark_rec/mark_rec2.json
diff --git a/...spacks/advancements/mark_rec/trigger.json → ...spacks/advancements/mark_rec/trigger.json b/...spacks/advancements/mark_rec/trigger.json → ...spacks/advancements/mark_rec/trigger.json
diff --git a/...9/data/inhauspacks/advancements/root.json → ...9/data/inhauspacks/advancements/root.json b/...9/data/inhauspacks/advancements/root.json → ...9/data/inhauspacks/advancements/root.json
diff --git a/...inhauspacks/tags/functions/uninstall.json → ...inhauspacks/tags/functions/uninstall.json b/...inhauspacks/tags/functions/uninstall.json → ...inhauspacks/tags/functions/uninstall.json
diff --git a/...9/data/markrec/advancements/mark_adv.json → ...9/data/markrec/advancements/mark_adv.json b/...9/data/markrec/advancements/mark_adv.json → ...9/data/markrec/advancements/mark_adv.json
diff --git a/...data/markrec/advancements/new_player.json → ...data/markrec/advancements/new_player.json b/...data/markrec/advancements/new_player.json → ...data/markrec/advancements/new_player.json
diff --git a/....1.19/data/markrec/advancements/root.json → ....2.19/data/markrec/advancements/root.json b/....1.19/data/markrec/advancements/root.json → ....2.19/data/markrec/advancements/root.json
diff --git a/...ata/markrec/functions/add_mark.mcfunction → ...ata/markrec/functions/add_mark.mcfunction b/...ata/markrec/functions/add_mark.mcfunction → ...ata/markrec/functions/add_mark.mcfunction
diff --git a/.../data/markrec/functions/bubble.mcfunction → .../data/markrec/functions/bubble.mcfunction b/.../data/markrec/functions/bubble.mcfunction → .../data/markrec/functions/bubble.mcfunction
diff --git a/...ata/markrec/functions/bubble_1.mcfunction → ...ata/markrec/functions/bubble_1.mcfunction b/...ata/markrec/functions/bubble_1.mcfunction → ...ata/markrec/functions/bubble_1.mcfunction
diff --git a/...ata/markrec/functions/bubble_2.mcfunction → ...ata/markrec/functions/bubble_2.mcfunction b/...ata/markrec/functions/bubble_2.mcfunction → ...ata/markrec/functions/bubble_2.mcfunction
diff --git a/...tions/check_chunk_fully_loaded.mcfunction → ...tions/check_chunk_fully_loaded.mcfunction b/...tions/check_chunk_fully_loaded.mcfunction → ...tions/check_chunk_fully_loaded.mcfunction
diff --git a/...data/markrec/functions/check_x.mcfunction → ...data/markrec/functions/check_x.mcfunction b/...data/markrec/functions/check_x.mcfunction → ...data/markrec/functions/check_x.mcfunction
diff --git a/...data/markrec/functions/check_z.mcfunction → ...data/markrec/functions/check_z.mcfunction b/...data/markrec/functions/check_z.mcfunction → ...data/markrec/functions/check_z.mcfunction
diff --git a/.../data/markrec/functions/config.mcfunction → .../data/markrec/functions/config.mcfunction b/.../data/markrec/functions/config.mcfunction → .../data/markrec/functions/config.mcfunction
diff --git a/...markrec/functions/crafted_mark.mcfunction → ...markrec/functions/crafted_mark.mcfunction b/...markrec/functions/crafted_mark.mcfunction → ...markrec/functions/crafted_mark.mcfunction
diff --git a/...c/functions/decrement_cooldown.mcfunction → ...c/functions/decrement_cooldown.mcfunction b/...c/functions/decrement_cooldown.mcfunction → ...c/functions/decrement_cooldown.mcfunction
diff --git a/.../functions/decrement_cooldowns.mcfunction → .../functions/decrement_cooldowns.mcfunction b/.../functions/decrement_cooldowns.mcfunction → .../functions/decrement_cooldowns.mcfunction
diff --git a/.../markrec/functions/delete_mark.mcfunction → .../markrec/functions/delete_mark.mcfunction b/.../markrec/functions/delete_mark.mcfunction → .../markrec/functions/delete_mark.mcfunction
diff --git a/...ons/display_mark_with_all_info.mcfunction → ...ons/display_mark_with_all_info.mcfunction b/...ons/display_mark_with_all_info.mcfunction → ...ons/display_mark_with_all_info.mcfunction
diff --git a/...display_mark_with_reduced_info.mcfunction → ...display_mark_with_reduced_info.mcfunction b/...display_mark_with_reduced_info.mcfunction → ...display_mark_with_reduced_info.mcfunction
diff --git a/...data/markrec/functions/go_mark.mcfunction → ...data/markrec/functions/go_mark.mcfunction b/...data/markrec/functions/go_mark.mcfunction → ...data/markrec/functions/go_mark.mcfunction
diff --git a/...unctions/hide_command_feedback.mcfunction → ...unctions/hide_command_feedback.mcfunction b/...unctions/hide_command_feedback.mcfunction → ...unctions/hide_command_feedback.mcfunction
diff --git a/...ns/initialize_dimension_marker.mcfunction → ...ns/initialize_dimension_marker.mcfunction b/...ns/initialize_dimension_marker.mcfunction → ...ns/initialize_dimension_marker.mcfunction
diff --git a/...ta/markrec/functions/list_mark.mcfunction → ...ta/markrec/functions/list_mark.mcfunction b/...ta/markrec/functions/list_mark.mcfunction → ...ta/markrec/functions/list_mark.mcfunction
diff --git a/...a/markrec/functions/list_marks.mcfunction → ...a/markrec/functions/list_marks.mcfunction b/...a/markrec/functions/list_marks.mcfunction → ...a/markrec/functions/list_marks.mcfunction
diff --git a/...19/data/markrec/functions/load.mcfunction → ...19/data/markrec/functions/load.mcfunction b/...19/data/markrec/functions/load.mcfunction → ...19/data/markrec/functions/load.mcfunction
@@ -1,8 +1,11 @@
 #load
 #patch
-execute unless score #patch marks.config matches 0.. unless score #patch marks.config matches ..0 run scoreboard players add #patch marks.config 0
-### Update Patch ###  - tem,p upded, change interanl after im done!
-execute if score #patch marks.config matches ..60 run function markrec:patch
+### Update Patch ### 
+# dev purposes only because apperntly this is broken for some ungodly unintuitive reason - literally the same command down below is working... i dont fucking know............
+#execute unless score #patch marks.config matches 0.. run scoreboard players set #patch marks.config 0
+#scoreboard players add #patch marks.config 0
+# - Stable 3.1+ = 61
+#execute if score #patch marks.config matches ..60 run function markrec:patch
 
 
 scoreboard objectives add setmark trigger "Set Mark"

diff --git a/...rkrec/functions/mark_dimension.mcfunction → ...rkrec/functions/mark_dimension.mcfunction b/...rkrec/functions/mark_dimension.mcfunction → ...rkrec/functions/mark_dimension.mcfunction
diff --git a/MarkRec_V3.2.19/data/markrec/functions/mark_recall.mcfunction b/MarkRec_V3.2.19/data/markrec/functions/mark_recall.mcfunction
@@ -0,0 +1,10 @@
+execute as @s[nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick",tag: {Tags: ["Mark_add"]}}}] run function markrec:trigger_add
+execute as @s[nbt={Inventory:[{Slot:-106b,id:"minecraft:carrot_on_a_stick",tag: {Tags: ["Mark_add"]}}]}] run function markrec:trigger_add
+#scoreboard players set @s mark_add 0
+# 
+execute as @s[nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick",tag: {Tags: ["Recall"]}}}] run function markrec:trigger_markrec
+execute as @s[nbt={Inventory:[{Slot:-106b,id:"minecraft:carrot_on_a_stick",tag: {Tags: ["Recall"]}}]}] run function markrec:trigger_markrec
+#scoreboard players set @s recall 0
+# 
+execute as @s[nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick",tag: {Tags: ["Mark"]}}}] run function markrec:trigger_setmarkrec
+execute as @s[nbt={Inventory:[{Slot:-106b,id:"minecraft:carrot_on_a_stick",tag: {Tags: ["Mark"]}}]}] run function markrec:trigger_setmarkrec
diff --git a/...ta/markrec/functions/name_mark.mcfunction → ...ta/markrec/functions/name_mark.mcfunction b/...ta/markrec/functions/name_mark.mcfunction → ...ta/markrec/functions/name_mark.mcfunction
diff --git a/...9/data/markrec/functions/patch.mcfunction → ...9/data/markrec/functions/patch.mcfunction b/...9/data/markrec/functions/patch.mcfunction → ...9/data/markrec/functions/patch.mcfunction
@@ -7,4 +7,4 @@ execute if score #patch marks.config matches ..50 run scoreboard players set #pa
 #update both patch numbers when patching
 function markrec:reinstall
 #
-#say patching mark
+say patching mark
diff --git a/...nctions/really_trigger_setmark.mcfunction → ...nctions/really_trigger_setmark.mcfunction b/...nctions/really_trigger_setmark.mcfunction → ...nctions/really_trigger_setmark.mcfunction
diff --git a/...ta/markrec/functions/reinstall.mcfunction → ...ta/markrec/functions/reinstall.mcfunction b/...ta/markrec/functions/reinstall.mcfunction → ...ta/markrec/functions/reinstall.mcfunction
diff --git a/...ctions/remove_dimension_marker.mcfunction → ...ctions/remove_dimension_marker.mcfunction b/...ctions/remove_dimension_marker.mcfunction → ...ctions/remove_dimension_marker.mcfunction
diff --git a/...krec/functions/reset_mark_name.mcfunction → ...krec/functions/reset_mark_name.mcfunction b/...krec/functions/reset_mark_name.mcfunction → ...krec/functions/reset_mark_name.mcfunction
diff --git a/...tions/restore_command_feedback.mcfunction → ...tions/restore_command_feedback.mcfunction b/...tions/restore_command_feedback.mcfunction → ...tions/restore_command_feedback.mcfunction
diff --git a/...ec/functions/rotate/add_player.mcfunction → ...ec/functions/rotate/add_player.mcfunction b/...ec/functions/rotate/add_player.mcfunction → ...ec/functions/rotate/add_player.mcfunction
diff --git a/.../markrec/functions/rotate/mark.mcfunction → .../markrec/functions/rotate/mark.mcfunction b/.../markrec/functions/rotate/mark.mcfunction → .../markrec/functions/rotate/mark.mcfunction
diff --git a/...markrec/functions/rotate/marks.mcfunction → ...markrec/functions/rotate/marks.mcfunction b/...markrec/functions/rotate/marks.mcfunction → ...markrec/functions/rotate/marks.mcfunction
diff --git a/...arkrec/functions/rotate/player.mcfunction → ...arkrec/functions/rotate/player.mcfunction b/...arkrec/functions/rotate/player.mcfunction → ...arkrec/functions/rotate/player.mcfunction
diff --git a/...rkrec/functions/rotate/players.mcfunction → ...rkrec/functions/rotate/players.mcfunction b/...rkrec/functions/rotate/players.mcfunction → ...rkrec/functions/rotate/players.mcfunction
diff --git a/...krec/functions/set_destination.mcfunction → ...krec/functions/set_destination.mcfunction b/...krec/functions/set_destination.mcfunction → ...krec/functions/set_destination.mcfunction
diff --git a/...ata/markrec/functions/set_mark.mcfunction → ...ata/markrec/functions/set_mark.mcfunction b/...ata/markrec/functions/set_mark.mcfunction → ...ata/markrec/functions/set_mark.mcfunction
diff --git a/...arkrec/functions/set_mark_name.mcfunction → ...arkrec/functions/set_mark_name.mcfunction b/...arkrec/functions/set_mark_name.mcfunction → ...arkrec/functions/set_mark_name.mcfunction
diff --git a/...rec/functions/start_to_go_mark.mcfunction → ...rec/functions/start_to_go_mark.mcfunction b/...rec/functions/start_to_go_mark.mcfunction → ...rec/functions/start_to_go_mark.mcfunction
diff --git a/...ctions/start_to_mark_dimension.mcfunction → ...ctions/start_to_mark_dimension.mcfunction b/...ctions/start_to_mark_dimension.mcfunction → ...ctions/start_to_mark_dimension.mcfunction
diff --git a/...19/data/markrec/functions/tick.mcfunction → ...19/data/markrec/functions/tick.mcfunction b/...19/data/markrec/functions/tick.mcfunction → ...19/data/markrec/functions/tick.mcfunction
@@ -6,16 +6,7 @@ execute as @a if score @s tpa.pid matches 1.. unless score @s markrec_id matches
 execute as @a unless score @s markrec_id matches 1.. store result score @s markrec_id run scoreboard players add #last markrec_id 1
 
 # 
-execute as @a[scores={mark.recall=1..},nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick",tag: {Tags: ["Mark_add"]}}}] run function markrec:trigger_add
-execute as @a[scores={mark.recall=1..},nbt={Inventory:[{Slot:-106b,id:"minecraft:carrot_on_a_stick",tag: {Tags: ["Mark_add"]}}]}] run function markrec:trigger_add
-#scoreboard players set @a mark_add 0
-# 
-execute as @a[scores={mark.recall=1..},nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick",tag: {Tags: ["Recall"]}}}] run function markrec:trigger_markrec
-execute as @a[scores={mark.recall=1..},nbt={Inventory:[{Slot:-106b,id:"minecraft:carrot_on_a_stick",tag: {Tags: ["Recall"]}}]}] run function markrec:trigger_markrec
-#scoreboard players set @a recall 0
-# 
-execute as @a[scores={mark.recall=1..},nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick",tag: {Tags: ["Mark"]}}}] run function markrec:trigger_setmarkrec
-execute as @a[scores={mark.recall=1..},nbt={Inventory:[{Slot:-106b,id:"minecraft:carrot_on_a_stick",tag: {Tags: ["Mark"]}}]}] run function markrec:trigger_setmarkrec
+execute as @a[scores={mark.recall=1..}] run function markrec:mark_recall
 scoreboard players set @a mark.recall 0
 scoreboard players set @a mark_crouch 0
 #####################################################################################

diff --git a/.../markrec/functions/trigger_add.mcfunction → .../markrec/functions/trigger_add.mcfunction b/.../markrec/functions/trigger_add.mcfunction → .../markrec/functions/trigger_add.mcfunction
diff --git a/...krec/functions/trigger_delmark.mcfunction → ...krec/functions/trigger_delmark.mcfunction b/...krec/functions/trigger_delmark.mcfunction → ...krec/functions/trigger_delmark.mcfunction
diff --git a/...markrec/functions/trigger_mark.mcfunction → ...markrec/functions/trigger_mark.mcfunction b/...markrec/functions/trigger_mark.mcfunction → ...markrec/functions/trigger_mark.mcfunction
diff --git a/...krec/functions/trigger_markrec.mcfunction → ...krec/functions/trigger_markrec.mcfunction b/...krec/functions/trigger_markrec.mcfunction → ...krec/functions/trigger_markrec.mcfunction
diff --git a/...arkrec/functions/trigger_marks.mcfunction → ...arkrec/functions/trigger_marks.mcfunction b/...arkrec/functions/trigger_marks.mcfunction → ...arkrec/functions/trigger_marks.mcfunction
diff --git a/...rec/functions/trigger_namemark.mcfunction → ...rec/functions/trigger_namemark.mcfunction b/...rec/functions/trigger_namemark.mcfunction → ...rec/functions/trigger_namemark.mcfunction
diff --git a/...krec/functions/trigger_setmark.mcfunction → ...krec/functions/trigger_setmark.mcfunction b/...krec/functions/trigger_setmark.mcfunction → ...krec/functions/trigger_setmark.mcfunction
diff --git a/...c/functions/trigger_setmarkrec.mcfunction → ...c/functions/trigger_setmarkrec.mcfunction b/...c/functions/trigger_setmarkrec.mcfunction → ...c/functions/trigger_setmarkrec.mcfunction
diff --git a/...krec/functions/try_to_add_mark.mcfunction → ...krec/functions/try_to_add_mark.mcfunction b/...krec/functions/try_to_add_mark.mcfunction → ...krec/functions/try_to_add_mark.mcfunction
diff --git a/...rkrec/functions/try_to_go_mark.mcfunction → ...rkrec/functions/try_to_go_mark.mcfunction b/...rkrec/functions/try_to_go_mark.mcfunction → ...rkrec/functions/try_to_go_mark.mcfunction
diff --git a/...unctions/try_to_mark_dimension.mcfunction → ...unctions/try_to_mark_dimension.mcfunction b/...unctions/try_to_mark_dimension.mcfunction → ...unctions/try_to_mark_dimension.mcfunction
diff --git a/...rec/functions/try_to_name_mark.mcfunction → ...rec/functions/try_to_name_mark.mcfunction b/...rec/functions/try_to_name_mark.mcfunction → ...rec/functions/try_to_name_mark.mcfunction
diff --git a/...nctions/try_to_reset_mark_name.mcfunction → ...nctions/try_to_reset_mark_name.mcfunction b/...nctions/try_to_reset_mark_name.mcfunction → ...nctions/try_to_reset_mark_name.mcfunction
diff --git a/...functions/try_to_set_mark_name.mcfunction → ...functions/try_to_set_mark_name.mcfunction b/...functions/try_to_set_mark_name.mcfunction → ...functions/try_to_set_mark_name.mcfunction
diff --git a/...ctions/try_to_start_to_go_mark.mcfunction → ...ctions/try_to_start_to_go_mark.mcfunction b/...ctions/try_to_start_to_go_mark.mcfunction → ...ctions/try_to_start_to_go_mark.mcfunction
diff --git a/...try_to_start_to_mark_dimension.mcfunction → ...try_to_start_to_mark_dimension.mcfunction b/...try_to_start_to_mark_dimension.mcfunction → ...try_to_start_to_mark_dimension.mcfunction
diff --git a/...ions/try_to_summon_destination.mcfunction → ...ions/try_to_summon_destination.mcfunction b/...ions/try_to_summon_destination.mcfunction → ...ions/try_to_summon_destination.mcfunction
diff --git a/...try_to_summon_dimension_marker.mcfunction → ...try_to_summon_dimension_marker.mcfunction b/...try_to_summon_dimension_marker.mcfunction → ...try_to_summon_dimension_marker.mcfunction
diff --git a/...unctions/try_to_try_to_go_mark.mcfunction → ...unctions/try_to_try_to_go_mark.mcfunction b/...unctions/try_to_try_to_go_mark.mcfunction → ...unctions/try_to_try_to_go_mark.mcfunction
diff --git a/...s/try_to_try_to_try_to_go_mark.mcfunction → ...s/try_to_try_to_try_to_go_mark.mcfunction b/...s/try_to_try_to_try_to_go_mark.mcfunction → ...s/try_to_try_to_try_to_go_mark.mcfunction
diff --git a/...ta/markrec/functions/uninstall.mcfunction → ...ta/markrec/functions/uninstall.mcfunction b/...ta/markrec/functions/uninstall.mcfunction → ...ta/markrec/functions/uninstall.mcfunction
diff --git a/.../loot_tables/create_dimension_marker.json → .../loot_tables/create_dimension_marker.json b/.../loot_tables/create_dimension_marker.json → .../loot_tables/create_dimension_marker.json
diff --git a/...ta/markrec/loot_tables/mark_add_loot.json → ...ta/markrec/loot_tables/mark_add_loot.json b/...ta/markrec/loot_tables/mark_add_loot.json → ...ta/markrec/loot_tables/mark_add_loot.json
diff --git a/...9/data/markrec/loot_tables/mark_loot.json → ...9/data/markrec/loot_tables/mark_loot.json b/...9/data/markrec/loot_tables/mark_loot.json → ...9/data/markrec/loot_tables/mark_loot.json
diff --git a/...data/markrec/loot_tables/recall_loot.json → ...data/markrec/loot_tables/recall_loot.json b/...data/markrec/loot_tables/recall_loot.json → ...data/markrec/loot_tables/recall_loot.json
diff --git a/...3.1.19/data/markrec/recipes/mark_rcp.json → ...3.2.19/data/markrec/recipes/mark_rcp.json b/...3.1.19/data/markrec/recipes/mark_rcp.json → ...3.2.19/data/markrec/recipes/mark_rcp.json
diff --git a/...9/data/minecraft/tags/functions/load.json → ...9/data/minecraft/tags/functions/load.json b/...9/data/minecraft/tags/functions/load.json → ...9/data/minecraft/tags/functions/load.json
diff --git a/MarkRec_V3.1.19/pack.mcmeta → MarkRec_V3.2.19/pack.mcmeta b/MarkRec_V3.1.19/pack.mcmeta → MarkRec_V3.2.19/pack.mcmeta
diff --git a/MarkRec_V3.1.19/pack.png → MarkRec_V3.2.19/pack.png b/MarkRec_V3.1.19/pack.png → MarkRec_V3.2.19/pack.png