fix: remove incorrect type definitions in features (#353)

source/behavior/features/features/minecraft.geode_feature.json

@@ -68,31 +68,26 @@
     },
     "filler": {
       "title": "Filler",
-      "type": "string",
       "description": "The block to fill the inside of the geode.",
       "$ref": "../../../general/block/reference.json"
     },
     "inner_layer": {
       "title": "Inner Layer",
-      "type": "string",
       "description": "The block that forms the inside layer of the geode shell.",
       "$ref": "../../../general/block/reference.json"
     },
     "alternate_inner_layer": {
       "title": "Alternate Inner Layer",
-      "type": "string",
       "description": "The block that has a chance of generating instead of inner_layer.",
       "$ref": "../../../general/block/reference.json"
     },
     "middle_layer": {
       "title": "Middle Layer",
-      "type": "string",
       "description": "The block that forms the middle layer of the geode shell.",
       "$ref": "../../../general/block/reference.json"
     },
     "outer_layer": {
       "title": "Outer Layer",
-      "type": "string",
       "description": "The block that forms the outer shell of the geode.",
       "$ref": "../../../general/block/reference.json"
     },

source/behavior/features/features/minecraft.growing_plant_feature.json

@@ -43,7 +43,6 @@
           {
             "title": "Plant Body Block",
             "description": "Plant body block.",
-            "type": "string",
             "$ref": "../../../general/block/reference.json"
           },
           {

source/behavior/features/features/minecraft.multiface_feature.json

@@ -11,7 +11,6 @@
     "places_block": {
       "title": "Places Block",
       "description": "Reference to the block to be placed.",
-      "type": "string",
       "$ref": "../../../general/block/reference.json"
     },
     "search_range": {

source/behavior/features/features/minecraft.nether_cave_carver_feature.json

@@ -11,7 +11,6 @@
     "fill_with": {
       "title": "Identifier",
       "description": "Reference to the block to fill the cave with.",
-      "type": "string",
       "$ref": "../../../general/block/reference.json"
     },
     "width_modifier": {

source/behavior/features/features/minecraft.single_block_feature.json

@@ -3,13 +3,34 @@
   "description": "`minecraft:single_block_feature` places a single block in the world. The `may_place_on` and `may_replace` fields are allowlists which specify where the block can be placed. If these fields are omitted, the block can be placed anywhere. The block's internal survivability and placement rules can optionally be enforced with the `enforce_survivability_rules` and `enforce_placement_rules` fields. These rules are specified per-block and are typically designed to produce high quality gameplay or natural behavior. However, enabling this enforcement may make it harder to debug placement failures.\n Succeeds if: The block is successfully placed in the world.\n Fails if: The block fails to be placed.",
   "type": "object",
   "additionalProperties": false,
-  "required": [ "description", "places_block", "enforce_placement_rules", "enforce_survivability_rules" ],
+  "required": ["description", "places_block", "enforce_placement_rules", "enforce_survivability_rules"],
   "definitions": {
     "block_side": {
       "oneOf": [
-        { "title": "Block", "description": "Reference to the block it may attach to.", "type": "string", "$ref": "../../../general/block/reference.json" },
-        { "type": "array", "items": { "title": "Block", "description": "Reference to the block it may attach to.", "type": "string", "$ref": "../../../general/block/reference.json" } }
+        { "title": "Block", "description": "Reference to the block it may attach to.", "$ref": "../../../general/block/reference.json" },
+        {
+          "type": "array",
+          "items": { "title": "Block", "description": "Reference to the blocks it may attach to.", "$ref": "../../../general/block/reference.json" }
+        }
       ]
+    },
+    "weighted_block_reference": {
+      "title": "Weighted Block Reference",
+      "description": "Reference to the block to be placed.",
+      "type": "object",
+      "required": ["block"],
+      "properties": {
+        "block": {
+          "title": "Block",
+          "description": "Reference to the block to be placed.",
+          "$ref": "../../../general/block/reference.json"
+        },
+        "weight": {
+          "title": "Weight",
+          "description": "Random weight of this block. A higher number will increase the probability of this block to be picked during placement.",
+          "type": "number"
+        }
+      }
     }
   },
   "properties": {
@@ -21,7 +42,6 @@
         {
           "title": "Places Block",
           "description": "Reference to the block to be placed.",
-          "type": "string",
           "$ref": "../../../general/block/reference.json"
         },
         {
@@ -30,17 +50,7 @@
           "type": "array",
           "minItems": 1,
           "items": {
-            "title": "Block",
-            "description": "Reference to the block to be placed.",
-            "type": "array",
-            "items": [
-              { "title": "Block", "description": "Reference to the block to be placed.", "$ref": "../../../general/block/reference.json" },
-              {
-                "title": "Weight",
-                "description": "Random weight of this block. A higher number will increase the probability of this block to be picked during placement.",
-                "type": "number"
-              }
-            ]
+            "$ref": "#/definitions/weighted_block_reference"
           }
         }
       ]
@@ -112,7 +122,6 @@
       "items": {
         "title": "Block",
         "description": "A block that may be replaced during placement. Omit this field to allow any block to be replaced.",
-        "type": "string",
         "$ref": "../../../general/block/reference.json"
       }
     }

source/behavior/features/features/minecraft.structure_template_feature.json

@@ -12,7 +12,7 @@
       "title": "Structure Name",
       "description": "Reference to the structure to be placed.",
       "type": "string",
-      "pattern": "^\\w+:(\\w|\/)+"
+      "pattern": "^\\w+:(\\w|/)+"
     },
     "adjustment_radius": {
       "title": "Adjustment Radius",
@@ -60,7 +60,6 @@
               "type": "array",
               "items": {
                 "title": "Block",
-                "type": "string",
                 "$ref": "../../../general/block/reference.json"
               }
             },
@@ -70,7 +69,6 @@
               "type": "array",
               "items": {
                 "title": "Block",
-                "type": "string",
                 "$ref": "../../../general/block/reference.json"
               }
             }

source/behavior/features/features/minecraft.tree_feature.json

@@ -111,7 +111,6 @@
                 "decoration_block": {
                   "title": "Decoration Block",
                   "description": "The block used for decorating the trunk.",
-                  "type": "string",
                   "$ref": "../../../general/block/reference.json"
                 },
                 "num_steps": {
@@ -379,7 +378,6 @@
     "leaf_block": {
       "title": "Leaf Block",
       "description": "The block thata forms the canopy of the tree.",
-      "type": "string",
       "$ref": "../../../general/block/reference.json"
     },
     "trunk_width": {
@@ -414,7 +412,6 @@
         "decoration_block": {
           "title": "Decoration Block",
           "description": "The block used for decorating the trunk.",
-          "type": "string",
           "$ref": "../../../general/block/reference.json"
         },
         "num_steps": {
@@ -439,7 +436,6 @@
     "trunk_block": {
       "title": "Trunk Block",
       "description": "The block that forms the tree trunk.",
-      "type": "string",
       "$ref": "../../../general/block/reference.json"
     }
   },
@@ -1130,7 +1126,6 @@
             "decoration_block": {
               "title": "Decoration Block",
               "description": "The block used for decorating the trunk.",
-              "type": "string",
               "$ref": "../../../general/block/reference.json"
             },
             "num_steps": {
@@ -1451,7 +1446,6 @@
         "root_block": {
           "title": "Root Block",
           "description": "Block used for roots.",
-          "type": "string",
           "$ref": "../../../general/block/reference.json"
         },
         "above_root": {
@@ -1468,19 +1462,16 @@
             "above_root_block": {
               "title": "Above Root Block",
               "description": "The block placed on the top of the roots.",
-              "type": "string",
               "$ref": "../../../general/block/reference.json"
             },
             "muddy_root_block": {
               "title": "Muddy Root Block",
               "description": "The block used for muddy roots.",
-              "type": "string",
               "$ref": "../../../general/block/reference.json"
             },
             "mud_block": {
               "title": "Mud Block",
               "description": "The block used to determine if a muddy root should be placed.",
-              "type": "string",
               "$ref": "../../../general/block/reference.json"
             },
             "y_offset": {

source/behavior/features/features/minecraft.vegetation_patch_feature.json

@@ -14,14 +14,12 @@
       "type": "array",
       "items": {
         "title": "Replace Block",
-        "type": "string",
         "$ref": "../../../general/block/reference.json"
       }
     },
     "ground_block": {
       "title": "Ground Block",
       "description": "Block used to create a base for the vegetation patch.",
-      "type": "string",
       "$ref": "../../../general/block/reference.json"
     },
     "vegetation_feature": {