From 9104556192e966c52b28c2e95e3e9692ed8e7932 Mon Sep 17 00:00:00 2001 From: Daniel Weipert Date: Sun, 23 Jun 2024 00:31:40 +0200 Subject: 1.21 update && overwrite some hard-coded structures :] --- .../minecraft/loot_table/chests/bastion_other.json | 11 +++ .../bridge/starting_pieces/entrance_base.nbt | Bin 0 -> 3517 bytes .../structure/bastion/hoglin_stable/air_base.nbt | Bin 0 -> 3517 bytes .../structure/bastion/treasure/big_air_full.nbt | Bin 0 -> 3517 bytes .../minecraft/structure/bastion/units/air_base.nbt | Bin 0 -> 3517 bytes .../structure/generate_empty_structures.js | 12 ++++ .../structure/trial_chambers/corridor/end_1.nbt | Bin 0 -> 10278 bytes .../structure/trial_chambers/corridor/end_2.nbt | Bin 0 -> 10278 bytes .../savanna/houses/savanna_animal_pen_1.nbt | 0 .../savanna/houses/savanna_animal_pen_2.nbt | 0 .../savanna/houses/savanna_animal_pen_3.nbt | 0 .../village/savanna/houses/savanna_armorer_1.nbt | 0 .../savanna/houses/savanna_butchers_shop_1.nbt | 0 .../savanna/houses/savanna_butchers_shop_2.nbt | 0 .../savanna/houses/savanna_cartographer_1.nbt | 0 .../savanna/houses/savanna_fisher_cottage_1.nbt | 0 .../savanna/houses/savanna_fletcher_house_1.nbt | 0 .../savanna/houses/savanna_large_farm_1.nbt | 0 .../savanna/houses/savanna_large_farm_2.nbt | 0 .../village/savanna/houses/savanna_library_1.nbt | 0 .../village/savanna/houses/savanna_mason_1.nbt | 0 .../savanna/houses/savanna_medium_house_1.nbt | 0 .../savanna/houses/savanna_medium_house_2.nbt | 0 .../village/savanna/houses/savanna_shepherd_1.nbt | 0 .../village/savanna/houses/savanna_small_farm.nbt | 0 .../savanna/houses/savanna_small_house_1.nbt | 0 .../savanna/houses/savanna_small_house_2.nbt | 0 .../savanna/houses/savanna_small_house_3.nbt | 0 .../savanna/houses/savanna_small_house_4.nbt | 0 .../savanna/houses/savanna_small_house_5.nbt | 0 .../savanna/houses/savanna_small_house_6.nbt | 0 .../savanna/houses/savanna_small_house_7.nbt | 0 .../savanna/houses/savanna_small_house_8.nbt | 0 .../village/savanna/houses/savanna_tannery_1.nbt | 0 .../village/savanna/houses/savanna_temple_1.nbt | 0 .../village/savanna/houses/savanna_temple_2.nbt | 0 .../savanna/houses/savanna_tool_smith_1.nbt | 0 .../savanna/houses/savanna_weaponsmith_1.nbt | 0 .../savanna/houses/savanna_weaponsmith_2.nbt | 0 .../town_centers/savanna_meeting_point_1.nbt | 0 .../town_centers/savanna_meeting_point_2.nbt | 0 .../town_centers/savanna_meeting_point_3.nbt | 0 .../town_centers/savanna_meeting_point_4.nbt | 0 .../structures/generate_empty_structures.js | 12 ---- .../savanna/houses/savanna_animal_pen_1.nbt | 0 .../savanna/houses/savanna_animal_pen_2.nbt | 0 .../savanna/houses/savanna_animal_pen_3.nbt | 0 .../village/savanna/houses/savanna_armorer_1.nbt | 0 .../savanna/houses/savanna_butchers_shop_1.nbt | 0 .../savanna/houses/savanna_butchers_shop_2.nbt | 0 .../savanna/houses/savanna_cartographer_1.nbt | 0 .../savanna/houses/savanna_fisher_cottage_1.nbt | 0 .../savanna/houses/savanna_fletcher_house_1.nbt | 0 .../savanna/houses/savanna_large_farm_1.nbt | 0 .../savanna/houses/savanna_large_farm_2.nbt | 0 .../village/savanna/houses/savanna_library_1.nbt | 0 .../village/savanna/houses/savanna_mason_1.nbt | 0 .../savanna/houses/savanna_medium_house_1.nbt | 0 .../savanna/houses/savanna_medium_house_2.nbt | 0 .../village/savanna/houses/savanna_shepherd_1.nbt | 0 .../village/savanna/houses/savanna_small_farm.nbt | 0 .../savanna/houses/savanna_small_house_1.nbt | 0 .../savanna/houses/savanna_small_house_2.nbt | 0 .../savanna/houses/savanna_small_house_3.nbt | 0 .../savanna/houses/savanna_small_house_4.nbt | 0 .../savanna/houses/savanna_small_house_5.nbt | 0 .../savanna/houses/savanna_small_house_6.nbt | 0 .../savanna/houses/savanna_small_house_7.nbt | 0 .../savanna/houses/savanna_small_house_8.nbt | 0 .../village/savanna/houses/savanna_tannery_1.nbt | 0 .../village/savanna/houses/savanna_temple_1.nbt | 0 .../village/savanna/houses/savanna_temple_2.nbt | 0 .../savanna/houses/savanna_tool_smith_1.nbt | 0 .../savanna/houses/savanna_weaponsmith_1.nbt | 0 .../savanna/houses/savanna_weaponsmith_2.nbt | 0 data/minecraft/tags/function/load.json | 5 ++ data/minecraft/tags/functions/load.json | 5 -- data/minecraft/tags/functions/tick.json | 5 -- data/minecraft/worldgen/structure/fortress.json | 56 +++++++++++++++ data/minecraft/worldgen/structure/stronghold.json | 20 ++++++ data/original_skyblock/function/debug.mcfunction | 23 +++++++ .../function/initialize.mcfunction | 76 +++++++++++++++++++++ data/original_skyblock/function/load.mcfunction | 3 + data/original_skyblock/functions/debug.mcfunction | 8 --- .../functions/hard_coded_structures.mcfunction | 8 --- .../functions/initialize.mcfunction | 61 ----------------- data/original_skyblock/functions/load.mcfunction | 3 - data/original_skyblock/functions/tick.mcfunction | 7 -- data/original_skyblock/structure/bastion_chest.nbt | Bin 0 -> 3517 bytes data/original_skyblock/structure/empty_16.nbt | Bin 0 -> 10278 bytes data/original_skyblock/structure/empty_full.nbt | Bin 0 -> 293225 bytes data/original_skyblock/structure/end_portal.nbt | Bin 0 -> 289 bytes .../worldgen/template_pool/fortress.json | 15 ++++ .../worldgen/template_pool/stronghold.json | 15 ++++ pack.mcmeta | 2 +- 95 files changed, 237 insertions(+), 110 deletions(-) create mode 100644 data/minecraft/loot_table/chests/bastion_other.json create mode 100644 data/minecraft/structure/bastion/bridge/starting_pieces/entrance_base.nbt create mode 100644 data/minecraft/structure/bastion/hoglin_stable/air_base.nbt create mode 100644 data/minecraft/structure/bastion/treasure/big_air_full.nbt create mode 100644 data/minecraft/structure/bastion/units/air_base.nbt create mode 100644 data/minecraft/structure/generate_empty_structures.js create mode 100644 data/minecraft/structure/trial_chambers/corridor/end_1.nbt create mode 100644 data/minecraft/structure/trial_chambers/corridor/end_2.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_animal_pen_1.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_animal_pen_2.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_animal_pen_3.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_armorer_1.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_butchers_shop_1.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_butchers_shop_2.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_cartographer_1.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_fisher_cottage_1.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_fletcher_house_1.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_large_farm_1.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_large_farm_2.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_library_1.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_mason_1.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_medium_house_1.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_medium_house_2.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_shepherd_1.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_small_farm.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_small_house_1.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_small_house_2.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_small_house_3.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_small_house_4.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_small_house_5.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_small_house_6.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_small_house_7.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_small_house_8.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_tannery_1.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_temple_1.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_temple_2.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_tool_smith_1.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_weaponsmith_1.nbt create mode 100644 data/minecraft/structure/village/savanna/houses/savanna_weaponsmith_2.nbt create mode 100644 data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_1.nbt create mode 100644 data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_2.nbt create mode 100644 data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_3.nbt create mode 100644 data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_4.nbt delete mode 100644 data/minecraft/structures/generate_empty_structures.js delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_animal_pen_1.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_animal_pen_2.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_animal_pen_3.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_armorer_1.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_butchers_shop_1.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_butchers_shop_2.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_cartographer_1.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_fisher_cottage_1.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_fletcher_house_1.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_large_farm_1.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_large_farm_2.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_library_1.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_mason_1.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_medium_house_1.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_medium_house_2.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_shepherd_1.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_small_farm.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_small_house_1.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_small_house_2.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_small_house_3.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_small_house_4.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_small_house_5.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_small_house_6.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_small_house_7.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_small_house_8.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_tannery_1.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_temple_1.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_temple_2.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_tool_smith_1.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_weaponsmith_1.nbt delete mode 100644 data/minecraft/structures/village/savanna/houses/savanna_weaponsmith_2.nbt create mode 100644 data/minecraft/tags/function/load.json delete mode 100644 data/minecraft/tags/functions/load.json delete mode 100644 data/minecraft/tags/functions/tick.json create mode 100644 data/minecraft/worldgen/structure/fortress.json create mode 100644 data/minecraft/worldgen/structure/stronghold.json create mode 100644 data/original_skyblock/function/debug.mcfunction create mode 100644 data/original_skyblock/function/initialize.mcfunction create mode 100644 data/original_skyblock/function/load.mcfunction delete mode 100644 data/original_skyblock/functions/debug.mcfunction delete mode 100644 data/original_skyblock/functions/hard_coded_structures.mcfunction delete mode 100644 data/original_skyblock/functions/initialize.mcfunction delete mode 100644 data/original_skyblock/functions/load.mcfunction delete mode 100644 data/original_skyblock/functions/tick.mcfunction create mode 100644 data/original_skyblock/structure/bastion_chest.nbt create mode 100644 data/original_skyblock/structure/empty_16.nbt create mode 100644 data/original_skyblock/structure/empty_full.nbt create mode 100644 data/original_skyblock/structure/end_portal.nbt create mode 100644 data/original_skyblock/worldgen/template_pool/fortress.json create mode 100644 data/original_skyblock/worldgen/template_pool/stronghold.json diff --git a/data/minecraft/loot_table/chests/bastion_other.json b/data/minecraft/loot_table/chests/bastion_other.json new file mode 100644 index 0000000..f29ea85 --- /dev/null +++ b/data/minecraft/loot_table/chests/bastion_other.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [] + } + ], + "random_sequence": "minecraft:chests/bastion_other" +} diff --git a/data/minecraft/structure/bastion/bridge/starting_pieces/entrance_base.nbt b/data/minecraft/structure/bastion/bridge/starting_pieces/entrance_base.nbt new file mode 100644 index 0000000..80b57df Binary files /dev/null and b/data/minecraft/structure/bastion/bridge/starting_pieces/entrance_base.nbt differ diff --git a/data/minecraft/structure/bastion/hoglin_stable/air_base.nbt b/data/minecraft/structure/bastion/hoglin_stable/air_base.nbt new file mode 100644 index 0000000..80b57df Binary files /dev/null and b/data/minecraft/structure/bastion/hoglin_stable/air_base.nbt differ diff --git a/data/minecraft/structure/bastion/treasure/big_air_full.nbt b/data/minecraft/structure/bastion/treasure/big_air_full.nbt new file mode 100644 index 0000000..80b57df Binary files /dev/null and b/data/minecraft/structure/bastion/treasure/big_air_full.nbt differ diff --git a/data/minecraft/structure/bastion/units/air_base.nbt b/data/minecraft/structure/bastion/units/air_base.nbt new file mode 100644 index 0000000..80b57df Binary files /dev/null and b/data/minecraft/structure/bastion/units/air_base.nbt differ diff --git a/data/minecraft/structure/generate_empty_structures.js b/data/minecraft/structure/generate_empty_structures.js new file mode 100644 index 0000000..ff5d505 --- /dev/null +++ b/data/minecraft/structure/generate_empty_structures.js @@ -0,0 +1,12 @@ +let mcmetaPath = '~/mcmeta'; // ~/Downloads/Minecraft/mcmeta # if not exists => git clone https://github.com/misode/mcmeta + +// TODO +// go to directory, switch to "summary" branch +// get "registries/data.json" +// => get "worldgen/template_pool" +// switch to "data" branch +// foreach entry get "data/minecraft/worldgen/template_pool/$entry.json" +// => foreach "elements[].element.location" +// create empty nbt file in "data/minecraft/structures" + +const result = fetch('template_pool'); diff --git a/data/minecraft/structure/trial_chambers/corridor/end_1.nbt b/data/minecraft/structure/trial_chambers/corridor/end_1.nbt new file mode 100644 index 0000000..3eddcb6 Binary files /dev/null and b/data/minecraft/structure/trial_chambers/corridor/end_1.nbt differ diff --git a/data/minecraft/structure/trial_chambers/corridor/end_2.nbt b/data/minecraft/structure/trial_chambers/corridor/end_2.nbt new file mode 100644 index 0000000..3eddcb6 Binary files /dev/null and b/data/minecraft/structure/trial_chambers/corridor/end_2.nbt differ diff --git a/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_1.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_2.nbt b/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_2.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_3.nbt b/data/minecraft/structure/village/savanna/houses/savanna_animal_pen_3.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_armorer_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_armorer_1.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_butchers_shop_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_butchers_shop_1.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_butchers_shop_2.nbt b/data/minecraft/structure/village/savanna/houses/savanna_butchers_shop_2.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_cartographer_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_cartographer_1.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_fisher_cottage_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_fisher_cottage_1.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_fletcher_house_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_fletcher_house_1.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_large_farm_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_large_farm_1.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_large_farm_2.nbt b/data/minecraft/structure/village/savanna/houses/savanna_large_farm_2.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_library_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_library_1.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_mason_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_mason_1.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_medium_house_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_medium_house_1.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_medium_house_2.nbt b/data/minecraft/structure/village/savanna/houses/savanna_medium_house_2.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_shepherd_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_shepherd_1.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_farm.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_farm.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_house_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_house_1.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_house_2.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_house_2.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_house_3.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_house_3.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_house_4.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_house_4.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_house_5.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_house_5.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_house_6.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_house_6.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_house_7.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_house_7.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_small_house_8.nbt b/data/minecraft/structure/village/savanna/houses/savanna_small_house_8.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_tannery_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_tannery_1.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_temple_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_temple_1.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_temple_2.nbt b/data/minecraft/structure/village/savanna/houses/savanna_temple_2.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_tool_smith_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_tool_smith_1.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_weaponsmith_1.nbt b/data/minecraft/structure/village/savanna/houses/savanna_weaponsmith_1.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/houses/savanna_weaponsmith_2.nbt b/data/minecraft/structure/village/savanna/houses/savanna_weaponsmith_2.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_1.nbt b/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_1.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_2.nbt b/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_2.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_3.nbt b/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_3.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_4.nbt b/data/minecraft/structure/village/savanna/town_centers/savanna_meeting_point_4.nbt new file mode 100644 index 0000000..e69de29 diff --git a/data/minecraft/structures/generate_empty_structures.js b/data/minecraft/structures/generate_empty_structures.js deleted file mode 100644 index 94cc542..0000000 --- a/data/minecraft/structures/generate_empty_structures.js +++ /dev/null @@ -1,12 +0,0 @@ -let mcmetaPath = '~/mcmeta'; // ~/Downloads/Minecraft/mcmeta - -// TODO -// go to directory, switch to "summary" branch -// get "registries/data.json" -// => get "worldgen/template_pool" -// switch to "data" branch -// foreach entry get "data/minecraft/worldgen/template_pool/$entry.json" -// => foreach "elements[].element.location" -// create empty nbt file in "data/minecraft/structures" - -const result = fetch('template_pool'); diff --git a/data/minecraft/structures/village/savanna/houses/savanna_animal_pen_1.nbt b/data/minecraft/structures/village/savanna/houses/savanna_animal_pen_1.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_animal_pen_2.nbt b/data/minecraft/structures/village/savanna/houses/savanna_animal_pen_2.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_animal_pen_3.nbt b/data/minecraft/structures/village/savanna/houses/savanna_animal_pen_3.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_armorer_1.nbt b/data/minecraft/structures/village/savanna/houses/savanna_armorer_1.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_butchers_shop_1.nbt b/data/minecraft/structures/village/savanna/houses/savanna_butchers_shop_1.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_butchers_shop_2.nbt b/data/minecraft/structures/village/savanna/houses/savanna_butchers_shop_2.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_cartographer_1.nbt b/data/minecraft/structures/village/savanna/houses/savanna_cartographer_1.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_fisher_cottage_1.nbt b/data/minecraft/structures/village/savanna/houses/savanna_fisher_cottage_1.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_fletcher_house_1.nbt b/data/minecraft/structures/village/savanna/houses/savanna_fletcher_house_1.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_large_farm_1.nbt b/data/minecraft/structures/village/savanna/houses/savanna_large_farm_1.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_large_farm_2.nbt b/data/minecraft/structures/village/savanna/houses/savanna_large_farm_2.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_library_1.nbt b/data/minecraft/structures/village/savanna/houses/savanna_library_1.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_mason_1.nbt b/data/minecraft/structures/village/savanna/houses/savanna_mason_1.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_medium_house_1.nbt b/data/minecraft/structures/village/savanna/houses/savanna_medium_house_1.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_medium_house_2.nbt b/data/minecraft/structures/village/savanna/houses/savanna_medium_house_2.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_shepherd_1.nbt b/data/minecraft/structures/village/savanna/houses/savanna_shepherd_1.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_small_farm.nbt b/data/minecraft/structures/village/savanna/houses/savanna_small_farm.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_small_house_1.nbt b/data/minecraft/structures/village/savanna/houses/savanna_small_house_1.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_small_house_2.nbt b/data/minecraft/structures/village/savanna/houses/savanna_small_house_2.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_small_house_3.nbt b/data/minecraft/structures/village/savanna/houses/savanna_small_house_3.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_small_house_4.nbt b/data/minecraft/structures/village/savanna/houses/savanna_small_house_4.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_small_house_5.nbt b/data/minecraft/structures/village/savanna/houses/savanna_small_house_5.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_small_house_6.nbt b/data/minecraft/structures/village/savanna/houses/savanna_small_house_6.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_small_house_7.nbt b/data/minecraft/structures/village/savanna/houses/savanna_small_house_7.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_small_house_8.nbt b/data/minecraft/structures/village/savanna/houses/savanna_small_house_8.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_tannery_1.nbt b/data/minecraft/structures/village/savanna/houses/savanna_tannery_1.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_temple_1.nbt b/data/minecraft/structures/village/savanna/houses/savanna_temple_1.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_temple_2.nbt b/data/minecraft/structures/village/savanna/houses/savanna_temple_2.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_tool_smith_1.nbt b/data/minecraft/structures/village/savanna/houses/savanna_tool_smith_1.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_weaponsmith_1.nbt b/data/minecraft/structures/village/savanna/houses/savanna_weaponsmith_1.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/structures/village/savanna/houses/savanna_weaponsmith_2.nbt b/data/minecraft/structures/village/savanna/houses/savanna_weaponsmith_2.nbt deleted file mode 100644 index e69de29..0000000 diff --git a/data/minecraft/tags/function/load.json b/data/minecraft/tags/function/load.json new file mode 100644 index 0000000..16f849e --- /dev/null +++ b/data/minecraft/tags/function/load.json @@ -0,0 +1,5 @@ +{ + "values": [ + "original_skyblock:load" + ] +} diff --git a/data/minecraft/tags/functions/load.json b/data/minecraft/tags/functions/load.json deleted file mode 100644 index 16f849e..0000000 --- a/data/minecraft/tags/functions/load.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "original_skyblock:load" - ] -} diff --git a/data/minecraft/tags/functions/tick.json b/data/minecraft/tags/functions/tick.json deleted file mode 100644 index 42ed6d0..0000000 --- a/data/minecraft/tags/functions/tick.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "original_skyblock:tick" - ] -} diff --git a/data/minecraft/worldgen/structure/fortress.json b/data/minecraft/worldgen/structure/fortress.json new file mode 100644 index 0000000..2e2f4a7 --- /dev/null +++ b/data/minecraft/worldgen/structure/fortress.json @@ -0,0 +1,56 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#minecraft:has_structure/nether_fortress", + "spawn_overrides": { + "monster": { + "bounding_box": "piece", + "spawns": [ + { + "type": "minecraft:blaze", + "maxCount": 3, + "minCount": 2, + "weight": 10 + }, + { + "type": "minecraft:zombified_piglin", + "maxCount": 4, + "minCount": 4, + "weight": 5 + }, + { + "type": "minecraft:wither_skeleton", + "maxCount": 5, + "minCount": 5, + "weight": 8 + }, + { + "type": "minecraft:skeleton", + "maxCount": 5, + "minCount": 5, + "weight": 2 + }, + { + "type": "minecraft:magma_cube", + "maxCount": 4, + "minCount": 4, + "weight": 3 + } + ] + } + }, + "step": "underground_decoration", + "start_pool": "original_skyblock:fortress", + "use_expansion_hack": false, + "max_distance_from_center": 1, + "size": 1, + "project_start_to_heightmap": "WORLD_SURFACE", + "start_height": { + "type": "minecraft:biased_to_bottom", + "min_inclusive": { + "above_bottom": 0 + }, + "max_inclusive": { + "below_top": 0 + } + } +} diff --git a/data/minecraft/worldgen/structure/stronghold.json b/data/minecraft/worldgen/structure/stronghold.json new file mode 100644 index 0000000..6f85ed3 --- /dev/null +++ b/data/minecraft/worldgen/structure/stronghold.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:jigsaw", + "biomes": "#minecraft:has_structure/stronghold", + "start_pool": "original_skyblock:stronghold", + "step": "surface_structures", + "terrain_adaption": "bury", + "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 + } + }, + "spawn_overrides": {}, + "use_expansion_hack": false +} diff --git a/data/original_skyblock/function/debug.mcfunction b/data/original_skyblock/function/debug.mcfunction new file mode 100644 index 0000000..3f336b5 --- /dev/null +++ b/data/original_skyblock/function/debug.mcfunction @@ -0,0 +1,23 @@ +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 new file mode 100644 index 0000000..36cf8ce --- /dev/null +++ b/data/original_skyblock/function/initialize.mcfunction @@ -0,0 +1,76 @@ +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 new file mode 100644 index 0000000..e65cbab --- /dev/null +++ b/data/original_skyblock/function/load.mcfunction @@ -0,0 +1,3 @@ +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/functions/debug.mcfunction b/data/original_skyblock/functions/debug.mcfunction deleted file mode 100644 index 3087cb2..0000000 --- a/data/original_skyblock/functions/debug.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -# 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/original_skyblock/functions/hard_coded_structures.mcfunction b/data/original_skyblock/functions/hard_coded_structures.mcfunction deleted file mode 100644 index 6820809..0000000 --- a/data/original_skyblock/functions/hard_coded_structures.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -schedule original_skyblock/hard_coded_structures/fortress 60s -# for each hard coded structure type -# run a function that schedules itself - -# locate structure (execute in dimension of structure) -# check against checked positions. if not found: -# add position to checked positions array -# remove all blocks associated with structure in appropriate radius diff --git a/data/original_skyblock/functions/initialize.mcfunction b/data/original_skyblock/functions/initialize.mcfunction deleted file mode 100644 index 70049af..0000000 --- a/data/original_skyblock/functions/initialize.mcfunction +++ /dev/null @@ -1,61 +0,0 @@ -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 -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 fill -1 64 4 -1 69 3 oak_log -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 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 diff --git a/data/original_skyblock/functions/load.mcfunction b/data/original_skyblock/functions/load.mcfunction deleted file mode 100644 index 0b60a35..0000000 --- a/data/original_skyblock/functions/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/functions/tick.mcfunction b/data/original_skyblock/functions/tick.mcfunction deleted file mode 100644 index aadc3f2..0000000 --- a/data/original_skyblock/functions/tick.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -# get render distance -# for each current chunk +- render distance (and not in scoreboard) - # check for end_portal_frame - # get positions - # fill chunk with air - # re-place end_portal_frame - # set scoreboard values to 1 for processed chunk diff --git a/data/original_skyblock/structure/bastion_chest.nbt b/data/original_skyblock/structure/bastion_chest.nbt new file mode 100644 index 0000000..80b57df Binary files /dev/null and b/data/original_skyblock/structure/bastion_chest.nbt differ diff --git a/data/original_skyblock/structure/empty_16.nbt b/data/original_skyblock/structure/empty_16.nbt new file mode 100644 index 0000000..3eddcb6 Binary files /dev/null and b/data/original_skyblock/structure/empty_16.nbt differ diff --git a/data/original_skyblock/structure/empty_full.nbt b/data/original_skyblock/structure/empty_full.nbt new file mode 100644 index 0000000..59af38e Binary files /dev/null and b/data/original_skyblock/structure/empty_full.nbt differ diff --git a/data/original_skyblock/structure/end_portal.nbt b/data/original_skyblock/structure/end_portal.nbt new file mode 100644 index 0000000..384e613 Binary files /dev/null and b/data/original_skyblock/structure/end_portal.nbt differ diff --git a/data/original_skyblock/worldgen/template_pool/fortress.json b/data/original_skyblock/worldgen/template_pool/fortress.json new file mode 100644 index 0000000..3e33fb1 --- /dev/null +++ b/data/original_skyblock/worldgen/template_pool/fortress.json @@ -0,0 +1,15 @@ +{ + "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 new file mode 100644 index 0000000..c22e6a1 --- /dev/null +++ b/data/original_skyblock/worldgen/template_pool/stronghold.json @@ -0,0 +1,15 @@ +{ + "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" + } + } + ] +} diff --git a/pack.mcmeta b/pack.mcmeta index b326aa8..877f073 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 26, + "pack_format": 48, "description": "スカイブロック" } } -- cgit v1.2.3