This commit is contained in:
Misode
2023-04-07 01:07:51 +02:00
parent 80edff8d40
commit 47e716df8a
5 changed files with 49 additions and 25 deletions

57
package-lock.json generated
View File

@@ -18,8 +18,9 @@
"@mcschema/java-1.18.2": "^0.1.17",
"@mcschema/java-1.19": "^0.1.41",
"@mcschema/java-1.19.3": "^0.0.3",
"@mcschema/java-1.19.4": "^0.1.5",
"@mcschema/locales": "^0.1.78",
"@mcschema/java-1.19.4": "^0.1.6",
"@mcschema/java-1.20": "^0.0.3",
"@mcschema/locales": "^0.1.79",
"@zip.js/zip.js": "^2.4.5",
"brace": "^0.11.1",
"buffer": "^6.0.3",
@@ -558,9 +559,9 @@
"integrity": "sha512-VMOxsWh/QDwrxPsgkSQnuZ+8mfNy1OTjzzUdLBvvZtpahwPTHTeVZ51RZRqO4xfKVrR+btIPA8D01IL3xeG66w=="
},
"node_modules/@mcschema/core": {
"version": "0.12.38",
"resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.12.38.tgz",
"integrity": "sha512-B3xgyc5GgVW1RXFNSkb4DMqBT27l8B2U8sXIV3bpEGCW29PkPKmH5HTw9Zo8+Bw0pqrT7cB2mkrXepsTY6B1gQ=="
"version": "0.12.39",
"resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.12.39.tgz",
"integrity": "sha512-IM6l5SyxkRkPnv1Zuc53ixsMIaARG9PJpRXkPp3rn8FlXvM1OU5iHEzmAMB/jLADkAl0t05Yiu6tjqhmtYAE6A=="
},
"node_modules/@mcschema/java-1.15": {
"version": "0.2.6",
@@ -619,17 +620,25 @@
}
},
"node_modules/@mcschema/java-1.19.4": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/@mcschema/java-1.19.4/-/java-1.19.4-0.1.5.tgz",
"integrity": "sha512-FSazxz2M++6XZ3OvsQG1LF81ozixaB2NNwseatSOVT9kZnTiTjyDH3LNN/y218YvDTKdBa24wYUHk7avZSXt+g==",
"version": "0.1.6",
"resolved": "https://registry.npmjs.org/@mcschema/java-1.19.4/-/java-1.19.4-0.1.6.tgz",
"integrity": "sha512-T9XGMWWdumKKzYLWZxLT7TWAOJID0NCv/k9WcYbwD2ry3hQ8Jktdf2oj472viVLvNoaTvblhuIxV1cbFaSfo+Q==",
"dependencies": {
"@mcschema/core": "^0.12.38"
}
},
"node_modules/@mcschema/java-1.20": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/@mcschema/java-1.20/-/java-1.20-0.0.3.tgz",
"integrity": "sha512-W9k3ImZSRdTXR7HUZW2JTAEW/Jp4VCedu1SLAyi3pTU19ovEr2HpgDbHTYycj4+R2IqwZjkjMsSYKznQxD/Kfw==",
"dependencies": {
"@mcschema/core": "^0.12.39"
}
},
"node_modules/@mcschema/locales": {
"version": "0.1.78",
"resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.78.tgz",
"integrity": "sha512-36olsVku2McW+bakgcv+4oYWyX+z2KelGwudEhXUUbflWp4QvPvU+W/znLKnXdDj/fAs6V5g+z3UbbHoUFGQ9w=="
"version": "0.1.79",
"resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.79.tgz",
"integrity": "sha512-y/VS3y8cLpsjtdzd0CdZiaGCZcAW4UIl2fGXrXUPBykJeSyPV772DaVfqfFTieSBrzVhzqAJjhgvMmSQbR8zUg=="
},
"node_modules/@nodelib/fs.scandir": {
"version": "2.1.5",
@@ -5703,9 +5712,9 @@
"integrity": "sha512-VMOxsWh/QDwrxPsgkSQnuZ+8mfNy1OTjzzUdLBvvZtpahwPTHTeVZ51RZRqO4xfKVrR+btIPA8D01IL3xeG66w=="
},
"@mcschema/core": {
"version": "0.12.38",
"resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.12.38.tgz",
"integrity": "sha512-B3xgyc5GgVW1RXFNSkb4DMqBT27l8B2U8sXIV3bpEGCW29PkPKmH5HTw9Zo8+Bw0pqrT7cB2mkrXepsTY6B1gQ=="
"version": "0.12.39",
"resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.12.39.tgz",
"integrity": "sha512-IM6l5SyxkRkPnv1Zuc53ixsMIaARG9PJpRXkPp3rn8FlXvM1OU5iHEzmAMB/jLADkAl0t05Yiu6tjqhmtYAE6A=="
},
"@mcschema/java-1.15": {
"version": "0.2.6",
@@ -5764,17 +5773,25 @@
}
},
"@mcschema/java-1.19.4": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/@mcschema/java-1.19.4/-/java-1.19.4-0.1.5.tgz",
"integrity": "sha512-FSazxz2M++6XZ3OvsQG1LF81ozixaB2NNwseatSOVT9kZnTiTjyDH3LNN/y218YvDTKdBa24wYUHk7avZSXt+g==",
"version": "0.1.6",
"resolved": "https://registry.npmjs.org/@mcschema/java-1.19.4/-/java-1.19.4-0.1.6.tgz",
"integrity": "sha512-T9XGMWWdumKKzYLWZxLT7TWAOJID0NCv/k9WcYbwD2ry3hQ8Jktdf2oj472viVLvNoaTvblhuIxV1cbFaSfo+Q==",
"requires": {
"@mcschema/core": "^0.12.38"
}
},
"@mcschema/java-1.20": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/@mcschema/java-1.20/-/java-1.20-0.0.3.tgz",
"integrity": "sha512-W9k3ImZSRdTXR7HUZW2JTAEW/Jp4VCedu1SLAyi3pTU19ovEr2HpgDbHTYycj4+R2IqwZjkjMsSYKznQxD/Kfw==",
"requires": {
"@mcschema/core": "^0.12.39"
}
},
"@mcschema/locales": {
"version": "0.1.78",
"resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.78.tgz",
"integrity": "sha512-36olsVku2McW+bakgcv+4oYWyX+z2KelGwudEhXUUbflWp4QvPvU+W/znLKnXdDj/fAs6V5g+z3UbbHoUFGQ9w=="
"version": "0.1.79",
"resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.79.tgz",
"integrity": "sha512-y/VS3y8cLpsjtdzd0CdZiaGCZcAW4UIl2fGXrXUPBykJeSyPV772DaVfqfFTieSBrzVhzqAJjhgvMmSQbR8zUg=="
},
"@nodelib/fs.scandir": {
"version": "2.1.5",

View File

@@ -24,8 +24,9 @@
"@mcschema/java-1.18.2": "^0.1.17",
"@mcschema/java-1.19": "^0.1.41",
"@mcschema/java-1.19.3": "^0.0.3",
"@mcschema/java-1.19.4": "^0.1.5",
"@mcschema/locales": "^0.1.78",
"@mcschema/java-1.19.4": "^0.1.6",
"@mcschema/java-1.20": "^0.0.3",
"@mcschema/locales": "^0.1.80",
"@zip.js/zip.js": "^2.4.5",
"brace": "^0.11.1",
"buffer": "^6.0.3",

View File

@@ -15,10 +15,10 @@ import { CachedDecorator, CachedFeature } from '../services/index.js'
import { deepClone, deepEqual, generateUUID, hexId, hexToRgb, isObject, newSeed, rgbToHex, stringToColor } from '../Utils.js'
import { ModelWrapper } from './ModelWrapper.js'
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', 'material_rule.type', 'material_condition.type', 'structure_placement.type', 'density_function.type', 'root_placer.type', 'entity.type_specific.cat.variant', 'entity.type_specific.frog.variant']
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', 'material_rule.type', 'material_condition.type', 'structure_placement.type', 'density_function.type', 'root_placer.type', 'entity.type_specific.cat.variant', 'entity.type_specific.frog.variant', 'rule_block_entity_modifier.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', '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', 'immersive_weathering.area_condition.type', 'immersive_weathering.block_growth.growth_for_face.entry.direction', 'immersive_weathering.position_test.predicate_type']
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']
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.matching_blocks.offset', 'block_predicate.matching_fluids.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']
const collapsedFields = ['noise_settings.surface_rule', 'noise_settings.noise.terrain_shaper']

View File

@@ -5,7 +5,7 @@ import { initPartners } from '../partners/index.js'
import { message } from '../Utils.js'
import { fetchData } from './DataFetcher.js'
export const VersionIds = ['1.15', '1.16', '1.17', '1.18', '1.18.2', '1.19', '1.19.3', '1.19.4'] as const
export const VersionIds = ['1.15', '1.16', '1.17', '1.18', '1.18.2', '1.19', '1.19.3', '1.19.4', '1.20'] as const
export type VersionId = typeof VersionIds[number]
export const DEFAULT_VERSION: VersionId = '1.19.4'
@@ -48,6 +48,7 @@ const versionGetter: {
1.19: () => import('@mcschema/java-1.19'),
'1.19.3': () => import('@mcschema/java-1.19.3'),
'1.19.4': () => import('@mcschema/java-1.19.4'),
'1.20': () => import('@mcschema/java-1.20'),
}
export let CachedDecorator: INode<any>

View File

@@ -95,6 +95,11 @@
"id": "1.19.4",
"ref": "1.19.4",
"pack_format": 12
},
{
"id": "1.20",
"dynamic": true,
"pack_format": 13
}
],
"generators": [