Added height render condition and moving skybox

TathanDev · TathanDev · commit 97504f79630d · 2025-12-08T22:03:53.000+01:00
diff --git a/changelog.md b/changelog.md
@@ -1,4 +1,8 @@
-# Sky Aesthetics 2.0.8-BETA Changelog
+# Sky Aesthetics 2.0.9-BETA Changelog
 
-## Changes
-- Update exo config to fix a crash when joining a world.
+## Features
+- Added new render condition : player height
+- The Skybox can now be rotated (see the wiki for more information)
+
+## Change
+- Change default skybox from saturn to milky way (- 7Mb of size 💀)
diff --git a/common/src/main/java/fr/tathan/sky_aesthetics/client/DimensionRenderer.java b/common/src/main/java/fr/tathan/sky_aesthetics/client/DimensionRenderer.java
@@ -21,6 +21,9 @@
 import java.util.List;
 import java.util.UUID;
 
+/**
+ * The class handling the rendering of a custom sky
+ */
 public class DimensionRenderer {
 
     public final List<SkyObject> skyObjects;
@@ -68,7 +71,6 @@ public boolean canRenderSky() {
 
     public void render(ClientLevel level, PoseStack poseStack, Matrix4f projectionMatrix, float partialTick, Camera camera, Runnable fogCallback) {
 
-
         Tesselator tesselator = Tesselator.getInstance();
         float dayAngle = level.getTimeOfDay(partialTick) * 360f % 360f;
         float nightAngle = dayAngle + 180;
@@ -83,7 +85,6 @@ public void render(ClientLevel level, PoseStack poseStack, Matrix4f projectionMa
         this.skyColor.setSkyColor(level, camera, partialTick);
 
         SkyHelper.drawSky(poseStack.last().pose(), projectionMatrix);
-        SkyAesthetics.LOG.error("rotation {}", dayAngle);
 
         if(this.skyBoxSetting != null) {
             this.skyBoxSetting.renderSkyBox(poseStack, projectionMatrix, camera,dayAngle);
@@ -138,10 +139,14 @@ public static class Builder {
         public List<SkyObject> skyObjects = new ArrayList<>();
         // Default cloud settings: show clouds and set height to 192
         public CloudSettings cloudSettings = CloudSettings.createDefaultSettings();
+        //No sun and moon by default
         public CustomVanillaObject.Sun sun = null;
         public CustomVanillaObject.Moon moon = null;
+
         public FogSettings fogSettings = FogSettings.createDefaultSettings();
         public StarSettings star = StarSettings.createDefaultStars();
+
+        //Always render sky by default
         public SkyProperties.RenderCondition renderCondition = null;
         public SkyColorSettings skyColor = SkyColorSettings.createDefaultSettings();
         public boolean weather = true; // Default to true
diff --git a/common/src/main/java/fr/tathan/sky_aesthetics/client/data/SkiesRegistry.java b/common/src/main/java/fr/tathan/sky_aesthetics/client/data/SkiesRegistry.java
@@ -17,6 +17,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * The registry handling the loading of custom skies from data packs
+ */
 public class SkiesRegistry extends SimpleJsonResourceReloadListener  {
 
     public static final Map<ResourceLocation, DimensionSky> SKY_PROPERTIES = new HashMap<>();
@@ -54,6 +57,12 @@ protected void apply(Map<ResourceLocation, JsonElement> object, @Nullable Resour
         });
     }
 
+    /**
+     * Allow to register sky.
+     * Can be used to register skies from code/at runtime.
+     * @param id the id of the sky to register
+     * @param sky the sky to register
+     */
     public static void registerSky(ResourceLocation id, DimensionSky sky) {
         if(SKY_PROPERTIES.containsKey(id)) {
             SkyAesthetics.LOG.warn("Sky with id {} already exists, overwriting it", id);
diff --git a/common/src/main/java/fr/tathan/sky_aesthetics/client/screens/SkiesComponents.java b/common/src/main/java/fr/tathan/sky_aesthetics/client/screens/SkiesComponents.java
@@ -103,6 +103,29 @@ public static CollapsibleContainer createSkyBoxSettings(Optional<SkyBoxSetting>
                 .tooltip(Component.literal("The Sphere rotation"))
                 .id("rotation"));
 
+        container.child(createDynamicRotation(setting.dynamicRotation).id("dynamic_rotation"));
+
+        return container;
+    }
+    public static CollapsibleContainer createDynamicRotation(Optional<Rotation> settings) {
+        CollapsibleContainer container = (CollapsibleContainer) Containers.collapsible(Sizing.content(), Sizing.content(0), Component.literal("Dynamic Rotation (Optionnal)"), settings.isPresent()).id("dynamic_rotation");
+
+        if(settings.isEmpty() && container.expanded()) container.toggleExpansion();
+
+        Rotation rotation = settings.orElseGet(Rotation::createDefaultSettings);
+
+        container.child(textBox(Sizing.fill(40))
+                .text(rotation.axis().getSerializedName())
+                .id("axis")
+                .tooltip(Component.literal("The rotation axis.").append("\nPossible Values : XP, ZP, YP"))
+        );
+        container.child(textBox(Sizing.fill(40))
+                .text(rotation.rotationType())
+                .id("rotation_type")
+                .tooltip(Component.literal("The rotation type.").append("\nPossible Values : DAY, NIGHT, STATIC"))
+
+        );
+
         return container;
     }
 
@@ -266,6 +289,8 @@ public static CollapsibleContainer createLightSettings(Optional<LightSettings> s
     }
 
 
+
+
     public static TextBoxComponent textBox(Sizing horizontalSizing) {
         TextBoxComponent component =  Components.textBox(horizontalSizing);
         component.setMaxLength(600);
diff --git a/common/src/main/java/fr/tathan/sky_aesthetics/client/screens/SkyModificationScreen.java b/common/src/main/java/fr/tathan/sky_aesthetics/client/screens/SkyModificationScreen.java
@@ -278,12 +278,25 @@ public static SkyProperties fromComponent(FlowLayout component) {
 
         CollapsibleContainer skyBoxSetting = component.childById(CollapsibleContainer.class, "skybox_settings");
 
+        Optional<Rotation> rotation = Optional.empty();
+
+        if(skyBoxSetting.expanded()) {
+            CollapsibleContainer dynamicRotationSettings = skyBoxSetting.childById(CollapsibleContainer.class, "dynamic_rotation");
+
+            rotation = !dynamicRotationSettings.expanded() ? Optional.empty() :
+                    Optional.of(new Rotation(
+                            Rotation.Axis.valueOf(dynamicRotationSettings.childById(TextBoxComponent.class, "axis").getValue()),
+                            getRotationType(dynamicRotationSettings.childById(TextBoxComponent.class, "rotation_type").getValue())
+                    ));
+
+        }
+
         Optional<SkyBoxSetting> skyBox = !skyBoxSetting.expanded() ? Optional.empty() :
                 Optional.of(new SkyBoxSetting(
                         (int) skyBoxSetting.childById(DiscreteSliderComponent.class, "gradation").discreteValue(),
                         ResourceLocation.parse(skyBoxSetting.childById(TextBoxComponent.class, "texture").getValue()),
                         getVec3fFromComponent(skyBoxSetting.childById(FlowLayout.class, "rotation")).orElseGet(Vector3f::new),
-                        Optional.of(Rotation.createDefaultSettings()))
+                        rotation)
                 );
 
         CollapsibleContainer lightSettings = component.childById(CollapsibleContainer.class, "light_settings");
@@ -314,8 +327,9 @@ public static SkyProperties fromComponent(FlowLayout component) {
 
     public static String getRotationType(String str) {
         return switch (str.toLowerCase()) {
-            case "static" -> "STATIC";
             case "day" -> "DAY";
+            case "night" -> "NIGHT";
+
             default -> "STATIC";
         };
     }
diff --git a/common/src/main/java/fr/tathan/sky_aesthetics/client/skies/settings/CloudSettings.java b/common/src/main/java/fr/tathan/sky_aesthetics/client/skies/settings/CloudSettings.java
@@ -7,7 +7,6 @@
 
 public record CloudSettings(boolean showCloud, Integer cloudHeight) {
 
-
     public static CloudSettings createDefaultSettings() {
         return new CloudSettings(true, 192);
     }
diff --git a/common/src/main/java/fr/tathan/sky_aesthetics/client/skies/settings/Constellation.java b/common/src/main/java/fr/tathan/sky_aesthetics/client/skies/settings/Constellation.java
@@ -9,8 +9,7 @@
 import java.util.Optional;
 
 public record Constellation(
-         String id, float scale, Vec3 color, Vec3 firstPoint, List<Vec3> points, Optional<ResourceLocation> starTexture
-) {
+         String id, float scale, Vec3 color, Vec3 firstPoint, List<Vec3> points, Optional<ResourceLocation> starTexture) {
 
     public static final Codec<Constellation> CODEC = RecordCodecBuilder.create(instance -> instance.group(
             Codec.STRING.fieldOf("id").forGetter(Constellation::id),
diff --git a/common/src/main/java/fr/tathan/sky_aesthetics/client/skies/settings/CustomVanillaObject.java b/common/src/main/java/fr/tathan/sky_aesthetics/client/skies/settings/CustomVanillaObject.java
@@ -10,6 +10,9 @@
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.resources.ResourceLocation;
 
+/**
+ * Custom vanilla objects like sun and moon with custom textures, sizes and heights.
+ */
 public class CustomVanillaObject{
 
     public record Sun(ResourceLocation sunTexture, Float sunHeight, Float sunSize) {
diff --git a/common/src/main/java/fr/tathan/sky_aesthetics/client/skies/settings/FogSettings.java b/common/src/main/java/fr/tathan/sky_aesthetics/client/skies/settings/FogSettings.java
@@ -10,6 +10,12 @@
 import java.util.List;
 import java.util.Optional;
 
+/**
+ * The class containing information about fog settings
+ * @param fog Whether fog is enabled
+ * @param customFogColor The custom RGB color of the fog
+ * @param fogDensity The density settings of the fog (near, far)
+ */
 public record FogSettings(Boolean fog, Optional<Vector3i> customFogColor, Optional<Vector2f> fogDensity) {
 
     public static Codec<Vector2f> VEC2F = Codec.FLOAT.listOf().comapFlatMap((list) -> Util.fixedSize(list, 2).map((listx) -> new Vector2f(listx.getFirst(), listx.getLast())), (vector2f) -> List.of(vector2f.x, vector2f.y));
diff --git a/common/src/main/java/fr/tathan/sky_aesthetics/client/skies/settings/LightSettings.java b/common/src/main/java/fr/tathan/sky_aesthetics/client/skies/settings/LightSettings.java
@@ -3,6 +3,12 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 
+/**
+ * Settings related to lighting in the sky.
+ *
+ * @param forceBrightLightmap   If true, forces a bright lightmap regardless of time of day.
+ * @param constantAmbientLight  If true, maintains constant ambient light levels.
+ */
 public record LightSettings(
         boolean forceBrightLightmap,
         boolean constantAmbientLight) {
diff --git a/common/src/main/java/fr/tathan/sky_aesthetics/client/skies/settings/Rotation.java b/common/src/main/java/fr/tathan/sky_aesthetics/client/skies/settings/Rotation.java
@@ -23,7 +23,9 @@ public void rotatePoseStack(Matrix4f modelMatrix, float dayAngle){
         if(Objects.equals(rotationType, "NIGHT")){
             dayAngle = -dayAngle;
         }
-        modelMatrix.rotate(axis.toQuaternion(dayAngle));
+        if(!Objects.equals(rotationType, "STATIC")) {
+            modelMatrix.rotate(axis.toQuaternion(dayAngle));
+        }
     }
 
     public enum Axis implements StringRepresentable {
diff --git a/common/src/main/java/fr/tathan/sky_aesthetics/client/skies/settings/SkyColorSettings.java b/common/src/main/java/fr/tathan/sky_aesthetics/client/skies/settings/SkyColorSettings.java
@@ -13,6 +13,12 @@
 import java.util.List;
 import java.util.Optional;
 
+/**
+ * The class containing information about sky colors
+ * @param color The RGBA color of the sky
+ * @param sunsetColor The RGB color of the sunset
+ * @param sunriseAlphaModifier The alpha modifier for the sunrise/sunset
+ */
 public record SkyColorSettings(Optional<Vector4f> color,
                                Optional<Vector3i> sunsetColor,
                                Optional<Integer> sunriseAlphaModifier
diff --git a/common/src/main/java/fr/tathan/sky_aesthetics/client/skies/settings/SkyObject.java b/common/src/main/java/fr/tathan/sky_aesthetics/client/skies/settings/SkyObject.java
@@ -6,19 +6,26 @@
 import com.mojang.math.Axis;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import fr.tathan.SkyAesthetics;
 import net.minecraft.Util;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.phys.Vec3;
 import org.joml.Matrix4f;
 import org.joml.Vector3f;
 
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
 
+/**
+ *
+ * @param texture The Object texture
+ * @param blend Should the object blend
+ * @param size The size of the object
+ * @param rotation The position of the object in the sky
+ * @param objectRotation The rotation of the object
+ * @param height The Object's height
+ * @param rotationType The type of rotation DAY, NIGHT or STATIC
+ */
 public record SkyObject(ResourceLocation texture, boolean blend, float size, Vector3f rotation, Vector3f objectRotation, int height, String rotationType) {
 
     public static Codec<Vector3f> VEC3F = Codec.FLOAT.listOf().comapFlatMap((list) -> Util.fixedSize(list, 3).map((listx) -> new Vector3f(listx.getFirst(), listx.get(1), listx.getLast())), (vector3f) -> List.of(vector3f.x, vector3f.y, vector3f.z));
diff --git a/common/src/main/java/fr/tathan/sky_aesthetics/client/skies/settings/StarSettings.java b/common/src/main/java/fr/tathan/sky_aesthetics/client/skies/settings/StarSettings.java
@@ -20,6 +20,17 @@
 
 import java.util.*;
 
+/**
+ * The class containing information about stars
+ * @param vanilla If the stars should be like vanilla one's
+ * @param movingStars if the stars should move
+ * @param count The count of stars
+ * @param allDaysVisible If stars should be visible all day
+ * @param scale The size of a star
+ * @param color The color of the stars
+ * @param shootingStars Shooting Star Settings
+ * @param starsTexture The texture of the star
+ */
 public record StarSettings(boolean vanilla, boolean movingStars, int count, boolean allDaysVisible, float scale, Vector3i color, Optional<ShootingStars> shootingStars, Optional<ResourceLocation> starsTexture) {
 
     public static final Codec<StarSettings> CODEC = RecordCodecBuilder.create(instance -> instance.group(
@@ -33,19 +44,7 @@ public record StarSettings(boolean vanilla, boolean movingStars, int count, bool
             ResourceLocation.CODEC.optionalFieldOf("star_texture").forGetter(StarSettings::starsTexture)
     ).apply(instance, StarSettings::new));
 
-    public record ShootingStars(int percentage, Vec2 randomLifetime, float scale, float speed, Vec3 color, Optional<Integer> rotation) {
-
-        public static Codec<Vec2> VEC2 = Codec.FLOAT.listOf().comapFlatMap((list) -> Util.fixedSize(list, 2).map((listx) -> new Vec2(listx.getFirst(), listx.get(1))), (vec2) -> List.of(vec2.x, vec2.y));
 
-        public static final Codec<ShootingStars> CODEC = RecordCodecBuilder.create(instance -> instance.group(
-                Codec.INT.fieldOf("percentage").forGetter(ShootingStars::percentage),
-                VEC2.fieldOf("random_lifetime").forGetter(ShootingStars::randomLifetime),
-                Codec.FLOAT.fieldOf("scale").forGetter(ShootingStars::scale),
-                Codec.FLOAT.fieldOf("speed").forGetter(ShootingStars::speed),
-                Vec3.CODEC.fieldOf("color").forGetter(ShootingStars::color),
-                Codec.INT.optionalFieldOf("rotation").forGetter(ShootingStars::rotation)
-        ).apply(instance, ShootingStars::new));
-    }
 
     public static StarSettings createDefaultStars() {
         return new StarSettings(true, false, 30000, false, 0.05f, new Vector3i(255, 255, 255), Optional.empty(), Optional.empty());
@@ -121,6 +120,27 @@ public void handleShootingStars(ClientLevel level, PoseStack poseStack, Matrix4f
         starsToRemove.forEach(shootingStars::remove);
     }
 
+    /**
+     *
+     * @param percentage The chance for a shooting star to happen
+     * @param randomLifetime The random lifetime of star
+     * @param scale The scale of the star
+     * @param speed The speed of the star
+     * @param color The color of the star
+     * @param rotation The rotation of the star
+     */
+    public record ShootingStars(int percentage, Vec2 randomLifetime, float scale, float speed, Vec3 color, Optional<Integer> rotation) {
+
+        public static Codec<Vec2> VEC2 = Codec.FLOAT.listOf().comapFlatMap((list) -> Util.fixedSize(list, 2).map((listx) -> new Vec2(listx.getFirst(), listx.get(1))), (vec2) -> List.of(vec2.x, vec2.y));
 
+        public static final Codec<ShootingStars> CODEC = RecordCodecBuilder.create(instance -> instance.group(
+                Codec.INT.fieldOf("percentage").forGetter(ShootingStars::percentage),
+                VEC2.fieldOf("random_lifetime").forGetter(ShootingStars::randomLifetime),
+                Codec.FLOAT.fieldOf("scale").forGetter(ShootingStars::scale),
+                Codec.FLOAT.fieldOf("speed").forGetter(ShootingStars::speed),
+                Vec3.CODEC.fieldOf("color").forGetter(ShootingStars::color),
+                Codec.INT.optionalFieldOf("rotation").forGetter(ShootingStars::rotation)
+        ).apply(instance, ShootingStars::new));
+    }
 
 }
diff --git a/common/src/main/resources/assets/sky_aesthetics/textures/skyboxes/milky_way.png b/common/src/main/resources/assets/sky_aesthetics/textures/skyboxes/milky_way.png
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx6G
 org.gradle.parallel=true
 
 # Mod properties
-mod_version = 2.0.8-beta
+mod_version = 2.0.9-beta
 maven_group = fr.tathan
 archives_name = sky_aesthetics
 enabled_platforms = fabric,neoforge,quilt

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`
`8`	`8`	`public record CloudSettings(boolean showCloud, Integer cloudHeight) {`
`9`	`9`
`10`		`-`
`11`	`10`	`public static CloudSettings createDefaultSettings() {`
`12`	`11`	`return new CloudSettings(true, 192);`
`13`	`12`	`}`