From d5c9e8bc2fc8092cabfc89e1dcbe676971e0f526 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Wed, 15 Nov 2023 18:56:43 +0900 Subject: [PATCH 1/5] Removed PersistenceRequreid from bats and increased their health. --- .../functions/internal/subtick/begin_launch_context.mcfunction | 2 +- .../functions/internal/subtick/end_launch_context.mcfunction | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/delta_datapack/data/delta/functions/internal/subtick/begin_launch_context.mcfunction b/delta_datapack/data/delta/functions/internal/subtick/begin_launch_context.mcfunction index 029c0d5..0339f28 100644 --- a/delta_datapack/data/delta/functions/internal/subtick/begin_launch_context.mcfunction +++ b/delta_datapack/data/delta/functions/internal/subtick/begin_launch_context.mcfunction @@ -2,6 +2,6 @@ # Sets up the bat and aec used to trigger the player_hurt_entity advancement right before an explosion summon minecraft:area_effect_cloud ~ ~10000 ~ {Duration:1,Radius:0.0f,ReapplicationDelay:-1,Age:-1,WaitTime:0,effects:[{id:"minecraft:instant_damage",amplifier:0b,duration:1}],Tags:["delta.init.aec"]} -summon minecraft:bat ~ ~10000 ~ {DeathLootTable:"",NoAI:1b,Health:1.0f,Tags:["delta.pre_explosion"],PersistenceRequired:1b} +summon minecraft:bat ~ ~10000 ~ {DeathLootTable:"",NoAI:1b,Health:2000.0f,Tags:["delta.pre_explosion"],PersistenceRequired:0b} function delta:internal/subtick/get_player_uuid execute positioned ~ ~10000 ~ as @e[type=area_effect_cloud,tag=delta.init.aec,distance=..0.01] run function delta:internal/subtick/aec_setup \ No newline at end of file diff --git a/delta_datapack/data/delta/functions/internal/subtick/end_launch_context.mcfunction b/delta_datapack/data/delta/functions/internal/subtick/end_launch_context.mcfunction index 8f85880..2198150 100644 --- a/delta_datapack/data/delta/functions/internal/subtick/end_launch_context.mcfunction +++ b/delta_datapack/data/delta/functions/internal/subtick/end_launch_context.mcfunction @@ -2,6 +2,6 @@ # Summons the bat and aec used to trigger the player_hurt_entity advancement immediately after an explosion summon minecraft:area_effect_cloud ~ ~12000 ~ {Duration:1,Radius:0.0f,ReapplicationDelay:-1,Age:-1,WaitTime:0,effects:[{id:"minecraft:instant_damage",amplifier:0b,duration:1}],Tags:["delta.init.aec"]} -summon minecraft:bat ~ ~12000 ~ {DeathLootTable:"",NoAI:1b,Health:1.0f,Tags:["delta.post_explosion"],PersistenceRequired:1b} +summon minecraft:bat ~ ~12000 ~ {DeathLootTable:"",NoAI:1b,Health:2000.0f,Tags:["delta.post_explosion"],PersistenceRequired:0b} function delta:internal/subtick/get_player_uuid execute positioned ~ ~12000 ~ as @e[type=area_effect_cloud,tag=delta.init.aec,distance=..0.01] run function delta:internal/subtick/aec_setup \ No newline at end of file From 5a6c8fd80743cebf93068eaf35d619c5f19c9de3 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Wed, 15 Nov 2023 20:18:59 +0900 Subject: [PATCH 2/5] returned to initial state --- .../functions/internal/subtick/begin_launch_context.mcfunction | 2 +- .../functions/internal/subtick/end_launch_context.mcfunction | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/delta_datapack/data/delta/functions/internal/subtick/begin_launch_context.mcfunction b/delta_datapack/data/delta/functions/internal/subtick/begin_launch_context.mcfunction index 0339f28..029c0d5 100644 --- a/delta_datapack/data/delta/functions/internal/subtick/begin_launch_context.mcfunction +++ b/delta_datapack/data/delta/functions/internal/subtick/begin_launch_context.mcfunction @@ -2,6 +2,6 @@ # Sets up the bat and aec used to trigger the player_hurt_entity advancement right before an explosion summon minecraft:area_effect_cloud ~ ~10000 ~ {Duration:1,Radius:0.0f,ReapplicationDelay:-1,Age:-1,WaitTime:0,effects:[{id:"minecraft:instant_damage",amplifier:0b,duration:1}],Tags:["delta.init.aec"]} -summon minecraft:bat ~ ~10000 ~ {DeathLootTable:"",NoAI:1b,Health:2000.0f,Tags:["delta.pre_explosion"],PersistenceRequired:0b} +summon minecraft:bat ~ ~10000 ~ {DeathLootTable:"",NoAI:1b,Health:1.0f,Tags:["delta.pre_explosion"],PersistenceRequired:1b} function delta:internal/subtick/get_player_uuid execute positioned ~ ~10000 ~ as @e[type=area_effect_cloud,tag=delta.init.aec,distance=..0.01] run function delta:internal/subtick/aec_setup \ No newline at end of file diff --git a/delta_datapack/data/delta/functions/internal/subtick/end_launch_context.mcfunction b/delta_datapack/data/delta/functions/internal/subtick/end_launch_context.mcfunction index 2198150..8f85880 100644 --- a/delta_datapack/data/delta/functions/internal/subtick/end_launch_context.mcfunction +++ b/delta_datapack/data/delta/functions/internal/subtick/end_launch_context.mcfunction @@ -2,6 +2,6 @@ # Summons the bat and aec used to trigger the player_hurt_entity advancement immediately after an explosion summon minecraft:area_effect_cloud ~ ~12000 ~ {Duration:1,Radius:0.0f,ReapplicationDelay:-1,Age:-1,WaitTime:0,effects:[{id:"minecraft:instant_damage",amplifier:0b,duration:1}],Tags:["delta.init.aec"]} -summon minecraft:bat ~ ~12000 ~ {DeathLootTable:"",NoAI:1b,Health:2000.0f,Tags:["delta.post_explosion"],PersistenceRequired:0b} +summon minecraft:bat ~ ~12000 ~ {DeathLootTable:"",NoAI:1b,Health:1.0f,Tags:["delta.post_explosion"],PersistenceRequired:1b} function delta:internal/subtick/get_player_uuid execute positioned ~ ~12000 ~ as @e[type=area_effect_cloud,tag=delta.init.aec,distance=..0.01] run function delta:internal/subtick/aec_setup \ No newline at end of file From 98a0313c952841eb9e85058d7e04a23fafb98b97 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Wed, 15 Nov 2023 20:21:33 +0900 Subject: [PATCH 3/5] add loottable --- .../blocks/light_blue_shulker_box.json | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 delta_datapack/data/minecraft/loot_tables/blocks/light_blue_shulker_box.json diff --git a/delta_datapack/data/minecraft/loot_tables/blocks/light_blue_shulker_box.json b/delta_datapack/data/minecraft/loot_tables/blocks/light_blue_shulker_box.json new file mode 100644 index 0000000..0489cb1 --- /dev/null +++ b/delta_datapack/data/minecraft/loot_tables/blocks/light_blue_shulker_box.json @@ -0,0 +1,71 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:dynamic", + "name": "minecraft:contents", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:debug_stick" + ] + } + } + ] + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:copy_name", + "source": "block_entity" + }, + { + "function": "minecraft:copy_nbt", + "source": "block_entity", + "ops": [ + { + "source": "Lock", + "target": "BlockEntityTag.Lock", + "op": "replace" + }, + { + "source": "LootTable", + "target": "BlockEntityTag.LootTable", + "op": "replace" + }, + { + "source": "LootTableSeed", + "target": "BlockEntityTag.LootTableSeed", + "op": "replace" + } + ] + }, + { + "function": "minecraft:set_contents", + "type": "minecraft:shulker_box", + "entries": [ + { + "type": "minecraft:dynamic", + "name": "minecraft:contents" + } + ] + } + ], + "name": "minecraft:light_blue_shulker_box" + } + ] + } + ] + } + ] +} \ No newline at end of file From cc2a310285c45a58c89a67189b615c9da28f74b6 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Wed, 15 Nov 2023 20:21:51 +0900 Subject: [PATCH 4/5] Added a shulker box to the load process. --- .../data/delta/functions/internal/technical/load.mcfunction | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/delta_datapack/data/delta/functions/internal/technical/load.mcfunction b/delta_datapack/data/delta/functions/internal/technical/load.mcfunction index 87da844..b828bad 100644 --- a/delta_datapack/data/delta/functions/internal/technical/load.mcfunction +++ b/delta_datapack/data/delta/functions/internal/technical/load.mcfunction @@ -42,6 +42,11 @@ team add delta.no_collide forceload remove 0 0 forceload add 0 0 +#Place Shulker Box +execute unless block 0 -64 0 light_blue_shulker_box run setblock 100001 -64 100000 light_blue_shulker_box +execute unless block 0 -63 0 bedrock run setblock 100001 -63 100000 bedrock + + #MARKERS kill d59ee2c6-58c8-4885-b9db-ecff066e4439 summon marker ~ ~ ~ {UUID: [I;-711007546,1489520773,-1176769281,107889721],Tags:["global.ignore"]} From 5ef950cd24a4a354f4efda2346314e2d410e2c1d Mon Sep 17 00:00:00 2001 From: Chuzume Date: Wed, 15 Nov 2023 20:25:05 +0900 Subject: [PATCH 5/5] Armor will now be disabled only at the moment of launch. --- .../internal/subtick/post_explosion_trigger.mcfunction | 3 +++ .../internal/subtick/pre_explosion_trigger.mcfunction | 7 +++++++ .../functions/internal/subtick/store_armor.mcfunction | 6 ++++++ 3 files changed, 16 insertions(+) create mode 100644 delta_datapack/data/delta/functions/internal/subtick/store_armor.mcfunction diff --git a/delta_datapack/data/delta/functions/internal/subtick/post_explosion_trigger.mcfunction b/delta_datapack/data/delta/functions/internal/subtick/post_explosion_trigger.mcfunction index 678b434..b7890a9 100644 --- a/delta_datapack/data/delta/functions/internal/subtick/post_explosion_trigger.mcfunction +++ b/delta_datapack/data/delta/functions/internal/subtick/post_explosion_trigger.mcfunction @@ -15,5 +15,8 @@ gamemode survival @s[scores={delta.internal.gamemode=3}] #Revert difficulty if necessary execute if score $diff delta.internal.gamemode matches 0 run difficulty peaceful +# Revert equipment +execute in overworld run loot replace entity @s weapon.mainhand mine 0 -64 0 minecraft:debug_stick + #Teleport self down tp @s ~ ~-1000 ~ \ No newline at end of file diff --git a/delta_datapack/data/delta/functions/internal/subtick/pre_explosion_trigger.mcfunction b/delta_datapack/data/delta/functions/internal/subtick/pre_explosion_trigger.mcfunction index 43ffe4e..5843598 100644 --- a/delta_datapack/data/delta/functions/internal/subtick/pre_explosion_trigger.mcfunction +++ b/delta_datapack/data/delta/functions/internal/subtick/pre_explosion_trigger.mcfunction @@ -17,3 +17,10 @@ gamemode creative #Teleport self up tp @s ~ ~1000 ~ + +#Store armor +execute in overworld run function delta:internal/subtick/store_armor +item replace entity @s armor.feet with minecraft:air +item replace entity @s armor.legs with minecraft:air +item replace entity @s armor.chest with minecraft:air +item replace entity @s armor.head with minecraft:air \ No newline at end of file diff --git a/delta_datapack/data/delta/functions/internal/subtick/store_armor.mcfunction b/delta_datapack/data/delta/functions/internal/subtick/store_armor.mcfunction new file mode 100644 index 0000000..e858549 --- /dev/null +++ b/delta_datapack/data/delta/functions/internal/subtick/store_armor.mcfunction @@ -0,0 +1,6 @@ +item replace block 0 -64 0 container.0 from entity @s weapon.mainhand +item replace block 0 -64 0 container.1 from entity @s weapon.offhand +item replace block 0 -64 0 container.2 from entity @s armor.feet +item replace block 0 -64 0 container.3 from entity @s armor.legs +item replace block 0 -64 0 container.4 from entity @s armor.chest +item replace block 0 -64 0 container.5 from entity @s armor.head \ No newline at end of file