From 52074d1e1789c9815c509c835722079f37627279 Mon Sep 17 00:00:00 2001 From: TATHAN Date: Thu, 26 Dec 2024 14:28:48 +0100 Subject: [PATCH 01/11] Added Custom Sky generator --- public/mcdoc/sky_aesthetics.mcdoc | 100 ++++++++++++++++++++++++++++++ src/config.json | 9 +++ src/locales/en.json | 2 + 3 files changed, 111 insertions(+) create mode 100644 public/mcdoc/sky_aesthetics.mcdoc diff --git a/public/mcdoc/sky_aesthetics.mcdoc b/public/mcdoc/sky_aesthetics.mcdoc new file mode 100644 index 000000000..2a385713d --- /dev/null +++ b/public/mcdoc/sky_aesthetics.mcdoc @@ -0,0 +1,100 @@ + +dispatch minecraft:resource[sky_aesthetics:sky] to struct SkyProperties { + world: #[id="dimension"] string, + id?: string, + cloud_settings: CloudSettings, + fog_settings?: FogSettings, + rain: boolean, + custom_vanilla_objects: CustomVanillaObjects, + stars: Star, + /// The R, G and B value for the color + sunrise_color?: [float] @ 3, + sunrise_alpha_modifier?: float, + sky_type: SkyType, + sky_color: struct { + custom_color: boolean, + /// The R, G and B value for the color + color: [float] @ 3 + }, + sky_objects: [SkyObject], + constellations: [string], + condition: RenderCondition + +} + +struct CloudSettings { + cloud: boolean, + cloud_height: int, + /// The R, G and B value for the color + cloud_color?: struct CustomCloudColor { + base_color: [double] @ 3, + storm_color: [double] @ 3, + rain_color: [double] @ 3, + always_base_color: boolean + } +} + +struct FogSettings { + fog: boolean, + /// The R, G, B and alpha value for the color + fog_color: [float] @ 4, + fog_density: [float] @ 2, +} + +struct CustomVanillaObjects { + sun: boolean, + sun_texture: string, + sun_height: int, + sun_size: int, + moon: boolean, + moon_phase: boolean, + moon_texture: string, + moon_height: int, + moon_size: int, +} + +struct Star { + vanilla: boolean, + moving_stars: boolean, + count: int, + all_days_visible: boolean, + scale: float, + /// The R, G and B value for the color + color: [float] @ 3, + shooting_stars? : struct shootingStars { + percentage: int, + random_lifetime: [double] @ 2, + scale: float, + speed: float, + color: [double] @ 3, + rotation?: int + } +} + +struct SkyObject { + texture: string, + blend: boolean, + size: float, + height: int, + rotation: [float] @ 3, + rotation_type: RotationType +} + +struct RenderCondition { + condition: boolean, + biome?: #[id="worldgen/biome"] string, + biomes?: #[id(registry="worldgen/biome",tags=allowed)] string, + +} + +enum(string) SkyType { + #[starred] Overworld = "OVERWORLD", + None = "NONE", + End = "END" +} + +enum(string) RotationType { + Day = "DAY", + Night = "NIGHT", + Fixed = "FIXED" +} diff --git a/src/config.json b/src/config.json index 4b82a0d77..5d260afc5 100644 --- a/src/config.json +++ b/src/config.json @@ -711,6 +711,15 @@ "dependency": "ohthetreesyoullgrow", "minVersion": "1.20", "wiki": "https://github.com/CorgiTaco/Oh-The-Trees-Youll-Grow/wiki/Generating-Your-Tree-With-Data-Packs!" + }, + { + "id": "sky_aesthetics:sky", + "url": "sky_aesthetics/sky", + "path": "sky_aesthetics/sky", + "tags": ["partners"], + "dependency": "sky_aesthetics", + "minVersion": "1.21.3", + "wiki": "https://github.com/TathanDev/SkyAesthetics/wiki/Custom-Sky" } ], "legacyGuides": [ diff --git a/src/locales/en.json b/src/locales/en.json index fbe5b0e53..e9f702bcb 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -95,6 +95,7 @@ "generator.neoforge:structure_modifier": "Structure Modifier", "generator.not_found": "Cannot find generator \"%0%\"", "generator.ohthetreesyoullgrow:configured_feature": "OTTYG Feature", + "generator.sky_aesthetics:sky": "Custom Sky", "generator.pack_mcmeta": "Pack.mcmeta", "generator.painting_variant": "Painting Variant", "generator.post_effect": "Post Effect", @@ -185,6 +186,7 @@ "partner.neoforge": "NeoForge", "partner.obsidian": "Obsidian", "partner.ohthetreesyoullgrow": "Oh The Trees You'll Grow", + "partner.sky_aesthetics": "Sky Aesthetics", "presets": "Presets", "preview": "Visualize", "preview.auto_scroll": "Auto scroll", From 83db2ef6ddea2fb212175bb9e86fca8bcdc24c32 Mon Sep 17 00:00:00 2001 From: TATHAN Date: Thu, 26 Dec 2024 21:08:32 +0100 Subject: [PATCH 02/11] Added 1.21.1 support --- public/mcdoc/sky_aesthetics.mcdoc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/public/mcdoc/sky_aesthetics.mcdoc b/public/mcdoc/sky_aesthetics.mcdoc index 2a385713d..03cb8eb01 100644 --- a/public/mcdoc/sky_aesthetics.mcdoc +++ b/public/mcdoc/sky_aesthetics.mcdoc @@ -13,8 +13,15 @@ dispatch minecraft:resource[sky_aesthetics:sky] to struct SkyProperties { sky_type: SkyType, sky_color: struct { custom_color: boolean, + + /// The R, G, B and alpha value for the color + #[until="1.21.2"] + color: [float] @ 4, + /// The R, G and B value for the color - color: [float] @ 3 + #[since="1.21.3"] + color: [float] @ 3 , + }, sky_objects: [SkyObject], constellations: [string], From 8f53a466ad8755de2501120ec3cd628a5520ec77 Mon Sep 17 00:00:00 2001 From: TATHAN Date: Thu, 26 Dec 2024 21:12:57 +0100 Subject: [PATCH 03/11] fix config --- src/config.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/config.json b/src/config.json index 5d260afc5..45846bf46 100644 --- a/src/config.json +++ b/src/config.json @@ -715,10 +715,10 @@ { "id": "sky_aesthetics:sky", "url": "sky_aesthetics/sky", - "path": "sky_aesthetics/sky", - "tags": ["partners"], + "path": "sky", + "tags": ["partners", "assets"], "dependency": "sky_aesthetics", - "minVersion": "1.21.3", + "minVersion": "1.21.1", "wiki": "https://github.com/TathanDev/SkyAesthetics/wiki/Custom-Sky" } ], From e4d6f0c341475971ede746c26036a79fb5d22373 Mon Sep 17 00:00:00 2001 From: TATHAN Date: Thu, 26 Dec 2024 21:19:29 +0100 Subject: [PATCH 04/11] revert config change --- public/mcdoc/sky_aesthetics.mcdoc | 1 - src/config.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/public/mcdoc/sky_aesthetics.mcdoc b/public/mcdoc/sky_aesthetics.mcdoc index 03cb8eb01..9ff907ea2 100644 --- a/public/mcdoc/sky_aesthetics.mcdoc +++ b/public/mcdoc/sky_aesthetics.mcdoc @@ -17,7 +17,6 @@ dispatch minecraft:resource[sky_aesthetics:sky] to struct SkyProperties { /// The R, G, B and alpha value for the color #[until="1.21.2"] color: [float] @ 4, - /// The R, G and B value for the color #[since="1.21.3"] color: [float] @ 3 , diff --git a/src/config.json b/src/config.json index 45846bf46..616e8b67a 100644 --- a/src/config.json +++ b/src/config.json @@ -716,7 +716,7 @@ "id": "sky_aesthetics:sky", "url": "sky_aesthetics/sky", "path": "sky", - "tags": ["partners", "assets"], + "tags": ["partners"], "dependency": "sky_aesthetics", "minVersion": "1.21.1", "wiki": "https://github.com/TathanDev/SkyAesthetics/wiki/Custom-Sky" From 04ef00b572d3810483aaaf60bdaf43dd17954ced Mon Sep 17 00:00:00 2001 From: Misode Date: Fri, 27 Dec 2024 00:48:21 +0100 Subject: [PATCH 05/11] Fix assets config not working --- package-lock.json | 126 +++++++++++++++++------------------ package.json | 10 +-- src/app/services/Spyglass.ts | 1 + src/config.json | 2 +- 4 files changed, 70 insertions(+), 69 deletions(-) diff --git a/package-lock.json b/package-lock.json index ad98a0f3a..8acbb9f47 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,12 +10,12 @@ "license": "MIT", "dependencies": { "@giscus/react": "^2.2.3", - "@spyglassmc/core": "^0.4.16", - "@spyglassmc/java-edition": "^0.3.22", - "@spyglassmc/json": "^0.3.19", + "@spyglassmc/core": "^0.4.17", + "@spyglassmc/java-edition": "^0.3.23", + "@spyglassmc/json": "^0.3.20", "@spyglassmc/locales": "^0.3.10", - "@spyglassmc/mcdoc": "^0.3.20", - "@spyglassmc/nbt": "^0.3.20", + "@spyglassmc/mcdoc": "^0.3.21", + "@spyglassmc/nbt": "^0.3.21", "@zip.js/zip.js": "^2.4.5", "brace": "^0.11.1", "buffer": "^6.0.3", @@ -742,9 +742,9 @@ } }, "node_modules/@spyglassmc/core": { - "version": "0.4.16", - "resolved": "https://registry.npmjs.org/@spyglassmc/core/-/core-0.4.16.tgz", - "integrity": "sha512-OA8mPp8TZQ9QQ/tee33UQglD3hEsJ6cbASagjLCskd7CPr2TVncRcuoUvRS955+eS0TW9I/+inhfgm8x5bwKig==", + "version": "0.4.17", + "resolved": "https://registry.npmjs.org/@spyglassmc/core/-/core-0.4.17.tgz", + "integrity": "sha512-9i+TBilUGv00H3kdRd5C7cVTv4qPXuVo3TH4TKPELqEn1sKNu4HPZQXT83Ux6bSOpD3YOqGXoFX0XqnBIa/soQ==", "dependencies": { "@spyglassmc/locales": "0.3.10", "base64-arraybuffer": "^1.0.2", @@ -760,26 +760,26 @@ } }, "node_modules/@spyglassmc/java-edition": { - "version": "0.3.22", - "resolved": "https://registry.npmjs.org/@spyglassmc/java-edition/-/java-edition-0.3.22.tgz", - "integrity": "sha512-KGdK1flAmuebffQ5TioLF4+f7uSUlViL4cZM9MRaVou4In+8hvpvZ6Tnta7Xc3IGvJuvZbbnuMRRDhYVUTDa7g==", + "version": "0.3.23", + "resolved": "https://registry.npmjs.org/@spyglassmc/java-edition/-/java-edition-0.3.23.tgz", + "integrity": "sha512-yhkuMT7nMJjQbStNgDp7rAd1BoJj5dJwWQIsvklwpk67Upqd5lyu0H50uewCd3PfN7iG62V11hPpV9yOJ3wANA==", "dependencies": { - "@spyglassmc/core": "0.4.16", - "@spyglassmc/json": "0.3.19", + "@spyglassmc/core": "0.4.17", + "@spyglassmc/json": "0.3.20", "@spyglassmc/locales": "0.3.10", - "@spyglassmc/mcdoc": "0.3.20", - "@spyglassmc/mcfunction": "0.2.18", - "@spyglassmc/nbt": "0.3.20" + "@spyglassmc/mcdoc": "0.3.21", + "@spyglassmc/mcfunction": "0.2.19", + "@spyglassmc/nbt": "0.3.21" } }, "node_modules/@spyglassmc/json": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/@spyglassmc/json/-/json-0.3.19.tgz", - "integrity": "sha512-4sJN4OlX+/t3g2xSJjozUKy7PGPw008zX702B8I7NxzjHcNZAia5+BL1E1lbsmh6fF1j6IqitoBlVtEgP93lRw==", + "version": "0.3.20", + "resolved": "https://registry.npmjs.org/@spyglassmc/json/-/json-0.3.20.tgz", + "integrity": "sha512-vbu6hic7sYnvDpmM2yb1yyA9rMZku2CCl+DC9zrWFfd2WSB/PGiBGY4d+L9azbbX+VhVf+Fg9y9//cZ/ttQM0Q==", "dependencies": { - "@spyglassmc/core": "0.4.16", + "@spyglassmc/core": "0.4.17", "@spyglassmc/locales": "0.3.10", - "@spyglassmc/mcdoc": "0.3.20" + "@spyglassmc/mcdoc": "0.3.21" } }, "node_modules/@spyglassmc/locales": { @@ -788,31 +788,31 @@ "integrity": "sha512-FzwmnX9+/OXsgD+EhsTBsloOKAYoaKYR3vVlEReNXtJuxtP08dufkSvDJBSSssgsd4iqi3/cA5ODJy6bUgj4+w==" }, "node_modules/@spyglassmc/mcdoc": { - "version": "0.3.20", - "resolved": "https://registry.npmjs.org/@spyglassmc/mcdoc/-/mcdoc-0.3.20.tgz", - "integrity": "sha512-yc5EJZYHQYAXLenKlwdYoSKqLKJKdYExP+/J+ahjzLn42XPQGW2No+1ayKmIgvT9uXGmyPKLLUhbLV2QY0bVTQ==", + "version": "0.3.21", + "resolved": "https://registry.npmjs.org/@spyglassmc/mcdoc/-/mcdoc-0.3.21.tgz", + "integrity": "sha512-9BiM8RKgk9gMFvIef+TA7exCd/VTcF5CuQq5ZB9ufWlRZqEWUvjtdn3O06MPOZ3uASgS/owDgGK5XF+etsww+g==", "dependencies": { - "@spyglassmc/core": "0.4.16", + "@spyglassmc/core": "0.4.17", "@spyglassmc/locales": "0.3.10" } }, "node_modules/@spyglassmc/mcfunction": { - "version": "0.2.18", - "resolved": "https://registry.npmjs.org/@spyglassmc/mcfunction/-/mcfunction-0.2.18.tgz", - "integrity": "sha512-CS9OtJ79Gn0XhIVDZjQ0//8P0Tt8PzcW0wE7IAx/v/5bWSoBGrrn2Or4lsyyhvKXfIaBh6cNEjW2U5rTUb2asg==", + "version": "0.2.19", + "resolved": "https://registry.npmjs.org/@spyglassmc/mcfunction/-/mcfunction-0.2.19.tgz", + "integrity": "sha512-bq+Xa/tPZqhOR83aHQeMqo2YSzbVGP5eyBaLTEtUdbwTSRy61bbO1sz5wC1ODTqSvv9vw0dw/1wl5o4mu/5haQ==", "dependencies": { - "@spyglassmc/core": "0.4.16", + "@spyglassmc/core": "0.4.17", "@spyglassmc/locales": "0.3.10" } }, "node_modules/@spyglassmc/nbt": { - "version": "0.3.20", - "resolved": "https://registry.npmjs.org/@spyglassmc/nbt/-/nbt-0.3.20.tgz", - "integrity": "sha512-FiY47F5hfeFW+05C3zI2m9y/3uCX7nGf/3EmTFm/XFIrZvMYBVqcD4xcJUPnX17/N7iz0SMmpPhAUQ6kamkn2A==", + "version": "0.3.21", + "resolved": "https://registry.npmjs.org/@spyglassmc/nbt/-/nbt-0.3.21.tgz", + "integrity": "sha512-ImYlk7vyyJ1M4g9r4WHytUVoDmxvIUcawa6vc8bvfItqiOCvBkfc9BA4uE1pug7oNFM9+Z+TSAF5uNV41B4qAw==", "dependencies": { - "@spyglassmc/core": "0.4.16", + "@spyglassmc/core": "0.4.17", "@spyglassmc/locales": "0.3.10", - "@spyglassmc/mcdoc": "0.3.20" + "@spyglassmc/mcdoc": "0.3.21" } }, "node_modules/@types/diff": { @@ -5185,9 +5185,9 @@ } }, "@spyglassmc/core": { - "version": "0.4.16", - "resolved": "https://registry.npmjs.org/@spyglassmc/core/-/core-0.4.16.tgz", - "integrity": "sha512-OA8mPp8TZQ9QQ/tee33UQglD3hEsJ6cbASagjLCskd7CPr2TVncRcuoUvRS955+eS0TW9I/+inhfgm8x5bwKig==", + "version": "0.4.17", + "resolved": "https://registry.npmjs.org/@spyglassmc/core/-/core-0.4.17.tgz", + "integrity": "sha512-9i+TBilUGv00H3kdRd5C7cVTv4qPXuVo3TH4TKPELqEn1sKNu4HPZQXT83Ux6bSOpD3YOqGXoFX0XqnBIa/soQ==", "requires": { "@spyglassmc/locales": "0.3.10", "base64-arraybuffer": "^1.0.2", @@ -5203,26 +5203,26 @@ } }, "@spyglassmc/java-edition": { - "version": "0.3.22", - "resolved": "https://registry.npmjs.org/@spyglassmc/java-edition/-/java-edition-0.3.22.tgz", - "integrity": "sha512-KGdK1flAmuebffQ5TioLF4+f7uSUlViL4cZM9MRaVou4In+8hvpvZ6Tnta7Xc3IGvJuvZbbnuMRRDhYVUTDa7g==", + "version": "0.3.23", + "resolved": "https://registry.npmjs.org/@spyglassmc/java-edition/-/java-edition-0.3.23.tgz", + "integrity": "sha512-yhkuMT7nMJjQbStNgDp7rAd1BoJj5dJwWQIsvklwpk67Upqd5lyu0H50uewCd3PfN7iG62V11hPpV9yOJ3wANA==", "requires": { - "@spyglassmc/core": "0.4.16", - "@spyglassmc/json": "0.3.19", + "@spyglassmc/core": "0.4.17", + "@spyglassmc/json": "0.3.20", "@spyglassmc/locales": "0.3.10", - "@spyglassmc/mcdoc": "0.3.20", - "@spyglassmc/mcfunction": "0.2.18", - "@spyglassmc/nbt": "0.3.20" + "@spyglassmc/mcdoc": "0.3.21", + "@spyglassmc/mcfunction": "0.2.19", + "@spyglassmc/nbt": "0.3.21" } }, "@spyglassmc/json": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/@spyglassmc/json/-/json-0.3.19.tgz", - "integrity": "sha512-4sJN4OlX+/t3g2xSJjozUKy7PGPw008zX702B8I7NxzjHcNZAia5+BL1E1lbsmh6fF1j6IqitoBlVtEgP93lRw==", + "version": "0.3.20", + "resolved": "https://registry.npmjs.org/@spyglassmc/json/-/json-0.3.20.tgz", + "integrity": "sha512-vbu6hic7sYnvDpmM2yb1yyA9rMZku2CCl+DC9zrWFfd2WSB/PGiBGY4d+L9azbbX+VhVf+Fg9y9//cZ/ttQM0Q==", "requires": { - "@spyglassmc/core": "0.4.16", + "@spyglassmc/core": "0.4.17", "@spyglassmc/locales": "0.3.10", - "@spyglassmc/mcdoc": "0.3.20" + "@spyglassmc/mcdoc": "0.3.21" } }, "@spyglassmc/locales": { @@ -5231,31 +5231,31 @@ "integrity": "sha512-FzwmnX9+/OXsgD+EhsTBsloOKAYoaKYR3vVlEReNXtJuxtP08dufkSvDJBSSssgsd4iqi3/cA5ODJy6bUgj4+w==" }, "@spyglassmc/mcdoc": { - "version": "0.3.20", - "resolved": "https://registry.npmjs.org/@spyglassmc/mcdoc/-/mcdoc-0.3.20.tgz", - "integrity": "sha512-yc5EJZYHQYAXLenKlwdYoSKqLKJKdYExP+/J+ahjzLn42XPQGW2No+1ayKmIgvT9uXGmyPKLLUhbLV2QY0bVTQ==", + "version": "0.3.21", + "resolved": "https://registry.npmjs.org/@spyglassmc/mcdoc/-/mcdoc-0.3.21.tgz", + "integrity": "sha512-9BiM8RKgk9gMFvIef+TA7exCd/VTcF5CuQq5ZB9ufWlRZqEWUvjtdn3O06MPOZ3uASgS/owDgGK5XF+etsww+g==", "requires": { - "@spyglassmc/core": "0.4.16", + "@spyglassmc/core": "0.4.17", "@spyglassmc/locales": "0.3.10" } }, "@spyglassmc/mcfunction": { - "version": "0.2.18", - "resolved": "https://registry.npmjs.org/@spyglassmc/mcfunction/-/mcfunction-0.2.18.tgz", - "integrity": "sha512-CS9OtJ79Gn0XhIVDZjQ0//8P0Tt8PzcW0wE7IAx/v/5bWSoBGrrn2Or4lsyyhvKXfIaBh6cNEjW2U5rTUb2asg==", + "version": "0.2.19", + "resolved": "https://registry.npmjs.org/@spyglassmc/mcfunction/-/mcfunction-0.2.19.tgz", + "integrity": "sha512-bq+Xa/tPZqhOR83aHQeMqo2YSzbVGP5eyBaLTEtUdbwTSRy61bbO1sz5wC1ODTqSvv9vw0dw/1wl5o4mu/5haQ==", "requires": { - "@spyglassmc/core": "0.4.16", + "@spyglassmc/core": "0.4.17", "@spyglassmc/locales": "0.3.10" } }, "@spyglassmc/nbt": { - "version": "0.3.20", - "resolved": "https://registry.npmjs.org/@spyglassmc/nbt/-/nbt-0.3.20.tgz", - "integrity": "sha512-FiY47F5hfeFW+05C3zI2m9y/3uCX7nGf/3EmTFm/XFIrZvMYBVqcD4xcJUPnX17/N7iz0SMmpPhAUQ6kamkn2A==", + "version": "0.3.21", + "resolved": "https://registry.npmjs.org/@spyglassmc/nbt/-/nbt-0.3.21.tgz", + "integrity": "sha512-ImYlk7vyyJ1M4g9r4WHytUVoDmxvIUcawa6vc8bvfItqiOCvBkfc9BA4uE1pug7oNFM9+Z+TSAF5uNV41B4qAw==", "requires": { - "@spyglassmc/core": "0.4.16", + "@spyglassmc/core": "0.4.17", "@spyglassmc/locales": "0.3.10", - "@spyglassmc/mcdoc": "0.3.20" + "@spyglassmc/mcdoc": "0.3.21" } }, "@types/diff": { diff --git a/package.json b/package.json index 1f92c0463..1ae4d4d4b 100644 --- a/package.json +++ b/package.json @@ -16,12 +16,12 @@ "license": "MIT", "dependencies": { "@giscus/react": "^2.2.3", - "@spyglassmc/core": "^0.4.16", - "@spyglassmc/java-edition": "^0.3.22", - "@spyglassmc/json": "^0.3.19", + "@spyglassmc/core": "^0.4.17", + "@spyglassmc/java-edition": "^0.3.23", + "@spyglassmc/json": "^0.3.20", "@spyglassmc/locales": "^0.3.10", - "@spyglassmc/mcdoc": "^0.3.20", - "@spyglassmc/nbt": "^0.3.20", + "@spyglassmc/mcdoc": "^0.3.21", + "@spyglassmc/nbt": "^0.3.21", "@zip.js/zip.js": "^2.4.5", "brace": "^0.11.1", "buffer": "^6.0.3", diff --git a/src/app/services/Spyglass.ts b/src/app/services/Spyglass.ts index 16e9c19b7..bc338f5e5 100644 --- a/src/app/services/Spyglass.ts +++ b/src/app/services/Spyglass.ts @@ -314,6 +314,7 @@ export class SpyglassService { ...Object.fromEntries(siteConfig.generators.filter(gen => gen.dependency).map(gen => [gen.path ?? gen.id, { category: gen.id, + pack: gen.tags?.includes('assets') ? 'assets' : 'data', }] )), }, diff --git a/src/config.json b/src/config.json index 616e8b67a..45846bf46 100644 --- a/src/config.json +++ b/src/config.json @@ -716,7 +716,7 @@ "id": "sky_aesthetics:sky", "url": "sky_aesthetics/sky", "path": "sky", - "tags": ["partners"], + "tags": ["partners", "assets"], "dependency": "sky_aesthetics", "minVersion": "1.21.1", "wiki": "https://github.com/TathanDev/SkyAesthetics/wiki/Custom-Sky" From d9b570aebb697dbe1de9188ae47780fe67ea8b90 Mon Sep 17 00:00:00 2001 From: TATHAN Date: Fri, 27 Dec 2024 11:45:20 +0100 Subject: [PATCH 06/11] update url --- src/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.json b/src/config.json index 490eee21e..378204063 100644 --- a/src/config.json +++ b/src/config.json @@ -722,7 +722,7 @@ }, { "id": "sky_aesthetics:sky", - "url": "sky_aesthetics/sky", + "url": "sky-aesthetics/sky", "path": "sky", "tags": ["partners", "assets"], "dependency": "sky_aesthetics", From ea649a8f49f801bfdf2dce14586d334b2791ffe9 Mon Sep 17 00:00:00 2001 From: Misode Date: Fri, 27 Dec 2024 22:42:27 +0100 Subject: [PATCH 07/11] Fix merge conflict --- src/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/en.json b/src/locales/en.json index 754980a4c..c63c847c9 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -97,7 +97,7 @@ "generator.not_found": "Cannot find generator \"%0%\"", "generator.ohthetreesyoullgrow:configured_feature": "OTTYG Feature", "generator.sky_aesthetics:sky": "Custom Sky", - "generator.pack_mcmeta": "Pack.mcmeta", + "generator.pack_mcmeta": "pack.mcmeta", "generator.painting_variant": "Painting Variant", "generator.post_effect": "Post Effect", "generator.predicate": "Predicate", From 3eff444ec5690d7cb9bab839024b6c19a52e8acf Mon Sep 17 00:00:00 2001 From: TATHAN Date: Thu, 27 Mar 2025 18:58:01 +0100 Subject: [PATCH 08/11] Update sky aesthetics mcdoc --- public/mcdoc/sky_aesthetics.mcdoc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/public/mcdoc/sky_aesthetics.mcdoc b/public/mcdoc/sky_aesthetics.mcdoc index 9ff907ea2..cbc3a20e4 100644 --- a/public/mcdoc/sky_aesthetics.mcdoc +++ b/public/mcdoc/sky_aesthetics.mcdoc @@ -2,10 +2,10 @@ dispatch minecraft:resource[sky_aesthetics:sky] to struct SkyProperties { world: #[id="dimension"] string, id?: string, - cloud_settings: CloudSettings, + cloud_settings?: CloudSettings, fog_settings?: FogSettings, rain: boolean, - custom_vanilla_objects: CustomVanillaObjects, + custom_vanilla_objects?: CustomVanillaObjects, stars: Star, /// The R, G and B value for the color sunrise_color?: [float] @ 3, @@ -16,10 +16,10 @@ dispatch minecraft:resource[sky_aesthetics:sky] to struct SkyProperties { /// The R, G, B and alpha value for the color #[until="1.21.2"] - color: [float] @ 4, + color?: [float] @ 4, /// The R, G and B value for the color #[since="1.21.3"] - color: [float] @ 3 , + color?: [float] @ 3 , }, sky_objects: [SkyObject], @@ -30,7 +30,7 @@ dispatch minecraft:resource[sky_aesthetics:sky] to struct SkyProperties { struct CloudSettings { cloud: boolean, - cloud_height: int, + cloud_height?: int, /// The R, G and B value for the color cloud_color?: struct CustomCloudColor { base_color: [double] @ 3, @@ -49,14 +49,14 @@ struct FogSettings { struct CustomVanillaObjects { sun: boolean, - sun_texture: string, - sun_height: int, - sun_size: int, + sun_texture?: string, + sun_height?: int, + sun_size?: int, moon: boolean, moon_phase: boolean, - moon_texture: string, - moon_height: int, - moon_size: int, + moon_texture?: string, + moon_height?: int, + moon_size?: int, } struct Star { From 5c8efde75fb63d4e4e84a6a95b15dd9c3c65c831 Mon Sep 17 00:00:00 2001 From: TATHAN Date: Thu, 27 Mar 2025 19:17:25 +0100 Subject: [PATCH 09/11] add object rotation --- public/mcdoc/sky_aesthetics.mcdoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/mcdoc/sky_aesthetics.mcdoc b/public/mcdoc/sky_aesthetics.mcdoc index cbc3a20e4..773da0e98 100644 --- a/public/mcdoc/sky_aesthetics.mcdoc +++ b/public/mcdoc/sky_aesthetics.mcdoc @@ -82,7 +82,8 @@ struct SkyObject { blend: boolean, size: float, height: int, - rotation: [float] @ 3, + rotation: [int] @ 3, + object_rotation: [float] @ 3, rotation_type: RotationType } From 7e8eaf46008fe5a521d99f5979eabf49e1d1a651 Mon Sep 17 00:00:00 2001 From: TATHAN Date: Thu, 27 Mar 2025 19:21:07 +0100 Subject: [PATCH 10/11] update SkyType --- public/mcdoc/sky_aesthetics.mcdoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/mcdoc/sky_aesthetics.mcdoc b/public/mcdoc/sky_aesthetics.mcdoc index 773da0e98..be17ec130 100644 --- a/public/mcdoc/sky_aesthetics.mcdoc +++ b/public/mcdoc/sky_aesthetics.mcdoc @@ -95,7 +95,11 @@ struct RenderCondition { } enum(string) SkyType { + #[until="1.21.3"] #[starred] Overworld = "OVERWORLD", + + #[until="1.21"] + #[starred] Normal = "NORMAL", None = "NONE", End = "END" } From af59d4c4f6de01156059627bb84f5889da6163e2 Mon Sep 17 00:00:00 2001 From: TATHAN Date: Thu, 27 Mar 2025 19:22:45 +0100 Subject: [PATCH 11/11] Fix SkyType --- public/mcdoc/sky_aesthetics.mcdoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/mcdoc/sky_aesthetics.mcdoc b/public/mcdoc/sky_aesthetics.mcdoc index be17ec130..85d15498b 100644 --- a/public/mcdoc/sky_aesthetics.mcdoc +++ b/public/mcdoc/sky_aesthetics.mcdoc @@ -95,10 +95,10 @@ struct RenderCondition { } enum(string) SkyType { - #[until="1.21.3"] + #[since="1.21.3"] #[starred] Overworld = "OVERWORLD", - - #[until="1.21"] + + #[until="1.21.2"] #[starred] Normal = "NORMAL", None = "NONE", End = "END"