From e7433813194f0a08689c5c5bb666d69831152798 Mon Sep 17 00:00:00 2001 From: Daniel Weipert Date: Wed, 20 Mar 2024 13:26:51 +0100 Subject: add all islands in init --- data/vanilla_skyblock/functions/debug.mcfunction | 8 ++++ .../functions/initialize.mcfunction | 46 ++++++++++++++++++---- .../functions/initialize_nether.mcfunction | 8 ---- data/vanilla_skyblock/functions/tick.mcfunction | 2 - data/vanilla_skyblock/predicates/in_nether.json | 6 --- 5 files changed, 46 insertions(+), 24 deletions(-) create mode 100644 data/vanilla_skyblock/functions/debug.mcfunction delete mode 100644 data/vanilla_skyblock/functions/initialize_nether.mcfunction delete mode 100644 data/vanilla_skyblock/predicates/in_nether.json (limited to 'data/vanilla_skyblock') diff --git a/data/vanilla_skyblock/functions/debug.mcfunction b/data/vanilla_skyblock/functions/debug.mcfunction new file mode 100644 index 0000000..3087cb2 --- /dev/null +++ b/data/vanilla_skyblock/functions/debug.mcfunction @@ -0,0 +1,8 @@ +# create nether portal +fill -1 63 -2 2 63 -2 obsidian +fill -1 63 -2 -1 68 -2 obsidian +fill 2 63 -2 2 68 -2 obsidian +fill -1 68 -2 2 68 -2 obsidian + +# add flint_and_steel to chest +execute in overworld run item replace block 4 64 0 container.2 with flint_and_steel 1 diff --git a/data/vanilla_skyblock/functions/initialize.mcfunction b/data/vanilla_skyblock/functions/initialize.mcfunction index 66630e3..70049af 100644 --- a/data/vanilla_skyblock/functions/initialize.mcfunction +++ b/data/vanilla_skyblock/functions/initialize.mcfunction @@ -1,6 +1,8 @@ setworldspawn 0 64 0 gamerule spawnRadius 0 + +# starting island execute in overworld run fill 4 63 -1 -1 63 1 grass_block execute in overworld run fill 4 62 -1 -1 61 1 dirt execute in overworld run fill 1 63 2 -1 63 4 grass_block @@ -14,18 +16,46 @@ execute in overworld run setblock 4 64 0 chest[facing=west] execute in overworld run item replace block 4 64 0 container.0 with ice 1 execute in overworld run item replace block 4 64 0 container.1 with lava_bucket 1 + +# sand island +execute in overworld run fill -63 64 -1 -65 66 1 sand +execute in overworld run fill -63 63 -1 -65 63 1 sandstone +execute in overworld run setblock -65 67 1 cactus + +execute in overworld run setblock -64 67 0 chest[facing=east] +execute in overworld run item replace block -64 67 0 container.0 with obsidian 10 +execute in overworld run item replace block -64 67 0 container.1 with melon_slice 1 +execute in overworld run item replace block -64 67 0 container.2 with pumpkin_seeds 1 + + +# nether +execute in the_nether run forceload add -1 -1 1 1 + +execute in the_nether run fill -1 61 1 1 63 -1 glowstone + +execute in the_nether run setblock 1 64 -1 chest[facing=west] +execute in the_nether run item replace block 1 64 -1 container.0 with birch_sapling 1 +execute in the_nether run item replace block 1 64 -1 container.1 with sugar_cane 1 +execute in the_nether run item replace block 1 64 -1 container.2 with ice 1 + +execute in the_nether run setblock 1 64 0 brown_mushroom +execute in the_nether run setblock -1 64 1 red_mushroom + +# place portal last to keep mushroom placement from breaking half the portal initially +execute in the_nether run fill 2 63 0 2 63 1 obsidian +execute in the_nether run fill 2 64 2 2 66 2 obsidian +execute in the_nether run fill 2 67 0 2 67 1 obsidian +execute in the_nether run fill 2 64 -1 2 66 -1 obsidian +execute in the_nether run fill 2 64 0 2 66 1 nether_portal + +execute in the_nether run forceload remove -1 -1 1 1 + + # end execute in the_end run forceload add -1 -1 1 1 execute in the_end run setblock 0 61 0 bedrock execute in the_end run forceload remove -1 -1 1 1 + # set flag scoreboard players set initialized vanilla_skyblock_data 1 - - -# debug -fill -1 63 -2 2 63 -2 obsidian -fill -1 63 -2 -1 68 -2 obsidian -fill 2 63 -2 2 68 -2 obsidian -fill -1 68 -2 2 68 -2 obsidian -execute in overworld run item replace block 4 64 0 container.2 with flint_and_steel 1 diff --git a/data/vanilla_skyblock/functions/initialize_nether.mcfunction b/data/vanilla_skyblock/functions/initialize_nether.mcfunction deleted file mode 100644 index 5b5fe61..0000000 --- a/data/vanilla_skyblock/functions/initialize_nether.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -execute as @a in the_nether run setblock ~1 ~-1 0 glowstone -execute in the_nether run spawnpoint @s 5 5 5 - -execute as @s in the_nether run setblock ~2 ~-2 2 glowstone -# todo: get current location of nether spawn in - -# set flag -scoreboard players set initialized_nether vanilla_skyblock_data 1 diff --git a/data/vanilla_skyblock/functions/tick.mcfunction b/data/vanilla_skyblock/functions/tick.mcfunction index ac0dd41..aadc3f2 100644 --- a/data/vanilla_skyblock/functions/tick.mcfunction +++ b/data/vanilla_skyblock/functions/tick.mcfunction @@ -5,5 +5,3 @@ # fill chunk with air # re-place end_portal_frame # set scoreboard values to 1 for processed chunk - -execute as @a[predicate=vanilla_skyblock:in_nether] unless score initialized_nether vanilla_skyblock_data matches 1 run function vanilla_skyblock:initialize_nether diff --git a/data/vanilla_skyblock/predicates/in_nether.json b/data/vanilla_skyblock/predicates/in_nether.json deleted file mode 100644 index 7f8bb16..0000000 --- a/data/vanilla_skyblock/predicates/in_nether.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "condition": "minecraft:location_check", - "predicate": { - "dimension": "minecraft:the_nether" - } -} -- cgit v1.2.3