From a5451a7c7081c35ec1686bca103e9a3ccf8b067b Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 20:31:33 +1000 Subject: [PATCH 01/75] Update lae_setup.mcfunction --- data/lae/functions/bible/lae_setup.mcfunction | 41 ++++++++++++------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/data/lae/functions/bible/lae_setup.mcfunction b/data/lae/functions/bible/lae_setup.mcfunction index 2fe6083..1fbd08b 100644 --- a/data/lae/functions/bible/lae_setup.mcfunction +++ b/data/lae/functions/bible/lae_setup.mcfunction @@ -1,29 +1,42 @@ #initiate all the scoreboards needed - gamerule commandBlockOutput false gamerule logAdminCommands false scoreboard objectives add lae_tally dummy ["James 1:12 Advancements"] scoreboard objectives add lae_paul dummy -scoreboard objectives add lae_walk minecraft.custom:minecraft.walk_one_cm -scoreboard players add @s lae_walk 0 -scoreboard objectives add lae_run minecraft.custom:minecraft.sprint_one_cm -scoreboard players add @s lae_run 0 +scoreboard objectives add lae_walk_cm minecraft.custom:minecraft.walk_one_cm +scoreboard objectives add lae_walk +scoreboard objectives add lae_run_cm minecraft.custom:minecraft.sprint_one_cm +scoreboard objectives add lae_run +scoreboard objectives add lae_boat_cm minecraft.custom:minecraft.boat_one_cm +scoreboard objectives add lae_boat +scoreboard objectives add lae_fly_cm minecraft.custom:minecraft.fly_one_cm +scoreboard objectives add lae_fly +scoreboard objectives add lae_ride_cm minecraft.custom:minecraft.horse_one_cm +scoreboard objectives add lae_ride +scoreboard objectives add 100 dummy +scoreboard players set # 100 scoreboard objectives add lae_bees dummy scoreboard objectives add lae_tnt minecraft.mined:minecraft.tnt -scoreboard objectives add lae_kind_time minecraft.custom:minecraft.play_one_minute scoreboard objectives add lae_kind_throw minecraft.dropped:minecraft.diamond_block -scoreboard objectives add lae_kind_catch minecraft.picked_up:minecraft.diamond_block #failsave function powered advancements - -advancement revoke @s only lae:bible/paul -advancement revoke @s only lae:bible/paul_trigger -advancement revoke @s only lae:bible/works -advancement revoke @s only lae:bible/works_trigger -advancement revoke @s only lae:bible/locusts -advancement revoke @s only lae:bible/locusts_trigger \ No newline at end of file +advancement revoke @a only lae:bible/paul +advancement revoke @a only lae:bible/paul_trigger +advancement revoke @a only lae:bible/works +advancement revoke @a only lae:bible/works_trigger +advancement revoke @a only lae:bible/locusts +advancement revoke @a only lae:bible/locusts_trigger +advancement revoke @a only lae:bible/kindness_trigger_catch + +#set up gamerules +dificulty hard +gamerule doDaylightCycle true +gamerule doFireTick false +gamerule doWeatherCycle true +gamerule playersSleepingPercentage 0 +gamerule spawnRadius 0 From 396e4a868275e87f126e8a8e95da23fc6691df64 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 20:33:36 +1000 Subject: [PATCH 02/75] Update locusts_trigger.mcfunction --- data/lae/functions/bible/locusts_trigger.mcfunction | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/lae/functions/bible/locusts_trigger.mcfunction b/data/lae/functions/bible/locusts_trigger.mcfunction index 5bf28c9..1d77fc4 100644 --- a/data/lae/functions/bible/locusts_trigger.mcfunction +++ b/data/lae/functions/bible/locusts_trigger.mcfunction @@ -2,7 +2,7 @@ scoreboard players add @s lae_bees 1 -#if (bees_bred >= 100) grant advancement +#if (bees_bred >= 50) grant advancement -advancement grant @s[scores={lae_bees=100..}] only lae:bible/locusts -advancement revoke @s[scores={lae_bees=..99}] only lae:bible/locusts_trigger \ No newline at end of file +advancement grant @s[scores={lae_bees=50..}] only lae:bible/locusts +advancement revoke @s[scores={lae_bees=..49}] only lae:bible/locusts_trigger From bed116f9aadd914a071beb9fde6f5862cbe48c7f Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 20:54:26 +1000 Subject: [PATCH 03/75] Update and rename paul_trigger.mcfunction to paul_trigger_0.mcfunction --- data/lae/functions/bible/paul_trigger.mcfunction | 13 ------------- data/lae/functions/bible/paul_trigger_0.mcfunction | 7 +++++++ 2 files changed, 7 insertions(+), 13 deletions(-) delete mode 100644 data/lae/functions/bible/paul_trigger.mcfunction create mode 100644 data/lae/functions/bible/paul_trigger_0.mcfunction diff --git a/data/lae/functions/bible/paul_trigger.mcfunction b/data/lae/functions/bible/paul_trigger.mcfunction deleted file mode 100644 index 640af5c..0000000 --- a/data/lae/functions/bible/paul_trigger.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -#add walk and run distances since last ping to total stat -scoreboard players operation @s lae_paul += @s lae_walk -scoreboard players operation @s lae_paul += @s lae_run - -#clear scores for next cycle -scoreboard players set @s lae_walk 0 -scoreboard players set @s lae_run 0 - -#test trigger -advancement grant @s[scores={lae_paul=1654566500..}] only lae:bible/paul -advancement revoke @s[scores={lae_paul=..1654566500}] only lae:bible/paul_trigger - -# Paul traveled a total of roughly 16 545 665m on his ministry journeys, not including within the towns. \ No newline at end of file diff --git a/data/lae/functions/bible/paul_trigger_0.mcfunction b/data/lae/functions/bible/paul_trigger_0.mcfunction new file mode 100644 index 0000000..550d95d --- /dev/null +++ b/data/lae/functions/bible/paul_trigger_0.mcfunction @@ -0,0 +1,7 @@ +#tag player so scheduled funtions can trigger +tag @s add paul_test +schedule function lae:bible/paul_trigger_1 1 replace +schedule function lae:bible/paul_trigger_2 2 replace + +#clear total score +scoreboard players set @s lae_paul 0 From 4472cdede6fb73c6c50b0e5bce076dd56ae5713b Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 20:57:05 +1000 Subject: [PATCH 04/75] Create paul_trigger_1.mcfunction --- data/lae/functions/bible/paul_trigger_1.mcfunction | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 data/lae/functions/bible/paul_trigger_1.mcfunction diff --git a/data/lae/functions/bible/paul_trigger_1.mcfunction b/data/lae/functions/bible/paul_trigger_1.mcfunction new file mode 100644 index 0000000..262ccbe --- /dev/null +++ b/data/lae/functions/bible/paul_trigger_1.mcfunction @@ -0,0 +1,6 @@ +#add distances since to total stat +execute as @a[tag=paul_test] run scoreboard players operation @s lae_paul += @s lae_walk +execute as @a[tag=paul_test] run scoreboard players operation @s lae_paul += @s lae_run +execute as @a[tag=paul_test] scoreboard players operation @s lae_paul += @s lae_boat +execute as @a[tag=paul_test] scoreboard players operation @s lae_paul += @s lae_fly +execute as @a[tag=paul_test] scoreboard players operation @s lae_paul += @s lae_ride From 49a8479e6a3e45e558b973782f8fc66831e3f1ed Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 20:59:05 +1000 Subject: [PATCH 05/75] Create paul_trigger_2.mcfunction --- data/lae/functions/bible/paul_trigger_2.mcfunction | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 data/lae/functions/bible/paul_trigger_2.mcfunction diff --git a/data/lae/functions/bible/paul_trigger_2.mcfunction b/data/lae/functions/bible/paul_trigger_2.mcfunction new file mode 100644 index 0000000..b4ecb13 --- /dev/null +++ b/data/lae/functions/bible/paul_trigger_2.mcfunction @@ -0,0 +1,7 @@ +#test trigger +execute as @a[tag=paul_test] advancement grant @s[scores={lae_paul=1650000..}] only lae:bible/paul +execute as @a[tag=paul_test] advancement revoke @s[scores={lae_paul=..1650000}] only lae:bible/paul_trigger +tag @a remove paul_test + +# Paul traveled a total of roughly 16,545,000m on his ministry journeys, not including within the towns. +# Players will be required to achieve 1% of that From ea9a9a912f4def958e9c7607023592af327b5808 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 21:00:32 +1000 Subject: [PATCH 06/75] Delete killer.json --- data/lae/advancements/bible/killer.json | 1133 ----------------------- 1 file changed, 1133 deletions(-) delete mode 100644 data/lae/advancements/bible/killer.json diff --git a/data/lae/advancements/bible/killer.json b/data/lae/advancements/bible/killer.json deleted file mode 100644 index 2feebf2..0000000 --- a/data/lae/advancements/bible/killer.json +++ /dev/null @@ -1,1133 +0,0 @@ -{ - "display": - { - "icon": {"item": "minecraft:wooden_sword"}, - "title": {"text": "True Monster Killer"}, - "description": {"text": "Don't need those fancy diamonds"}, - "frame": "challenge" - }, - "parent": "lae:bible/horsemen", - "criteria": - { - "bat": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "bat" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "bee": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "bee" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "cat": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "cat" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "chicken": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "chicken" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "cod": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "cod" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "cow": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "cow" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "donkey": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "donkey" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "fox": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "fox" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "horse": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "horse" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "mooshroom": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "mooshroom" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "mule": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "mule" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "ocelot": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "ocelot" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "parrot": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "parrot" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "pig": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "pig" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "rabbit": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "rabbit" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "salmon": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "salmon" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "sheep": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "sheep" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "skeleton_horse": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "skeleton_horse" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "squid": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "squid" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "tropical_fish": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "tropical_fish" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "turtle": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "turtle" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "villager": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "villager" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "wandering_trader": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "wandering_trader" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "trader_llama": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "trader_llama" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "pufferfish": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "pufferfish" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "dolphin": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "dolphin" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "llama": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "llama" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "panda": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "panda" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "polar_bear": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "polar_bear" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "wolf": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "wolf" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "cave_spider": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "cave_spider" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "enderman": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "enderman" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "spider": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "spider" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "blaze": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "blaze" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "creeper": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "creeper" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "drowned": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "drowned" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "elder_guardian": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "elder_guardian" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "endermite": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "endermite" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "evoker": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "evoker" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "ghast": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "ghast" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "guardian": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "guardian" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "husk": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "husk" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "magma_cube": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "magma_cube" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "phantom": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "phantom" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "pillager": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "pillager" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "ravager": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "ravager" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "shulker": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "shulker" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "silverfish": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "silverfish" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "skeleton": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "skeleton" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "slime": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "slime" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "stray": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "stray" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "vex": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "vex" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "vindicator": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "vindicator" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "witch": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "witch" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "wither_skeleton": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "wither_skeleton" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "zombie": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "zombie" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "zombie_villager": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "zombie_villager" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "iron_golem": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "iron_golem" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "snow_golem": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "snow_golem" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "ender_dragon": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "ender_dragon" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "wither": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "wither" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - }, - "player": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "player" - }, - "killing_blow": - { - "source_entity": - { - "nbt": "{SelectedItem:{id:\"minecraft:wooden_sword\"}}" - } - } - } - } - }, - "rewards": - { - "function": "lae:bible/advance" - } -} From f305f5c60a8a915f3e56ebeaf318a0d566343d85 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 21:01:15 +1000 Subject: [PATCH 07/75] Update lae_setup.mcfunction --- data/lae/functions/bible/lae_setup.mcfunction | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/data/lae/functions/bible/lae_setup.mcfunction b/data/lae/functions/bible/lae_setup.mcfunction index 1fbd08b..2433326 100644 --- a/data/lae/functions/bible/lae_setup.mcfunction +++ b/data/lae/functions/bible/lae_setup.mcfunction @@ -5,18 +5,11 @@ gamerule logAdminCommands false scoreboard objectives add lae_tally dummy ["James 1:12 Advancements"] scoreboard objectives add lae_paul dummy -scoreboard objectives add lae_walk_cm minecraft.custom:minecraft.walk_one_cm -scoreboard objectives add lae_walk -scoreboard objectives add lae_run_cm minecraft.custom:minecraft.sprint_one_cm -scoreboard objectives add lae_run -scoreboard objectives add lae_boat_cm minecraft.custom:minecraft.boat_one_cm -scoreboard objectives add lae_boat -scoreboard objectives add lae_fly_cm minecraft.custom:minecraft.fly_one_cm -scoreboard objectives add lae_fly -scoreboard objectives add lae_ride_cm minecraft.custom:minecraft.horse_one_cm -scoreboard objectives add lae_ride -scoreboard objectives add 100 dummy -scoreboard players set # 100 +scoreboard objectives add lae_walk minecraft.custom:minecraft.walk_one_cm +scoreboard objectives add lae_run minecraft.custom:minecraft.sprint_one_cm +scoreboard objectives add lae_boat minecraft.custom:minecraft.boat_one_cm +scoreboard objectives add lae_fly minecraft.custom:minecraft.aviate_one_cm +scoreboard objectives add lae_ride minecraft.custom:minecraft.horse_one_cm scoreboard objectives add lae_bees dummy From dc24e566fe7a4ca53f6d77fffa08b13dae2b1193 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 21:01:48 +1000 Subject: [PATCH 08/75] Update paul_trigger.json --- data/lae/advancements/bible/paul_trigger.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/lae/advancements/bible/paul_trigger.json b/data/lae/advancements/bible/paul_trigger.json index 4575fed..26226bd 100644 --- a/data/lae/advancements/bible/paul_trigger.json +++ b/data/lae/advancements/bible/paul_trigger.json @@ -9,6 +9,6 @@ }, "rewards": { - "function": "lae:bible/paul_trigger" + "function": "lae:bible/paul_trigger_0" } -} \ No newline at end of file +} From eaaa0b4026c9e743c53ee735943b958d49645a86 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 21:02:12 +1000 Subject: [PATCH 09/75] Update works_trigger.json --- data/lae/advancements/bible/works_trigger.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/lae/advancements/bible/works_trigger.json b/data/lae/advancements/bible/works_trigger.json index a369da7..ca9b0ac 100644 --- a/data/lae/advancements/bible/works_trigger.json +++ b/data/lae/advancements/bible/works_trigger.json @@ -9,6 +9,6 @@ }, "rewards": { - "function": "lae:bible/works_trigger_1" + "function": "lae:bible/works_trigger_0" } } From 8ffba387ad39ebd88416d04f801f02ef55e2df71 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 21:03:17 +1000 Subject: [PATCH 10/75] Update savior.json --- data/lae/advancements/bible/savior.json | 49 ++----------------------- 1 file changed, 4 insertions(+), 45 deletions(-) diff --git a/data/lae/advancements/bible/savior.json b/data/lae/advancements/bible/savior.json index 1423801..273a55c 100644 --- a/data/lae/advancements/bible/savior.json +++ b/data/lae/advancements/bible/savior.json @@ -3,59 +3,18 @@ { "icon": {"item": "minecraft:diamond_sword"}, "title": {"text": "Savior Of All"}, - "description": {"text": "Bring salvation to all nations"} + "description": {"text": "Bring salvation to the nations"} }, "parent": "lae:bible/leap", "criteria": { - "plains": + "hero": { - "trigger": "minecraft:hero_of_the_village", - "conditions": - { - "feature": "Village", - "biome": "plains" - } - } - ,"desert": - { - "trigger": "minecraft:hero_of_the_village", - "conditions": - { - "feature": "Village", - "biome": "desert" - } - } - ,"savanna": - { - "trigger": "minecraft:hero_of_the_village", - "conditions": - { - "feature": "Village", - "biome": "savanna" - } - } - ,"taiga": - { - "trigger": "minecraft:hero_of_the_village", - "conditions": - { - "feature": "Village", - "biome": "taiga" - } - } - ,"snowy_tundra": - { - "trigger": "minecraft:hero_of_the_village", - "conditions": - { - "feature": "Village", - "biome": "snowy_tundra" - } + "trigger": "minecraft:hero_of_the_village" } }, "rewards": { "function": "lae:bible/advance" } -} \ No newline at end of file +} From a003c453b8259ad8154f4ecbe74a563fe925e5ee Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 21:05:46 +1000 Subject: [PATCH 11/75] Update goliath.json --- data/lae/advancements/bible/goliath.json | 27 ++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/data/lae/advancements/bible/goliath.json b/data/lae/advancements/bible/goliath.json index 6f81a5a..02f8ea2 100644 --- a/data/lae/advancements/bible/goliath.json +++ b/data/lae/advancements/bible/goliath.json @@ -8,7 +8,7 @@ "parent": "lae:bible/locusts", "criteria": { - "button": + "enderman": { "trigger": "minecraft:player_killed_entity", "conditions": @@ -24,9 +24,32 @@ } } } + ,"golem": + { + "trigger": "minecraft:player_killed_entity", + "conditions": + { + "entity": + {"type": "iron_golem"}, + "killing_blow": + { + "source_entity": + { + "nbt": "{SelectedItem:{id:\"minecraft:stone_button\"}}" + } + } + } + } }, + "requirements": + [ + [ + "enderman", + "golem" + ] + ], "rewards": { "function": "lae:bible/advance" } -} \ No newline at end of file +} From 5bda2b5bbaa5b7fdecbcf67ca8a803a89154b5b5 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 21:07:25 +1000 Subject: [PATCH 12/75] Update and rename works_trigger_1.mcfunction to works_trigger_0.mcfunction --- data/lae/functions/bible/works_trigger_0.mcfunction | 3 +++ data/lae/functions/bible/works_trigger_1.mcfunction | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 data/lae/functions/bible/works_trigger_0.mcfunction delete mode 100644 data/lae/functions/bible/works_trigger_1.mcfunction diff --git a/data/lae/functions/bible/works_trigger_0.mcfunction b/data/lae/functions/bible/works_trigger_0.mcfunction new file mode 100644 index 0000000..6c45ef9 --- /dev/null +++ b/data/lae/functions/bible/works_trigger_0.mcfunction @@ -0,0 +1,3 @@ +scoreboard players set lae_tally 0 +schedule function works_trigger_1 1 replace +schedule function works_trigger_1 2 replace diff --git a/data/lae/functions/bible/works_trigger_1.mcfunction b/data/lae/functions/bible/works_trigger_1.mcfunction deleted file mode 100644 index 63f440b..0000000 --- a/data/lae/functions/bible/works_trigger_1.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -scoreboard players set lae_tally 0 -schedule function works_trigger_2 1 append -schedule function works_trigger_3 2 append From 3827435b8df9b83ee687806bfcb35f2ec475b826 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 21:07:57 +1000 Subject: [PATCH 13/75] Update works_trigger_0.mcfunction --- data/lae/functions/bible/works_trigger_0.mcfunction | 1 + 1 file changed, 1 insertion(+) diff --git a/data/lae/functions/bible/works_trigger_0.mcfunction b/data/lae/functions/bible/works_trigger_0.mcfunction index 6c45ef9..76ac9a8 100644 --- a/data/lae/functions/bible/works_trigger_0.mcfunction +++ b/data/lae/functions/bible/works_trigger_0.mcfunction @@ -1,3 +1,4 @@ +tag @s add works_test scoreboard players set lae_tally 0 schedule function works_trigger_1 1 replace schedule function works_trigger_1 2 replace From c68a1c0eae6087d8ddfa813df66d5cc5a3145e05 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 21:08:59 +1000 Subject: [PATCH 14/75] Update paul_trigger_1.mcfunction --- data/lae/functions/bible/paul_trigger_1.mcfunction | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/lae/functions/bible/paul_trigger_1.mcfunction b/data/lae/functions/bible/paul_trigger_1.mcfunction index 262ccbe..4666bdc 100644 --- a/data/lae/functions/bible/paul_trigger_1.mcfunction +++ b/data/lae/functions/bible/paul_trigger_1.mcfunction @@ -1,6 +1,6 @@ #add distances since to total stat execute as @a[tag=paul_test] run scoreboard players operation @s lae_paul += @s lae_walk execute as @a[tag=paul_test] run scoreboard players operation @s lae_paul += @s lae_run -execute as @a[tag=paul_test] scoreboard players operation @s lae_paul += @s lae_boat -execute as @a[tag=paul_test] scoreboard players operation @s lae_paul += @s lae_fly -execute as @a[tag=paul_test] scoreboard players operation @s lae_paul += @s lae_ride +execute as @a[tag=paul_test] run scoreboard players operation @s lae_paul += @s lae_boat +execute as @a[tag=paul_test] run scoreboard players operation @s lae_paul += @s lae_fly +execute as @a[tag=paul_test] run scoreboard players operation @s lae_paul += @s lae_ride From f2d9d1095a933c552df2ef9391b41ea22df324e2 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 21:10:35 +1000 Subject: [PATCH 15/75] Update and rename works_trigger_2.mcfunction to works_trigger_1.mcfunction --- .../bible/works_trigger_1.mcfunction | 63 ++++++++++++++++++ .../bible/works_trigger_2.mcfunction | 64 ------------------- 2 files changed, 63 insertions(+), 64 deletions(-) create mode 100644 data/lae/functions/bible/works_trigger_1.mcfunction delete mode 100644 data/lae/functions/bible/works_trigger_2.mcfunction diff --git a/data/lae/functions/bible/works_trigger_1.mcfunction b/data/lae/functions/bible/works_trigger_1.mcfunction new file mode 100644 index 0000000..7b71c73 --- /dev/null +++ b/data/lae/functions/bible/works_trigger_1.mcfunction @@ -0,0 +1,63 @@ +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/5000=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/ark=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/ascension=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/babel=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/baptism=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/betrayal=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/brimstone=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/burnt_offering=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/control=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/day_1=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/day_2=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/day_3=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/day_4=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/day_5=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/day_6=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/day_7=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/emergency=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/faithfulness=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/fish_men=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/flood=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/forbidden=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/formless=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/furnace=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/gardener=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/gentleness=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/goliath=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/goodness=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/graven=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/horsemen=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/jawbone=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/joy=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/kindness=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/leap=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/legion=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/light_world=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/lion=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/locusts=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/love=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/murder=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/music=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/not_up=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/patience=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/paul=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/peace=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/psalmist=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/respawn=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/sabath=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/sacrifice=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/savior=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/sign=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/sin=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/solomon=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/sower=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/spirit=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/supper=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/technicolour=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/tentpeg=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/to_all=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/tree_of_life=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/water_walking=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/weak_flesh=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/works=true}] lae_tally 1 +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/worst_trade=true}] lae_tally 1 diff --git a/data/lae/functions/bible/works_trigger_2.mcfunction b/data/lae/functions/bible/works_trigger_2.mcfunction deleted file mode 100644 index 81f7b8b..0000000 --- a/data/lae/functions/bible/works_trigger_2.mcfunction +++ /dev/null @@ -1,64 +0,0 @@ -scoreboard players add @s[advancements={lae:bible/5000=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/ark=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/ascension=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/babel=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/baptism=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/betrayal=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/brimstone=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/burnt_offering=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/control=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/day_1=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/day_2=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/day_3=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/day_4=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/day_5=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/day_6=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/day_7=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/emergency=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/faithfulness=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/fish_men=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/flood=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/forbidden=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/formless=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/furnace=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/gardener=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/gentleness=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/goliath=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/goodness=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/graven=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/horsemen=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/jawbone=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/joy=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/killer=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/kindness=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/leap=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/legion=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/light_world=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/lion=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/locusts=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/love=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/murder=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/music=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/not_up=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/patience=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/paul=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/peace=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/psalmist=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/respawn=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/sabath=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/sacrifice=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/savior=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/sign=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/sin=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/solomon=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/sower=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/spirit=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/supper=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/technicolour=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/tentpeg=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/to_all=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/tree_of_life=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/water_walking=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/weak_flesh=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/works=true}] lae_tally 1 -scoreboard players add @s[advancements={lae:bible/worst_trade=true}] lae_tally 1 From e9d4f451048d89105a7381f9ad677899ba87d3cc Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 21:11:46 +1000 Subject: [PATCH 16/75] Update and rename works_trigger_3.mcfunction to works_trigger_2.mcfunction --- data/lae/functions/bible/works_trigger_2.mcfunction | 3 +++ data/lae/functions/bible/works_trigger_3.mcfunction | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 data/lae/functions/bible/works_trigger_2.mcfunction delete mode 100644 data/lae/functions/bible/works_trigger_3.mcfunction diff --git a/data/lae/functions/bible/works_trigger_2.mcfunction b/data/lae/functions/bible/works_trigger_2.mcfunction new file mode 100644 index 0000000..e919839 --- /dev/null +++ b/data/lae/functions/bible/works_trigger_2.mcfunction @@ -0,0 +1,3 @@ +advancement grant @a[tag=works_test,scores={lae_tally=61..}] only lae:bible/works +advancement revoke @a[tag=works_test,scores={lae_tally=..60}] only lae_bible/works_trigger +tag @a remove works_test diff --git a/data/lae/functions/bible/works_trigger_3.mcfunction b/data/lae/functions/bible/works_trigger_3.mcfunction deleted file mode 100644 index 27f553f..0000000 --- a/data/lae/functions/bible/works_trigger_3.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -advancement grant @s[scores={lae_tally=62..}] only lae:bible/works -advancement revoke @s[scores={lae_tally=..61}] only lae_bible/works_trigger From 605d2e96f8774dd41e712eb538cdd4d407892194 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 21:12:02 +1000 Subject: [PATCH 17/75] Update works_trigger_2.mcfunction --- data/lae/functions/bible/works_trigger_2.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/lae/functions/bible/works_trigger_2.mcfunction b/data/lae/functions/bible/works_trigger_2.mcfunction index e919839..b5554c1 100644 --- a/data/lae/functions/bible/works_trigger_2.mcfunction +++ b/data/lae/functions/bible/works_trigger_2.mcfunction @@ -1,3 +1,3 @@ advancement grant @a[tag=works_test,scores={lae_tally=61..}] only lae:bible/works -advancement revoke @a[tag=works_test,scores={lae_tally=..60}] only lae_bible/works_trigger +advancement revoke @a[tag=works_test,scores={lae_tally=..60}] only lae:bible/works_trigger tag @a remove works_test From 78cd23608f50c4bede146ca847ed5ba11f43b989 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 22:07:47 +1000 Subject: [PATCH 18/75] Update 5000.json --- data/lae/advancements/bible/5000.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/data/lae/advancements/bible/5000.json b/data/lae/advancements/bible/5000.json index d86e303..b549bcc 100644 --- a/data/lae/advancements/bible/5000.json +++ b/data/lae/advancements/bible/5000.json @@ -16,11 +16,11 @@ "items": [ { - "item": "minecraft:cod", + "items": ["minecraft:cod"], "count": 2 }, { - "item": "minecraft:bread", + "items": ["minecraft:bread"], "count": 5 } ] @@ -34,11 +34,11 @@ "items": [ { - "item": "minecraft:salmon", + "items": ["minecraft:salmon"], "count": 2 }, { - "item": "minecraft:bread", + "items": ["minecraft:bread"], "count": 5 } ] @@ -52,11 +52,11 @@ "items": [ { - "item": "minecraft:cooked_cod", + "items": "[minecraft:cooked_cod]", "count": 2 }, { - "item": "minecraft:bread", + "items": "[minecraft:bread]", "count": 5 } ] @@ -70,11 +70,11 @@ "items": [ { - "item": "minecraft:cooked_salmon", + "items": ["minecraft:cooked_salmon"], "count": 2 }, { - "item": "minecraft:bread", + "items": ["minecraft:bread"], "count": 5 } ] @@ -94,4 +94,4 @@ { "function": "lae:bible/advance" } -} \ No newline at end of file +} From abf3c0939213ee75fb28c94497abe70b7d74c255 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 22:09:38 +1000 Subject: [PATCH 19/75] Update ark.json --- data/lae/advancements/bible/ark.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/lae/advancements/bible/ark.json b/data/lae/advancements/bible/ark.json index 7f33e25..cfea615 100644 --- a/data/lae/advancements/bible/ark.json +++ b/data/lae/advancements/bible/ark.json @@ -212,7 +212,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { - "items": [{"item": "minecraft:oak_boat"}] + "items": [{"items": ["minecraft:oak_boat"]}] } }, "spruce_boat": @@ -220,7 +220,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { - "items": [{"item": "minecraft:spruce_boat"}] + "items": [{"items": ["minecraft:spruce_boat"]}] } }, "birch_boat": @@ -228,7 +228,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { - "items": [{"item": "minecraft:birch_boat"}] + "items": [{"items": ["minecraft:birch_boat"]}] } }, "jungle_boat": @@ -236,7 +236,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { - "items": [{"item": "minecraft:jungle_boat"}] + "items": [{"items": ["minecraft:jungle_boat"]}] } }, "acacia_boat": @@ -244,7 +244,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { - "items": [{"item": "minecraft:acacia_boat"}] + "items": [{"items": ["minecraft:acacia_boat"]}] } }, "dark_oak_boat": @@ -252,7 +252,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { - "items": [{"item": "minecraft:dark_oak_boat"}] + "items": [{"items": ["minecraft:dark_oak_boat"]}] } } }, From fe09f4dc73bbc8d51c0343bca82135a7d0c77086 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 22:10:25 +1000 Subject: [PATCH 20/75] Update betrayal.json --- data/lae/advancements/bible/betrayal.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/lae/advancements/bible/betrayal.json b/data/lae/advancements/bible/betrayal.json index f2f72df..3f67751 100644 --- a/data/lae/advancements/bible/betrayal.json +++ b/data/lae/advancements/bible/betrayal.json @@ -17,7 +17,7 @@ "items": [ { - "item": "minecraft:iron_nugget", + "items": ["minecraft:iron_nugget"], "count": 12 } ] @@ -31,7 +31,7 @@ "items": [ { - "item": "minecraft:iron_nugget", + "items": ["minecraft:iron_nugget"], "count": 30 } ] From 0b929b4051c2c9394a3e1285ec703769ed074a00 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 22:10:41 +1000 Subject: [PATCH 21/75] Update brimstone.json --- data/lae/advancements/bible/brimstone.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/lae/advancements/bible/brimstone.json b/data/lae/advancements/bible/brimstone.json index 6b450f1..549afde 100644 --- a/data/lae/advancements/bible/brimstone.json +++ b/data/lae/advancements/bible/brimstone.json @@ -17,11 +17,11 @@ "items": [ { - "item": "minecraft:magma_block", + "items": ["minecraft:magma_block"], "count": 64 }, { - "item": "minecraft:soul_sand", + "items": ["minecraft:soul_sand"], "count": 64 } ] @@ -32,4 +32,4 @@ { "function": "lae:bible/advance" } -} \ No newline at end of file +} From b82f1df19029f6499b2a68cd4494ec614841b4fb Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 22:18:21 +1000 Subject: [PATCH 22/75] Update burnt_offering.json --- data/lae/advancements/bible/burnt_offering.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/lae/advancements/bible/burnt_offering.json b/data/lae/advancements/bible/burnt_offering.json index 99bd603..19cc95a 100644 --- a/data/lae/advancements/bible/burnt_offering.json +++ b/data/lae/advancements/bible/burnt_offering.json @@ -13,7 +13,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { - "items": [{"item": "minecraft:cooked_mutton"}] + "items": [{"items": ["minecraft:cooked_mutton"]}] } } }, From 647ff2c0133871cdd47846a10ad632862f43358f Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 22:22:19 +1000 Subject: [PATCH 23/75] Update day_5.json --- data/lae/advancements/bible/day_5.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/lae/advancements/bible/day_5.json b/data/lae/advancements/bible/day_5.json index 72f7d22..74661cc 100644 --- a/data/lae/advancements/bible/day_5.json +++ b/data/lae/advancements/bible/day_5.json @@ -13,7 +13,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { - "items": [{"item": "minecraft:cod_bucket"}] + "items": [{"items": ["minecraft:cod_bucket"]}] } }, "salmon_bucket": @@ -21,7 +21,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { - "items": [{"item": "minecraft:salmon_bucket"}] + "items": [{"items": ["minecraft:salmon_bucket"]}] } }, "pufferfish_bucket": @@ -29,7 +29,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { - "items": [{"item": "minecraft:pufferfish_bucket"}] + "items": [{"items": ["minecraft:pufferfish_bucket"]}] } }, "tropical_fish_bucket": @@ -37,7 +37,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { - "items": [{"item": "minecraft:tropical_fish_bucket"}] + "items": [{"items": ["minecraft:tropical_fish_bucket"]}] } }, "egg": @@ -45,7 +45,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { - "items": [{"item": "minecraft:egg"}] + "items": [{"items": ["minecraft:egg"]}] } } }, @@ -65,4 +65,4 @@ { "function": "lae:bible/advance" } -} \ No newline at end of file +} From f63c66dc5fc40eefdbb4840d94a131a86548c12a Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 22:25:27 +1000 Subject: [PATCH 24/75] Update forbidden.json --- data/lae/advancements/bible/forbidden.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/lae/advancements/bible/forbidden.json b/data/lae/advancements/bible/forbidden.json index 9bc8047..fdeec38 100644 --- a/data/lae/advancements/bible/forbidden.json +++ b/data/lae/advancements/bible/forbidden.json @@ -14,7 +14,7 @@ "trigger": "minecraft:consume_item", "conditions": { - "item": {"item": "minecraft:chorus_fruit"} + "item": {"items": ["minecraft:chorus_fruit"]} } } }, @@ -22,4 +22,4 @@ { "function": "lae:bible/advance" } -} \ No newline at end of file +} From e25ca686511c8d2f398c25b519d6736ed9e05178 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 22:26:23 +1000 Subject: [PATCH 25/75] Update formless.json --- data/lae/advancements/bible/formless.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/lae/advancements/bible/formless.json b/data/lae/advancements/bible/formless.json index 2740bc5..858614f 100644 --- a/data/lae/advancements/bible/formless.json +++ b/data/lae/advancements/bible/formless.json @@ -12,11 +12,11 @@ { "trigger": "minecraft:inventory_changed", "conditions": - {"items":[{"item": "minecraft:dirt"}]} + {"items":[{"items": ["minecraft:dirt"]}]} } }, "rewards": { "function": "lae:bible/advance" } -} \ No newline at end of file +} From c53d37345f445d9c8aa126353c5378f851216d52 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 22:28:05 +1000 Subject: [PATCH 26/75] Update gentleness.json --- data/lae/advancements/bible/gentleness.json | 23 +++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/data/lae/advancements/bible/gentleness.json b/data/lae/advancements/bible/gentleness.json index 0c7963f..b5c5e8f 100644 --- a/data/lae/advancements/bible/gentleness.json +++ b/data/lae/advancements/bible/gentleness.json @@ -16,7 +16,7 @@ "items": [ { - "item": "minecraft:diamond_pickaxe", + "items": ["minecraft:diamond_pickaxe"], "enchantments": [{"enchantment": "minecraft:silk_touch"}] } @@ -31,7 +31,7 @@ "items": [ { - "item": "minecraft:diamond_shovel", + "items": ["minecraft:diamond_shovel"], "enchantments": [{"enchantment": "minecraft:silk_touch"}] } @@ -46,7 +46,22 @@ "items": [ { - "item": "minecraft:diamond_axe", + "items": ["minecraft:diamond_axe"], + "enchantments": + [{"enchantment": "minecraft:silk_touch"}] + } + ] + } + } + ,"hoe": + { + "trigger": "minecraft:inventory_changed", + "conditions": + { + "items": + [ + { + "items": ["minecraft:diamond_hoe"], "enchantments": [{"enchantment": "minecraft:silk_touch"}] } @@ -58,4 +73,4 @@ { "function": "lae:bible/advance" } -} \ No newline at end of file +} From e34aec7d2c979132a8af3ee798f3f861dafb1e65 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 22:30:34 +1000 Subject: [PATCH 27/75] Update leap.json --- data/lae/advancements/bible/leap.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/lae/advancements/bible/leap.json b/data/lae/advancements/bible/leap.json index 4e9e009..98dd3ac 100644 --- a/data/lae/advancements/bible/leap.json +++ b/data/lae/advancements/bible/leap.json @@ -17,7 +17,7 @@ "items": [ { - "item": "minecraft:leather_boots", + "items": ["minecraft:leather_boots"], "enchantments": [ { @@ -37,7 +37,7 @@ "items": [ { - "item": "minecraft:chainmail_boots", + "items": ["minecraft:chainmail_boots"], "enchantments": [ { @@ -57,7 +57,7 @@ "items": [ { - "item": "minecraft:iron_boots", + "items": ["minecraft:iron_boots"], "enchantments": [ { @@ -77,7 +77,7 @@ "items": [ { - "item": "minecraft:diamond_boots", + "items": ["minecraft:diamond_boots"], "enchantments": [ { @@ -97,7 +97,7 @@ "items": [ { - "item": "minecraft:golden_boots", + "items": ["minecraft:golden_boots"], "enchantments": [ { @@ -124,4 +124,4 @@ { "function": "lae:bible/advance" } -} \ No newline at end of file +} From accee240a5c7fed0224ce50592d163ad9857a349 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 22:30:52 +1000 Subject: [PATCH 28/75] Update legion.json --- data/lae/advancements/bible/legion.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/lae/advancements/bible/legion.json b/data/lae/advancements/bible/legion.json index 4ec3f9b..e362eba 100644 --- a/data/lae/advancements/bible/legion.json +++ b/data/lae/advancements/bible/legion.json @@ -16,7 +16,7 @@ "items": [ { - "item": "minecraft:porkchop", + "items": ["minecraft:porkchop"], "count": 64 } ] @@ -27,4 +27,4 @@ { "function": "lae:bible/advance" } -} \ No newline at end of file +} From 7e0e6d0dd5615f554e57257e1c0b9ce895209a24 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 22:31:32 +1000 Subject: [PATCH 29/75] Update graven.json --- data/lae/advancements/bible/graven.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/lae/advancements/bible/graven.json b/data/lae/advancements/bible/graven.json index 1af1492..1d28f2b 100644 --- a/data/lae/advancements/bible/graven.json +++ b/data/lae/advancements/bible/graven.json @@ -43,7 +43,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { - "items": [{"item": "minecraft:totem_of_undying"}] + "items": [{"items": ["minecraft:totem_of_undying"]}] } } }, From dd4396f4963faaa192c7a54793aa45ff2ad830e0 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 22:32:10 +1000 Subject: [PATCH 30/75] Update joy.json --- data/lae/advancements/bible/joy.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/lae/advancements/bible/joy.json b/data/lae/advancements/bible/joy.json index 28483b9..dc779cc 100644 --- a/data/lae/advancements/bible/joy.json +++ b/data/lae/advancements/bible/joy.json @@ -16,7 +16,7 @@ "items": [ { - "item": "minecraft:firework_rocket", + "items": ["minecraft:firework_rocket"], "count": 64 } ] @@ -27,4 +27,4 @@ { "function": "lae:bible/advance" } -} \ No newline at end of file +} From 4b694f8b87bb916fccd7e99cee8953d5f943424f Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 22:33:13 +1000 Subject: [PATCH 31/75] Update kindness.json --- data/lae/advancements/bible/kindness.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/lae/advancements/bible/kindness.json b/data/lae/advancements/bible/kindness.json index d60484d..6c4d0e9 100644 --- a/data/lae/advancements/bible/kindness.json +++ b/data/lae/advancements/bible/kindness.json @@ -13,7 +13,7 @@ "trigger": "minecraft:thrown_item_picked_up_by_entity", "conditions": { - "item": {"item": "minecraft:diamond_block"}, + "item": {"items": ["minecraft:diamond_block"]}, "entity": [ { From 19e65ae37d3e80a5efd5aedadec175b5ba70778d Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 22:33:37 +1000 Subject: [PATCH 32/75] Update kindness_trigger_catch.json --- data/lae/advancements/bible/kindness_trigger_catch.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/lae/advancements/bible/kindness_trigger_catch.json b/data/lae/advancements/bible/kindness_trigger_catch.json index 4811e4c..89bca33 100644 --- a/data/lae/advancements/bible/kindness_trigger_catch.json +++ b/data/lae/advancements/bible/kindness_trigger_catch.json @@ -6,7 +6,7 @@ { "trigger": "minecraft:thrown_item_picked_up_by_entity", "conditions": - {"items":[{"item": "minecraft:diamond_block"}]} + {"items":[{"items": ["minecraft:diamond_block"]}]} } }, "rewards": From 58f949d6f5ab831d70fc58420ff1da2c3afbfb1d Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 22:59:19 +1000 Subject: [PATCH 33/75] Update music.json --- data/lae/advancements/bible/music.json | 32 +++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/data/lae/advancements/bible/music.json b/data/lae/advancements/bible/music.json index 484724d..fc2579f 100644 --- a/data/lae/advancements/bible/music.json +++ b/data/lae/advancements/bible/music.json @@ -16,7 +16,7 @@ "items": [ { - "item": "minecraft:note_block", + "items": ["minecraft:note_block"], "count": 1 } ] @@ -30,7 +30,7 @@ "items": [ { - "item": "minecraft:jukebox", + "items": ["minecraft:jukebox"], "count": 1 } ] @@ -44,7 +44,7 @@ "items": [ { - "item": "minecraft:bell", + "items": ["minecraft:bell"], "count": 1 } ] @@ -56,7 +56,7 @@ "conditions": { "items": - [{"item": "minecraft:music_disc_13"}] + [{"items": ["minecraft:music_disc_13"]}] } } ,"cat": @@ -65,7 +65,7 @@ "conditions": { "items": - [{"item": "minecraft:music_disc_cat"}] + [{"items": ["minecraft:music_disc_cat"]}] } } ,"blocks": @@ -74,7 +74,7 @@ "conditions": { "items": - [{"item": "minecraft:music_disc_blocks"}] + [{"items": ["minecraft:music_disc_blocks"]}] } } ,"chirp": @@ -83,7 +83,7 @@ "conditions": { "items": - [{"item": "minecraft:music_disc_chirp"}] + [{"items": ["minecraft:music_disc_chirp"]}] } } ,"far": @@ -92,7 +92,7 @@ "conditions": { "items": - [{"item": "minecraft:music_disc_far"}] + [{"items": ["minecraft:music_disc_far"]}] } } ,"mall": @@ -101,7 +101,7 @@ "conditions": { "items": - [{"item": "minecraft:music_disc_mall"}] + [{"items": ["minecraft:music_disc_mall"]}] } } ,"mellohi": @@ -110,7 +110,7 @@ "conditions": { "items": - [{"item": "minecraft:music_disc_mellohi"}] + [{"items": ["minecraft:music_disc_mellohi"]}] } } ,"stal": @@ -119,7 +119,7 @@ "conditions": { "items": - [{"item": "minecraft:music_disc_stal"}] + [{"items": ["minecraft:music_disc_stal"]}] } } ,"strad": @@ -128,7 +128,7 @@ "conditions": { "items": - [{"item": "minecraft:music_disc_strad"}] + [{"items": ["minecraft:music_disc_strad"]}] } } ,"ward": @@ -137,7 +137,7 @@ "conditions": { "items": - [{"item": "minecraft:music_disc_ward"}] + [{"items": ["minecraft:music_disc_ward"]}] } } ,"11": @@ -146,7 +146,7 @@ "conditions": { "items": - [{"item": "minecraft:music_disc_11"}] + [{"items": ["minecraft:music_disc_11"]}] } } ,"wait": @@ -155,7 +155,7 @@ "conditions": { "items": - [{"item": "minecraft:music_disc_wait"}] + [{"items": ["minecraft:music_disc_wait"]}] } } }, @@ -183,4 +183,4 @@ { "function": "lae:bible/advance" } -} \ No newline at end of file +} From ae6818bbb2e8948e2492e5fd61ba06eccdbf58e1 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 22:59:53 +1000 Subject: [PATCH 34/75] Update patience.json --- data/lae/advancements/bible/patience.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/lae/advancements/bible/patience.json b/data/lae/advancements/bible/patience.json index fda7123..232f8d3 100644 --- a/data/lae/advancements/bible/patience.json +++ b/data/lae/advancements/bible/patience.json @@ -16,7 +16,7 @@ "items": [ { - "item": "minecraft:scute", + "items": ["minecraft:scute"], "count": 5 } ] @@ -27,4 +27,4 @@ { "function": "lae:bible/advance" } -} \ No newline at end of file +} From 4eaedd84970dc82f83928e1b7637af6dec53e1f6 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 23:01:33 +1000 Subject: [PATCH 35/75] Update psalmist.json --- data/lae/advancements/bible/psalmist.json | 32 +++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/data/lae/advancements/bible/psalmist.json b/data/lae/advancements/bible/psalmist.json index 3c0cc99..6981e39 100644 --- a/data/lae/advancements/bible/psalmist.json +++ b/data/lae/advancements/bible/psalmist.json @@ -17,7 +17,7 @@ "items": [ { - "item": "minecraft:note_block", + "items": ["minecraft:note_block"], "count": 64 } ] @@ -31,7 +31,7 @@ "items": [ { - "item": "minecraft:jukebox", + "items": ["minecraft:jukebox"], "count": 1 } ] @@ -45,7 +45,7 @@ "items": [ { - "item": "minecraft:bell", + "items": ["minecraft:bell"], "count": 1 } ] @@ -57,7 +57,7 @@ "conditions": { "items": - [{"item": "minecraft:music_disc_13"}] + [{"items": ["minecraft:music_disc_13"]}] } } ,"cat": @@ -66,7 +66,7 @@ "conditions": { "items": - [{"item": "minecraft:music_disc_cat"}] + [{"items": ["minecraft:music_disc_cat"]}] } } ,"blocks": @@ -75,7 +75,7 @@ "conditions": { "items": - [{"item": "minecraft:music_disc_blocks"}] + [{"items": ["minecraft:music_disc_blocks"]}] } } ,"chirp": @@ -84,7 +84,7 @@ "conditions": { "items": - [{"item": "minecraft:music_disc_chirp"}] + [{"items": ["minecraft:music_disc_chirp"]}] } } ,"far": @@ -93,7 +93,7 @@ "conditions": { "items": - [{"item": "minecraft:music_disc_far"}] + [{"items": ["minecraft:music_disc_far"]}] } } ,"mall": @@ -102,7 +102,7 @@ "conditions": { "items": - [{"item": "minecraft:music_disc_mall"}] + [{"items": ["minecraft:music_disc_mall"]}] } } ,"mellohi": @@ -111,7 +111,7 @@ "conditions": { "items": - [{"item": "minecraft:music_disc_mellohi"}] + [{"items": ["minecraft:music_disc_mellohi"]}] } } ,"stal": @@ -120,7 +120,7 @@ "conditions": { "items": - [{"item": "minecraft:music_disc_stal"}] + [{"items": ["minecraft:music_disc_stal"]}] } } ,"strad": @@ -129,7 +129,7 @@ "conditions": { "items": - [{"item": "minecraft:music_disc_strad"}] + [{"items": ["minecraft:music_disc_strad"]}] } } ,"ward": @@ -138,7 +138,7 @@ "conditions": { "items": - [{"item": "minecraft:music_disc_ward"}] + [{"items": ["minecraft:music_disc_ward"]}] } } ,"11": @@ -147,7 +147,7 @@ "conditions": { "items": - [{"item": "minecraft:music_disc_11"}] + [{"items": ["minecraft:music_disc_11"]}] } } ,"wait": @@ -156,7 +156,7 @@ "conditions": { "items": - [{"item": "minecraft:music_disc_wait"}] + [{"items": ["minecraft:music_disc_wait"]}] } } }, @@ -164,4 +164,4 @@ { "function": "lae:bible/advance" } -} \ No newline at end of file +} From 0cbd8ca31109bd1eeaa6ed8e9b9e879f24dc57b1 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 23:02:51 +1000 Subject: [PATCH 36/75] Update root.json --- data/lae/advancements/bible/root.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/data/lae/advancements/bible/root.json b/data/lae/advancements/bible/root.json index 0633d1e..a63897c 100644 --- a/data/lae/advancements/bible/root.json +++ b/data/lae/advancements/bible/root.json @@ -11,9 +11,5 @@ "criteria": { "instant": {"trigger": "minecraft:tick"} - }, - "rewards": - { - "function": "lae:bible/lae_setup" - } -} \ No newline at end of file + } +} From b6ba06c3a3941a5289e12b318ad5386c048cd416 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 23:04:24 +1000 Subject: [PATCH 37/75] Update sacrifice.json --- data/lae/advancements/bible/sacrifice.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/data/lae/advancements/bible/sacrifice.json b/data/lae/advancements/bible/sacrifice.json index 8edbc82..c5e105e 100644 --- a/data/lae/advancements/bible/sacrifice.json +++ b/data/lae/advancements/bible/sacrifice.json @@ -3,17 +3,18 @@ { "icon": {"item": "minecraft:mutton"}, "title": {"text": "Sacrifice to the Lord"}, - "description": {"text": "Kill a sheep, not your son"} + "description": {"text": "Kill a goat, not your son"} }, "parent": "lae:bible/babel", "criteria": { "mutton": { - "trigger": "minecraft:inventory_changed", + "trigger": "minecraft:player_killed_entity", "conditions": { - "items": [{"item": "minecraft:mutton"}] + "entity": + {"type": "goat"} } } }, From 1470dbc813b75678d23d17a9565ff6a1236789c1 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 4 Jul 2021 23:05:27 +1000 Subject: [PATCH 38/75] Update sign.json --- data/lae/advancements/bible/sign.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/data/lae/advancements/bible/sign.json b/data/lae/advancements/bible/sign.json index 0a2e8b7..7da9adc 100644 --- a/data/lae/advancements/bible/sign.json +++ b/data/lae/advancements/bible/sign.json @@ -13,7 +13,7 @@ "trigger": "minecraft:placed_block", "conditions": { - "item": {"item": "minecraft:oak_sign"} + "item": {"items": ["minecraft:oak_sign"]} } }, "spruce_sign": @@ -21,7 +21,7 @@ "trigger": "minecraft:placed_block", "conditions": { - "item": {"item": "minecraft:spruce_sign"} + "item": {"items": ["minecraft:spruce_sign"]} } }, "birch_sign": @@ -29,7 +29,7 @@ "trigger": "minecraft:placed_block", "conditions": { - "item": {"item": "minecraft:birch_sign"} + "item": {"items": ["minecraft:birch_sign"]} } }, "jungle_sign": @@ -37,7 +37,7 @@ "trigger": "minecraft:placed_block", "conditions": { - "item": {"item": "minecraft:jungle_sign"} + "item": {"items": ["minecraft:jungle_sign"]} } }, "acacia_sign": @@ -45,7 +45,7 @@ "trigger": "minecraft:placed_block", "conditions": { - "item": {"item": "minecraft:acacia_sign"} + "item": {"items": ["minecraft:acacia_sign"]} } }, "dark_oak_sign": @@ -53,7 +53,7 @@ "trigger": "minecraft:placed_block", "conditions": { - "item": {"item": "minecraft:dark_oak_sign"} + "item": {"items": ["minecraft:dark_oak_sign"]} } } }, @@ -62,7 +62,7 @@ "trigger": "minecraft:placed_block", "conditions": { - "item": {"item": "minecraft:crimson_sign"} + "item": {"items": ["minecraft:crimson_sign"]} } } }, @@ -71,7 +71,7 @@ "trigger": "minecraft:placed_block", "conditions": { - "item": {"item": "minecraft:warped_sign"} + "item": {"items": ["minecraft:warped_sign"]} } } }, From 82a2f74d62482abc85ca0b2a4bba0a996e05d656 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Mon, 5 Jul 2021 00:02:04 +1000 Subject: [PATCH 39/75] Update sin.json --- data/lae/advancements/bible/sin.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/lae/advancements/bible/sin.json b/data/lae/advancements/bible/sin.json index e471a45..38c1c57 100644 --- a/data/lae/advancements/bible/sin.json +++ b/data/lae/advancements/bible/sin.json @@ -14,7 +14,7 @@ "trigger": "minecraft:consume_item", "conditions": { - "item": {"item": "minecraft:apple"} + "item": {"items": ["minecraft:apple"]} } } }, @@ -22,4 +22,4 @@ { "function": "lae:bible/advance" } -} \ No newline at end of file +} From e5eb1359b980da00e97170389d523b7449137079 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Mon, 5 Jul 2021 00:03:11 +1000 Subject: [PATCH 40/75] Update solomon.json --- data/lae/advancements/bible/solomon.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/data/lae/advancements/bible/solomon.json b/data/lae/advancements/bible/solomon.json index 27b8795..4f4f806 100644 --- a/data/lae/advancements/bible/solomon.json +++ b/data/lae/advancements/bible/solomon.json @@ -17,43 +17,43 @@ "items": [ { - "item": "minecraft:netherite_block", + "items": ["minecraft:netherite_block"], "count": {"min": 1} }, { - "item": "minecraft:diamond_block", + "items": ["minecraft:diamond_block"], "count": {"min": 8} }, { - "item": "minecraft:gold_block", + "items": ["minecraft:gold_block"], "count": {"min": 16} }, { - "item": "minecraft:quartz_block", + "items": ["minecraft:quartz_block"], "count": {"min": 32} }, { - "item": "minecraft:emerald_block", + "items": ["minecraft:emerald_block"], "count": {"min": 16} }, { - "item": "minecraft:lapis_block", + "items": ["minecraft:lapis_block"], "count": {"min": 32} }, { - "item": "minecraft:totem_of_undying" + "items": ["minecraft:totem_of_undying]" }, { - "item": "minecraft:netherite_helmet" + "items": ["minecraft:netherite_helmet"] }, { - "item": "minecraft:netherite_chestplate" + "items": ["minecraft:netherite_chestplate"] }, { - "item": "minecraft:netherite_leggings" + "items": ["minecraft:netherite_leggings"] }, { - "item": "minecraft:netherite_boots" + "items": ["minecraft:netherite_boots"] } ] } From 2b82716cecac68fc5c82c19d353546779f724062 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Mon, 5 Jul 2021 00:07:25 +1000 Subject: [PATCH 41/75] Update spirit.json --- data/lae/advancements/bible/spirit.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/lae/advancements/bible/spirit.json b/data/lae/advancements/bible/spirit.json index d0f7b27..32570d9 100644 --- a/data/lae/advancements/bible/spirit.json +++ b/data/lae/advancements/bible/spirit.json @@ -13,7 +13,7 @@ "trigger": "minecraft:consume_item", "conditions": { - "item": {"item": "minecraft:golden_apple"} + "item": {"items": ["minecraft:golden_apple"]} } } }, @@ -21,4 +21,4 @@ { "function": "lae:bible/advance" } -} \ No newline at end of file +} From 1617352a1396fb42ed6fe04cdd502ee1b07e33d7 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Mon, 5 Jul 2021 00:15:03 +1000 Subject: [PATCH 42/75] Update supper.json --- data/lae/advancements/bible/supper.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/data/lae/advancements/bible/supper.json b/data/lae/advancements/bible/supper.json index 5b50b69..438afdb 100644 --- a/data/lae/advancements/bible/supper.json +++ b/data/lae/advancements/bible/supper.json @@ -16,11 +16,11 @@ "items": [ { - "item": "minecraft:potion", + "items": ["minecraft:potion"], "potion": "minecraft:healing" } ,{ - "item": "minecraft:bread" + "items": ["minecraft:bread"] } ] } @@ -33,11 +33,11 @@ "items": [ { - "item": "minecraft:potion", + "items": ["minecraft:potion"], "potion": "minecraft:strong_healing" } ,{ - "item": "minecraft:bread" + "items": ["minecraft:bread"] } ] } @@ -50,11 +50,11 @@ "items": [ { - "item": "minecraft:potion", + "items": ["minecraft:potion"], "potion": "minecraft:regeneration" } ,{ - "item": "minecraft:bread" + "items": ["minecraft:bread"] } ] } @@ -67,11 +67,11 @@ "items": [ { - "item": "minecraft:potion", + "items": ["minecraft:potion"], "potion": "minecraft:strong_regeneration" } ,{ - "item": "minecraft:bread" + "items": ["minecraft:bread"] } ] } @@ -84,11 +84,11 @@ "items": [ { - "item": "minecraft:potion", + "items": ["minecraft:potion"], "potion": "minecraft:long_regeneration" } ,{ - "item": "minecraft:bread" + "items": ["minecraft:bread"] } ] } @@ -108,4 +108,4 @@ { "function": "lae:bible/advance" } -} \ No newline at end of file +} From 212e62e9c5712193acd5c02a4d35715107fd06e3 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Mon, 5 Jul 2021 00:25:01 +1000 Subject: [PATCH 43/75] Update to_all.json --- data/lae/advancements/bible/to_all.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/lae/advancements/bible/to_all.json b/data/lae/advancements/bible/to_all.json index c126563..acb2413 100644 --- a/data/lae/advancements/bible/to_all.json +++ b/data/lae/advancements/bible/to_all.json @@ -13,7 +13,7 @@ "trigger": "minecraft:location", "conditions": { - "feature": "Village", + "feature": "village", "biome": "plains" } } @@ -22,7 +22,7 @@ "trigger": "minecraft:location", "conditions": { - "feature": "Village", + "feature": "village", "biome": "desert" } } @@ -31,7 +31,7 @@ "trigger": "minecraft:location", "conditions": { - "feature": "Village", + "feature": "village", "biome": "savanna" } } @@ -40,7 +40,7 @@ "trigger": "minecraft:location", "conditions": { - "feature": "Village", + "feature": "village", "biome": "taiga" } } @@ -49,7 +49,7 @@ "trigger": "minecraft:location", "conditions": { - "feature": "Village", + "feature": "village", "biome": "snowy_tundra" } } From 0441feee5a8fe34cb519886173b19a3a4e67fa02 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Mon, 5 Jul 2021 00:26:35 +1000 Subject: [PATCH 44/75] Update tree_of_life.json --- data/lae/advancements/bible/tree_of_life.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/lae/advancements/bible/tree_of_life.json b/data/lae/advancements/bible/tree_of_life.json index 36ebe6c..2703a2f 100644 --- a/data/lae/advancements/bible/tree_of_life.json +++ b/data/lae/advancements/bible/tree_of_life.json @@ -14,7 +14,7 @@ "trigger": "minecraft:consume_item", "conditions": { - "item": {"item": "minecraft:enchanted_golden_apple"} + "item": {"items": ["minecraft:enchanted_golden_apple"]} } } }, @@ -22,4 +22,4 @@ { "function": "lae:bible/advance" } -} \ No newline at end of file +} From 468306e9a533f0e8ecb79dd1d144e5c15eab7a17 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Mon, 5 Jul 2021 00:27:02 +1000 Subject: [PATCH 45/75] Update water_walking.json --- data/lae/advancements/bible/water_walking.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/lae/advancements/bible/water_walking.json b/data/lae/advancements/bible/water_walking.json index d3f048f..03fe242 100644 --- a/data/lae/advancements/bible/water_walking.json +++ b/data/lae/advancements/bible/water_walking.json @@ -16,7 +16,7 @@ "items": [ { - "item": "minecraft:leather_boots", + "items": ["minecraft:leather_boots"], "enchantments": [ { @@ -36,7 +36,7 @@ "items": [ { - "item": "minecraft:chainmail_boots", + "items": ["minecraft:chainmail_boots"], "enchantments": [ { @@ -56,7 +56,7 @@ "items": [ { - "item": "minecraft:iron_boots", + "items": ["minecraft:iron_boots"], "enchantments": [ { @@ -76,7 +76,7 @@ "items": [ { - "item": "minecraft:diamond_boots", + "items": ["minecraft:diamond_boots"], "enchantments": [ { @@ -96,7 +96,7 @@ "items": [ { - "item": "minecraft:golden_boots", + "items": ["minecraft:golden_boots"], "enchantments": [ { @@ -123,4 +123,4 @@ { "function": "lae:bible/advance" } -} \ No newline at end of file +} From 1ba734d75c124f6aae8f6dacd9971915c2a960c3 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Mon, 5 Jul 2021 00:27:19 +1000 Subject: [PATCH 46/75] Update weak_flesh.json --- data/lae/advancements/bible/weak_flesh.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/lae/advancements/bible/weak_flesh.json b/data/lae/advancements/bible/weak_flesh.json index 1f48ebe..09d19c2 100644 --- a/data/lae/advancements/bible/weak_flesh.json +++ b/data/lae/advancements/bible/weak_flesh.json @@ -16,7 +16,7 @@ "items": [ { - "item": "minecraft:rotten_flesh", + "items": ["minecraft:rotten_flesh"], "count": 64 } ] From 86b946ed8fce3546996d90a0bfc60b06a6de54c3 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Mon, 5 Jul 2021 00:28:25 +1000 Subject: [PATCH 47/75] Update worst_trade.json --- data/lae/advancements/bible/worst_trade.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/lae/advancements/bible/worst_trade.json b/data/lae/advancements/bible/worst_trade.json index e195237..1f8a2c6 100644 --- a/data/lae/advancements/bible/worst_trade.json +++ b/data/lae/advancements/bible/worst_trade.json @@ -13,7 +13,7 @@ "trigger": "minecraft:consume_item", "conditions": { - "item": {"item": "minecraft:beetroot_soup"} + "item": {"items": ["minecraft:beetroot_soup"]} } } ,"rabbit": @@ -21,7 +21,7 @@ "trigger": "minecraft:consume_item", "conditions": { - "item": {"item": "minecraft:rabbit_stew"} + "item": {"items": ["minecraft:rabbit_stew"]} } } ,"mushroom": @@ -29,7 +29,7 @@ "trigger": "minecraft:consume_item", "conditions": { - "item": {"item": "minecraft:mushroom_stew"} + "item": {"items": ["minecraft:mushroom_stew"]} } } ,"suspicious": @@ -37,7 +37,7 @@ "trigger": "minecraft:consume_item", "conditions": { - "item": {"item": "minecraft:suspicious_stew"} + "item": {"items": ["minecraft:suspicious_stew"]} } } }, @@ -54,4 +54,4 @@ { "function": "lae:bible/advance" } -} \ No newline at end of file +} From b84bcf65fdf0de37705ed7f69795bef48a4b8a1c Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Mon, 5 Jul 2021 00:31:19 +1000 Subject: [PATCH 48/75] Update pack.mcmeta --- pack.mcmeta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pack.mcmeta b/pack.mcmeta index 4375e90..3b6fd9f 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -1,7 +1,7 @@ { "pack": { - "pack_format": 5, + "pack_format": 7, "description": "James 1:12 advancement pack, created by Lego_archer_elf for the Crafting For Christ network" } -} \ No newline at end of file +} From 608c59931d10f03df0e17391671569f80b5917b2 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Mon, 5 Jul 2021 22:43:56 +1000 Subject: [PATCH 49/75] Update savior.json --- data/lae/advancements/bible/savior.json | 47 +++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/data/lae/advancements/bible/savior.json b/data/lae/advancements/bible/savior.json index 273a55c..1d5fa09 100644 --- a/data/lae/advancements/bible/savior.json +++ b/data/lae/advancements/bible/savior.json @@ -3,14 +3,55 @@ { "icon": {"item": "minecraft:diamond_sword"}, "title": {"text": "Savior Of All"}, - "description": {"text": "Bring salvation to the nations"} + "description": {"text": "Bring salvation to all nations"} }, "parent": "lae:bible/leap", "criteria": { - "hero": + "plains": { - "trigger": "minecraft:hero_of_the_village" + "trigger": "minecraft:hero_of_the_village", + "conditions": + { + "feature": "village", + "biome": "plains" + } + } + ,"desert": + { + "trigger": "minecraft:hero_of_the_village", + "conditions": + { + "feature": "village", + "biome": "desert" + } + } + ,"savanna": + { + "trigger": "minecraft:hero_of_the_village", + "conditions": + { + "feature": "village", + "biome": "savanna" + } + } + ,"taiga": + { + "trigger": "minecraft:hero_of_the_village", + "conditions": + { + "feature": "village", + "biome": "taiga" + } + } + ,"snowy_tundra": + { + "trigger": "minecraft:hero_of_the_village", + "conditions": + { + "feature": "village", + "biome": "snowy_tundra" + } } }, "rewards": From 19b5950c0c46767631dc5aad75ca9951a7934935 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Mon, 5 Jul 2021 23:21:58 +1000 Subject: [PATCH 50/75] Update 5000.json --- data/lae/advancements/bible/5000.json | 65 +-------------------------- 1 file changed, 1 insertion(+), 64 deletions(-) diff --git a/data/lae/advancements/bible/5000.json b/data/lae/advancements/bible/5000.json index b549bcc..20ab4be 100644 --- a/data/lae/advancements/bible/5000.json +++ b/data/lae/advancements/bible/5000.json @@ -16,61 +16,7 @@ "items": [ { - "items": ["minecraft:cod"], - "count": 2 - }, - { - "items": ["minecraft:bread"], - "count": 5 - } - ] - } - } - ,"salmon": - { - "trigger": "minecraft:inventory_changed", - "conditions": - { - "items": - [ - { - "items": ["minecraft:salmon"], - "count": 2 - }, - { - "items": ["minecraft:bread"], - "count": 5 - } - ] - } - } - ,"cooked_cod": - { - "trigger": "minecraft:inventory_changed", - "conditions": - { - "items": - [ - { - "items": "[minecraft:cooked_cod]", - "count": 2 - }, - { - "items": "[minecraft:bread]", - "count": 5 - } - ] - } - } - ,"cooked_salmon": - { - "trigger": "minecraft:inventory_changed", - "conditions": - { - "items": - [ - { - "items": ["minecraft:cooked_salmon"], + "items": ["cod","cooked_cod","salmon","cooked_salmon"], "count": 2 }, { @@ -81,15 +27,6 @@ } } }, - "requirements": - [ - [ - "cod" - ,"salmon" - ,"cooked_cod" - ,"cooked_salmon" - ] - ], "rewards": { "function": "lae:bible/advance" From 87579253904077f79bf030990841eba0e68a7bc3 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Tue, 6 Jul 2021 00:32:48 +1000 Subject: [PATCH 51/75] Update solomon.json --- data/lae/advancements/bible/solomon.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/lae/advancements/bible/solomon.json b/data/lae/advancements/bible/solomon.json index 4f4f806..6491bb4 100644 --- a/data/lae/advancements/bible/solomon.json +++ b/data/lae/advancements/bible/solomon.json @@ -41,7 +41,7 @@ "count": {"min": 32} }, { - "items": ["minecraft:totem_of_undying]" + "items": ["minecraft:totem_of_undying"] }, { "items": ["minecraft:netherite_helmet"] From b57c59aa77f6b8e7b394cc4f4cc5bede37e8d1f0 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Tue, 6 Jul 2021 00:33:09 +1000 Subject: [PATCH 52/75] Update lae_setup.mcfunction --- data/lae/functions/bible/lae_setup.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/lae/functions/bible/lae_setup.mcfunction b/data/lae/functions/bible/lae_setup.mcfunction index 2433326..9a7208a 100644 --- a/data/lae/functions/bible/lae_setup.mcfunction +++ b/data/lae/functions/bible/lae_setup.mcfunction @@ -27,7 +27,7 @@ advancement revoke @a only lae:bible/locusts_trigger advancement revoke @a only lae:bible/kindness_trigger_catch #set up gamerules -dificulty hard +difficulty hard gamerule doDaylightCycle true gamerule doFireTick false gamerule doWeatherCycle true From d3817a3aacda450c2ef7878c8745ed72fe33ced1 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sat, 10 Jul 2021 12:11:15 +1000 Subject: [PATCH 53/75] Update paul_trigger_2.mcfunction --- data/lae/functions/bible/paul_trigger_2.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/lae/functions/bible/paul_trigger_2.mcfunction b/data/lae/functions/bible/paul_trigger_2.mcfunction index b4ecb13..101d21d 100644 --- a/data/lae/functions/bible/paul_trigger_2.mcfunction +++ b/data/lae/functions/bible/paul_trigger_2.mcfunction @@ -1,6 +1,6 @@ #test trigger -execute as @a[tag=paul_test] advancement grant @s[scores={lae_paul=1650000..}] only lae:bible/paul -execute as @a[tag=paul_test] advancement revoke @s[scores={lae_paul=..1650000}] only lae:bible/paul_trigger +execute as @a[tag=paul_test] run advancement grant @s[scores={lae_paul=1650000..}] only lae:bible/paul +execute as @a[tag=paul_test] run advancement revoke @s[scores={lae_paul=..1650000}] only lae:bible/paul_trigger tag @a remove paul_test # Paul traveled a total of roughly 16,545,000m on his ministry journeys, not including within the towns. From 438e9218b5152c125995eb0e6c44eca978a8eb9d Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sat, 10 Jul 2021 12:15:04 +1000 Subject: [PATCH 54/75] Update paul_trigger_2.mcfunction --- data/lae/functions/bible/paul_trigger_2.mcfunction | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/lae/functions/bible/paul_trigger_2.mcfunction b/data/lae/functions/bible/paul_trigger_2.mcfunction index 101d21d..d33bd8e 100644 --- a/data/lae/functions/bible/paul_trigger_2.mcfunction +++ b/data/lae/functions/bible/paul_trigger_2.mcfunction @@ -1,7 +1,7 @@ #test trigger -execute as @a[tag=paul_test] run advancement grant @s[scores={lae_paul=1650000..}] only lae:bible/paul -execute as @a[tag=paul_test] run advancement revoke @s[scores={lae_paul=..1650000}] only lae:bible/paul_trigger +execute as @a[tag=paul_test] run advancement grant @s[scores={lae_paul=16500000..}] only lae:bible/paul +execute as @a[tag=paul_test] run advancement revoke @s[scores={lae_paul=..16500000}] only lae:bible/paul_trigger tag @a remove paul_test # Paul traveled a total of roughly 16,545,000m on his ministry journeys, not including within the towns. -# Players will be required to achieve 1% of that +# Players will be required to achieve 10% of that From 655699c758b6cc94a6d4305503b44e90cfceb541 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sat, 10 Jul 2021 12:16:15 +1000 Subject: [PATCH 55/75] Update paul.json --- data/lae/advancements/bible/paul.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/lae/advancements/bible/paul.json b/data/lae/advancements/bible/paul.json index bc88242..bc5c984 100644 --- a/data/lae/advancements/bible/paul.json +++ b/data/lae/advancements/bible/paul.json @@ -3,7 +3,7 @@ { "icon": {"item": "minecraft:leather_boots"}, "title": {"text": "Paul's Traveling Companion"}, - "description": {"text": "Paul traveled a long way. Well done keeping up!"}, + "description": {"text": "Paul traveled a long way. You've made it 10% of the way"}, "hidden": "true", "frame": "challenge" }, @@ -19,4 +19,4 @@ { "function": "lae:bible/advance" } -} \ No newline at end of file +} From da209355e9c26862b565dd9cdf98dc73c02b9c90 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sat, 10 Jul 2021 12:21:16 +1000 Subject: [PATCH 56/75] Update day_7.json --- data/lae/advancements/bible/day_7.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/lae/advancements/bible/day_7.json b/data/lae/advancements/bible/day_7.json index e55d2ba..053c5b0 100644 --- a/data/lae/advancements/bible/day_7.json +++ b/data/lae/advancements/bible/day_7.json @@ -1,7 +1,7 @@ { "display": { - "icon": {"item": "minecraft:red_bed"}, + "icon": {"item": "minecraft:green_bed"}, "title": {"text": "The seventh day"}, "description": {"text": "God rested. You should too."} }, @@ -17,4 +17,4 @@ { "function": "lae:bible/advance" } -} \ No newline at end of file +} From ddf86cbe72c9d2d401f5ac670bca04c885720203 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sat, 10 Jul 2021 19:35:08 +1000 Subject: [PATCH 57/75] Update graven.json --- data/lae/advancements/bible/graven.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/data/lae/advancements/bible/graven.json b/data/lae/advancements/bible/graven.json index 1d28f2b..67b6b2e 100644 --- a/data/lae/advancements/bible/graven.json +++ b/data/lae/advancements/bible/graven.json @@ -38,6 +38,16 @@ "trigger": "minecraft:placed_block", "conditions": {"block": "minecraft:chiseled_polished_blackstone"} } + ,"chiseled_deepslate": + { + "trigger": "minecraft:placed_block", + "conditions": {"block": "minecraft:chiseled_deepslate"} + } + ,"chiseled_stone_bricks": + { + "trigger": "minecraft:placed_block", + "conditions": {"block": "minecraft:chiseled_stone_bricks"} + } ,"totem_of_undying": { "trigger": "minecraft:inventory_changed", From 45a744e7266871c1eb07c04e299854f33c09ac76 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sat, 10 Jul 2021 19:35:34 +1000 Subject: [PATCH 58/75] Update brimstone.json --- data/lae/advancements/bible/brimstone.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/lae/advancements/bible/brimstone.json b/data/lae/advancements/bible/brimstone.json index 549afde..97a05cc 100644 --- a/data/lae/advancements/bible/brimstone.json +++ b/data/lae/advancements/bible/brimstone.json @@ -6,7 +6,7 @@ "description": {"text": "Burn their souls!"}, "frame": "goal" }, - "parent": "lae:bible/sin", + "parent": "lae:bible/jawbone", "criteria": { "brimstone": From 32c7964ebe59b0079571d85ba0d12aca9788f5c0 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sat, 10 Jul 2021 20:44:00 +1000 Subject: [PATCH 59/75] Update day_4.json --- data/lae/advancements/bible/day_4.json | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/data/lae/advancements/bible/day_4.json b/data/lae/advancements/bible/day_4.json index 422019f..6cc3086 100644 --- a/data/lae/advancements/bible/day_4.json +++ b/data/lae/advancements/bible/day_4.json @@ -39,11 +39,6 @@ "trigger": "minecraft:placed_block", "conditions": {"block": "minecraft:lantern"} }, - "magma_block": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:magma_block"} - }, "redstone_lamp": { "trigger": "minecraft:placed_block", @@ -88,7 +83,23 @@ { "trigger": "minecraft:placed_block", "conditions": {"block": "minecraft:torch"} - } + }, + "glow_berries": + { + "trigger": "minecraft:placed_block", + "conditions": + { + "item": {"items": ["glow_berries"]} + } + }, + "candles": + { + "trigger": "minecraft:placed_block", + "conditions": + { + "item": {"items": ["candle","white_candle","orange_candle","magenta_candle","light_blue_candle","yellow_candle","lime_candle","pink_candle","gray_candle","light_gray_candle","cyan_candle","purple_candle","blue_candle","brown_candle","green_candle","red_candle","black_candle"]} + } + } }, "rewards": { From 1591668696d32b2c1c522f58cde1a76a9d5df2bc Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sat, 10 Jul 2021 20:45:28 +1000 Subject: [PATCH 60/75] Update day_4.json --- data/lae/advancements/bible/day_4.json | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/data/lae/advancements/bible/day_4.json b/data/lae/advancements/bible/day_4.json index 6cc3086..5d9692b 100644 --- a/data/lae/advancements/bible/day_4.json +++ b/data/lae/advancements/bible/day_4.json @@ -86,20 +86,18 @@ }, "glow_berries": { - "trigger": "minecraft:placed_block", - "conditions": - { - "item": {"items": ["glow_berries"]} - } - }, + "trigger": "minecraft:placed_block", + "conditions": + {"item": {"items": ["glow_berries"]}} + }, "candles": { - "trigger": "minecraft:placed_block", - "conditions": + "trigger": "minecraft:placed_block", + "conditions": { - "item": {"items": ["candle","white_candle","orange_candle","magenta_candle","light_blue_candle","yellow_candle","lime_candle","pink_candle","gray_candle","light_gray_candle","cyan_candle","purple_candle","blue_candle","brown_candle","green_candle","red_candle","black_candle"]} - } - } + "item": {"items": ["candle","white_candle","orange_candle","magenta_candle","light_blue_candle","yellow_candle","lime_candle","pink_candle","gray_candle","light_gray_candle","cyan_candle","purple_candle","blue_candle","brown_candle","green_candle","red_candle","black_candle"]} + } + } }, "rewards": { From 866f4742eaabe285a69f1ec0c8313bb478934097 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sat, 10 Jul 2021 20:47:43 +1000 Subject: [PATCH 61/75] Update day_1.json --- data/lae/advancements/bible/day_1.json | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/data/lae/advancements/bible/day_1.json b/data/lae/advancements/bible/day_1.json index 2090d29..1007a80 100644 --- a/data/lae/advancements/bible/day_1.json +++ b/data/lae/advancements/bible/day_1.json @@ -38,11 +38,6 @@ "trigger": "minecraft:placed_block", "conditions": {"block": "minecraft:lantern"} }, - "magma_block": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:magma_block"} - }, "redstone_lamp": { "trigger": "minecraft:placed_block", @@ -87,7 +82,19 @@ { "trigger": "minecraft:placed_block", "conditions": {"block": "minecraft:torch"} - } + }, + "glow_berries": + { + "trigger": "minecraft:placed_block", + "conditions": + {"item": {"items": ["glow_berries"]}} + }, + "candles": + { + "trigger": "minecraft:placed_block", + "conditions": + {"item": {"items": ["candle","white_candle","orange_candle","magenta_candle","light_blue_candle","yellow_candle","lime_candle","pink_candle","gray_candle","light_gray_candle","cyan_candle","purple_candle","blue_candle","brown_candle","green_candle","red_candle","black_candle"]}} + } }, "requirements": [ @@ -98,7 +105,6 @@ "glowstone", "jack_o_lantern", "lantern", - "magma_block", "redstone_lamp", "redstone_torch", "sea_lantern", @@ -107,7 +113,9 @@ "soul_campfire", "soul_lantern", "soul_torch", - "torch" + "torch", + "glow_berries", + "candles" ] ], "rewards": From 40af59f50c4606256f1ee6e2bedb9b409189b3cf Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sat, 10 Jul 2021 21:35:35 +1000 Subject: [PATCH 62/75] Update gentleness.json --- data/lae/advancements/bible/gentleness.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/lae/advancements/bible/gentleness.json b/data/lae/advancements/bible/gentleness.json index b5c5e8f..0e9b791 100644 --- a/data/lae/advancements/bible/gentleness.json +++ b/data/lae/advancements/bible/gentleness.json @@ -16,7 +16,7 @@ "items": [ { - "items": ["minecraft:diamond_pickaxe"], + "items": ["diamond_pickaxe","netherite_pickaxe"], "enchantments": [{"enchantment": "minecraft:silk_touch"}] } @@ -31,7 +31,7 @@ "items": [ { - "items": ["minecraft:diamond_shovel"], + "items": ["diamond_shovel","netherite_shovel"], "enchantments": [{"enchantment": "minecraft:silk_touch"}] } @@ -46,7 +46,7 @@ "items": [ { - "items": ["minecraft:diamond_axe"], + "items": ["diamond_axe","netherite_axe"], "enchantments": [{"enchantment": "minecraft:silk_touch"}] } @@ -61,7 +61,7 @@ "items": [ { - "items": ["minecraft:diamond_hoe"], + "items": ["diamond_hoe","netherite_hoe"], "enchantments": [{"enchantment": "minecraft:silk_touch"}] } From 799b8d068288d591741a3a5fa0d58791917fa4e0 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sat, 10 Jul 2021 21:57:25 +1000 Subject: [PATCH 63/75] Update gentleness.json --- data/lae/advancements/bible/gentleness.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/lae/advancements/bible/gentleness.json b/data/lae/advancements/bible/gentleness.json index 0e9b791..b5c5e8f 100644 --- a/data/lae/advancements/bible/gentleness.json +++ b/data/lae/advancements/bible/gentleness.json @@ -16,7 +16,7 @@ "items": [ { - "items": ["diamond_pickaxe","netherite_pickaxe"], + "items": ["minecraft:diamond_pickaxe"], "enchantments": [{"enchantment": "minecraft:silk_touch"}] } @@ -31,7 +31,7 @@ "items": [ { - "items": ["diamond_shovel","netherite_shovel"], + "items": ["minecraft:diamond_shovel"], "enchantments": [{"enchantment": "minecraft:silk_touch"}] } @@ -46,7 +46,7 @@ "items": [ { - "items": ["diamond_axe","netherite_axe"], + "items": ["minecraft:diamond_axe"], "enchantments": [{"enchantment": "minecraft:silk_touch"}] } @@ -61,7 +61,7 @@ "items": [ { - "items": ["diamond_hoe","netherite_hoe"], + "items": ["minecraft:diamond_hoe"], "enchantments": [{"enchantment": "minecraft:silk_touch"}] } From fa7e78f2211f530919753de0b4a74a2fba90cf33 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Sun, 11 Jul 2021 14:35:50 +1000 Subject: [PATCH 64/75] Update paul.json --- data/lae/advancements/bible/paul.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/lae/advancements/bible/paul.json b/data/lae/advancements/bible/paul.json index bc5c984..b9386f2 100644 --- a/data/lae/advancements/bible/paul.json +++ b/data/lae/advancements/bible/paul.json @@ -7,7 +7,7 @@ "hidden": "true", "frame": "challenge" }, - "parent": "lae:bible/savior", + "parent": "lae:bible/ascension", "criteria": { "walk": From 3ba3092958b5ad42c866ffb4cac5b6f9f26bf749 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Wed, 14 Jul 2021 22:58:59 +1000 Subject: [PATCH 65/75] Update savior.json --- data/lae/advancements/bible/savior.json | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/data/lae/advancements/bible/savior.json b/data/lae/advancements/bible/savior.json index 1d5fa09..64e19cd 100644 --- a/data/lae/advancements/bible/savior.json +++ b/data/lae/advancements/bible/savior.json @@ -12,46 +12,31 @@ { "trigger": "minecraft:hero_of_the_village", "conditions": - { - "feature": "village", - "biome": "plains" - } + {"location":{"biome": "plains"}} } ,"desert": { "trigger": "minecraft:hero_of_the_village", "conditions": - { - "feature": "village", - "biome": "desert" - } + {"location":{"biome": "desert"}} } ,"savanna": { "trigger": "minecraft:hero_of_the_village", "conditions": - { - "feature": "village", - "biome": "savanna" - } + {"location":{"biome": "savanna"}} } ,"taiga": { "trigger": "minecraft:hero_of_the_village", "conditions": - { - "feature": "village", - "biome": "taiga" - } + {"location":{"biome": "taiga"}} } ,"snowy_tundra": { "trigger": "minecraft:hero_of_the_village", "conditions": - { - "feature": "village", - "biome": "snowy_tundra" - } + {"location":{"biome": "snowy_tundra"}} } }, "rewards": From 7d245ddcf705179deedc7e7e3944922b05be56e0 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Wed, 14 Jul 2021 23:07:40 +1000 Subject: [PATCH 66/75] Update ark.json --- data/lae/advancements/bible/ark.json | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/data/lae/advancements/bible/ark.json b/data/lae/advancements/bible/ark.json index cfea615..c65a33c 100644 --- a/data/lae/advancements/bible/ark.json +++ b/data/lae/advancements/bible/ark.json @@ -130,17 +130,6 @@ } } }, - "ocelot": - { - "trigger": "minecraft:bred_animals", - "conditions": - { - "child": - { - "type": "minecraft:ocelot" - } - } - }, "rabbit": { "trigger": "minecraft:bred_animals", @@ -196,17 +185,6 @@ } } }, - "hoglin": - { - "trigger": "minecraft:bred_animals", - "conditions": - { - "child": - { - "type": "minecraft:hoglin" - } - } - }, "oak_boat": { "trigger": "minecraft:inventory_changed", From bdbc8a2f99d5b30ec41388adeb4c656a0f3dd22c Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Wed, 14 Jul 2021 23:15:13 +1000 Subject: [PATCH 67/75] Update flood.json --- data/lae/advancements/bible/flood.json | 101 +++---------------------- 1 file changed, 12 insertions(+), 89 deletions(-) diff --git a/data/lae/advancements/bible/flood.json b/data/lae/advancements/bible/flood.json index 4da8ffd..52b4575 100644 --- a/data/lae/advancements/bible/flood.json +++ b/data/lae/advancements/bible/flood.json @@ -263,69 +263,69 @@ } } }, - "squid": + "goat": { "trigger": "minecraft:player_killed_entity", "conditions": { "entity": { - "type": "squid" + "type": "goat" } } }, - "tropical_fish": + "squid": { "trigger": "minecraft:player_killed_entity", "conditions": { "entity": { - "type": "tropical_fish" + "type": "squid" } } }, - "turtle": + "glow_squid": { "trigger": "minecraft:player_killed_entity", "conditions": { "entity": { - "type": "turtle" + "type": "glow_squid" } } }, - "villager": + "axolotl": { "trigger": "minecraft:player_killed_entity", "conditions": { "entity": { - "type": "villager" + "type": "axolotl" } } }, - "wandering_trader": + "tropical_fish": { "trigger": "minecraft:player_killed_entity", "conditions": { "entity": { - "type": "wandering_trader" + "type": "tropical_fish" } } }, - "trader_llama": + "turtle": { "trigger": "minecraft:player_killed_entity", "conditions": { "entity": { - "type": "trader_llama" + "type": "turtle" } } }, @@ -461,17 +461,6 @@ } } }, - "elder_guardian": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "elder_guardian" - } - } - }, "endermite": { "trigger": "minecraft:player_killed_entity", @@ -626,17 +615,6 @@ } } }, - "vex": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "vex" - } - } - }, "vindicator": { "trigger": "minecraft:player_killed_entity", @@ -691,61 +669,6 @@ "type": "zombie_villager" } } - }, - "iron_golem": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "iron_golem" - } - } - }, - "snow_golem": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "snow_golem" - } - } - }, - "ender_dragon": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "ender_dragon" - } - } - }, - "wither": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "wither" - } - } - }, - "player": - { - "trigger": "minecraft:player_killed_entity", - "conditions": - { - "entity": - { - "type": "player" - } - } } }, "rewards": From 17c5854ec5315b8da933739ae239ab48aa1b59d3 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Wed, 14 Jul 2021 23:39:16 +1000 Subject: [PATCH 68/75] Update gardener.json --- data/lae/advancements/bible/gardener.json | 300 +--------------------- 1 file changed, 10 insertions(+), 290 deletions(-) diff --git a/data/lae/advancements/bible/gardener.json b/data/lae/advancements/bible/gardener.json index 84a119d..7b175f1 100644 --- a/data/lae/advancements/bible/gardener.json +++ b/data/lae/advancements/bible/gardener.json @@ -9,215 +9,45 @@ "parent": "lae:bible/tree_of_life", "criteria": { - "oak_1": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:oak_log"} - } - ,"spruce_1": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:spruce_log"} - } - ,"birch_1": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:birch_log"} - } - ,"jungle_1": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:jungle_log"} - } - ,"acacia_1": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:acacia_log"} - } - ,"dark_oak_1": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:dark_oak_log"} - } - ,"crimson_1": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:crimson_stem"} - } - ,"warped_1": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:warped_stem"} - } - ,"oak_2": + "oak": { "trigger": "minecraft:placed_block", "conditions": {"block": "minecraft:oak_sapling"} } - ,"spruce_2": + ,"spruce": { "trigger": "minecraft:placed_block", "conditions": {"block": "minecraft:spruce_sapling"} } - ,"birch_2": + ,"birch": { "trigger": "minecraft:placed_block", "conditions": {"block": "minecraft:birch_sapling"} } - ,"jungle_2": + ,"jungle": { "trigger": "minecraft:placed_block", "conditions": {"block": "minecraft:jungle_sapling"} } - ,"acacia_2": + ,"acacia": { "trigger": "minecraft:placed_block", "conditions": {"block": "minecraft:acacia_sapling"} } - ,"dark_oak_2": + ,"dark_oak": { "trigger": "minecraft:placed_block", "conditions": {"block": "minecraft:dark_oak_sapling"} } - ,"crimson_2": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:crimson_fungus"} - } - ,"warped_2": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:warped_fungus"} - } - ,"oak_3": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:oak_leaves"} - } - ,"spruce_3": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:spruce_leaves"} - } - ,"birch_3": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:birch_leaves"} - } - ,"jungle_3": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:jungle_leaves"} - } - ,"acacia_3": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:acacia_leaves"} - } - ,"dark_oak_3": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:dark_oak_leaves"} - } - ,"crimson_3": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:nether_wart_block"} - } - ,"warped_3": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:warped_wart_block"} - } - ,"blue_coral_1": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:tube_coral_block"} - } - ,"blue_coral_2": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:tube_coral"} - } - ,"blue_coral_3": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:tube_coral_fan"} - } - ,"pink_coral_1": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:brain_coral_block"} - } - ,"pink_coral_2": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:brain_coral"} - } - ,"pink_coral_3": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:brain_coral_fan"} - } - ,"purple_coral_1": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:bubble_coral_block"} - } - ,"purple_coral_2": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:bubble_coral"} - } - ,"purple_coral_3": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:bubble_coral_fan"} - } - ,"red_coral_1": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:fire_coral_block"} - } - ,"red_coral_2": + ,"azalea": { "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:fire_coral"} + "conditions": {"block": "minecraft:azalea"} } - ,"red_coral_3": + ,"flowering_azalea": { "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:fire_coral_fan"} - } - ,"yellow_coral_1": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:horn_coral_block"} - } - ,"yellow_coral_2": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:horn_coral"} - } - ,"yellow_coral_3": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:horn_coral_fan"} - } - ,"seagrass": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:seagrass"} - } - ,"pickle": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:sea_pickle"} - } - ,"kelp": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:kelp"} + "conditions": {"block": "minecraft:flowering_azalea"} } ,"dandelion": { @@ -279,11 +109,6 @@ "trigger": "minecraft:placed_block", "conditions": {"block": "minecraft:lily_of_the_valley"} } - ,"wither_rose": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:wither_rose"} - } ,"sunflower": { "trigger": "minecraft:placed_block", @@ -324,61 +149,6 @@ "trigger": "minecraft:placed_block", "conditions": {"block": "minecraft:lily_pad"} } - ,"gass_block": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:grass_block"} - } - ,"mycelium": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:mycelium"} - } - ,"podzol": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:podzol"} - } - ,"wheat": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:wheat"} - } - ,"pumpkin_stem": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:pumpkin_stem"} - } - ,"pumpkin": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:pumpkin"} - } - ,"melon_stem": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:melon_stem"} - } - ,"melon": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:melon"} - } - ,"beetroots": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:beetroots"} - } - ,"carrots": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:carrots"} - } - ,"potatoes": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:potatoes"} - } ,"sweet_berry_bush": { "trigger": "minecraft:placed_block", @@ -409,56 +179,6 @@ "trigger": "minecraft:placed_block", "conditions": {"block": "minecraft:red_mushroom"} } - ,"mushroom_3": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:mushroom_stem"} - } - ,"mushroom_4": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:brown_mushroom_block"} - } - ,"mushroom_5": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:red_mushroom_block"} - } - ,"nether_wart": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:nether_wart"} - } - ,"chorus_flower": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:chorus_flower"} - } - ,"crimson_roots": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:crimson_roots"} - } - ,"warped_roots": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:warped_roots"} - } - ,"nether_sprouts": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:nether_sprouts"} - } - ,"weeping_vines": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:weeping_vines"} - } - ,"twisting_vines": - { - "trigger": "minecraft:placed_block", - "conditions": {"block": "minecraft:twisting_vines"} - } }, "rewards": { From c232200a7b32c529adadc7669b8ee7b07d71d661 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Wed, 14 Jul 2021 23:48:22 +1000 Subject: [PATCH 69/75] Update works_trigger_0.mcfunction --- data/lae/functions/bible/works_trigger_0.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/lae/functions/bible/works_trigger_0.mcfunction b/data/lae/functions/bible/works_trigger_0.mcfunction index 76ac9a8..f854736 100644 --- a/data/lae/functions/bible/works_trigger_0.mcfunction +++ b/data/lae/functions/bible/works_trigger_0.mcfunction @@ -1,4 +1,4 @@ tag @s add works_test -scoreboard players set lae_tally 0 +scoreboard players set @s lae_tally 0 schedule function works_trigger_1 1 replace schedule function works_trigger_1 2 replace From 6d8c9a674fb3b35a64e9a75705665f2a9a4f6e41 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Wed, 14 Jul 2021 23:50:00 +1000 Subject: [PATCH 70/75] Update works_trigger_0.mcfunction --- data/lae/functions/bible/works_trigger_0.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/lae/functions/bible/works_trigger_0.mcfunction b/data/lae/functions/bible/works_trigger_0.mcfunction index f854736..006d207 100644 --- a/data/lae/functions/bible/works_trigger_0.mcfunction +++ b/data/lae/functions/bible/works_trigger_0.mcfunction @@ -1,4 +1,4 @@ tag @s add works_test scoreboard players set @s lae_tally 0 -schedule function works_trigger_1 1 replace -schedule function works_trigger_1 2 replace +schedule function lae:bible/works_trigger_1 1 replace +schedule function lae:bible/works_trigger_1 2 replace From 6d5a370c8faa0cfa01f92882a59857ea727933b3 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Wed, 14 Jul 2021 23:51:35 +1000 Subject: [PATCH 71/75] Update works_trigger_1.mcfunction --- data/lae/functions/bible/works_trigger_1.mcfunction | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/lae/functions/bible/works_trigger_1.mcfunction b/data/lae/functions/bible/works_trigger_1.mcfunction index 7b71c73..c425a10 100644 --- a/data/lae/functions/bible/works_trigger_1.mcfunction +++ b/data/lae/functions/bible/works_trigger_1.mcfunction @@ -59,5 +59,6 @@ execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bi execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/tree_of_life=true}] lae_tally 1 execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/water_walking=true}] lae_tally 1 execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/weak_flesh=true}] lae_tally 1 -execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/works=true}] lae_tally 1 execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/worst_trade=true}] lae_tally 1 + +execute as @a[tag=works_test] run scoreboard players add @s[advancements={lae:bible/works=true}] lae_tally 1 From 8b37808d66a7d2a6b18187bd39941894a3e4d493 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Thu, 15 Jul 2021 00:03:06 +1000 Subject: [PATCH 72/75] Update works_trigger_2.mcfunction --- data/lae/functions/bible/works_trigger_2.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/lae/functions/bible/works_trigger_2.mcfunction b/data/lae/functions/bible/works_trigger_2.mcfunction index b5554c1..52111c0 100644 --- a/data/lae/functions/bible/works_trigger_2.mcfunction +++ b/data/lae/functions/bible/works_trigger_2.mcfunction @@ -1,3 +1,3 @@ -advancement grant @a[tag=works_test,scores={lae_tally=61..}] only lae:bible/works -advancement revoke @a[tag=works_test,scores={lae_tally=..60}] only lae:bible/works_trigger +advancement grant @a[tag=works_test,scores={lae_tally=62..}] only lae:bible/works +advancement revoke @a[tag=works_test,scores={lae_tally=..61}] only lae:bible/works_trigger tag @a remove works_test From 053c5134fb70c08a2a4ff95a9f5786c93e7e331e Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Thu, 15 Jul 2021 00:03:36 +1000 Subject: [PATCH 73/75] Update works_trigger_0.mcfunction --- data/lae/functions/bible/works_trigger_0.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/lae/functions/bible/works_trigger_0.mcfunction b/data/lae/functions/bible/works_trigger_0.mcfunction index 006d207..c2551a1 100644 --- a/data/lae/functions/bible/works_trigger_0.mcfunction +++ b/data/lae/functions/bible/works_trigger_0.mcfunction @@ -1,4 +1,4 @@ tag @s add works_test scoreboard players set @s lae_tally 0 schedule function lae:bible/works_trigger_1 1 replace -schedule function lae:bible/works_trigger_1 2 replace +schedule function lae:bible/works_trigger_2 2 replace From d0725d88a1a63b0eaed9238bd9ae778db471eed1 Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Thu, 15 Jul 2021 00:05:31 +1000 Subject: [PATCH 74/75] Update works_trigger.json --- data/lae/advancements/bible/works_trigger.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/lae/advancements/bible/works_trigger.json b/data/lae/advancements/bible/works_trigger.json index ca9b0ac..ab50fb7 100644 --- a/data/lae/advancements/bible/works_trigger.json +++ b/data/lae/advancements/bible/works_trigger.json @@ -4,7 +4,7 @@ { "advancement": { - "trigger": "minecraft:location" + "trigger": "minecraft:impossible" } }, "rewards": From ef650aa8acdac1455bff09708500352da1d6b46f Mon Sep 17 00:00:00 2001 From: Lego_archer_elf Date: Thu, 15 Jul 2021 14:04:15 +1000 Subject: [PATCH 75/75] Update lae_setup.mcfunction --- data/lae/functions/bible/lae_setup.mcfunction | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/data/lae/functions/bible/lae_setup.mcfunction b/data/lae/functions/bible/lae_setup.mcfunction index 9a7208a..3c4628c 100644 --- a/data/lae/functions/bible/lae_setup.mcfunction +++ b/data/lae/functions/bible/lae_setup.mcfunction @@ -1,7 +1,4 @@ #initiate all the scoreboards needed -gamerule commandBlockOutput false -gamerule logAdminCommands false - scoreboard objectives add lae_tally dummy ["James 1:12 Advancements"] scoreboard objectives add lae_paul dummy @@ -25,11 +22,3 @@ advancement revoke @a only lae:bible/works_trigger advancement revoke @a only lae:bible/locusts advancement revoke @a only lae:bible/locusts_trigger advancement revoke @a only lae:bible/kindness_trigger_catch - -#set up gamerules -difficulty hard -gamerule doDaylightCycle true -gamerule doFireTick false -gamerule doWeatherCycle true -gamerule playersSleepingPercentage 0 -gamerule spawnRadius 0