From fcbea16f2ae86843eb214f64e02a96862e8e3564 Mon Sep 17 00:00:00 2001 From: Daniel Weipert Date: Sun, 23 Jun 2024 17:04:11 +0200 Subject: original => vanilla && overwrite some more hard-coded structures :] --- data/original_skyblock/function/debug.mcfunction | 23 ------- .../function/initialize.mcfunction | 76 --------------------- data/original_skyblock/function/load.mcfunction | 3 - data/original_skyblock/structure/bastion_chest.nbt | Bin 3517 -> 0 bytes data/original_skyblock/structure/empty_16.nbt | Bin 10278 -> 0 bytes data/original_skyblock/structure/empty_full.nbt | Bin 293225 -> 0 bytes data/original_skyblock/structure/end_portal.nbt | Bin 289 -> 0 bytes .../worldgen/template_pool/fortress.json | 15 ---- .../worldgen/template_pool/stronghold.json | 15 ---- 9 files changed, 132 deletions(-) delete mode 100644 data/original_skyblock/function/debug.mcfunction delete mode 100644 data/original_skyblock/function/initialize.mcfunction delete mode 100644 data/original_skyblock/function/load.mcfunction delete mode 100644 data/original_skyblock/structure/bastion_chest.nbt delete mode 100644 data/original_skyblock/structure/empty_16.nbt delete mode 100644 data/original_skyblock/structure/empty_full.nbt delete mode 100644 data/original_skyblock/structure/end_portal.nbt delete mode 100644 data/original_skyblock/worldgen/template_pool/fortress.json delete mode 100644 data/original_skyblock/worldgen/template_pool/stronghold.json (limited to 'data/original_skyblock') diff --git a/data/original_skyblock/function/debug.mcfunction b/data/original_skyblock/function/debug.mcfunction deleted file mode 100644 index 3f336b5..0000000 --- a/data/original_skyblock/function/debug.mcfunction +++ /dev/null @@ -1,23 +0,0 @@ -gamemode creative - - - -# 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 - -fill 0 64 -2 1 67 -2 nether_portal - - - -# create end portal - -fill 5 63 1 5 63 -1 end_portal_frame -fill 6 63 2 8 63 2 end_portal_frame -fill 6 63 -2 8 63 -2 end_portal_frame -fill 9 63 1 9 63 -1 end_portal_frame - -fill 6 63 1 8 63 -1 end_portal diff --git a/data/original_skyblock/function/initialize.mcfunction b/data/original_skyblock/function/initialize.mcfunction deleted file mode 100644 index 36cf8ce..0000000 --- a/data/original_skyblock/function/initialize.mcfunction +++ /dev/null @@ -1,76 +0,0 @@ -setworldspawn 0 64 0 -gamerule spawnRadius 0 - - - -# starting island - -execute in overworld run forceload add -1 -1 1 1 -execute in overworld run forceload remove -1 -1 1 1 - -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 -execute in overworld run fill 1 62 2 -1 61 4 dirt -execute in overworld run setblock 0 61 0 bedrock - -execute in overworld run place feature oak -1 64 4 - -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 forceload add -63 -1 -65 1 -execute in overworld run forceload remove -63 -1 -65 1 - -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 forceload remove -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 (not working though) -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 - - - -# end - -execute in the_end run forceload add -1 -1 1 1 -execute in the_end run forceload remove -1 -1 1 1 - -execute in the_end run setblock 0 61 0 bedrock - - - -# set flag -scoreboard players set $initialized original_skyblock_data 1 diff --git a/data/original_skyblock/function/load.mcfunction b/data/original_skyblock/function/load.mcfunction deleted file mode 100644 index e65cbab..0000000 --- a/data/original_skyblock/function/load.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -scoreboard objectives add original_skyblock_data dummy - -execute unless score $initialized original_skyblock_data matches 1 run function original_skyblock:initialize diff --git a/data/original_skyblock/structure/bastion_chest.nbt b/data/original_skyblock/structure/bastion_chest.nbt deleted file mode 100644 index 80b57df..0000000 Binary files a/data/original_skyblock/structure/bastion_chest.nbt and /dev/null differ diff --git a/data/original_skyblock/structure/empty_16.nbt b/data/original_skyblock/structure/empty_16.nbt deleted file mode 100644 index 3eddcb6..0000000 Binary files a/data/original_skyblock/structure/empty_16.nbt and /dev/null differ diff --git a/data/original_skyblock/structure/empty_full.nbt b/data/original_skyblock/structure/empty_full.nbt deleted file mode 100644 index 59af38e..0000000 Binary files a/data/original_skyblock/structure/empty_full.nbt and /dev/null differ diff --git a/data/original_skyblock/structure/end_portal.nbt b/data/original_skyblock/structure/end_portal.nbt deleted file mode 100644 index 384e613..0000000 Binary files a/data/original_skyblock/structure/end_portal.nbt and /dev/null differ diff --git a/data/original_skyblock/worldgen/template_pool/fortress.json b/data/original_skyblock/worldgen/template_pool/fortress.json deleted file mode 100644 index 3e33fb1..0000000 --- a/data/original_skyblock/worldgen/template_pool/fortress.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "original_skyblock:fortress", - "fallback": "minecraft:empty", - "elements": [ - { - "weight": 1, - "element": { - "element_type": "minecraft:single_pool_element", - "location": "original_skyblock:empty_full", - "projection": "rigid", - "processors": "minecraft:empty" - } - } - ] -} diff --git a/data/original_skyblock/worldgen/template_pool/stronghold.json b/data/original_skyblock/worldgen/template_pool/stronghold.json deleted file mode 100644 index c22e6a1..0000000 --- a/data/original_skyblock/worldgen/template_pool/stronghold.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "original_skyblock:stronghold", - "fallback": "minecraft:empty", - "elements": [ - { - "weight": 1, - "element": { - "element_type": "minecraft:single_pool_element", - "location": "original_skyblock:end_portal", - "projection": "rigid", - "processors": "minecraft:empty" - } - } - ] -} -- cgit v1.2.3