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 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"]} 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