From f57413ca94575727529273c4d6a87a92e15ac6ef Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 30 Jun 2025 17:11:43 +0100 Subject: [PATCH] dimension settings, planet renderer, etc --- .../{moon_orbit.json => earth_orbit.json} | 20 ++-- .../ad_astra/planet_renderers/mars_orbit.json | 93 ------------------- .../ad_astra/planet_renderers/moon.json | 2 +- .../data/ad_astra/dimension/earth_orbit.json | 11 +++ kubejs/data/ad_astra/dimension/moon.json | 2 +- kubejs/data/tfg/dimension_type/moon.json | 6 +- kubejs/data/tfg/dimension_type/orbit.json | 25 +++++ 7 files changed, 51 insertions(+), 108 deletions(-) rename kubejs/assets/ad_astra/planet_renderers/{moon_orbit.json => earth_orbit.json} (90%) delete mode 100644 kubejs/assets/ad_astra/planet_renderers/mars_orbit.json create mode 100644 kubejs/data/ad_astra/dimension/earth_orbit.json create mode 100644 kubejs/data/tfg/dimension_type/orbit.json diff --git a/kubejs/assets/ad_astra/planet_renderers/moon_orbit.json b/kubejs/assets/ad_astra/planet_renderers/earth_orbit.json similarity index 90% rename from kubejs/assets/ad_astra/planet_renderers/moon_orbit.json rename to kubejs/assets/ad_astra/planet_renderers/earth_orbit.json index 915a42096..e03b24d23 100644 --- a/kubejs/assets/ad_astra/planet_renderers/moon_orbit.json +++ b/kubejs/assets/ad_astra/planet_renderers/earth_orbit.json @@ -2,14 +2,14 @@ "custom_clouds": true, "custom_sky": true, "custom_weather": false, - "dimension": "ad_astra:moon_orbit", + "dimension": "ad_astra:earth_orbit", "has_fog": false, "has_thick_fog": false, "render_in_rain": true, "sky_renderables": [ { "back_light_color": -39, - "back_light_scale": 27.0, + "back_light_scale": 30.0, "blend": false, "global_rotation": [ 0.0, @@ -22,11 +22,11 @@ 0.0 ], "movement_type": "TIME_OF_DAY", - "scale": 9.0, + "scale": 10.0, "texture": "ad_astra:textures/environment/sun.png" }, { - "back_light_color": -5261108, + "back_light_color": -12813094, "back_light_scale": 240.0, "blend": false, "global_rotation": [ @@ -41,11 +41,11 @@ ], "movement_type": "STATIC", "scale": 80.0, - "texture": "ad_astra:textures/environment/moon.png" + "texture": "ad_astra:textures/environment/earth.png" }, { - "back_light_color": -12813094, - "back_light_scale": 42.0, + "back_light_color": -5261108, + "back_light_scale": 24.0, "blend": false, "global_rotation": [ 80.0, @@ -58,8 +58,8 @@ 0.0 ], "movement_type": "STATIC", - "scale": 14.0, - "texture": "ad_astra:textures/environment/earth.png" + "scale": 8.0, + "texture": "ad_astra:textures/environment/moon.png" } ], "star_brightness": 0.6, @@ -106,6 +106,6 @@ } ], "stars": 13000, - "sunrise_angle": 0, + "sunrise_angle": 90, "sunrise_color": 0 } \ No newline at end of file diff --git a/kubejs/assets/ad_astra/planet_renderers/mars_orbit.json b/kubejs/assets/ad_astra/planet_renderers/mars_orbit.json deleted file mode 100644 index b8b66b637..000000000 --- a/kubejs/assets/ad_astra/planet_renderers/mars_orbit.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "custom_clouds": true, - "custom_sky": true, - "custom_weather": false, - "dimension": "ad_astra:mars_orbit", - "has_fog": false, - "has_thick_fog": false, - "render_in_rain": true, - "sky_renderables": [ - { - "back_light_color": -39, - "back_light_scale": 21.0, - "blend": false, - "global_rotation": [ - 0.0, - 0.0, - 0.0 - ], - "local_rotation": [ - 0.0, - 0.0, - 0.0 - ], - "movement_type": "TIME_OF_DAY", - "scale": 7.0, - "texture": "ad_astra:textures/environment/sun.png" - }, - { - "back_light_color": -4827861, - "back_light_scale": 240.0, - "blend": false, - "global_rotation": [ - 180.0, - 0.0, - 0.0 - ], - "local_rotation": [ - 0.0, - 0.0, - 0.0 - ], - "movement_type": "STATIC", - "scale": 80.0, - "texture": "ad_astra:textures/environment/mars.png" - } - ], - "star_brightness": 0.6, - "star_colors": [ - { - "data": -1447239681, - "weight": 3 - }, - { - "data": -1143472129, - "weight": 5 - }, - { - "data": -726785, - "weight": 100 - }, - { - "data": -3038977, - "weight": 80 - }, - { - "data": -7697665, - "weight": 150 - }, - { - "data": -12254977, - "weight": 10 - }, - { - "data": -2817, - "weight": 60 - }, - { - "data": -464897, - "weight": 40 - }, - { - "data": -256, - "weight": 20 - }, - { - "data": -65536, - "weight": 1 - } - ], - "stars": 13000, - "sunrise_angle": 0, - "sunrise_color": 0 -} \ No newline at end of file diff --git a/kubejs/assets/ad_astra/planet_renderers/moon.json b/kubejs/assets/ad_astra/planet_renderers/moon.json index 2a334aff6..f6df53193 100644 --- a/kubejs/assets/ad_astra/planet_renderers/moon.json +++ b/kubejs/assets/ad_astra/planet_renderers/moon.json @@ -88,6 +88,6 @@ } ], "stars": 13000, - "sunrise_angle": 0, + "sunrise_angle": 90, "sunrise_color": 0 } \ No newline at end of file diff --git a/kubejs/data/ad_astra/dimension/earth_orbit.json b/kubejs/data/ad_astra/dimension/earth_orbit.json new file mode 100644 index 000000000..b77acf637 --- /dev/null +++ b/kubejs/data/ad_astra/dimension/earth_orbit.json @@ -0,0 +1,11 @@ +{ + "type": "tfg:orbit", + "generator": { + "type": "minecraft:noise", + "biome_source": { + "type": "minecraft:fixed", + "biome": "ad_astra:orbit" + }, + "settings": "ad_astra:orbit" + } +} \ No newline at end of file diff --git a/kubejs/data/ad_astra/dimension/moon.json b/kubejs/data/ad_astra/dimension/moon.json index cdaf9dcea..9d45ed528 100644 --- a/kubejs/data/ad_astra/dimension/moon.json +++ b/kubejs/data/ad_astra/dimension/moon.json @@ -1,5 +1,5 @@ { - "type": "ad_astra:moon", + "type": "tfg:moon", "generator": { "type": "minecraft:noise", "settings": "tfg:moon_noise", diff --git a/kubejs/data/tfg/dimension_type/moon.json b/kubejs/data/tfg/dimension_type/moon.json index 127d50557..492702880 100644 --- a/kubejs/data/tfg/dimension_type/moon.json +++ b/kubejs/data/tfg/dimension_type/moon.json @@ -9,12 +9,12 @@ "height": 384, "infiniburn": "#minecraft:infiniburn_overworld", "logical_height": 384, - "min_y": -64, - "monster_spawn_block_light_limit": 0, + "min_y": 0, + "monster_spawn_block_light_limit": 15, "monster_spawn_light_level": { "type": "minecraft:uniform", "value": { - "max_inclusive": 7, + "max_inclusive": 15, "min_inclusive": 0 } }, diff --git a/kubejs/data/tfg/dimension_type/orbit.json b/kubejs/data/tfg/dimension_type/orbit.json new file mode 100644 index 000000000..fe839f92c --- /dev/null +++ b/kubejs/data/tfg/dimension_type/orbit.json @@ -0,0 +1,25 @@ +{ + "ambient_light": 0.0, + "bed_works": true, + "coordinate_scale": 1.0, + "effects": "ad_astra:earth_orbit", + "has_ceiling": false, + "has_raids": false, + "has_skylight": true, + "height": 384, + "infiniburn": "#minecraft:infiniburn_overworld", + "logical_height": 384, + "min_y": -64, + "monster_spawn_block_light_limit": 0, + "monster_spawn_light_level": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 0 + } + }, + "natural": true, + "piglin_safe": false, + "respawn_anchor_works": false, + "ultrawarm": false +} \ No newline at end of file