akanealw/misode.github.io
1
0
Fork 0
mirror of https://github.com/misode/misode.github.io.git synced 2026-04-27 08:48:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

21w41a

Browse Source
This commit is contained in:
Misode
2021-10-14 00:18:58 +02:00
parent 7a82594efc
commit ed0b415af5
7 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
package-lock.json generated
View File

@@ -9,12 +9,12 @@
"version": "1.0.0",
"license": "MIT",
"dependencies": {
"@mcschema/core": "^0.12.11",
"@mcschema/core": "^0.12.12",
"@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.8",
"@mcschema/locales": "^0.1.30",
"@mcschema/java-1.18": "^0.1.13",
"@mcschema/locales": "^0.1.32",
"deepslate": "^0.9.0-beta.2",
"howler": "^2.2.3",
"rfdc": "^1.3.0"
@@ -318,9 +318,9 @@
}
},
"node_modules/@mcschema/core": {
"version": "0.12.11",
"resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.12.11.tgz",
"integrity": "sha512-YNB9aUr7szseHfMxL/XJaAObMOZ94sXBmgu+miqdNHUSWgVMKLYBv1LJ2r5p8EY3EtULjq8YXxRxC8NYUJCEig=="
"version": "0.12.12",
"resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.12.12.tgz",
"integrity": "sha512-fS0etFZadUcFW/j8pSQrXc+gqtMsEWyRS8NXSVFdPV3w2a0uUi20eAWzHaYJcyqp20VvCBa0i8cK4y13IWu/Ow=="
},
"node_modules/@mcschema/java-1.15": {
"version": "0.2.2",
@@ -347,17 +347,17 @@
}
},
"node_modules/@mcschema/java-1.18": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/@mcschema/java-1.18/-/java-1.18-0.1.8.tgz",
"integrity": "sha512-pZhmfo42++aV5tfKJXWd9A6Ff+EB/zRdmBW4HSIc6nrBC47BN9OgIEG5BTRSC0EEMbnYfy+5AHJtd6x+Qw+6Sw==",
"version": "0.1.13",
"resolved": "https://registry.npmjs.org/@mcschema/java-1.18/-/java-1.18-0.1.13.tgz",
"integrity": "sha512-OTirbpGPxD4qaU9d39lFJuL5S+sv6WbZJe46C//xZBec1kOE8gNc+5Nc5+wtsvPWAkKVXNUCPPKv0GRsZRGLxw==",
"dependencies": {
"@mcschema/core": "^0.12.10"
"@mcschema/core": "^0.12.12"
}
},
"node_modules/@mcschema/locales": {
"version": "0.1.30",
"resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.30.tgz",
"integrity": "sha512-TN7lpGRvC6FxB+8xepYZvAh87wVDHqPa9DfWextykOqfnatlUU3DQxGGKXykJY3pZnlHrazTxCbISiUE/mVPmw=="
"version": "0.1.32",
"resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.32.tgz",
"integrity": "sha512-k7PTddKdj0FjNmQbz1zv+tJl+7sM6RNVi+yHjtEZ8MUEWsAL1Bm5V5lhqulQml5H6AnO3/z3FHzx1eli9gzlyw=="
},
"node_modules/@nodelib/fs.scandir": {
"version": "2.1.5",
@@ -2926,9 +2926,9 @@
}
},
"@mcschema/core": {
"version": "0.12.11",
"resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.12.11.tgz",
"integrity": "sha512-YNB9aUr7szseHfMxL/XJaAObMOZ94sXBmgu+miqdNHUSWgVMKLYBv1LJ2r5p8EY3EtULjq8YXxRxC8NYUJCEig=="
"version": "0.12.12",
"resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.12.12.tgz",
"integrity": "sha512-fS0etFZadUcFW/j8pSQrXc+gqtMsEWyRS8NXSVFdPV3w2a0uUi20eAWzHaYJcyqp20VvCBa0i8cK4y13IWu/Ow=="
},
"@mcschema/java-1.15": {
"version": "0.2.2",
@@ -2955,17 +2955,17 @@
}
},
"@mcschema/java-1.18": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/@mcschema/java-1.18/-/java-1.18-0.1.8.tgz",
"integrity": "sha512-pZhmfo42++aV5tfKJXWd9A6Ff+EB/zRdmBW4HSIc6nrBC47BN9OgIEG5BTRSC0EEMbnYfy+5AHJtd6x+Qw+6Sw==",
"version": "0.1.13",
"resolved": "https://registry.npmjs.org/@mcschema/java-1.18/-/java-1.18-0.1.13.tgz",
"integrity": "sha512-OTirbpGPxD4qaU9d39lFJuL5S+sv6WbZJe46C//xZBec1kOE8gNc+5Nc5+wtsvPWAkKVXNUCPPKv0GRsZRGLxw==",
"requires": {
"@mcschema/core": "^0.12.10"
"@mcschema/core": "^0.12.12"
}
},
"@mcschema/locales": {
"version": "0.1.30",
"resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.30.tgz",
"integrity": "sha512-TN7lpGRvC6FxB+8xepYZvAh87wVDHqPa9DfWextykOqfnatlUU3DQxGGKXykJY3pZnlHrazTxCbISiUE/mVPmw=="
"version": "0.1.32",
"resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.32.tgz",
"integrity": "sha512-k7PTddKdj0FjNmQbz1zv+tJl+7sM6RNVi+yHjtEZ8MUEWsAL1Bm5V5lhqulQml5H6AnO3/z3FHzx1eli9gzlyw=="
},
"@nodelib/fs.scandir": {
"version": "2.1.5",

6
package.json
View File

@@ -14,12 +14,12 @@
"author": "Misode",
"license": "MIT",
"dependencies": {
"@mcschema/core": "^0.12.11",
"@mcschema/core": "^0.12.12",
"@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.8",
"@mcschema/locales": "^0.1.30",
"@mcschema/java-1.18": "^0.1.13",
"@mcschema/locales": "^0.1.32",
"deepslate": "^0.9.0-beta.2",
"howler": "^2.2.3",
"rfdc": "^1.3.0"

5
src/app/DataFetcher.ts
View File

@@ -164,6 +164,11 @@ export async function fetchPreset(version: VersionId, registry: string, id: stri
try {
const url = `${vanillaDatapackUrl}/${versionData.refs.vanilla_datapack_data}/data/minecraft/${registry}/${id}.json`
const res = await fetch(url)
if (registry === 'worldgen/noise_settings' && version === '1.18') {
let text = await res.text()
text = text.replaceAll('"max_threshold": Infinity', '"max_threshold": 100')
return JSON.parse(text)
}
return await res.json()
} catch (e) {
console.warn(`Error occurred while fetching ${registry} preset ${id}:`, message(e))

4
src/app/Schemas.ts
View File

@@ -100,7 +100,9 @@ export async function getModel(version: VersionId, id: string): Promise<DataMode
}
Models[id] = { model, version }
} catch (e) {
throw new Error(`Cannot get generator "${id}" for version "${version}": ${message(e)}`)
const err = new Error(`Cannot get generator "${id}" for version "${version}": ${message(e)}`)
if (e instanceof Error) err.stack = e.stack
throw err
}
}
return Models[id].model

2
src/app/pages/Generator.tsx
View File

@@ -36,7 +36,7 @@ export function Generator({ lang, changeTitle, version, changeVersion }: Generat
}, [gen.id, version])
const allowedVersions = config.versions
.filter(v => checkVersion(v.id, gen.minVersion))
.filter(v => checkVersion(v.id, gen.minVersion, gen.maxVersion))
.map(v => v.id as VersionId)
changeTitle(loc('title.generator', loc(gen.id)), allowedVersions)

6
src/app/schema/renderHtml.tsx
View File

@@ -12,10 +12,10 @@ 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', '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 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']
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', 'block_predicate.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']
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']

7
src/config.json
View File

@@ -176,7 +176,8 @@
"url": "worldgen/surface-builder",
"category": "worldgen",
"schema": "configured_surface_builder",
"minVersion": "1.16"
"minVersion": "1.16",
"maxVersion": "1.17"
},
{
"id": "worldgen/processor_list",
@@ -246,12 +247,14 @@
{ "id": "worldgen/feature", "minVersion": "1.16" },
{ "id": "worldgen/feature_size_type", "minVersion": "1.16" },
{ "id": "worldgen/foliage_placer_type", "minVersion": "1.16" },
{ "id": "worldgen/material_condition", "minVersion": "1.18" },
{ "id": "worldgen/material_rule", "minVersion": "1.18" },
{ "id": "worldgen/noise_settings", "minVersion": "1.16" , "dynamic": true },
{ "id": "worldgen/processor_list", "minVersion": "1.16" , "dynamic": true },
{ "id": "worldgen/structure_feature", "minVersion": "1.16" },
{ "id": "worldgen/structure_pool_element", "minVersion": "1.16" },
{ "id": "worldgen/structure_processor", "minVersion": "1.16" },
{ "id": "worldgen/surface_builder", "minVersion": "1.16" },
{ "id": "worldgen/surface_builder", "minVersion": "1.16", "maxVersion": "1.17" },
{ "id": "worldgen/template_pool", "minVersion": "1.16" , "dynamic": true },
{ "id": "worldgen/tree_decorator_type", "minVersion": "1.16" },
{ "id": "worldgen/trunk_placer_type", "minVersion": "1.16" },