diff options
Diffstat (limited to 'data')
64 files changed, 532 insertions, 102 deletions
diff --git a/data/minecraft/loot_table/chests/bastion_other.json b/data/minecraft/loot_table/chests/bastion_other.json deleted file mode 100644 index f29ea85..0000000 --- a/data/minecraft/loot_table/chests/bastion_other.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "minecraft:chest", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [] - } - ], - "random_sequence": "minecraft:chests/bastion_other" -} diff --git a/data/minecraft/structure/ancient_city/city_center/city_center_1.nbt b/data/minecraft/structure/ancient_city/city_center/city_center_1.nbt Binary files differnew file mode 100644 index 0000000..7b1394d --- /dev/null +++ b/data/minecraft/structure/ancient_city/city_center/city_center_1.nbt diff --git a/data/minecraft/structure/ancient_city/city_center/city_center_2.nbt b/data/minecraft/structure/ancient_city/city_center/city_center_2.nbt Binary files differnew file mode 100644 index 0000000..7b1394d --- /dev/null +++ b/data/minecraft/structure/ancient_city/city_center/city_center_2.nbt diff --git a/data/minecraft/structure/ancient_city/city_center/city_center_3.nbt b/data/minecraft/structure/ancient_city/city_center/city_center_3.nbt Binary files differnew file mode 100644 index 0000000..7b1394d --- /dev/null +++ b/data/minecraft/structure/ancient_city/city_center/city_center_3.nbt diff --git a/data/minecraft/structure/bastion/bridge/starting_pieces/entrance_base.nbt b/data/minecraft/structure/bastion/bridge/starting_pieces/entrance_base.nbt Binary files differindex 80b57df..10a8a03 100644 --- a/data/minecraft/structure/bastion/bridge/starting_pieces/entrance_base.nbt +++ b/data/minecraft/structure/bastion/bridge/starting_pieces/entrance_base.nbt diff --git a/data/minecraft/structure/bastion/hoglin_stable/air_base.nbt b/data/minecraft/structure/bastion/hoglin_stable/air_base.nbt Binary files differindex 80b57df..1feb6fd 100644 --- a/data/minecraft/structure/bastion/hoglin_stable/air_base.nbt +++ b/data/minecraft/structure/bastion/hoglin_stable/air_base.nbt diff --git a/data/minecraft/structure/bastion/treasure/big_air_full.nbt b/data/minecraft/structure/bastion/treasure/big_air_full.nbt Binary files differindex 80b57df..e8b7c89 100644 --- a/data/minecraft/structure/bastion/treasure/big_air_full.nbt +++ b/data/minecraft/structure/bastion/treasure/big_air_full.nbt diff --git a/data/original_skyblock/structure/empty_16.nbt b/data/minecraft/structure/pillager_outpost/base_plate.nbt Binary files differindex 3eddcb6..3eddcb6 100644 --- a/data/original_skyblock/structure/empty_16.nbt +++ b/data/minecraft/structure/pillager_outpost/base_plate.nbt diff --git a/data/minecraft/structure/trail_ruins/tower/tower_1.nbt b/data/minecraft/structure/trail_ruins/tower/tower_1.nbt Binary files differnew file mode 100644 index 0000000..7537513 --- /dev/null +++ b/data/minecraft/structure/trail_ruins/tower/tower_1.nbt diff --git a/data/minecraft/structure/trail_ruins/tower/tower_2.nbt b/data/minecraft/structure/trail_ruins/tower/tower_2.nbt Binary files differnew file mode 100644 index 0000000..7537513 --- /dev/null +++ b/data/minecraft/structure/trail_ruins/tower/tower_2.nbt diff --git a/data/minecraft/structure/trail_ruins/tower/tower_3.nbt b/data/minecraft/structure/trail_ruins/tower/tower_3.nbt Binary files differnew file mode 100644 index 0000000..7537513 --- /dev/null +++ b/data/minecraft/structure/trail_ruins/tower/tower_3.nbt diff --git a/data/minecraft/structure/trail_ruins/tower/tower_4.nbt b/data/minecraft/structure/trail_ruins/tower/tower_4.nbt Binary files differnew file mode 100644 index 0000000..7537513 --- /dev/null +++ b/data/minecraft/structure/trail_ruins/tower/tower_4.nbt diff --git a/data/minecraft/structure/trail_ruins/tower/tower_5.nbt b/data/minecraft/structure/trail_ruins/tower/tower_5.nbt Binary files differnew file mode 100644 index 0000000..1ebd680 --- /dev/null +++ b/data/minecraft/structure/trail_ruins/tower/tower_5.nbt diff --git a/data/minecraft/structure/trial_chambers/corridor/end_1.nbt b/data/minecraft/structure/trial_chambers/corridor/end_1.nbt Binary files differindex 3eddcb6..63d0f51 100644 --- a/data/minecraft/structure/trial_chambers/corridor/end_1.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/end_1.nbt diff --git a/data/minecraft/structure/trial_chambers/corridor/end_2.nbt b/data/minecraft/structure/trial_chambers/corridor/end_2.nbt Binary files differindex 3eddcb6..63d0f51 100644 --- a/data/minecraft/structure/trial_chambers/corridor/end_2.nbt +++ b/data/minecraft/structure/trial_chambers/corridor/end_2.nbt diff --git a/data/minecraft/tags/function/load.json b/data/minecraft/tags/function/load.json index 16f849e..a12c1ab 100644 --- a/data/minecraft/tags/function/load.json +++ b/data/minecraft/tags/function/load.json @@ -1,5 +1,5 @@ { "values": [ - "original_skyblock:load" + "vanilla_skyblock:load" ] } diff --git a/data/minecraft/worldgen/configured_feature/end_island.json b/data/minecraft/worldgen/configured_feature/end_island.json new file mode 100644 index 0000000..d4c80fe --- /dev/null +++ b/data/minecraft/worldgen/configured_feature/end_island.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:fill_layer", + "config": { + "state": { + "Name": "minecraft:air" + }, + "height": 0 + } +} diff --git a/data/minecraft/worldgen/configured_feature/iceberg_blue.json b/data/minecraft/worldgen/configured_feature/iceberg_blue.json new file mode 100644 index 0000000..d4c80fe --- /dev/null +++ b/data/minecraft/worldgen/configured_feature/iceberg_blue.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:fill_layer", + "config": { + "state": { + "Name": "minecraft:air" + }, + "height": 0 + } +} diff --git a/data/minecraft/worldgen/configured_feature/iceberg_packed.json b/data/minecraft/worldgen/configured_feature/iceberg_packed.json new file mode 100644 index 0000000..d4c80fe --- /dev/null +++ b/data/minecraft/worldgen/configured_feature/iceberg_packed.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:fill_layer", + "config": { + "state": { + "Name": "minecraft:air" + }, + "height": 0 + } +} diff --git a/data/minecraft/worldgen/noise/iceberg_pillar.json b/data/minecraft/worldgen/noise/iceberg_pillar.json new file mode 100644 index 0000000..fe7e7ca --- /dev/null +++ b/data/minecraft/worldgen/noise/iceberg_pillar.json @@ -0,0 +1,4 @@ +{ + "firstOctave": 0, + "amplitudes": [] +} diff --git a/data/minecraft/worldgen/noise/iceberg_pillar_roof.json b/data/minecraft/worldgen/noise/iceberg_pillar_roof.json new file mode 100644 index 0000000..fe7e7ca --- /dev/null +++ b/data/minecraft/worldgen/noise/iceberg_pillar_roof.json @@ -0,0 +1,4 @@ +{ + "firstOctave": 0, + "amplitudes": [] +} diff --git a/data/minecraft/worldgen/noise/iceberg_surface.json b/data/minecraft/worldgen/noise/iceberg_surface.json new file mode 100644 index 0000000..fe7e7ca --- /dev/null +++ b/data/minecraft/worldgen/noise/iceberg_surface.json @@ -0,0 +1,4 @@ +{ + "firstOctave": 0, + "amplitudes": [] +} diff --git a/data/minecraft/worldgen/structure/ancient_city.json b/data/minecraft/worldgen/structure/ancient_city.json new file mode 100644 index 0000000..5123d6e --- /dev/null +++ b/data/minecraft/worldgen/structure/ancient_city.json @@ -0,0 +1,47 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#minecraft:has_structure/ancient_city", + "step": "underground_decoration", + "spawn_overrides": { + "ambient": { + "bounding_box": "full", + "spawns": [] + }, + "axolotls": { + "bounding_box": "full", + "spawns": [] + }, + "creature": { + "bounding_box": "full", + "spawns": [] + }, + "misc": { + "bounding_box": "full", + "spawns": [] + }, + "monster": { + "bounding_box": "full", + "spawns": [] + }, + "underground_water_creature": { + "bounding_box": "full", + "spawns": [] + }, + "water_ambient": { + "bounding_box": "full", + "spawns": [] + }, + "water_creature": { + "bounding_box": "full", + "spawns": [] + } + }, + "terrain_adaptation": "beard_box", + "start_pool": "minecraft:ancient_city/city_center", + "size": 7, + "start_height": { + "absolute": -27 + }, + "max_distance_from_center": 116, + "use_expansion_hack": false +} diff --git a/data/minecraft/worldgen/structure/desert_pyramid.json b/data/minecraft/worldgen/structure/desert_pyramid.json new file mode 100644 index 0000000..8a7f761 --- /dev/null +++ b/data/minecraft/worldgen/structure/desert_pyramid.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#minecraft:has_structure/desert_pyramid", + "step": "surface_structures", + "spawn_overrides": {}, + "start_pool": "vanilla_skyblock:desert_pyramid", + "max_distance_from_center": 1, + "size": 1, + "start_height": { + "type": "minecraft:very_biased_to_bottom", + "min_inclusive": { + "above_bottom": 0 + }, + "max_inclusive": { + "below_top": 0 + } + }, + "use_expansion_hack": false +} diff --git a/data/minecraft/worldgen/structure/end_city.json b/data/minecraft/worldgen/structure/end_city.json new file mode 100644 index 0000000..3ab736f --- /dev/null +++ b/data/minecraft/worldgen/structure/end_city.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#minecraft:has_structure/end_city", + "step": "surface_structures", + "spawn_overrides": {}, + "start_pool": "vanilla_skyblock:end_city", + "max_distance_from_center": 1, + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "above_bottom": 0 + }, + "max_inclusive": { + "below_top": 0 + } + }, + "use_expansion_hack": false +} diff --git a/data/minecraft/worldgen/structure/fortress.json b/data/minecraft/worldgen/structure/fortress.json index 2e2f4a7..1b5f723 100644 --- a/data/minecraft/worldgen/structure/fortress.json +++ b/data/minecraft/worldgen/structure/fortress.json @@ -1,6 +1,7 @@ { "type": "minecraft:jigsaw", "biomes": "#minecraft:has_structure/nether_fortress", + "step": "underground_decoration", "spawn_overrides": { "monster": { "bounding_box": "piece", @@ -38,12 +39,9 @@ ] } }, - "step": "underground_decoration", - "start_pool": "original_skyblock:fortress", - "use_expansion_hack": false, + "start_pool": "vanilla_skyblock:fortress", "max_distance_from_center": 1, "size": 1, - "project_start_to_heightmap": "WORLD_SURFACE", "start_height": { "type": "minecraft:biased_to_bottom", "min_inclusive": { @@ -52,5 +50,6 @@ "max_inclusive": { "below_top": 0 } - } + }, + "use_expansion_hack": false } diff --git a/data/minecraft/worldgen/structure/igloo.json b/data/minecraft/worldgen/structure/igloo.json new file mode 100644 index 0000000..e37f954 --- /dev/null +++ b/data/minecraft/worldgen/structure/igloo.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#minecraft:has_structure/igloo", + "step": "surface_structures", + "spawn_overrides": {}, + "start_pool": "vanilla_skyblock:empty_16", + "max_distance_from_center": 1, + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "above_bottom": 0 + }, + "max_inclusive": { + "below_top": 0 + } + }, + "use_expansion_hack": false +} diff --git a/data/minecraft/worldgen/structure/monument.json b/data/minecraft/worldgen/structure/monument.json new file mode 100644 index 0000000..fc89fa7 --- /dev/null +++ b/data/minecraft/worldgen/structure/monument.json @@ -0,0 +1,39 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#minecraft:has_structure/ocean_monument", + "step": "surface_structures", + "spawn_overrides": { + "axolotls": { + "bounding_box": "full", + "spawns": [] + }, + "monster": { + "bounding_box": "full", + "spawns": [ + { + "type": "minecraft:guardian", + "weight": 1, + "minCount": 2, + "maxCount": 4 + } + ] + }, + "underground_water_creature": { + "bounding_box": "full", + "spawns": [] + } + }, + "start_pool": "vanilla:empty_full", + "max_distance_from_center": 1, + "size": 1, + "start_height": { + "type": "minecraft:biased_to_bottom", + "min_inclusive": { + "above_bottom": 0 + }, + "max_inclusive": { + "below_top": 0 + } + }, + "use_expansion_hack": false +} diff --git a/data/minecraft/worldgen/structure/ocean_ruin_cold.json b/data/minecraft/worldgen/structure/ocean_ruin_cold.json new file mode 100644 index 0000000..ad12c20 --- /dev/null +++ b/data/minecraft/worldgen/structure/ocean_ruin_cold.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#minecraft:has_structure/ocean_ruin_cold", + "step": "surface_structures", + "spawn_overrides": {}, + "biome_temp": "cold", + "large_probability": 0.3, + "cluster_probability": 0.9, + "start_pool": "vanilla_skyblock:ocean_ruin_cold", + "max_distance_from_center": 1, + "size": 1, + "start_height": { + "type": "minecraft:very_biased_to_bottom", + "min_inclusive": { + "above_bottom": 0 + }, + "max_inclusive": { + "below_top": 0 + } + }, + "use_expansion_hack": false +} diff --git a/data/minecraft/worldgen/structure/ocean_ruin_warm.json b/data/minecraft/worldgen/structure/ocean_ruin_warm.json new file mode 100644 index 0000000..501acc2 --- /dev/null +++ b/data/minecraft/worldgen/structure/ocean_ruin_warm.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#minecraft:has_structure/ocean_ruin_warm", + "step": "surface_structures", + "spawn_overrides": {}, + "biome_temp": "warm", + "large_probability": 0.3, + "cluster_probability": 0.9, + "start_pool": "vanilla_skyblock:ocean_ruin_warm", + "max_distance_from_center": 1, + "size": 1, + "start_height": { + "type": "minecraft:very_biased_to_bottom", + "min_inclusive": { + "above_bottom": 0 + }, + "max_inclusive": { + "below_top": 0 + } + }, + "use_expansion_hack": false +} diff --git a/data/minecraft/worldgen/structure/ruined_portal.json b/data/minecraft/worldgen/structure/ruined_portal.json new file mode 100644 index 0000000..4651ce2 --- /dev/null +++ b/data/minecraft/worldgen/structure/ruined_portal.json @@ -0,0 +1,41 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#minecraft:has_structure/ruined_portal_standard", + "step": "surface_structures", + "spawn_overrides": {}, + "setups": [ + { + "placement": "underground", + "air_pocket_probability": 1, + "mossiness": 0.2, + "overgrown": false, + "vines": false, + "can_be_cold": true, + "replace_with_blackstone": false, + "weight": 0.5 + }, + { + "placement": "on_land_surface", + "air_pocket_probability": 0.5, + "mossiness": 0.2, + "overgrown": false, + "vines": false, + "can_be_cold": true, + "replace_with_blackstone": false, + "weight": 0.5 + } + ], + "start_pool": "vanilla_skyblock:empty_16", + "max_distance_from_center": 1, + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "above_bottom": 0 + }, + "max_inclusive": { + "below_top": 0 + } + }, + "use_expansion_hack": false +} diff --git a/data/minecraft/worldgen/structure/ruined_portal_desert.json b/data/minecraft/worldgen/structure/ruined_portal_desert.json new file mode 100644 index 0000000..8416773 --- /dev/null +++ b/data/minecraft/worldgen/structure/ruined_portal_desert.json @@ -0,0 +1,31 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#minecraft:has_structure/ruined_portal_desert", + "step": "surface_structures", + "spawn_overrides": {}, + "setups": [ + { + "placement": "partly_buried", + "air_pocket_probability": 0, + "mossiness": 0, + "overgrown": false, + "vines": false, + "can_be_cold": false, + "replace_with_blackstone": false, + "weight": 1 + } + ], + "start_pool": "vanilla_skyblock:empty_16", + "max_distance_from_center": 1, + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "above_bottom": 0 + }, + "max_inclusive": { + "below_top": 0 + } + }, + "use_expansion_hack": false +} diff --git a/data/minecraft/worldgen/structure/shipwreck.json b/data/minecraft/worldgen/structure/shipwreck.json new file mode 100644 index 0000000..5df556c --- /dev/null +++ b/data/minecraft/worldgen/structure/shipwreck.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#minecraft:has_structure/shipwreck", + "step": "surface_structures", + "spawn_overrides": {}, + "is_beached": false, + "start_pool": "vanilla_skyblock:empty_16", + "max_distance_from_center": 1, + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "above_bottom": 0 + }, + "max_inclusive": { + "below_top": 0 + } + }, + "use_expansion_hack": false +} diff --git a/data/minecraft/worldgen/structure/shipwreck_beached.json b/data/minecraft/worldgen/structure/shipwreck_beached.json new file mode 100644 index 0000000..56e8774 --- /dev/null +++ b/data/minecraft/worldgen/structure/shipwreck_beached.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#minecraft:has_structure/shipwreck_beached", + "step": "surface_structures", + "spawn_overrides": {}, + "is_beached": true, + "start_pool": "vanilla_skyblock:empty_16", + "max_distance_from_center": 1, + "size": 1, + "start_height": { + "type": "minecraft:uniform", + "min_inclusive": { + "above_bottom": 0 + }, + "max_inclusive": { + "below_top": 0 + } + }, + "use_expansion_hack": false +} diff --git a/data/minecraft/worldgen/structure/stronghold.json b/data/minecraft/worldgen/structure/stronghold.json index 6f85ed3..1c95ac2 100644 --- a/data/minecraft/worldgen/structure/stronghold.json +++ b/data/minecraft/worldgen/structure/stronghold.json @@ -1,9 +1,10 @@ { "type": "minecraft:jigsaw", "biomes": "#minecraft:has_structure/stronghold", - "start_pool": "original_skyblock:stronghold", "step": "surface_structures", "terrain_adaption": "bury", + "spawn_overrides": {}, + "start_pool": "vanilla_skyblock:stronghold", "max_distance_from_center": 1, "size": 1, "start_height": { @@ -15,6 +16,5 @@ "below_top": 0 } }, - "spawn_overrides": {}, "use_expansion_hack": false } diff --git a/data/minecraft/worldgen/structure/trail_ruins.json b/data/minecraft/worldgen/structure/trail_ruins.json new file mode 100644 index 0000000..817b3cc --- /dev/null +++ b/data/minecraft/worldgen/structure/trail_ruins.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#minecraft:has_structure/trail_ruins", + "step": "underground_structures", + "spawn_overrides": {}, + "terrain_adaptation": "bury", + "start_pool": "minecraft:trail_ruins/tower", + "size": 7, + "start_height": { + "absolute": -15 + }, + "max_distance_from_center": 80, + "use_expansion_hack": false +} 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/function/debug.mcfunction b/data/vanilla_skyblock/function/debug.mcfunction index 3f336b5..bbf2fe7 100644 --- a/data/original_skyblock/function/debug.mcfunction +++ b/data/vanilla_skyblock/function/debug.mcfunction @@ -21,3 +21,7 @@ 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 + +execute in the_end run forceload add 103 0 +execute in the_end run forceload remove 103 0 +execute in the_end run setblock 103 48 0 end_gateway diff --git a/data/vanilla_skyblock/function/initialize.mcfunction b/data/vanilla_skyblock/function/initialize.mcfunction new file mode 100644 index 0000000..5a0f179 --- /dev/null +++ b/data/vanilla_skyblock/function/initialize.mcfunction @@ -0,0 +1,63 @@ +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 +#execute in overworld run item replace block 4 64 0 container.26 with obsidian 10 + +execute in overworld run setblock 0 60 0 chest[facing=north] +execute in the_nether run item replace block 0 60 0 container.0 with sweet_berries 1 +#execute in overworld run item replace block 0 60 0 container.1 with sniffer_egg 2 + + + +# 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 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[axis=z] + +execute in the_nether run fill 1 63 -1 1 63 2 glowstone +execute in the_nether run fill 3 63 -1 3 63 2 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 nether_wart 1 + + + +# end + +execute in the_end run forceload add -1 -1 112 0 +execute in the_end run forceload remove -1 -1 112 0 + +execute in the_end run setblock 0 61 0 bedrock + +execute in the_end run setblock 112 48 0 obsidian +execute in the_end run setblock 112 49 0 chest[facing=west] +execute in the_end run item replace block 112 49 0 container.0 with chorus_flower 1 + + + +# set flag +scoreboard players set $initialized vanilla_skyblock_data 1 diff --git a/data/vanilla_skyblock/function/load.mcfunction b/data/vanilla_skyblock/function/load.mcfunction new file mode 100644 index 0000000..512c50a --- /dev/null +++ b/data/vanilla_skyblock/function/load.mcfunction @@ -0,0 +1,3 @@ +scoreboard objectives add vanilla_skyblock_data dummy + +execute unless score $initialized vanilla_skyblock_data matches 1 run function vanilla_skyblock:initialize diff --git a/data/vanilla_skyblock/structure/archaeology/desert_pyramid.nbt b/data/vanilla_skyblock/structure/archaeology/desert_pyramid.nbt Binary files differnew file mode 100644 index 0000000..1e42216 --- /dev/null +++ b/data/vanilla_skyblock/structure/archaeology/desert_pyramid.nbt diff --git a/data/vanilla_skyblock/structure/archaeology/desert_well.nbt b/data/vanilla_skyblock/structure/archaeology/desert_well.nbt Binary files differnew file mode 100644 index 0000000..ec5aa82 --- /dev/null +++ b/data/vanilla_skyblock/structure/archaeology/desert_well.nbt diff --git a/data/vanilla_skyblock/structure/archaeology/ocean_ruin_cold.nbt b/data/vanilla_skyblock/structure/archaeology/ocean_ruin_cold.nbt Binary files differnew file mode 100644 index 0000000..09aedf6 --- /dev/null +++ b/data/vanilla_skyblock/structure/archaeology/ocean_ruin_cold.nbt diff --git a/data/vanilla_skyblock/structure/archaeology/ocean_ruin_warm.nbt b/data/vanilla_skyblock/structure/archaeology/ocean_ruin_warm.nbt Binary files differnew file mode 100644 index 0000000..668f7fa --- /dev/null +++ b/data/vanilla_skyblock/structure/archaeology/ocean_ruin_warm.nbt diff --git a/data/vanilla_skyblock/structure/archaeology/trail_ruins_common.nbt b/data/vanilla_skyblock/structure/archaeology/trail_ruins_common.nbt Binary files differnew file mode 100644 index 0000000..7537513 --- /dev/null +++ b/data/vanilla_skyblock/structure/archaeology/trail_ruins_common.nbt diff --git a/data/vanilla_skyblock/structure/archaeology/trail_ruins_rare.nbt b/data/vanilla_skyblock/structure/archaeology/trail_ruins_rare.nbt Binary files differnew file mode 100644 index 0000000..1ebd680 --- /dev/null +++ b/data/vanilla_skyblock/structure/archaeology/trail_ruins_rare.nbt diff --git a/data/vanilla_skyblock/structure/bastion/bastion_bridge.nbt b/data/vanilla_skyblock/structure/bastion/bastion_bridge.nbt Binary files differnew file mode 100644 index 0000000..10a8a03 --- /dev/null +++ b/data/vanilla_skyblock/structure/bastion/bastion_bridge.nbt diff --git a/data/vanilla_skyblock/structure/bastion/bastion_hoglin_stable.nbt b/data/vanilla_skyblock/structure/bastion/bastion_hoglin_stable.nbt Binary files differnew file mode 100644 index 0000000..1feb6fd --- /dev/null +++ b/data/vanilla_skyblock/structure/bastion/bastion_hoglin_stable.nbt diff --git a/data/original_skyblock/structure/bastion_chest.nbt b/data/vanilla_skyblock/structure/bastion/bastion_other.nbt Binary files differindex 80b57df..80b57df 100644 --- a/data/original_skyblock/structure/bastion_chest.nbt +++ b/data/vanilla_skyblock/structure/bastion/bastion_other.nbt diff --git a/data/vanilla_skyblock/structure/bastion/bastion_treasure.nbt b/data/vanilla_skyblock/structure/bastion/bastion_treasure.nbt Binary files differnew file mode 100644 index 0000000..e8b7c89 --- /dev/null +++ b/data/vanilla_skyblock/structure/bastion/bastion_treasure.nbt diff --git a/data/vanilla_skyblock/structure/empty_16.nbt b/data/vanilla_skyblock/structure/empty_16.nbt Binary files differnew file mode 100644 index 0000000..3eddcb6 --- /dev/null +++ b/data/vanilla_skyblock/structure/empty_16.nbt diff --git a/data/original_skyblock/structure/empty_full.nbt b/data/vanilla_skyblock/structure/empty_full.nbt Binary files differindex 59af38e..59af38e 100644 --- a/data/original_skyblock/structure/empty_full.nbt +++ b/data/vanilla_skyblock/structure/empty_full.nbt diff --git a/data/vanilla_skyblock/structure/end/end_city.nbt b/data/vanilla_skyblock/structure/end/end_city.nbt Binary files differnew file mode 100644 index 0000000..2e05534 --- /dev/null +++ b/data/vanilla_skyblock/structure/end/end_city.nbt diff --git a/data/original_skyblock/structure/end_portal.nbt b/data/vanilla_skyblock/structure/end/end_portal.nbt Binary files differindex 384e613..384e613 100644 --- a/data/original_skyblock/structure/end_portal.nbt +++ b/data/vanilla_skyblock/structure/end/end_portal.nbt diff --git a/data/vanilla_skyblock/structure/trial_chamber.nbt b/data/vanilla_skyblock/structure/trial_chamber.nbt Binary files differnew file mode 100644 index 0000000..63d0f51 --- /dev/null +++ b/data/vanilla_skyblock/structure/trial_chamber.nbt diff --git a/data/vanilla_skyblock/worldgen/template_pool/desert_pyramid.json b/data/vanilla_skyblock/worldgen/template_pool/desert_pyramid.json new file mode 100644 index 0000000..b2b87d1 --- /dev/null +++ b/data/vanilla_skyblock/worldgen/template_pool/desert_pyramid.json @@ -0,0 +1,24 @@ +{ + "name": "vanilla_skyblock:desert_pyramid", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "location": "vanilla_skyblock:archaeology/desert_pyramid", + "projection": "rigid", + "processors": "minecraft:empty" + } + }, + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "location": "vanilla_skyblock:archaeology/desert_well", + "projection": "rigid", + "processors": "minecraft:empty" + } + } + ] +} diff --git a/data/original_skyblock/worldgen/template_pool/stronghold.json b/data/vanilla_skyblock/worldgen/template_pool/empty_16.json index c22e6a1..87f1e50 100644 --- a/data/original_skyblock/worldgen/template_pool/stronghold.json +++ b/data/vanilla_skyblock/worldgen/template_pool/empty_16.json @@ -1,12 +1,12 @@ { - "name": "original_skyblock:stronghold", + "name": "vanilla_skyblock:empty_16", "fallback": "minecraft:empty", "elements": [ { "weight": 1, "element": { "element_type": "minecraft:single_pool_element", - "location": "original_skyblock:end_portal", + "location": "vanilla_skyblock:empty_16", "projection": "rigid", "processors": "minecraft:empty" } diff --git a/data/vanilla_skyblock/worldgen/template_pool/empty_full.json b/data/vanilla_skyblock/worldgen/template_pool/empty_full.json new file mode 100644 index 0000000..7f737c8 --- /dev/null +++ b/data/vanilla_skyblock/worldgen/template_pool/empty_full.json @@ -0,0 +1,15 @@ +{ + "name": "vanilla_skyblock:empty_full", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "location": "vanilla_skyblock:empty_full", + "projection": "rigid", + "processors": "minecraft:empty" + } + } + ] +} diff --git a/data/vanilla_skyblock/worldgen/template_pool/end_city.json b/data/vanilla_skyblock/worldgen/template_pool/end_city.json new file mode 100644 index 0000000..fb693af --- /dev/null +++ b/data/vanilla_skyblock/worldgen/template_pool/end_city.json @@ -0,0 +1,15 @@ +{ + "name": "vanilla_skyblock:end_city", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "location": "vanilla_skyblock:end/end_city", + "projection": "rigid", + "processors": "minecraft:empty" + } + } + ] +} diff --git a/data/original_skyblock/worldgen/template_pool/fortress.json b/data/vanilla_skyblock/worldgen/template_pool/fortress.json index 3e33fb1..78a1273 100644 --- a/data/original_skyblock/worldgen/template_pool/fortress.json +++ b/data/vanilla_skyblock/worldgen/template_pool/fortress.json @@ -1,12 +1,12 @@ { - "name": "original_skyblock:fortress", + "name": "vanilla_skyblock:fortress", "fallback": "minecraft:empty", "elements": [ { "weight": 1, "element": { "element_type": "minecraft:single_pool_element", - "location": "original_skyblock:empty_full", + "location": "vanilla_skyblock:empty_full", "projection": "rigid", "processors": "minecraft:empty" } diff --git a/data/vanilla_skyblock/worldgen/template_pool/ocean_ruin_cold.json b/data/vanilla_skyblock/worldgen/template_pool/ocean_ruin_cold.json new file mode 100644 index 0000000..3e329be --- /dev/null +++ b/data/vanilla_skyblock/worldgen/template_pool/ocean_ruin_cold.json @@ -0,0 +1,15 @@ +{ + "name": "vanilla_skyblock:ocean_ruin_cold", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "location": "vanilla_skyblock:archaeology/ocean_ruin_cold", + "projection": "rigid", + "processors": "minecraft:empty" + } + } + ] +} diff --git a/data/vanilla_skyblock/worldgen/template_pool/ocean_ruin_warm.json b/data/vanilla_skyblock/worldgen/template_pool/ocean_ruin_warm.json new file mode 100644 index 0000000..3092131 --- /dev/null +++ b/data/vanilla_skyblock/worldgen/template_pool/ocean_ruin_warm.json @@ -0,0 +1,15 @@ +{ + "name": "vanilla_skyblock:ocean_ruin_warm", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "location": "vanilla_skyblock:archaeology/ocean_ruin_warm", + "projection": "rigid", + "processors": "minecraft:empty" + } + } + ] +} diff --git a/data/vanilla_skyblock/worldgen/template_pool/stronghold.json b/data/vanilla_skyblock/worldgen/template_pool/stronghold.json new file mode 100644 index 0000000..1120c75 --- /dev/null +++ b/data/vanilla_skyblock/worldgen/template_pool/stronghold.json @@ -0,0 +1,15 @@ +{ + "name": "vanilla_skyblock:stronghold", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "element_type": "minecraft:single_pool_element", + "location": "vanilla_skyblock:end/end_portal", + "projection": "rigid", + "processors": "minecraft:empty" + } + } + ] +} |