original => vanilla && overwrite some more hard-coded structures :]

36 files changed, 359 insertions, 19 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
new 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
new 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
new 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
index 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
index 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
index 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/minecraft/structure/pillager_outpost/base_plate.nbt b/data/minecraft/structure/pillager_outpost/base_plate.nbt
new file mode 100644
index 0000000..3eddcb6
--- /dev/null
+++ 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
new 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
new 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
new 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
new 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
new 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
index 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
index 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
+}