Add schemas for Fusion resource pack metadata (#3476)

* Add Fusion properties to minecraft-pack-mcmeta.json

* Add Fusion properties to minecraft-texture-mcmeta.json

* Fix Fusion texture metadata

* Add positive tests for Fusion pack and texture metadata

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Prefix Fusion schemas with 'partial-'

* Apply Fusion metadata tests tot regular Minecraft schemas

* Add empty 'fileMatch' properties for Fusion schemas in `catalog.json`

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: SuperMartijn642

src/api/json/catalog.json

@@ -1873,6 +1873,18 @@
       "fileMatch": ["function.json"],
       "url": "https://json.schemastore.org/function.json"
     },
+    {
+      "name": "Fusion resource pack metadata",
+      "description": "Fusion properties for Minecraft resource pack metadata",
+      "fileMatch": [],
+      "url": "https://json.schemastore.org/partial-fusion-pack-metadata.json"
+    },
+    {
+      "name": "Fusion texture metadata",
+      "description": "Fusion properties for Minecraft texture metadata",
+      "fileMatch": [],
+      "url": "https://json.schemastore.org/partial-fusion-texture-metadata.json"
+    },
     {
       "name": "G2P Mapping Configuration",
       "description": "defining mappings for Python-based grapheme-to-phoneme engine 'g2p'",

src/negative_test/minecraft-texture-mcmeta/fusion-with-vanilla-properties.json

@@ -0,0 +1,22 @@
+{
+  "animation": {
+    "frames": [
+      0,
+      1,
+      2,
+      {
+        "index": 10,
+        "time": 20
+      }
+    ],
+    "frametime": 8,
+    "height": 8,
+    "interpolate": true,
+    "width": 8
+  },
+  "fusion": {
+    "layout": "compact",
+    "render_type": "opaque",
+    "type": "connecting"
+  }
+}

src/schema-validation.json

@@ -615,6 +615,16 @@
         "unknownKeywords": ["examples"]
       }
     },
+    {
+      "minecraft-pack-mcmeta.json": {
+        "externalSchema": ["partial-fusion-pack-metadata.json"]
+      }
+    },
+    {
+      "minecraft-texture-mcmeta.json": {
+        "externalSchema": ["partial-fusion-texture-metadata.json"]
+      }
+    },
     {
       "ninjs-2.0.json": {
         "unknownKeywords": ["name"],

src/schemas/json/minecraft-pack-mcmeta.json

@@ -43,6 +43,10 @@
         },
         "additionalProperties": false
       }
+    },
+    "fusion": {
+      "$comment": "Fusion properties for Minecraft resource packs",
+      "$ref": "https://json.schemastore.org/partial-fusion-pack-metadata.json#/definitions/fusion-properties"
     }
   },
   "title": "pack metadata",

src/schemas/json/minecraft-texture-mcmeta.json

@@ -2,50 +2,63 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "https://json.schemastore.org/minecraft-texture-mcmeta.json",
   "description": "A mcmeta file for an animated texture for a Minecraft resource pack config schema",
-  "properties": {
-    "animation": {
-      "description": "Animation",
-      "type": "object",
+  "oneOf": [
+    {
       "properties": {
-        "interpolate": {
-          "type": "boolean",
-          "default": false
-        },
-        "width": {
-          "type": "integer"
-        },
-        "height": {
-          "type": "integer"
-        },
-        "frametime": {
-          "type": "integer",
-          "default": 1
-        },
-        "frames": {
-          "type": "array",
-          "items": {
-            "oneOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "index": {
+        "animation": {
+          "description": "Animation",
+          "type": "object",
+          "properties": {
+            "interpolate": {
+              "type": "boolean",
+              "default": false
+            },
+            "width": {
+              "type": "integer"
+            },
+            "height": {
+              "type": "integer"
+            },
+            "frametime": {
+              "type": "integer",
+              "default": 1
+            },
+            "frames": {
+              "type": "array",
+              "items": {
+                "oneOf": [
+                  {
                     "type": "integer"
                   },
-                  "time": {
-                    "type": "integer"
+                  {
+                    "type": "object",
+                    "properties": {
+                      "index": {
+                        "type": "integer"
+                      },
+                      "time": {
+                        "type": "integer"
+                      }
+                    }
                   }
-                }
+                ]
               }
-            ]
+            }
           }
         }
-      }
+      },
+      "required": ["animation"]
+    },
+    {
+      "properties": {
+        "fusion": {
+          "$comment": "Fusion properties for Minecraft texture metadata",
+          "$ref": "https://json.schemastore.org/partial-fusion-texture-metadata.json#/definitions/fusion-properties"
+        }
+      },
+      "required": ["fusion"]
     }
-  },
-  "required": ["animation"],
+  ],
   "title": "Minecraft Resource Pack Texture Mcmeta",
   "type": "object"
 }

src/schemas/json/partial-fusion-pack-metadata.json

@@ -0,0 +1,70 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "https://json.schemastore.org/partial-fusion-pack-metadata.json",
+  "additionalProperties": false,
+  "definitions": {
+    "fusion-properties": {
+      "additionalProperties": false,
+      "description": "Fusion options for the current pack\nhttps://github.com/SuperMartijn642/Fusion/wiki",
+      "properties": {
+        "overrides_folder": {
+          "default": "fusion",
+          "description": "Folder which contains files which should override regular files when Fusion is loaded\nhttps://github.com/SuperMartijn642/Fusion/wiki/Optional-Fusion-Overwrites",
+          "minLength": 1,
+          "title": "Fusion Overrides Folder",
+          "type": "string"
+        }
+      },
+      "title": "Fusion Options",
+      "type": "object"
+    }
+  },
+  "description": "Fusion extension for Minecraft resource pack metadata",
+  "properties": {
+    "filter": {
+      "additionalProperties": {
+        "additionalProperties": false,
+        "description": "A pattern for the current pack\nhttps://minecraft.wiki/w/Data_pack",
+        "properties": {
+          "namespace": {
+            "description": "A namespace regular expression for the current pack\nhttps://minecraft.wiki/w/Data_pack",
+            "type": "string"
+          },
+          "path": {
+            "description": "A path regular expression for the current pack\nhttps://minecraft.wiki/w/Data_pack",
+            "type": "string"
+          }
+        },
+        "title": "pattern",
+        "type": "object"
+      },
+      "description": "Filter options for the current pack\nhttps://minecraft.wiki/w/Data_pack",
+      "title": "filter options",
+      "type": "object"
+    },
+    "fusion": {
+      "$ref": "#/definitions/fusion-properties"
+    },
+    "pack": {
+      "additionalProperties": false,
+      "description": "Options for the current pack\nhttps://minecraft.wiki/w/Data_pack#Contents",
+      "properties": {
+        "description": {
+          "description": "A description for the current pack\nhttps://minecraft.wiki/w/Data_pack#Contents",
+          "title": "description"
+        },
+        "pack_format": {
+          "default": 4,
+          "description": "A version for the current pack\nhttps://minecraft.wiki/w/Data_pack#Contents",
+          "maximum": 18,
+          "minimum": 1,
+          "type": "integer"
+        }
+      },
+      "title": "pack options",
+      "type": "object"
+    }
+  },
+  "title": "Fusion Resource Pack Metadata",
+  "type": "object"
+}