From 95df45acb11d8c5bfaa914ae2a7967b96039d73b Mon Sep 17 00:00:00 2001 From: Misode Date: Thu, 7 Mar 2024 01:13:20 +0100 Subject: [PATCH] 24w10a --- .vscode/settings.json | 12 ++++++------ package-lock.json | 28 ++++++++++++++-------------- package.json | 4 ++-- src/app/schema/renderHtml.tsx | 2 +- src/config.json | 15 ++++++++++++++- src/locales/en.json | 4 +++- 6 files changed, 40 insertions(+), 25 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index a13ca050..fbac3724 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,20 +1,20 @@ { "[typescript]": { "editor.codeActionsOnSave": { - "source.organizeImports": true, - "source.fixAll.eslint": true + "source.organizeImports": "explicit", + "source.fixAll.eslint": "explicit" } }, "[typescriptreact]": { "editor.codeActionsOnSave": { - "source.organizeImports": true, - "source.fixAll.eslint": true + "source.organizeImports": "explicit", + "source.fixAll.eslint": "explicit" } }, "[javascript]": { "editor.codeActionsOnSave": { - "source.organizeImports": true, - "source.fixAll.eslint": true + "source.organizeImports": "explicit", + "source.fixAll.eslint": "explicit" } }, "[markdown]": { diff --git a/package-lock.json b/package-lock.json index 676a8708..2863c67e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,8 +22,8 @@ "@mcschema/java-1.20": "^0.0.18", "@mcschema/java-1.20.2": "^0.0.7", "@mcschema/java-1.20.3": "^0.0.8", - "@mcschema/java-1.20.5": "^0.0.6", - "@mcschema/locales": "^0.1.95", + "@mcschema/java-1.20.5": "^0.0.8", + "@mcschema/locales": "^0.1.96", "@zip.js/zip.js": "^2.4.5", "brace": "^0.11.1", "buffer": "^6.0.3", @@ -668,17 +668,17 @@ } }, "node_modules/@mcschema/java-1.20.5": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/@mcschema/java-1.20.5/-/java-1.20.5-0.0.6.tgz", - "integrity": "sha512-dWrN/FBdQRdzyeIOWb+Ddb3VwoILSjjOJLeA5yFj7BCJDJCcXohHS+b98+vEQRBaMhTQl2K9tI+sxg79xIKD5g==", + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/@mcschema/java-1.20.5/-/java-1.20.5-0.0.8.tgz", + "integrity": "sha512-NHxNYu2+y981lydoW/Q1s8cogqTw6bFRxiShi+MKW4SEbClH0bz+PaWXNqfM7AVtuNb6bpgHF3YJc2UHioUoXQ==", "dependencies": { "@mcschema/core": "^0.13.0" } }, "node_modules/@mcschema/locales": { - "version": "0.1.95", - "resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.95.tgz", - "integrity": "sha512-kQcJgzpHRpjLcanOnrkXzLAwE/HqbS0KgoLm2BYWvwn/s5HsNyRttHtbtxM8E7ZRrcWP+/k2EAIejEZDVDYG8Q==" + "version": "0.1.96", + "resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.96.tgz", + "integrity": "sha512-6NudiAdnU32PJpnkpA7X16WdjhVKXhZ3DovJHIJ5V64l5EJlbmFSa3VQPe1eRvo1X2mGy0Fqrr+iSjz8RiIaxw==" }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", @@ -4777,17 +4777,17 @@ } }, "@mcschema/java-1.20.5": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/@mcschema/java-1.20.5/-/java-1.20.5-0.0.6.tgz", - "integrity": "sha512-dWrN/FBdQRdzyeIOWb+Ddb3VwoILSjjOJLeA5yFj7BCJDJCcXohHS+b98+vEQRBaMhTQl2K9tI+sxg79xIKD5g==", + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/@mcschema/java-1.20.5/-/java-1.20.5-0.0.8.tgz", + "integrity": "sha512-NHxNYu2+y981lydoW/Q1s8cogqTw6bFRxiShi+MKW4SEbClH0bz+PaWXNqfM7AVtuNb6bpgHF3YJc2UHioUoXQ==", "requires": { "@mcschema/core": "^0.13.0" } }, "@mcschema/locales": { - "version": "0.1.95", - "resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.95.tgz", - "integrity": "sha512-kQcJgzpHRpjLcanOnrkXzLAwE/HqbS0KgoLm2BYWvwn/s5HsNyRttHtbtxM8E7ZRrcWP+/k2EAIejEZDVDYG8Q==" + "version": "0.1.96", + "resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.96.tgz", + "integrity": "sha512-6NudiAdnU32PJpnkpA7X16WdjhVKXhZ3DovJHIJ5V64l5EJlbmFSa3VQPe1eRvo1X2mGy0Fqrr+iSjz8RiIaxw==" }, "@nodelib/fs.scandir": { "version": "2.1.5", diff --git a/package.json b/package.json index 258dba0c..5686acf5 100644 --- a/package.json +++ b/package.json @@ -28,8 +28,8 @@ "@mcschema/java-1.20": "^0.0.18", "@mcschema/java-1.20.2": "^0.0.7", "@mcschema/java-1.20.3": "^0.0.8", - "@mcschema/java-1.20.5": "^0.0.6", - "@mcschema/locales": "^0.1.95", + "@mcschema/java-1.20.5": "^0.0.8", + "@mcschema/locales": "^0.1.96", "@zip.js/zip.js": "^2.4.5", "brace": "^0.11.1", "buffer": "^6.0.3", diff --git a/src/app/schema/renderHtml.tsx b/src/app/schema/renderHtml.tsx index 36c66d85..b1e247e0 100644 --- a/src/app/schema/renderHtml.tsx +++ b/src/app/schema/renderHtml.tsx @@ -21,7 +21,7 @@ const hiddenFields = ['number_provider.type', 'score_provider.type', 'nbt_provid 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', 'material_rule.block.result_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', 'block_predicate.type', 'material_rule.type', 'material_condition.type', 'density_function.type', 'root_placer.type', 'entity.type_specific.type', 'glyph_provider.type', 'sprite_source.type', 'rule_block_entity_modifier.type', 'immersive_weathering.area_condition.type', 'immersive_weathering.block_growth.growth_for_face.entry.direction', 'immersive_weathering.position_test.predicate_type', 'pool_alias_binding.type', 'item_stack.id', 'data_component.banner_patterns.entry.pattern', 'data_component.container.entry.slot', 'map_decoration.type', 'suspicious_stew_effect_instance.id'] const nbtFields = ['function.set_nbt.tag', 'advancement.display.icon.nbt', 'text_component_object.nbt', 'entity.nbt', 'block.nbt', 'item.nbt'] -const fixedLists = ['generator_biome.parameters.temperature', 'generator_biome.parameters.humidity', 'generator_biome.parameters.continentalness', 'generator_biome.parameters.erosion', 'generator_biome.parameters.depth', 'generator_biome.parameters.weirdness', 'feature.end_spike.crystal_beam_target', 'feature.end_gateway.exit', 'decorator.block_filter.offset', 'block_predicate.has_sturdy_face.offset', 'block_predicate.inside_world_bounds.offset', 'block_predicate.matching_block_tag.offset', 'block_predicate.matching_blocks.offset', 'block_predicate.matching_fluids.offset', 'block_predicate.would_survive.offset', 'model_element.from', 'model_element.to', 'model_element.rotation.origin', 'model_element.faces.uv', 'item_transform.rotation', 'item_transform.translation', 'item_transform.scale', 'generator_structure.random_spread.locate_offset', 'pack_overlay.formats', 'data_component.profile.id'] +const fixedLists = ['generator_biome.parameters.temperature', 'generator_biome.parameters.humidity', 'generator_biome.parameters.continentalness', 'generator_biome.parameters.erosion', 'generator_biome.parameters.depth', 'generator_biome.parameters.weirdness', 'feature.end_spike.crystal_beam_target', 'feature.end_gateway.exit', 'decorator.block_filter.offset', 'block_predicate.has_sturdy_face.offset', 'block_predicate.inside_world_bounds.offset', 'block_predicate.matching_block_tag.offset', 'block_predicate.matching_blocks.offset', 'block_predicate.matching_fluids.offset', 'block_predicate.would_survive.offset', 'model_element.from', 'model_element.to', 'model_element.rotation.origin', 'model_element.faces.uv', 'item_transform.rotation', 'item_transform.translation', 'item_transform.scale', 'generator_structure.random_spread.locate_offset', 'pack_overlay.formats', 'data_component.profile.id', 'data_component.lodestone_tracker.tracker.pos'] const collapsedFields = ['noise_settings.surface_rule', 'noise_settings.noise.terrain_shaper'] const collapsableFields = ['density_function.argument', 'density_function.argument1', 'density_function.argument2', 'density_function.input', 'density_function.when_in_range', 'density_function.when_out_of_range'] const itemPreviewFields = ['loot_pool.entries.entry', 'loot_entry.alternatives.children.entry', 'loot_entry.group.children.entry', 'loot_entry.sequence.children.entry', 'function.set_contents.entries.entry'] diff --git a/src/config.json b/src/config.json index 67a03a7b..6e7d4c23 100644 --- a/src/config.json +++ b/src/config.json @@ -209,7 +209,8 @@ "id": "chat_type", "url": "chat-type", "schema": "chat_type", - "minVersion": "1.19" + "minVersion": "1.19", + "wiki": "https://minecraft.wiki/w/Chat_type" }, { "id": "trim_material", @@ -223,6 +224,18 @@ "schema": "trim_pattern", "minVersion": "1.19.4" }, + { + "id": "banner_pattern", + "url": "banner-pattern", + "schema": "banner_pattern", + "minVersion": "1.20.5" + }, + { + "id": "wolf_variant", + "url": "wolf-variant", + "schema": "wolf_variant", + "minVersion": "1.20.5" + }, { "id": "pack_mcmeta", "url": "pack-mcmeta", diff --git a/src/locales/en.json b/src/locales/en.json index 3ee7cb76..a03d694e 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -54,10 +54,11 @@ "generate_new_uuid": "Generate new UUID", "generator.advancement": "Advancement", "generator.atlas": "Atlas", + "generator.banner_pattern": "Banner Pattern", "generator.block_definition": "Blockstate", "generator.browse_available": "Browse available generators for %0%", "generator.chat_type": "Chat Type", - "generator.damage_type": "Damage type", + "generator.damage_type": "Damage Type", "generator.dimension": "Dimension", "generator.dimension_type": "Dimension Type", "generator.error_max_version": "This generator is not available in versions above %0%", @@ -95,6 +96,7 @@ "generator.text_component": "Text Component", "generator.trim_material": "Trim material", "generator.trim_pattern": "Trim pattern", + "generator.wolf_variant": "Wolf Variant", "generator.world": "World Settings", "generator.worldgen/biome": "Biome", "generator.worldgen/configured_carver": "Configured Carver",