Merge remote-tracking branch 'origin/master'

flat/biomes/f2.json

@@ -1,23 +0,0 @@
-{
-    "name": "Flat 2",
-    "derivative": "PLAINS",
-    "layers": [
-        {
-            "maxHeight": 10,
-            "minHeight": 10,
-            "palette": [
-                "REDSTONE_BLOCK"
-            ]
-        },
-        {
-            "palette": ["DIRT"],
-            "minHeight": 2,
-            "maxHeight": 2
-        }
-    ],
-    "generators": [{
-        "min": 30,
-        "max": 50,
-        "generator": "flat"
-    }]
-}

flat/biomes/flat.json

@@ -6,7 +6,7 @@
             "maxHeight": 10,
             "minHeight": 10,
             "palette": [
-                "EMERALD_BLOCK"
+                "GRASS_BLOCK"
             ]
         },
         {
@@ -16,8 +16,8 @@
         }
     ],
     "generators": [{
-        "min": 9,
-        "max": 15,
+        "min": 4,
+        "max": 89,
         "generator": "flat"
     }]
 }

flat/dimensions/flat.json

@@ -7,7 +7,7 @@
     "carving": false,
     "postProcessing": false,
     "caves": false,
-    "placeObjects": false,
+    "placeObjects": true,
     "coordFractureDistance": 24,
     "landChance": 1,
     "fluidHeight": 0,

flat/generators/flat.json

@@ -1,12 +1,11 @@
 {
     "seed": 1,
-    "interpolationFunction": "HERMITE_LOOSE",
+    "interpolationFunction": "NONE",
     "interpolationScale": 3,
     "composite": [
         {
             "style": {
-                "style": "SIMPLEX",
-                "zoom": 0.3
+                "style": "IRIS_DOUBLE"
             },
             "seed": 10
         }

flat/regions/flat.json

@@ -1,6 +1,14 @@
 {
     "shoreBiomes": ["flat"],
-    "landBiomes": ["flat", "f2"],
+    "landBiomes": ["flat"],
     "seaBiomes": ["flat"],
-    "name": "Flat"
+    "name": "Flat",
+    "structures": [
+        {
+            "tileset": "v",
+            "ratio": 0.1,
+            "rarity": 1,
+            "zoom": 1
+        }
+    ]
 }

flat/structures/v.json

@@ -0,0 +1,79 @@
+{
+    "name": "V Test",
+    "gridSize": 9,
+    "gridHeight": 9,
+    "maxLayers": 1,
+    "mergeEdges": false,
+    "wallStyle": {
+        "style": "STATIC"
+    },
+    "wallChance": 0.35,
+    "tiles": [
+        {
+            "ceiling": "AGNOSTIC",
+            "floor": "REQUIRED",
+            "north": "NEVER",
+            "east": "NEVER",
+            "south": "REQUIRED",
+            "west": "NEVER",
+            "objects": [
+                "vv/s"
+            ]
+        },
+        {
+            "ceiling": "AGNOSTIC",
+            "floor": "REQUIRED",
+            "north": "NEVER",
+            "east": "REQUIRED",
+            "south": "REQUIRED",
+            "west": "REQUIRED",
+            "objects": [
+                "vv/sew"
+            ]
+        },
+        {
+            "ceiling": "AGNOSTIC",
+            "floor": "REQUIRED",
+            "north": "REQUIRED",
+            "east": "NEVER",
+            "south": "REQUIRED",
+            "west": "NEVER",
+            "objects": [
+                "vv/ns"
+            ]
+        },
+        {
+            "ceiling": "AGNOSTIC",
+            "floor": "REQUIRED",
+            "north": "NEVER",
+            "east": "REQUIRED",
+            "south": "REQUIRED",
+            "west": "NEVER",
+            "objects": [
+                "vv/se"
+            ]
+        },
+        {
+            "ceiling": "AGNOSTIC",
+            "floor": "REQUIRED",
+            "north": "REQUIRED",
+            "east": "REQUIRED",
+            "south": "REQUIRED",
+            "west": "REQUIRED",
+            "objects": [
+                "vv/a"
+            ]
+        },
+        {
+            "ceiling": "AGNOSTIC",
+            "floor": "REQUIRED",
+            "north": "NEVER",
+            "east": "NEVER",
+            "south": "NEVER",
+            "west": "NEVER",
+            "objects": [
+                "vv/x"
+            ]
+        }
+    ]
+}

flat/structures/village.json

@@ -0,0 +1,108 @@
+{
+    "name": "Village",
+    "gridHeight": 11,
+    "gridSize": 11,
+    "maxLayers": 1,
+    "wallChance": 0.435,
+    "tiles": [
+        {
+            "ceiling": "AGNOSTIC",
+            "floor": "REQUIRED",
+            "north": "NEVER",
+            "east": "REQUIRED",
+            "south": "NEVER",
+            "west": "NEVER",
+            "objects": [
+                "village/tcross-e-1",
+                "village/tcross-e-2",
+                "village/tcross-e-3",
+                "village/tcross-e-3",
+                "village/tcross-e-3",
+                "village/tcross-e-3",
+                "village/tcross-e-3",
+                "village/tcross-e-4",
+                "village/tcross-e-4"
+            ]
+        },
+        {
+            "ceiling": "AGNOSTIC",
+            "floor": "REQUIRED",
+            "north": "NEVER",
+            "east": "REQUIRED",
+            "south": "REQUIRED",
+            "west": "REQUIRED",
+            "objects": [
+                "village/room-crop-sew-1",
+                "village/room-dirt-sew-1",
+                "village/room-crop-sew-2",
+                "village/room-dirt-sew-1",
+                "village/room-crop-sew-3",
+                "village/room-dirt-sew-1",
+                "village/room-crop-wheat-sew-1",
+                "village/room-dirt-sew-1",
+                "village/room-crop-wheat-sew-2",
+                "village/room-dirt-sew-1",
+                "village/room-crop-wheat-sew-3"
+            ]
+        },
+        {
+            "ceiling": "AGNOSTIC",
+            "floor": "REQUIRED",
+            "north": "NEVER",
+            "east": "REQUIRED",
+            "south": "NEVER",
+            "west": "REQUIRED",
+            "objects": [
+                "village/hall-we-1",
+                "village/hall-we-2",
+                "village/hall-we-3",
+                "village/hall-we-3",
+                "village/hall-we-3",
+                "village/hall-we-3",
+                "village/hall-we-3",
+                "village/hall-we-3"
+            ]
+        },
+        {
+            "ceiling": "AGNOSTIC",
+            "floor": "REQUIRED",
+            "north": "NEVER",
+            "east": "REQUIRED",
+            "south": "REQUIRED",
+            "west": "NEVER",
+            "objects": [
+                "village/corner-se-1",
+                "village/corner-se-2",
+                "village/corner-se-3",
+                "village/corner-se-3",
+                "village/corner-se-4",
+                "village/corner-se-4",
+                "village/corner-se-4",
+                "village/corner-se-4",
+                "village/corner-se-4"
+            ]
+        },
+        {
+            "ceiling": "AGNOSTIC",
+            "floor": "REQUIRED",
+            "north": "NEVER",
+            "east": "NEVER",
+            "south": "NEVER",
+            "west": "NEVER",
+            "objects": [
+                "village/cross-a-1",
+                "village/cross-a-1",
+                "village/cross-a-1",
+                "village/cross-a-1",
+                "village/cross-a-1",
+                "village/cross-a-1",
+                "village/cross-a-2",
+                "village/cross-a-3",
+                "village/cross-a-4",
+                "village/cross-a-5",
+                "village/cross-a-4",
+                "village/cross-a-5"
+            ]
+        }
+    ]
+}

overworld/biomes/frozen-beach.json

@@ -23,21 +23,6 @@
             ]
         }
     ],
-    "decorators":[
-        {
-            "palette": [
-                "minecraft:snow[layers=1]",
-                "minecraft:snow[layers=2]",
-                "minecraft:snow[layers=3]",
-                "minecraft:snow[layers=4]"
-            ],
-            "chance": 1,
-            "variance": {
-                "style": "IRIS",
-                "zoom": 0.2
-            }
-        }
-    ],
     "seaLayers": [
         {
             "minHeight": 1,