diff --git a/src/app/Config.ts b/src/app/Config.ts index fab1c8f7..41780376 100644 --- a/src/app/Config.ts +++ b/src/app/Config.ts @@ -5,7 +5,6 @@ export interface ConfigLanguage { code: string, name: string, mc: string, - schemas?: boolean, } export interface ConfigVersion { diff --git a/src/app/services/DataFetcher.ts b/src/app/services/DataFetcher.ts index da7186d1..7d5a8406 100644 --- a/src/app/services/DataFetcher.ts +++ b/src/app/services/DataFetcher.ts @@ -137,7 +137,7 @@ export async function fetchPreset(versionId: VersionId, registry: string, id: st if (id.startsWith('immersive_weathering:')) { url = `https://raw.githubusercontent.com/AstralOrdana/Immersive-Weathering/main/src/main/resources/data/immersive_weathering/block_growths/${id.slice(21)}.json` } else { - const type = ['atlases', 'blockstates', 'items', 'font', 'lang', 'models', 'post_effect'].includes(registry) ? 'assets' : 'data' + const type = ['atlases', 'blockstates', 'items', 'font', 'lang', 'models', 'equipment', 'post_effect'].includes(registry) ? 'assets' : 'data' url = `${mcmeta(version, type)}/${type}/minecraft/${registry}/${id}.json` } const res = await fetch(url) @@ -152,7 +152,7 @@ export async function fetchAllPresets(versionId: VersionId, registry: string) { const version = config.versions.find(v => v.id === versionId)! await validateCache(version) try { - const type = ['atlas', 'block_definition', 'item_definition', 'model', 'font'].includes(registry) ? 'assets' : 'data' + const type = ['atlas', 'block_definition', 'item_definition', 'model', 'font', 'lang', 'equipment', 'post_effect'].includes(registry) ? 'assets' : 'data' return new Map(Object.entries(await cachedFetch(`${mcmeta(version, 'summary')}/${type}/${registry}/data.min.json`))) } catch (e) { throw new Error(`Error occurred while fetching all ${registry} presets: ${message(e)}`) diff --git a/src/config.json b/src/config.json index 5b09121e..ec973c1e 100644 --- a/src/config.json +++ b/src/config.json @@ -33,8 +33,7 @@ { "code": "ko", "name": "한국어", - "mc": "ko_kr", - "schemas": false + "mc": "ko_kr" }, { "code": "pl", @@ -54,8 +53,7 @@ { "code": "sk", "name": "Slovenčina", - "mc": "sk_sk", - "schemas": false + "mc": "sk_sk" }, { "code": "tr", @@ -551,22 +549,30 @@ "url": "assets/blockstate", "path": "blockstates", "tags": ["assets"], - "wiki": "https://minecraft.wiki/w/Tutorials/Models#Block_states" + "wiki": "https://minecraft.wiki/w/Blockstates_definition" }, { "id": "item_definition", "url": "assets/item", "path": "items", "tags": ["assets"], - "schema": "item_definition", - "minVersion": "1.21.4" + "minVersion": "1.21.4", + "wiki": "https://minecraft.wiki/w/Items_model_definition" }, { "id": "model", "url": "assets/model", "path": "models", "tags": ["assets"], - "wiki": "https://minecraft.wiki/w/Tutorials/Models" + "minVersion": "1.21.4", + "wiki": "https://minecraft.wiki/w/Model#Item_models" + }, + { + "id": "equipment", + "url": "assets/equipment", + "path": "equipment", + "tags": ["assets"], + "wiki": "https://minecraft.wiki/w/Model#Equipment_models" }, { "id": "lang", diff --git a/src/locales/en.json b/src/locales/en.json index 7fd6fcc1..973b09db 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -65,6 +65,7 @@ "generator.dimension_type": "Dimension Type", "generator.enchantment": "Enchantment", "generator.enchantment_provider": "Enchantment Provider", + "generator.equipment": "Equipment", "generator.error_max_version": "This generator is not available in versions above %0%", "generator.error_min_version": "The minimum version for this generator is %0%", "generator.font": "Font",