1.19 Update - Datapack

InfamousMusicify · Jun 7, 2023 · 547dd26 · 547dd26
1 parent 78cc447
commit 547dd26
Show file tree

Hide file tree

Showing 54 changed files with 8 additions and 4 deletions.
diff --git a/BlockMart_V0.30.2_19/LICENSE → BlockMart_V0.30.3_19/LICENSE b/BlockMart_V0.30.2_19/LICENSE → BlockMart_V0.30.3_19/LICENSE
diff --git a/...blockmart/advancements/blockmart/new.json → ...blockmart/advancements/blockmart/new.json b/...blockmart/advancements/blockmart/new.json → ...blockmart/advancements/blockmart/new.json
diff --git a/...blockmart/functions/balancetop.mcfunction → ...blockmart/functions/balancetop.mcfunction b/...blockmart/functions/balancetop.mcfunction → ...blockmart/functions/balancetop.mcfunction
diff --git a/...functions/balancetop_try_false.mcfunction → ...functions/balancetop_try_false.mcfunction b/...functions/balancetop_try_false.mcfunction → ...functions/balancetop_try_false.mcfunction
diff --git a/...lockmart/functions/baltop_down.mcfunction → ...lockmart/functions/baltop_down.mcfunction b/...lockmart/functions/baltop_down.mcfunction → ...lockmart/functions/baltop_down.mcfunction
diff --git a/...lockmart/functions/baltop_math.mcfunction → ...lockmart/functions/baltop_math.mcfunction b/...lockmart/functions/baltop_math.mcfunction → ...lockmart/functions/baltop_math.mcfunction
diff --git a/...mart/functions/baltop_pg_start.mcfunction → ...mart/functions/baltop_pg_start.mcfunction b/...mart/functions/baltop_pg_start.mcfunction → ...mart/functions/baltop_pg_start.mcfunction
diff --git a/...blockmart/functions/baltop_pgs.mcfunction → ...blockmart/functions/baltop_pgs.mcfunction b/...blockmart/functions/baltop_pgs.mcfunction → ...blockmart/functions/baltop_pgs.mcfunction
diff --git a/.../blockmart/functions/baltop_up.mcfunction → .../blockmart/functions/baltop_up.mcfunction b/.../blockmart/functions/baltop_up.mcfunction → .../blockmart/functions/baltop_up.mcfunction
diff --git a/.../blockmart/functions/baltopper.mcfunction → .../blockmart/functions/baltopper.mcfunction b/.../blockmart/functions/baltopper.mcfunction → .../blockmart/functions/baltopper.mcfunction
diff --git a/...mart/functions/baltopper_false.mcfunction → ...mart/functions/baltopper_false.mcfunction b/...mart/functions/baltopper_false.mcfunction → ...mart/functions/baltopper_false.mcfunction
diff --git a/.../data/blockmart/functions/bank.mcfunction → .../data/blockmart/functions/bank.mcfunction b/.../data/blockmart/functions/bank.mcfunction → .../data/blockmart/functions/bank.mcfunction
diff --git a/.../data/blockmart/functions/cash.mcfunction → .../data/blockmart/functions/cash.mcfunction b/.../data/blockmart/functions/cash.mcfunction → .../data/blockmart/functions/cash.mcfunction
diff --git a/...ata/blockmart/functions/config.mcfunction → ...ata/blockmart/functions/config.mcfunction b/...ata/blockmart/functions/config.mcfunction → ...ata/blockmart/functions/config.mcfunction
diff --git a/...t/functions/decrement_cooldown.mcfunction → ...t/functions/decrement_cooldown.mcfunction b/...t/functions/decrement_cooldown.mcfunction → ...t/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/...ta/blockmart/functions/deposit.mcfunction → ...ta/blockmart/functions/deposit.mcfunction b/...ta/blockmart/functions/deposit.mcfunction → ...ta/blockmart/functions/deposit.mcfunction
diff --git a/...lockmart/functions/deposit_try.mcfunction → ...lockmart/functions/deposit_try.mcfunction b/...lockmart/functions/deposit_try.mcfunction → ...lockmart/functions/deposit_try.mcfunction
diff --git a/.../data/blockmart/functions/earn.mcfunction → .../data/blockmart/functions/earn.mcfunction b/.../data/blockmart/functions/earn.mcfunction → .../data/blockmart/functions/earn.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/.../data/blockmart/functions/load.mcfunction → .../data/blockmart/functions/load.mcfunction b/.../data/blockmart/functions/load.mcfunction → .../data/blockmart/functions/load.mcfunction
@@ -26,8 +26,9 @@ scoreboard objectives add nugget.wallet dummy "Wallet $$$"
 # money change tracker
 scoreboard objectives add nugget.track dummy
 scoreboard objectives add nugget.track2 dummy
-scoreboard objectives add nugget.track3 dummy
-scoreboard objectives add baltop.track dummy
+
+
+
 #################################################################################### triggers
 # check balance
 scoreboard objectives add money trigger "Money"
@@ -46,6 +47,8 @@ scoreboard objectives add paysend trigger "PaySend"
 # top balances
 scoreboard objectives add baltop trigger "BalTop"
 scoreboard objectives add balancetop trigger "BalanceTop"
+scoreboard objectives add baltop.track dummy
+scoreboard objectives add nugget.track3 dummy
 #################################################################################### shop setup
 # infested stones toggle
 execute unless score #infested blockmart.config matches 0.. run scoreboard players set #infested blockmart.config 0
@@ -67,8 +70,7 @@ execute unless score #cmds blockmart.config matches 0.. run scoreboard players s
 scoreboard players set #zero blockmart.config 0
 scoreboard players set #one blockmart.config 1
 # display IDs if no tpa (needs testing)
-scoreboard objectives add tpa.config dummy "TPA Config"
-execute unless score #cooldown tpa.config matches 0.. run scoreboard objectives setdisplay list blockmart.pid
+schedule function blockmart:load_late 1s
 # scheduled
 schedule function blockmart:tick 1s
 schedule function blockmart:tick_money 1s

diff --git a/BlockMart_V0.30.3_19/data/blockmart/functions/load_late.mcfunction b/BlockMart_V0.30.3_19/data/blockmart/functions/load_late.mcfunction
@@ -0,0 +1,2 @@
+scoreboard objectives add tpa.config dummy "TPA Config"
+execute unless score #cooldown tpa.config matches 0.. run scoreboard objectives setdisplay list blockmart.pid
diff --git a/...ata/blockmart/functions/logout.mcfunction → ...ata/blockmart/functions/logout.mcfunction b/...ata/blockmart/functions/logout.mcfunction → ...ata/blockmart/functions/logout.mcfunction
diff --git a/...data/blockmart/functions/money.mcfunction → ...data/blockmart/functions/money.mcfunction b/...data/blockmart/functions/money.mcfunction → ...data/blockmart/functions/money.mcfunction
diff --git a/...ockmart/functions/money_button.mcfunction → ...ockmart/functions/money_button.mcfunction b/...ockmart/functions/money_button.mcfunction → ...ockmart/functions/money_button.mcfunction
diff --git a/...ockmart/functions/money_change.mcfunction → ...ockmart/functions/money_change.mcfunction b/...ockmart/functions/money_change.mcfunction → ...ockmart/functions/money_change.mcfunction
diff --git a/...9/data/blockmart/functions/new.mcfunction → ...9/data/blockmart/functions/new.mcfunction b/...9/data/blockmart/functions/new.mcfunction → ...9/data/blockmart/functions/new.mcfunction
diff --git a/...9/data/blockmart/functions/pay.mcfunction → ...9/data/blockmart/functions/pay.mcfunction b/...9/data/blockmart/functions/pay.mcfunction → ...9/data/blockmart/functions/pay.mcfunction
diff --git a/...ta/blockmart/functions/paysend.mcfunction → ...ta/blockmart/functions/paysend.mcfunction b/...ta/blockmart/functions/paysend.mcfunction → ...ta/blockmart/functions/paysend.mcfunction
diff --git a/...art/functions/pre_money_button.mcfunction → ...art/functions/pre_money_button.mcfunction b/...art/functions/pre_money_button.mcfunction → ...art/functions/pre_money_button.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/...art/functions/retry_balancetop.mcfunction → ...art/functions/retry_balancetop.mcfunction b/...art/functions/retry_balancetop.mcfunction → ...art/functions/retry_balancetop.mcfunction
diff --git a/...functions/retry_balancetop_old.mcfunction → ...functions/retry_balancetop_old.mcfunction b/...functions/retry_balancetop_old.mcfunction → ...functions/retry_balancetop_old.mcfunction
diff --git a/...data/blockmart/functions/spend.mcfunction → ...data/blockmart/functions/spend.mcfunction b/...data/blockmart/functions/spend.mcfunction → ...data/blockmart/functions/spend.mcfunction
diff --git a/.../data/blockmart/functions/tick.mcfunction → .../data/blockmart/functions/tick.mcfunction b/.../data/blockmart/functions/tick.mcfunction → .../data/blockmart/functions/tick.mcfunction
diff --git a/...blockmart/functions/tick_money.mcfunction → ...blockmart/functions/tick_money.mcfunction b/...blockmart/functions/tick_money.mcfunction → ...blockmart/functions/tick_money.mcfunction
diff --git a/...t/functions/trigger_balancetop.mcfunction → ...t/functions/trigger_balancetop.mcfunction b/...t/functions/trigger_balancetop.mcfunction → ...t/functions/trigger_balancetop.mcfunction
diff --git a/...lockmart/functions/trigger_pay.mcfunction → ...lockmart/functions/trigger_pay.mcfunction b/...lockmart/functions/trigger_pay.mcfunction → ...lockmart/functions/trigger_pay.mcfunction
diff --git a/...mart/functions/trigger_paysend.mcfunction → ...mart/functions/trigger_paysend.mcfunction b/...mart/functions/trigger_paysend.mcfunction → ...mart/functions/trigger_paysend.mcfunction
diff --git a/...kmart/functions/try_balancetop.mcfunction → ...kmart/functions/try_balancetop.mcfunction b/...kmart/functions/try_balancetop.mcfunction → ...kmart/functions/try_balancetop.mcfunction
diff --git a/...t/functions/try_balancetop_old.mcfunction → ...t/functions/try_balancetop_old.mcfunction b/...t/functions/try_balancetop_old.mcfunction → ...t/functions/try_balancetop_old.mcfunction
diff --git a/.../blockmart/functions/uninstall.mcfunction → .../blockmart/functions/uninstall.mcfunction b/.../blockmart/functions/uninstall.mcfunction → .../blockmart/functions/uninstall.mcfunction
diff --git a/...kmart/functions/uninstall_full.mcfunction → ...kmart/functions/uninstall_full.mcfunction b/...kmart/functions/uninstall_full.mcfunction → ...kmart/functions/uninstall_full.mcfunction
diff --git a/...ckmart/functions/uninstall_old.mcfunction → ...ckmart/functions/uninstall_old.mcfunction b/...ckmart/functions/uninstall_old.mcfunction → ...ckmart/functions/uninstall_old.mcfunction
diff --git a/...ata/blockmart/functions/wallet.mcfunction → ...ata/blockmart/functions/wallet.mcfunction b/...ata/blockmart/functions/wallet.mcfunction → ...ata/blockmart/functions/wallet.mcfunction
diff --git a/...a/blockmart/functions/withdraw.mcfunction → ...a/blockmart/functions/withdraw.mcfunction b/...a/blockmart/functions/withdraw.mcfunction → ...a/blockmart/functions/withdraw.mcfunction
diff --git a/...ockmart/functions/withdraw_try.mcfunction → ...ockmart/functions/withdraw_try.mcfunction b/...ockmart/functions/withdraw_try.mcfunction → ...ockmart/functions/withdraw_try.mcfunction
diff --git a/...0.30.2_19/data/head/loot_tables/head.json → ...0.30.3_19/data/head/loot_tables/head.json b/...0.30.2_19/data/head/loot_tables/head.json → ...0.30.3_19/data/head/loot_tables/head.json
diff --git a/...a/inhauspacks/advancements/blockmart.json → ...a/inhauspacks/advancements/blockmart.json b/...a/inhauspacks/advancements/blockmart.json → ...a/inhauspacks/advancements/blockmart.json
diff --git a/...cks/advancements/blockmart/blockmart.json → ...cks/advancements/blockmart/blockmart.json b/...cks/advancements/blockmart/blockmart.json → ...cks/advancements/blockmart/blockmart.json
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/...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/...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/BlockMart_V0.30.2_19/pack.mcmeta → BlockMart_V0.30.3_19/pack.mcmeta b/BlockMart_V0.30.2_19/pack.mcmeta → BlockMart_V0.30.3_19/pack.mcmeta