From 24178dadf79e7114c1b37cf9ed935d4ecc5739af Mon Sep 17 00:00:00 2001
From: Misode <Misoloo64@gmail.com>
Date: Thu, 21 May 2020 20:06:11 +0200
Subject: [PATCH] Add properties for default block and fluid

---
 locales/en.json       |  9 +++++++--
 schemas/worldgen.json | 31 ++++++++++++++++++++++++++-----
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/locales/en.json b/locales/en.json
index 46bd0906..422d87a3 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -351,8 +351,13 @@
     "generator.settings.bedrock_floor_position": "Bedrock Floor Position",
     "generator.settings.sea_level": "Sea Level",
     "generator.settings.disable_mob_generation": "Disable Mob Generation",
-    "generator.settings.default_block": "Default Block",
-    "generator.settings.default_fluid": "Default Fluid",
+    "generator.settings.default_block.name": "Default Block",
+    "generator.settings.default_fluid.name": "Default Fluid",
+    "generator.settings.block_states": "Block States",
+    "generator.settings.block_states_add": "Add Block State",
+    "generator.settings.fluid_states": "Fluid States",
+    "generator.settings.fluid_states_add": "Add Fluid State",
+    "generator.settings.properties_add": "Add Property",
     "generator.settings.layers_add": "Add Layer",
     "generator.settings.noise": "Noise Options",
     "generator.settings.noise.density_factor": "Density Factor",
diff --git a/schemas/worldgen.json b/schemas/worldgen.json
index c1f6a100..9172b97c 100644
--- a/schemas/worldgen.json
+++ b/schemas/worldgen.json
@@ -239,30 +239,51 @@
                 {
                   "id": "default_block",
                   "type": "object",
-                  "card": false,
+                  "color": "dark",
                   "default": {
                     "Name": "minecraft:stone"
                   },
                   "fields": [
                     {
                       "id": "Name",
-                      "translate": "generator.settings.default_block",
+                      "translate": "generator.settings.default_block.name",
                       "type": "string"
+                    },
+                    {
+                      "id": "Properties",
+                      "translate": "generator.settings.block_states",
+                      "translatePlaceholder": "block_state",
+                      "type": "map",
+                      "default": {},
+                      "values": {
+                        "type": "string"
+                      }
                     }
                   ]
                 },
                 {
                   "id": "default_fluid",
                   "type": "object",
-                  "card": false,
+                  "color": "dark",
                   "default": {
-                    "Name": "minecraft:air"
+                    "Name": "minecraft:water",
+                    "Properties": {}
                   },
                   "fields": [
                     {
                       "id": "Name",
-                      "translate": "generator.settings.default_fluid",
+                      "translate": "generator.settings.default_fluid.name",
                       "type": "string"
+                    },
+                    {
+                      "id": "Properties",
+                      "translate": "generator.settings.fluid_states",
+                      "translatePlaceholder": "fluid_state",
+                      "type": "map",
+                      "default": {},
+                      "values": {
+                        "type": "string"
+                      }
                     }
                   ]
                 },