Add superflat layers and add filter conditions

index.html

@@ -59,18 +59,18 @@
           </div>
         </a>
       </div>
-    </div>
+      <div class="card bg-dark mb-3">
-    <div class="card bg-dark mb-3" style="max-width: 400px;">
         <a href="worldgen">
           <div class="card-body">
-          <span class="badge badge-danger" data-i18n="badge.experimental"></span>
-          <span class="badge badge-danger" data-i18n="badge.unstable"></span>
             <h5 class="card-title" data-i18n="title.worldgen"></h5>
             <p class="card-subtitle">Minecraft 1.16</p>
+            <span class="badge badge-danger" data-i18n="badge.experimental"></span>
+            <span class="badge badge-danger" data-i18n="badge.unstable"></span>
           </div>
         </a>
       </div>
     </div>
+  </div>
 
   <script src="https://code.jquery.com/jquery-3.4.1.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script>

js/view.js

@@ -412,11 +412,7 @@ function generateObject(data, struct, options) {
       let hasNoValue = typeof data[field.id] !== 'object';
       let arrowDirection = hasNoValue ? 'dropright' : 'dropdown'
       $body.append('<span class="' + arrowDirection + '"><button type="button" class="mt-3 btn btn-light dropdown-toggle" onclick="toggleCollapseObject(this)" data-index="' + field.id + '" data-i18n="' + field.translate + '"></button></span>');
-      if (field.help) {
+      if (hasNoValue && field.values) {
-        $body.find('span').append(generateTooltip(field.translate));
-      }
-      if (hasNoValue) {
-        if (field.values) {
         let outValue, $field;
         ({out: outValue, component: $field} = generateEnum(data[field.id], field));
         out[field.id] = outValue;
@@ -430,7 +426,14 @@ function generateObject(data, struct, options) {
         $selection.attr('data-type', 'enum');
         $selection.attr('data-index', field.id);
         $dropdown.append($selection);
-        } else {
+      }
+      if (field.help) {
+        const $tooltip = generateTooltip(field.translate)
+        $tooltip.addClass('mt-3')
+        $body.children().last().append($tooltip);
+      }
+      if (hasNoValue) {
+        if (!field.values) {
           $body.append('<div/>');
         }
         continue;

locales/en.json

@@ -35,6 +35,7 @@
     "biome.parameters.humidity": "Humidity",
     "biome_add": "Add Biome",
     "biome_remove": "Remove Biome",
+    "biome_source.biome": "Biome",
     "biome_source.large_biomes": "Large Biomes",
     "biome_source.preset": "Biomes Preset",
     "biome_source.seed": "Biomes Seed",
@@ -347,6 +348,7 @@
     "generator.settings.disable_mob_generation": "Disable Mob Generation",
     "generator.settings.default_block": "Default Block",
     "generator.settings.default_fluid": "Default Fluid",
+    "generator.settings.layers_add": "Add Layer",
     "generator.settings.noise": "Noise Options",
     "generator.settings.noise.island_noise_override": "Island Noise Override",
     "generator.settings.noise.density_factor": "Density Factor",
@@ -395,6 +397,9 @@
     "item.potion": "Potion",
     "item.tag": "Item Tag",
     "item_remove": "Remove Item",
+    "layer_remove": "Remove Layer",
+    "layer.block": "Block ID",
+    "layer.height": "Height",
     "location.biome": "Biome",
     "location.block": "Block",
     "location.block.block": "Block ID",

schemas/worldgen.json

@@ -91,6 +91,7 @@
               "translate": "generator.type",
               "translateValue": "generator.type",
               "type": "enum",
+              "filter": true,
               "values": [
                 "minecraft:noise",
                 "minecraft:flat",
@@ -112,6 +113,7 @@
                   "translate": "biome_source.type",
                   "translateValue": "biome_source.type",
                   "type": "enum",
+                  "filter": true,
                   "values": [
                     "minecraft:fixed",
                     "minecraft:multi_noise",
@@ -133,20 +135,44 @@
                   "unset": true,
                   "values": [
                     "minecraft:nether"
+                  ],
+                  "require": [
+                    "minecraft:multi_noise"
                   ]
                 },
                 {
                   "id": "large_biomes",
                   "translate": "biome_source.large_biomes",
-                  "type": "boolean"
+                  "type": "boolean",
+                  "require": [
+                    "minecraft:vanilla_layered",
+                    "minecraft:multi_noise",
+                    "minecraft:the_end"
+                  ]
                 },
                 {
                   "id": "biomes",
                   "translate": "biome",
                   "type": "array",
                   "values": "biome",
-                  "button": "field"
+                  "button": "field",
+                  "require": [
+                    "minecraft:multi_noise",
+                    "minecraft:checkerboard"
+                  ]
+                },
+                {
+                  "id": "biome",
+                  "translate": "biome_source.biome",
+                  "type": "enum",
+                  "values": "biomes",
+                  "require": [
+                    "minecraft:fixed"
+                  ]
                 }
+              ],
+              "require": [
+                "minecraft:noise"
               ]
             },
             {
@@ -338,6 +364,51 @@
                     }
                   ]
                 }
+              ],
+              "require": [
+                "minecraft:noise"
+              ]
+            },
+            {
+              "id": "settings",
+              "translate": "generator.settings",
+              "type": "object",
+              "color": "dark",
+              "collapse": true,
+              "fields": [
+                {
+                  "id": "biome",
+                  "translate": "biome_source.biome",
+                  "type": "enum",
+                  "values": "biomes"
+                },
+                {
+                  "id": "layers",
+                  "translate": "generator.settings.layers",
+                  "type": "array",
+                  "values": "layer",
+                  "button": "field"
+                },
+                {
+                  "id": "structures",
+                  "type": "object",
+                  "card": false,
+                  "fields": [
+                    {
+                      "id": "structures",
+                      "translate": "generator.settings.structures",
+                      "translatePlaceholder": "structure",
+                      "type": "map",
+                      "values": {
+                        "type": "object",
+                        "value": "structure"
+                      }
+                    }
+                  ]
+                }
+              ],
+              "require": [
+                "minecraft:flat"
               ]
             }
           ]
@@ -464,6 +535,23 @@
           "type": "int"
         }
       ]
+    },
+    {
+      "id": "layer",
+      "type": "object",
+      "color": "info",
+      "fields": [
+        {
+          "id": "block",
+          "translate": "layer.block",
+          "type": "string"
+        },
+        {
+          "id": "height",
+          "translate": "layer.height",
+          "type": "int"
+        }
+      ]
     }
   ],
   "collections": {

worldgen/index.html

@@ -18,8 +18,8 @@
 <body>
   <nav class="navbar navbar-expand-md navbar-dark bg-dark">
     <a id="descriptionSpan" class="navbar-brand mb-0 h1" href="../" data-i18n="description.worldgen"></a>
-    <span class="badge badge-danger" data-i18n="badge.experimental"></span>
+    <span class="badge badge-danger mr-1" data-i18n="badge.experimental"></span>
-    <span class="badge badge-danger ml-1" data-i18n="badge.unstable"></span>
+    <span class="badge badge-danger mr-1" data-i18n="badge.unstable"></span>
     <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#collapsibleNavbar">
       <span class="navbar-toggler-icon"></span>
     </button>