From 17ed93a182f9449bfa0d9ff2330702bb4c2bab00 Mon Sep 17 00:00:00 2001 From: Misode Date: Mon, 4 Oct 2021 23:32:41 +0200 Subject: [PATCH] Add recipe generator --- package-lock.json | 70 +++++++++++++++++------------------ package.json | 10 ++--- src/app/schema/renderHtml.tsx | 2 +- src/config.json | 9 ++++- src/locales/en.json | 1 + src/sitemap.txt | 1 + vite.config.js | 3 +- 7 files changed, 53 insertions(+), 43 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8d9cc141..a683d4e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,11 +10,11 @@ "license": "MIT", "dependencies": { "@mcschema/core": "^0.12.10", - "@mcschema/java-1.15": "^0.2.0", - "@mcschema/java-1.16": "^0.6.3", - "@mcschema/java-1.17": "^0.2.23", - "@mcschema/java-1.18": "^0.1.4", - "@mcschema/locales": "^0.1.28", + "@mcschema/java-1.15": "^0.2.2", + "@mcschema/java-1.16": "^0.6.5", + "@mcschema/java-1.17": "^0.2.24", + "@mcschema/java-1.18": "^0.1.5", + "@mcschema/locales": "^0.1.29", "deepslate": "^0.9.0-beta.2", "rfdc": "^1.3.0" }, @@ -321,41 +321,41 @@ "integrity": "sha512-uPP6iiVaml5MUBbcu5tnl3atadAwdQOpXBZdpoDMjLX+7nUUUAjiynHpbwXVeqTgO473j4QI2EQv2NqPH+wCSw==" }, "node_modules/@mcschema/java-1.15": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@mcschema/java-1.15/-/java-1.15-0.2.1.tgz", - "integrity": "sha512-vGOxAc76oukMGfRaktH2KC1CdxTpM5GOGnLfhIfFxw4QSscy6YUkPsr63l+bceeV5e0XHku50w6sH3Yxl103Ng==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/@mcschema/java-1.15/-/java-1.15-0.2.2.tgz", + "integrity": "sha512-vHvL6yOb3kuNiBNYlbmLNB+fnqGcFP6W9fdzzBCOPxRKIKBbUZKvcD14O8MTlnDQ9JsDkDLUMHWIzNh5MSZ8uA==", "dependencies": { "@mcschema/core": "^0.12.0" } }, "node_modules/@mcschema/java-1.16": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@mcschema/java-1.16/-/java-1.16-0.6.4.tgz", - "integrity": "sha512-8s7GfqREHau2JokROYMqR2PrreweWAHNEaK/Wto5P0v7pUHV1KcO48/7TXTogUOqzWYgk9CzjwU1V8/MtN7tnQ==", + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/@mcschema/java-1.16/-/java-1.16-0.6.5.tgz", + "integrity": "sha512-yAB98OFMXUuPRJyyUwkHlHFiSRsZbQC4rQC/InRdPMMY1xdjrP5gRRjKsC9rhej3VOSD9q/rbEWQ+wWxorcKBA==", "dependencies": { "@mcschema/core": "^0.12.0" } }, "node_modules/@mcschema/java-1.17": { - "version": "0.2.23", - "resolved": "https://registry.npmjs.org/@mcschema/java-1.17/-/java-1.17-0.2.23.tgz", - "integrity": "sha512-DsPtcPca3lprAOd5atjLhulefrsrZOiHO69y/Vn2/Y/dZM85A7/wc9P2kfrlQAyc5rN8+yw/VwDblATp7o4Kmw==", + "version": "0.2.24", + "resolved": "https://registry.npmjs.org/@mcschema/java-1.17/-/java-1.17-0.2.24.tgz", + "integrity": "sha512-sw+02IBAhq9x3mpHElYshJWxQoTAXya28btdQjsWe9BCPic5N8fUonXRAIA7czksZmsX5cqL9hCum0tV8L+X8A==", "dependencies": { "@mcschema/core": "^0.12.4" } }, "node_modules/@mcschema/java-1.18": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/@mcschema/java-1.18/-/java-1.18-0.1.4.tgz", - "integrity": "sha512-SCDKE9LrYLfjsMNx9q6wNNtdKidVkt3EbW9rVwMVpi/N1ATUJQPV6+g52JWCU+TMOeZ5VJO6mukg94xzBs1/Bg==", + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/@mcschema/java-1.18/-/java-1.18-0.1.5.tgz", + "integrity": "sha512-sR9/UAgnLBBkJCpfZProyNlcNnoDkAVT3TndeH2Mdn/v5woGVqnW7gXJNYbCmgmpk+Cq0LgkraAvPkYsMRTdNQ==", "dependencies": { "@mcschema/core": "^0.12.10" } }, "node_modules/@mcschema/locales": { - "version": "0.1.28", - "resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.28.tgz", - "integrity": "sha512-lab3mg/WyImBt2M8DBhBlPz0+URKEZg26HcD7v9Gu+ZaXBSQptJfKLE4dzqotos6C0SR9lrNjhwgIyS2U9n6rg==" + "version": "0.1.29", + "resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.29.tgz", + "integrity": "sha512-aE8+wYEV/o1Gsrer5U2cO9PxLmU9YSogUgQBbXdt16xSgf2tf7Cbu3F7N1R01r0yQjsl1e36hAFso79irqJmuw==" }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", @@ -2918,41 +2918,41 @@ "integrity": "sha512-uPP6iiVaml5MUBbcu5tnl3atadAwdQOpXBZdpoDMjLX+7nUUUAjiynHpbwXVeqTgO473j4QI2EQv2NqPH+wCSw==" }, "@mcschema/java-1.15": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@mcschema/java-1.15/-/java-1.15-0.2.1.tgz", - "integrity": "sha512-vGOxAc76oukMGfRaktH2KC1CdxTpM5GOGnLfhIfFxw4QSscy6YUkPsr63l+bceeV5e0XHku50w6sH3Yxl103Ng==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/@mcschema/java-1.15/-/java-1.15-0.2.2.tgz", + "integrity": "sha512-vHvL6yOb3kuNiBNYlbmLNB+fnqGcFP6W9fdzzBCOPxRKIKBbUZKvcD14O8MTlnDQ9JsDkDLUMHWIzNh5MSZ8uA==", "requires": { "@mcschema/core": "^0.12.0" } }, "@mcschema/java-1.16": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@mcschema/java-1.16/-/java-1.16-0.6.4.tgz", - "integrity": "sha512-8s7GfqREHau2JokROYMqR2PrreweWAHNEaK/Wto5P0v7pUHV1KcO48/7TXTogUOqzWYgk9CzjwU1V8/MtN7tnQ==", + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/@mcschema/java-1.16/-/java-1.16-0.6.5.tgz", + "integrity": "sha512-yAB98OFMXUuPRJyyUwkHlHFiSRsZbQC4rQC/InRdPMMY1xdjrP5gRRjKsC9rhej3VOSD9q/rbEWQ+wWxorcKBA==", "requires": { "@mcschema/core": "^0.12.0" } }, "@mcschema/java-1.17": { - "version": "0.2.23", - "resolved": "https://registry.npmjs.org/@mcschema/java-1.17/-/java-1.17-0.2.23.tgz", - "integrity": "sha512-DsPtcPca3lprAOd5atjLhulefrsrZOiHO69y/Vn2/Y/dZM85A7/wc9P2kfrlQAyc5rN8+yw/VwDblATp7o4Kmw==", + "version": "0.2.24", + "resolved": "https://registry.npmjs.org/@mcschema/java-1.17/-/java-1.17-0.2.24.tgz", + "integrity": "sha512-sw+02IBAhq9x3mpHElYshJWxQoTAXya28btdQjsWe9BCPic5N8fUonXRAIA7czksZmsX5cqL9hCum0tV8L+X8A==", "requires": { "@mcschema/core": "^0.12.4" } }, "@mcschema/java-1.18": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/@mcschema/java-1.18/-/java-1.18-0.1.4.tgz", - "integrity": "sha512-SCDKE9LrYLfjsMNx9q6wNNtdKidVkt3EbW9rVwMVpi/N1ATUJQPV6+g52JWCU+TMOeZ5VJO6mukg94xzBs1/Bg==", + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/@mcschema/java-1.18/-/java-1.18-0.1.5.tgz", + "integrity": "sha512-sR9/UAgnLBBkJCpfZProyNlcNnoDkAVT3TndeH2Mdn/v5woGVqnW7gXJNYbCmgmpk+Cq0LgkraAvPkYsMRTdNQ==", "requires": { "@mcschema/core": "^0.12.10" } }, "@mcschema/locales": { - "version": "0.1.28", - "resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.28.tgz", - "integrity": "sha512-lab3mg/WyImBt2M8DBhBlPz0+URKEZg26HcD7v9Gu+ZaXBSQptJfKLE4dzqotos6C0SR9lrNjhwgIyS2U9n6rg==" + "version": "0.1.29", + "resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.29.tgz", + "integrity": "sha512-aE8+wYEV/o1Gsrer5U2cO9PxLmU9YSogUgQBbXdt16xSgf2tf7Cbu3F7N1R01r0yQjsl1e36hAFso79irqJmuw==" }, "@nodelib/fs.scandir": { "version": "2.1.5", diff --git a/package.json b/package.json index 93abf3fb..1f815197 100644 --- a/package.json +++ b/package.json @@ -15,11 +15,11 @@ "license": "MIT", "dependencies": { "@mcschema/core": "^0.12.10", - "@mcschema/java-1.15": "^0.2.0", - "@mcschema/java-1.16": "^0.6.3", - "@mcschema/java-1.17": "^0.2.23", - "@mcschema/java-1.18": "^0.1.4", - "@mcschema/locales": "^0.1.28", + "@mcschema/java-1.15": "^0.2.2", + "@mcschema/java-1.16": "^0.6.5", + "@mcschema/java-1.17": "^0.2.24", + "@mcschema/java-1.18": "^0.1.5", + "@mcschema/locales": "^0.1.29", "deepslate": "^0.9.0-beta.2", "rfdc": "^1.3.0" }, diff --git a/src/app/schema/renderHtml.tsx b/src/app/schema/renderHtml.tsx index 27a70cbc..79b8249e 100644 --- a/src/app/schema/renderHtml.tsx +++ b/src/app/schema/renderHtml.tsx @@ -12,7 +12,7 @@ import { CachedDecorator, CachedFeature } from '../Schemas' import { deepClone, deepEqual, hexId, isObject, newSeed } from '../Utils' import { ModelWrapper } from './ModelWrapper' -const selectRegistries = ['loot_table.type', 'loot_entry.type', 'function.function', 'condition.condition', 'criterion.trigger', 'dimension.generator.type', 'dimension.generator.biome_source.type', 'dimension.generator.biome_source.preset', 'carver.type', 'feature.type', 'decorator.type', 'feature.tree.minimum_size.type', 'block_state_provider.type', 'trunk_placer.type', 'foliage_placer.type', 'tree_decorator.type', 'int_provider.type', 'float_provider.type', 'height_provider.type', 'structure_feature.type', 'surface_builder.type', 'processor.processor_type', 'rule_test.predicate_type', 'pos_rule_test.predicate_type', 'template_element.element_type', 'block_placer.type', 'block_predicate.type'] +const selectRegistries = ['loot_table.type', 'loot_entry.type', 'function.function', 'condition.condition', 'criterion.trigger', 'recipe.type', 'dimension.generator.type', 'dimension.generator.biome_source.type', 'dimension.generator.biome_source.preset', 'carver.type', 'feature.type', 'decorator.type', 'feature.tree.minimum_size.type', 'block_state_provider.type', 'trunk_placer.type', 'foliage_placer.type', 'tree_decorator.type', 'int_provider.type', 'float_provider.type', 'height_provider.type', 'structure_feature.type', 'surface_builder.type', 'processor.processor_type', 'rule_test.predicate_type', 'pos_rule_test.predicate_type', 'template_element.element_type', 'block_placer.type', 'block_predicate.type'] const hiddenFields = ['number_provider.type', 'score_provider.type', 'nbt_provider.type', 'int_provider.type', 'float_provider.type', 'height_provider.type'] const flattenedFields = ['feature.config', 'decorator.config', 'int_provider.value', 'float_provider.value', 'block_state_provider.simple_state_provider.state', 'block_state_provider.rotated_block_provider.state', 'block_state_provider.weighted_state_provider.entries.entry.data', 'rule_test.block_state', 'structure_feature.config', 'surface_builder.config', 'template_pool.elements.entry.element', 'decorator.block_survives_filter.state'] const inlineFields = ['loot_entry.type', 'function.function', 'condition.condition', 'criterion.trigger', 'dimension.generator.type', 'dimension.generator.biome_source.type', 'feature.type', 'decorator.type', 'block_state_provider.type', 'feature.tree.minimum_size.type', 'trunk_placer.type', 'foliage_placer.type', 'tree_decorator.type', 'block_placer.type', 'rule_test.predicate_type', 'processor.processor_type', 'template_element.element_type', 'nbt_operation.op', 'number_provider.value', 'score_provider.name', 'score_provider.target', 'nbt_provider.source', 'nbt_provider.target', 'generator_biome.biome'] diff --git a/src/config.json b/src/config.json index 220ba02a..9450a592 100644 --- a/src/config.json +++ b/src/config.json @@ -106,6 +106,12 @@ "path": "advancements", "schema": "advancement" }, + { + "id": "recipe", + "url": "recipe", + "path": "recipes", + "schema": "recipe" + }, { "id": "dimension", "url": "dimension", @@ -212,6 +218,7 @@ { "id": "potion", "minVersion": "1.15" }, { "id": "predicate", "dynamic": true }, { "id": "recipe", "dynamic": true }, + { "id": "recipe_serializer" }, { "id": "rule_test", "minVersion": "1.16" }, { "id": "sound_event" }, { "id": "stat_type" }, @@ -223,7 +230,7 @@ { "id": "tag/item", "dynamic": true }, { "id": "worldgen/biome", "dynamic": true }, { "id": "worldgen/block_state_provider_type", "minVersion": "1.16" }, - { "id": "worldgen/block_placer_type", "minVersion": "1.16" }, + { "id": "worldgen/block_placer_type", "minVersion": "1.16", "maxVersion": "1.17" }, { "id": "worldgen/biome_source", "minVersion": "1.16" }, { "id": "worldgen/carver", "minVersion": "1.16" }, { "id": "worldgen/chunk_generator", "minVersion": "1.16" }, diff --git a/src/locales/en.json b/src/locales/en.json index 8d7702fd..d24491a8 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -39,6 +39,7 @@ "no_presets": "No presets", "output_settings": "JSON output settings", "predicate": "Predicate", + "recipe": "Recipe", "redo": "Redo", "reset": "Reset", "settings": "Settings", diff --git a/src/sitemap.txt b/src/sitemap.txt index 0a279abe..6079bda6 100644 --- a/src/sitemap.txt +++ b/src/sitemap.txt @@ -3,6 +3,7 @@ https://misode.github.io/loot-table/ https://misode.github.io/predicate/ https://misode.github.io/item-modifier/ https://misode.github.io/advancement/ +https://misode.github.io/recipe/ https://misode.github.io/dimension/ https://misode.github.io/dimension-type/ https://misode.github.io/world/ diff --git a/vite.config.js b/vite.config.js index 19b5934c..46ad279c 100644 --- a/vite.config.js +++ b/vite.config.js @@ -23,7 +23,8 @@ export default defineConfig({ })), copy({ targets: [ - { src: 'src/sitemap.txt', dest: 'dist' } + { src: 'src/sitemap.txt', dest: 'dist' }, + { src: 'src/sitemap.txt', dest: 'dist', rename: 'sitemap2.txt' }, ], hook: 'writeBundle' })