From d2ccead6d09ec20de61282bebac25aefabb9faf6 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Wed, 2 Feb 2022 14:33:43 +0000
Subject: [PATCH] Provide only one default value for added properties

---
 .../mapping_schema_0011_1.14.0_to_1.16.0.json | 82 ++++++++-----------
 ...apping_schema_0021_1.16.0_to_1.16.100.json | 10 +--
 ...apping_schema_0041_1.17.10_to_1.17.30.json | 20 ++---
 ...apping_schema_0051_1.17.30_to_1.17.40.json | 10 +--
 upgrade_schema/mapping_schema_schema.json     | 17 ++--
 5 files changed, 56 insertions(+), 83 deletions(-)

diff --git a/upgrade_schema/mapping_schema_0011_1.14.0_to_1.16.0.json b/upgrade_schema/mapping_schema_0011_1.14.0_to_1.16.0.json
index 058034e..7e9d0ad 100644
--- a/upgrade_schema/mapping_schema_0011_1.14.0_to_1.16.0.json
+++ b/upgrade_schema/mapping_schema_0011_1.14.0_to_1.16.0.json
@@ -1,60 +1,44 @@
 {
     "addedProperties": {
         "minecraft:melon_stem": {
-            "facing_direction": [
-                {
-                    "type": "int",
-                    "value": 0
-                }
-            ]
+            "facing_direction": {
+                "type": "int",
+                "value": 0
+            }
         },
         "minecraft:jigsaw": {
-            "rotation": [
-                {
-                    "type": "int",
-                    "value": 0
-                }
-            ]
+            "rotation": {
+                "type": "int",
+                "value": 0
+            }
         },
         "minecraft:cobblestone_wall": {
-            "wall_connection_type_east": [
-                {
-                    "type": "string",
-                    "value": "none"
-                }
-            ],
-            "wall_connection_type_north": [
-                {
-                    "type": "string",
-                    "value": "none"
-                }
-            ],
-            "wall_connection_type_south": [
-                {
-                    "type": "string",
-                    "value": "none"
-                }
-            ],
-            "wall_connection_type_west": [
-                {
-                    "type": "string",
-                    "value": "none"
-                }
-            ],
-            "wall_post_bit": [
-                {
-                    "type": "byte",
-                    "value": 0
-                }
-            ]
+            "wall_connection_type_east": {
+                "type": "string",
+                "value": "none"
+            },
+            "wall_connection_type_north": {
+                "type": "string",
+                "value": "none"
+            },
+            "wall_connection_type_south": {
+                "type": "string",
+                "value": "none"
+            },
+            "wall_connection_type_west": {
+                "type": "string",
+                "value": "none"
+            },
+            "wall_post_bit": {
+                "type": "byte",
+                "value": 0
+            }
         },
         "minecraft:pumpkin_stem": {
-            "facing_direction": [
-                {
-                    "type": "int",
-                    "value": 0
-                }
-            ]
+            "facing_direction": {
+                "type": "int",
+                "value": 0
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/upgrade_schema/mapping_schema_0021_1.16.0_to_1.16.100.json b/upgrade_schema/mapping_schema_0021_1.16.0_to_1.16.100.json
index 7c9e5f8..d47ff0e 100644
--- a/upgrade_schema/mapping_schema_0021_1.16.0_to_1.16.100.json
+++ b/upgrade_schema/mapping_schema_0021_1.16.0_to_1.16.100.json
@@ -9,12 +9,10 @@
     },
     "addedProperties": {
         "minecraft:chain": {
-            "pillar_axis": [
-                {
-                    "type": "string",
-                    "value": "y"
-                }
-            ]
+            "pillar_axis": {
+                "type": "string",
+                "value": "y"
+            }
         }
     },
     "remappedPropertyValues": {
diff --git a/upgrade_schema/mapping_schema_0041_1.17.10_to_1.17.30.json b/upgrade_schema/mapping_schema_0041_1.17.10_to_1.17.30.json
index 016f0da..05fd258 100644
--- a/upgrade_schema/mapping_schema_0041_1.17.10_to_1.17.30.json
+++ b/upgrade_schema/mapping_schema_0041_1.17.10_to_1.17.30.json
@@ -1,20 +1,16 @@
 {
     "addedProperties": {
         "minecraft:frame": {
-            "item_frame_photo_bit": [
-                {
-                    "type": "byte",
-                    "value": 0
-                }
-            ]
+            "item_frame_photo_bit": {
+                "type": "byte",
+                "value": 0
+            }
         },
         "minecraft:glow_frame": {
-            "item_frame_photo_bit": [
-                {
-                    "type": "byte",
-                    "value": 0
-                }
-            ]
+            "item_frame_photo_bit": {
+                "type": "byte",
+                "value": 0
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/upgrade_schema/mapping_schema_0051_1.17.30_to_1.17.40.json b/upgrade_schema/mapping_schema_0051_1.17.30_to_1.17.40.json
index d3bebe8..8d6d39f 100644
--- a/upgrade_schema/mapping_schema_0051_1.17.30_to_1.17.40.json
+++ b/upgrade_schema/mapping_schema_0051_1.17.30_to_1.17.40.json
@@ -1,12 +1,10 @@
 {
     "addedProperties": {
         "minecraft:sculk_catalyst": {
-            "bloom": [
-                {
-                    "type": "byte",
-                    "value": 0
-                }
-            ]
+            "bloom": {
+                "type": "byte",
+                "value": 0
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/upgrade_schema/mapping_schema_schema.json b/upgrade_schema/mapping_schema_schema.json
index 5eb1493..078f85f 100644
--- a/upgrade_schema/mapping_schema_schema.json
+++ b/upgrade_schema/mapping_schema_schema.json
@@ -36,16 +36,13 @@
 			"additionalProperties": {
 				"type": "object",
 				"additionalProperties": {
-					"type": "array",
-					"items": {
-						"type": "object",
-						"properties": {
-							"type": {
-								"type": "string"
-							},
-							"value": {
-								"type": ["string", "integer"]
-							}
+					"type": "object",
+					"properties": {
+						"type": {
+							"type": "string"
+						},
+						"value": {
+							"type": ["string", "integer"]
 						}
 					}
 				}