Small refactors

Author: lowercasebtw

src/main/java/btw/lowercase/optiboxes/skybox/OptiFineSkyLayer.java

@@ -27,26 +27,24 @@
 import java.util.List;
 
 public class OptiFineSkyLayer {
-    private static final Codec<Vector3f> VEC_3_F = Codec.FLOAT.listOf().comapFlatMap((list) -> {
+    private static final Codec<Vector3f> Vector3fCodec = Codec.FLOAT.listOf().comapFlatMap((list) -> {
         if (list.size() < 3) {
             return DataResult.error(() -> "Incomplete number of elements in vector");
         } else {
             return DataResult.success(new Vector3f(list.get(0), list.get(1), list.get(2)));
         }
     }, (vec) -> ImmutableList.of(vec.x(), vec.y(), vec.z()));
 
-    private static final Fade OPTIFINE_FADE = new Fade(0, 0, 0, 0, true);
-
     public static final Codec<OptiFineSkyLayer> CODEC = RecordCodecBuilder.create(instance -> instance.group(
             ResourceLocation.CODEC.fieldOf("source").forGetter(OptiFineSkyLayer::getSource),
             Codec.BOOL.optionalFieldOf("biomeInclusion", true).forGetter(OptiFineSkyLayer::isBiomeInclusion),
             ResourceLocation.CODEC.listOf().optionalFieldOf("biomes", ImmutableList.of()).forGetter(OptiFineSkyLayer::getBiomes),
             Range.CODEC.listOf().optionalFieldOf("heights", ImmutableList.of()).forGetter(OptiFineSkyLayer::getHeights),
             Blend.CODEC.optionalFieldOf("blend", Blend.ADD).forGetter(OptiFineSkyLayer::getBlend),
-            Fade.CODEC.optionalFieldOf("fade", OPTIFINE_FADE).forGetter(OptiFineSkyLayer::getFade),
+            Fade.CODEC.optionalFieldOf("fade", Fade.DEFAULT).forGetter(OptiFineSkyLayer::getFade),
             Codec.BOOL.optionalFieldOf("rotate", false).forGetter(OptiFineSkyLayer::isRotate),
             Codec.FLOAT.optionalFieldOf("speed", 1.0F).forGetter(OptiFineSkyLayer::getSpeed),
-            VEC_3_F.optionalFieldOf("axis", new Vector3f(1, 0, 0)).forGetter(OptiFineSkyLayer::getAxis),
+            Vector3fCodec.optionalFieldOf("axis", new Vector3f(1, 0, 0)).forGetter(OptiFineSkyLayer::getAxis),
             Loop.CODEC.optionalFieldOf("loop", Loop.DEFAULT).forGetter(OptiFineSkyLayer::getLoop),
             Codec.FLOAT.optionalFieldOf("transition", 1.0F).forGetter(OptiFineSkyLayer::getTransition),
             Weather.CODEC.listOf().optionalFieldOf("weathers", ImmutableList.of(Weather.CLEAR)).forGetter(OptiFineSkyLayer::getWeathers)

src/main/java/btw/lowercase/optiboxes/skybox/SkyboxManager.java

@@ -9,7 +9,10 @@
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.resources.ResourceLocation;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 public class SkyboxManager implements AbstractSkyboxManager {
     public static final SkyboxManager INSTANCE = new SkyboxManager();
@@ -46,9 +49,6 @@ public void tick(ClientLevel level) {
                 this.activeAbstractSkyboxes.add(abstractSkybox);
             }
         }
-
-        // TODO/NOTE: Layer is always 0? Do I need "getLayer" anymore? Do I need this call anymore?
-        this.activeAbstractSkyboxes.sort(Comparator.comparingInt(AbstractSkybox::getLayer));
     }
 
     @Override

src/main/java/btw/lowercase/optiboxes/utils/CommonUtils.java

@@ -67,14 +67,12 @@ public static JsonObject convertOptiFineSkyProperties(OptiFineResourceHelper opt
 
         // Rotation
         if (properties.containsKey("rotate")) {
-            boolean rotate = Boolean.parseBoolean(properties.getProperty("rotate", "true"));
-            jsonObject.addProperty("rotate", rotate);
+            jsonObject.addProperty("rotate", Boolean.parseBoolean(properties.getProperty("rotate", "true")));
         }
 
         // Transition
         if (properties.containsKey("transition")) {
-            int transition = Integer.parseInt(properties.getProperty("transition", "1"));
-            jsonObject.addProperty("transition", transition);
+            jsonObject.addProperty("transition", Integer.parseInt(properties.getProperty("transition", "1")));
         }
 
         // Axis

src/main/java/btw/lowercase/optiboxes/utils/api/AbstractSkybox.java

@@ -8,11 +8,6 @@
 import net.minecraft.client.renderer.SkyRenderer;
 
 public interface AbstractSkybox {
-    // TODO/NOTE: Not needed anymore?
-    default int getLayer() {
-        return 0;
-    }
-
     void render(SkyRenderer skyRenderer, PoseStack poseStack, float tickDelta, Camera camera, MultiBufferSource.BufferSource bufferSource, FogParameters fogParameters);
 
     void tick(ClientLevel level);

src/main/java/btw/lowercase/optiboxes/utils/components/Fade.java

@@ -5,6 +5,7 @@
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 
 public record Fade(int startFadeIn, int endFadeIn, int startFadeOut, int endFadeOut, boolean alwaysOn) {
+    public static final Fade DEFAULT = new Fade(0, 0, 0, 0, true);
     public static final Codec<Fade> CODEC = RecordCodecBuilder.create(instance -> instance.group(
             Codec.INT.optionalFieldOf("startFadeIn", 0).forGetter(Fade::startFadeIn),
             Codec.INT.optionalFieldOf("endFadeIn", 0).forGetter(Fade::endFadeIn),