diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/SkyboxManager.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/SkyboxManager.java index 8cf84a8c..0c6cf88a 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/SkyboxManager.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/SkyboxManager.java @@ -9,8 +9,8 @@ import io.github.amerebagatelle.mods.nuit.api.NuitPlatformHelper; import io.github.amerebagatelle.mods.nuit.api.skyboxes.Skybox; import io.github.amerebagatelle.mods.nuit.mixin.LevelRendererAccessor; -import io.github.amerebagatelle.mods.nuit.skybox.Metadata; -import io.github.amerebagatelle.mods.nuit.skyboxes.SkyboxType; +import io.github.amerebagatelle.mods.nuit.components.Metadata; +import io.github.amerebagatelle.mods.nuit.skybox.SkyboxType; import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap; import net.minecraft.client.Camera; import net.minecraft.client.multiplayer.ClientLevel; diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/api/NuitPlatformHelper.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/api/NuitPlatformHelper.java index c04be1d8..1e1dea59 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/api/NuitPlatformHelper.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/api/NuitPlatformHelper.java @@ -1,7 +1,7 @@ package io.github.amerebagatelle.mods.nuit.api; import io.github.amerebagatelle.mods.nuit.api.skyboxes.Skybox; -import io.github.amerebagatelle.mods.nuit.skyboxes.SkyboxType; +import io.github.amerebagatelle.mods.nuit.skybox.SkyboxType; import io.github.amerebagatelle.mods.nuit.util.Utils; import net.minecraft.core.Registry; diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/api/skyboxes/NuitSkybox.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/api/skyboxes/NuitSkybox.java index 5769abf4..c1b21834 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/api/skyboxes/NuitSkybox.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/api/skyboxes/NuitSkybox.java @@ -1,8 +1,8 @@ package io.github.amerebagatelle.mods.nuit.api.skyboxes; -import io.github.amerebagatelle.mods.nuit.skybox.Conditions; -import io.github.amerebagatelle.mods.nuit.skybox.Decorations; -import io.github.amerebagatelle.mods.nuit.skybox.Properties; +import io.github.amerebagatelle.mods.nuit.components.Conditions; +import io.github.amerebagatelle.mods.nuit.components.Decorations; +import io.github.amerebagatelle.mods.nuit.components.Properties; public interface NuitSkybox extends Skybox { float getAlpha(); diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/api/skyboxes/RotatableSkybox.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/api/skyboxes/RotatableSkybox.java index a5a44ab4..fad4c50e 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/api/skyboxes/RotatableSkybox.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/api/skyboxes/RotatableSkybox.java @@ -1,6 +1,6 @@ package io.github.amerebagatelle.mods.nuit.api.skyboxes; -import io.github.amerebagatelle.mods.nuit.skybox.Rotation; +import io.github.amerebagatelle.mods.nuit.components.Rotation; public interface RotatableSkybox { Rotation getRotation(); diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/AnimatableTexture.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/AnimatableTexture.java similarity index 98% rename from common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/AnimatableTexture.java rename to common/src/main/java/io/github/amerebagatelle/mods/nuit/components/AnimatableTexture.java index 62da6ec1..25a3e152 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/AnimatableTexture.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/AnimatableTexture.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skybox; +package io.github.amerebagatelle.mods.nuit.components; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Blend.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Blend.java similarity index 98% rename from common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Blend.java rename to common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Blend.java index 0cf4649e..648f6433 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Blend.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Blend.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skybox; +package io.github.amerebagatelle.mods.nuit.components; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Blender.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Blender.java similarity index 99% rename from common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Blender.java rename to common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Blender.java index a76493c4..dd7ebe5a 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Blender.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Blender.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skybox; +package io.github.amerebagatelle.mods.nuit.components; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Conditions.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Conditions.java similarity index 96% rename from common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Conditions.java rename to common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Conditions.java index c8cdd05b..f286cffe 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Conditions.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Conditions.java @@ -1,12 +1,10 @@ -package io.github.amerebagatelle.mods.nuit.skybox; +package io.github.amerebagatelle.mods.nuit.components; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.resources.ResourceLocation; -import java.util.Collection; import java.util.List; public class Conditions { diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Decorations.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Decorations.java similarity index 98% rename from common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Decorations.java rename to common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Decorations.java index 4a54509b..ddca8899 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Decorations.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Decorations.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skybox; +package io.github.amerebagatelle.mods.nuit.components; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Fade.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Fade.java similarity index 98% rename from common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Fade.java rename to common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Fade.java index fed48923..7b69c3f6 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Fade.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Fade.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skybox; +package io.github.amerebagatelle.mods.nuit.components; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Metadata.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Metadata.java similarity index 88% rename from common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Metadata.java rename to common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Metadata.java index 9e5c0509..4308f722 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Metadata.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Metadata.java @@ -1,8 +1,8 @@ -package io.github.amerebagatelle.mods.nuit.skybox; +package io.github.amerebagatelle.mods.nuit.components; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; -import io.github.amerebagatelle.mods.nuit.skyboxes.SkyboxType; +import io.github.amerebagatelle.mods.nuit.skybox.SkyboxType; import net.minecraft.resources.ResourceLocation; public class Metadata { diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/MinMaxEntry.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/MinMaxEntry.java similarity index 93% rename from common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/MinMaxEntry.java rename to common/src/main/java/io/github/amerebagatelle/mods/nuit/components/MinMaxEntry.java index 5661db62..0f1ce724 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/MinMaxEntry.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/MinMaxEntry.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skybox; +package io.github.amerebagatelle.mods.nuit.components; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Properties.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Properties.java similarity index 98% rename from common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Properties.java rename to common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Properties.java index 2011842e..a0100e41 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Properties.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Properties.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skybox; +package io.github.amerebagatelle.mods.nuit.components; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/RGBA.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/RGBA.java similarity index 96% rename from common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/RGBA.java rename to common/src/main/java/io/github/amerebagatelle/mods/nuit/components/RGBA.java index 38ac3755..d30a152d 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/RGBA.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/RGBA.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skybox; +package io.github.amerebagatelle.mods.nuit.components; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Rotation.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Rotation.java similarity index 98% rename from common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Rotation.java rename to common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Rotation.java index 9a514c52..ceb92b3f 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Rotation.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Rotation.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skybox; +package io.github.amerebagatelle.mods.nuit.components; import com.google.common.collect.ImmutableList; import com.mojang.serialization.Codec; diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Texture.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Texture.java similarity index 93% rename from common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Texture.java rename to common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Texture.java index 69a7b1d5..5b21132e 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Texture.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Texture.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skybox; +package io.github.amerebagatelle.mods.nuit.components; import com.mojang.serialization.Codec; import net.minecraft.resources.ResourceLocation; diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/UVRange.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/UVRange.java similarity index 95% rename from common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/UVRange.java rename to common/src/main/java/io/github/amerebagatelle/mods/nuit/components/UVRange.java index 8cbcdc68..1c46c76a 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/UVRange.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/UVRange.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skybox; +package io.github.amerebagatelle.mods.nuit.components; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Weather.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Weather.java similarity index 94% rename from common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Weather.java rename to common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Weather.java index a97c4a87..02dbad6f 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/Weather.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/components/Weather.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skybox; +package io.github.amerebagatelle.mods.nuit.components; import com.google.common.collect.ImmutableMap; import com.mojang.serialization.Codec; diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/mixin/MixinFogRenderer.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/mixin/MixinFogRenderer.java index c5dbbf31..69b08222 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/mixin/MixinFogRenderer.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/mixin/MixinFogRenderer.java @@ -4,8 +4,8 @@ import io.github.amerebagatelle.mods.nuit.SkyboxManager; import io.github.amerebagatelle.mods.nuit.api.skyboxes.NuitSkybox; import io.github.amerebagatelle.mods.nuit.api.skyboxes.Skybox; -import io.github.amerebagatelle.mods.nuit.skybox.RGBA; -import io.github.amerebagatelle.mods.nuit.skyboxes.AbstractSkybox; +import io.github.amerebagatelle.mods.nuit.components.RGBA; +import io.github.amerebagatelle.mods.nuit.skybox.AbstractSkybox; import io.github.amerebagatelle.mods.nuit.util.FogRGBA; import io.github.amerebagatelle.mods.nuit.util.Utils; import net.minecraft.client.Camera; diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skyboxes/AbstractSkybox.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/AbstractSkybox.java similarity index 98% rename from common/src/main/java/io/github/amerebagatelle/mods/nuit/skyboxes/AbstractSkybox.java rename to common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/AbstractSkybox.java index 87b9e10b..da0d52d1 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skyboxes/AbstractSkybox.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/AbstractSkybox.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skyboxes; +package io.github.amerebagatelle.mods.nuit.skybox; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.*; @@ -6,10 +6,10 @@ import io.github.amerebagatelle.mods.nuit.NuitClient; import io.github.amerebagatelle.mods.nuit.api.skyboxes.NuitSkybox; import io.github.amerebagatelle.mods.nuit.mixin.LevelRendererAccessor; -import io.github.amerebagatelle.mods.nuit.skybox.Conditions; -import io.github.amerebagatelle.mods.nuit.skybox.Decorations; -import io.github.amerebagatelle.mods.nuit.skybox.Properties; -import io.github.amerebagatelle.mods.nuit.skybox.Weather; +import io.github.amerebagatelle.mods.nuit.components.Conditions; +import io.github.amerebagatelle.mods.nuit.components.Decorations; +import io.github.amerebagatelle.mods.nuit.components.Properties; +import io.github.amerebagatelle.mods.nuit.components.Weather; import io.github.amerebagatelle.mods.nuit.util.Utils; import it.unimi.dsi.fastutil.longs.Long2FloatArrayMap; import net.minecraft.client.Camera; diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skyboxes/MonoColorSkybox.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/MonoColorSkybox.java similarity index 97% rename from common/src/main/java/io/github/amerebagatelle/mods/nuit/skyboxes/MonoColorSkybox.java rename to common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/MonoColorSkybox.java index 70395531..1992b004 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skyboxes/MonoColorSkybox.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/MonoColorSkybox.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skyboxes; +package io.github.amerebagatelle.mods.nuit.skybox; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.*; @@ -6,7 +6,7 @@ import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import io.github.amerebagatelle.mods.nuit.mixin.LevelRendererAccessor; -import io.github.amerebagatelle.mods.nuit.skybox.*; +import io.github.amerebagatelle.mods.nuit.components.*; import net.minecraft.client.Camera; import net.minecraft.client.renderer.GameRenderer; import org.joml.Matrix4f; diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skyboxes/SkyboxType.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/SkyboxType.java similarity index 90% rename from common/src/main/java/io/github/amerebagatelle/mods/nuit/skyboxes/SkyboxType.java rename to common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/SkyboxType.java index ee485606..bd00ed80 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skyboxes/SkyboxType.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/SkyboxType.java @@ -1,14 +1,14 @@ -package io.github.amerebagatelle.mods.nuit.skyboxes; +package io.github.amerebagatelle.mods.nuit.skybox; import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableBiMap; import com.mojang.serialization.Codec; import io.github.amerebagatelle.mods.nuit.NuitClient; import io.github.amerebagatelle.mods.nuit.api.skyboxes.Skybox; -import io.github.amerebagatelle.mods.nuit.skyboxes.textured.MultiTexturedSkybox; -import io.github.amerebagatelle.mods.nuit.skyboxes.textured.SquareTexturedSkybox; -import io.github.amerebagatelle.mods.nuit.skyboxes.vanilla.EndSkybox; -import io.github.amerebagatelle.mods.nuit.skyboxes.vanilla.OverworldSkybox; +import io.github.amerebagatelle.mods.nuit.skybox.textured.MultiTexturedSkybox; +import io.github.amerebagatelle.mods.nuit.skybox.textured.SquareTexturedSkybox; +import io.github.amerebagatelle.mods.nuit.skybox.vanilla.EndSkybox; +import io.github.amerebagatelle.mods.nuit.skybox.vanilla.OverworldSkybox; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skyboxes/textured/MultiTexturedSkybox.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/textured/MultiTexturedSkybox.java similarity index 96% rename from common/src/main/java/io/github/amerebagatelle/mods/nuit/skyboxes/textured/MultiTexturedSkybox.java rename to common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/textured/MultiTexturedSkybox.java index 8eb87108..9f09ba0b 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skyboxes/textured/MultiTexturedSkybox.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/textured/MultiTexturedSkybox.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skyboxes.textured; +package io.github.amerebagatelle.mods.nuit.skybox.textured; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.*; @@ -6,8 +6,8 @@ import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import io.github.amerebagatelle.mods.nuit.mixin.LevelRendererAccessor; -import io.github.amerebagatelle.mods.nuit.skybox.*; -import io.github.amerebagatelle.mods.nuit.skyboxes.AbstractSkybox; +import io.github.amerebagatelle.mods.nuit.components.*; +import io.github.amerebagatelle.mods.nuit.skybox.AbstractSkybox; import io.github.amerebagatelle.mods.nuit.util.Utils; import net.minecraft.client.Camera; import org.joml.Matrix4f; diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skyboxes/textured/SquareTexturedSkybox.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/textured/SquareTexturedSkybox.java similarity index 95% rename from common/src/main/java/io/github/amerebagatelle/mods/nuit/skyboxes/textured/SquareTexturedSkybox.java rename to common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/textured/SquareTexturedSkybox.java index 63ed5f45..4385c054 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skyboxes/textured/SquareTexturedSkybox.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/textured/SquareTexturedSkybox.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skyboxes.textured; +package io.github.amerebagatelle.mods.nuit.skybox.textured; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.*; @@ -6,8 +6,8 @@ import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import io.github.amerebagatelle.mods.nuit.mixin.LevelRendererAccessor; -import io.github.amerebagatelle.mods.nuit.skybox.*; -import io.github.amerebagatelle.mods.nuit.skyboxes.AbstractSkybox; +import io.github.amerebagatelle.mods.nuit.components.*; +import io.github.amerebagatelle.mods.nuit.skybox.AbstractSkybox; import io.github.amerebagatelle.mods.nuit.util.Utils; import net.minecraft.client.Camera; import org.joml.Matrix4f; diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skyboxes/textured/TexturedSkybox.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/textured/TexturedSkybox.java similarity index 96% rename from common/src/main/java/io/github/amerebagatelle/mods/nuit/skyboxes/textured/TexturedSkybox.java rename to common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/textured/TexturedSkybox.java index ffe32166..1ec5a4ca 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skyboxes/textured/TexturedSkybox.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/textured/TexturedSkybox.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skyboxes.textured; +package io.github.amerebagatelle.mods.nuit.skybox.textured; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.BufferBuilder; @@ -7,8 +7,8 @@ import com.mojang.math.Axis; import io.github.amerebagatelle.mods.nuit.api.skyboxes.RotatableSkybox; import io.github.amerebagatelle.mods.nuit.mixin.LevelRendererAccessor; -import io.github.amerebagatelle.mods.nuit.skybox.*; -import io.github.amerebagatelle.mods.nuit.skyboxes.AbstractSkybox; +import io.github.amerebagatelle.mods.nuit.components.*; +import io.github.amerebagatelle.mods.nuit.skybox.AbstractSkybox; import io.github.amerebagatelle.mods.nuit.util.Utils; import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skyboxes/vanilla/EndSkybox.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/vanilla/EndSkybox.java similarity index 91% rename from common/src/main/java/io/github/amerebagatelle/mods/nuit/skyboxes/vanilla/EndSkybox.java rename to common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/vanilla/EndSkybox.java index 86163b9a..ccd33627 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skyboxes/vanilla/EndSkybox.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/vanilla/EndSkybox.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skyboxes.vanilla; +package io.github.amerebagatelle.mods.nuit.skybox.vanilla; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.*; @@ -6,10 +6,10 @@ import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import io.github.amerebagatelle.mods.nuit.mixin.LevelRendererAccessor; -import io.github.amerebagatelle.mods.nuit.skybox.Conditions; -import io.github.amerebagatelle.mods.nuit.skybox.Decorations; -import io.github.amerebagatelle.mods.nuit.skybox.Properties; -import io.github.amerebagatelle.mods.nuit.skyboxes.AbstractSkybox; +import io.github.amerebagatelle.mods.nuit.components.Conditions; +import io.github.amerebagatelle.mods.nuit.components.Decorations; +import io.github.amerebagatelle.mods.nuit.components.Properties; +import io.github.amerebagatelle.mods.nuit.skybox.AbstractSkybox; import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GameRenderer; diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skyboxes/vanilla/OverworldSkybox.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/vanilla/OverworldSkybox.java similarity index 94% rename from common/src/main/java/io/github/amerebagatelle/mods/nuit/skyboxes/vanilla/OverworldSkybox.java rename to common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/vanilla/OverworldSkybox.java index 7c175e77..fcbe9911 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/skyboxes/vanilla/OverworldSkybox.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/skybox/vanilla/OverworldSkybox.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skyboxes.vanilla; +package io.github.amerebagatelle.mods.nuit.skybox.vanilla; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.*; @@ -8,10 +8,10 @@ import io.github.amerebagatelle.mods.nuit.SkyboxManager; import io.github.amerebagatelle.mods.nuit.api.NuitApi; import io.github.amerebagatelle.mods.nuit.mixin.LevelRendererAccessor; -import io.github.amerebagatelle.mods.nuit.skybox.Conditions; -import io.github.amerebagatelle.mods.nuit.skybox.Decorations; -import io.github.amerebagatelle.mods.nuit.skybox.Properties; -import io.github.amerebagatelle.mods.nuit.skyboxes.AbstractSkybox; +import io.github.amerebagatelle.mods.nuit.components.Conditions; +import io.github.amerebagatelle.mods.nuit.components.Decorations; +import io.github.amerebagatelle.mods.nuit.components.Properties; +import io.github.amerebagatelle.mods.nuit.skybox.AbstractSkybox; import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/util/FogRGBA.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/util/FogRGBA.java index 12b8c098..9db5bc36 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/util/FogRGBA.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/util/FogRGBA.java @@ -1,6 +1,6 @@ package io.github.amerebagatelle.mods.nuit.util; -import io.github.amerebagatelle.mods.nuit.skybox.RGBA; +import io.github.amerebagatelle.mods.nuit.components.RGBA; public class FogRGBA extends RGBA { private final boolean modifyDensity; diff --git a/common/src/main/java/io/github/amerebagatelle/mods/nuit/util/Utils.java b/common/src/main/java/io/github/amerebagatelle/mods/nuit/util/Utils.java index acc52f6b..8c499e37 100644 --- a/common/src/main/java/io/github/amerebagatelle/mods/nuit/util/Utils.java +++ b/common/src/main/java/io/github/amerebagatelle/mods/nuit/util/Utils.java @@ -4,9 +4,9 @@ import io.github.amerebagatelle.mods.nuit.NuitClient; import io.github.amerebagatelle.mods.nuit.api.skyboxes.NuitSkybox; import io.github.amerebagatelle.mods.nuit.api.skyboxes.Skybox; -import io.github.amerebagatelle.mods.nuit.skybox.MinMaxEntry; -import io.github.amerebagatelle.mods.nuit.skybox.RGBA; -import io.github.amerebagatelle.mods.nuit.skybox.UVRange; +import io.github.amerebagatelle.mods.nuit.components.MinMaxEntry; +import io.github.amerebagatelle.mods.nuit.components.RGBA; +import io.github.amerebagatelle.mods.nuit.components.UVRange; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.util.Mth; import net.minecraft.util.Tuple; diff --git a/common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/AnimatableTextureTest.java b/common/src/test/java/io/github/amerebagatelle/mods/nuit/components/AnimatableTextureTest.java similarity index 97% rename from common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/AnimatableTextureTest.java rename to common/src/test/java/io/github/amerebagatelle/mods/nuit/components/AnimatableTextureTest.java index 78cf0589..90c14663 100644 --- a/common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/AnimatableTextureTest.java +++ b/common/src/test/java/io/github/amerebagatelle/mods/nuit/components/AnimatableTextureTest.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skybox; +package io.github.amerebagatelle.mods.nuit.components; import com.mojang.serialization.JsonOps; import org.junit.jupiter.params.ParameterizedTest; diff --git a/common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/BlendTest.java b/common/src/test/java/io/github/amerebagatelle/mods/nuit/components/BlendTest.java similarity index 98% rename from common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/BlendTest.java rename to common/src/test/java/io/github/amerebagatelle/mods/nuit/components/BlendTest.java index 1d7a9eac..4213b168 100644 --- a/common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/BlendTest.java +++ b/common/src/test/java/io/github/amerebagatelle/mods/nuit/components/BlendTest.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skybox; +package io.github.amerebagatelle.mods.nuit.components; import com.mojang.serialization.JsonOps; import org.junit.jupiter.params.ParameterizedTest; diff --git a/common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/BlenderTest.java b/common/src/test/java/io/github/amerebagatelle/mods/nuit/components/BlenderTest.java similarity index 95% rename from common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/BlenderTest.java rename to common/src/test/java/io/github/amerebagatelle/mods/nuit/components/BlenderTest.java index b88d8505..3a8efbbd 100644 --- a/common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/BlenderTest.java +++ b/common/src/test/java/io/github/amerebagatelle/mods/nuit/components/BlenderTest.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skybox; +package io.github.amerebagatelle.mods.nuit.components; import com.mojang.serialization.JsonOps; import org.junit.jupiter.params.ParameterizedTest; diff --git a/common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/FadeTest.java b/common/src/test/java/io/github/amerebagatelle/mods/nuit/components/FadeTest.java similarity index 95% rename from common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/FadeTest.java rename to common/src/test/java/io/github/amerebagatelle/mods/nuit/components/FadeTest.java index 93388b41..d2cac173 100644 --- a/common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/FadeTest.java +++ b/common/src/test/java/io/github/amerebagatelle/mods/nuit/components/FadeTest.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skybox; +package io.github.amerebagatelle.mods.nuit.components; import com.mojang.serialization.JsonOps; import org.junit.jupiter.params.ParameterizedTest; diff --git a/common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/JsonTestHelper.java b/common/src/test/java/io/github/amerebagatelle/mods/nuit/components/JsonTestHelper.java similarity index 86% rename from common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/JsonTestHelper.java rename to common/src/test/java/io/github/amerebagatelle/mods/nuit/components/JsonTestHelper.java index 5f168891..6848ba99 100644 --- a/common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/JsonTestHelper.java +++ b/common/src/test/java/io/github/amerebagatelle/mods/nuit/components/JsonTestHelper.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skybox; +package io.github.amerebagatelle.mods.nuit.components; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/MinMaxTest.java b/common/src/test/java/io/github/amerebagatelle/mods/nuit/components/MinMaxTest.java similarity index 96% rename from common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/MinMaxTest.java rename to common/src/test/java/io/github/amerebagatelle/mods/nuit/components/MinMaxTest.java index 37390bf2..92ae1273 100644 --- a/common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/MinMaxTest.java +++ b/common/src/test/java/io/github/amerebagatelle/mods/nuit/components/MinMaxTest.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skybox; +package io.github.amerebagatelle.mods.nuit.components; import com.mojang.serialization.JsonOps; import org.junit.jupiter.params.ParameterizedTest; diff --git a/common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/RGBATest.java b/common/src/test/java/io/github/amerebagatelle/mods/nuit/components/RGBATest.java similarity index 97% rename from common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/RGBATest.java rename to common/src/test/java/io/github/amerebagatelle/mods/nuit/components/RGBATest.java index 672c58b4..7370d969 100644 --- a/common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/RGBATest.java +++ b/common/src/test/java/io/github/amerebagatelle/mods/nuit/components/RGBATest.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skybox; +package io.github.amerebagatelle.mods.nuit.components; import com.mojang.serialization.JsonOps; import org.junit.jupiter.params.ParameterizedTest; diff --git a/common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/RotationTest.java b/common/src/test/java/io/github/amerebagatelle/mods/nuit/components/RotationTest.java similarity index 96% rename from common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/RotationTest.java rename to common/src/test/java/io/github/amerebagatelle/mods/nuit/components/RotationTest.java index 2f35a70a..fb609f6b 100644 --- a/common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/RotationTest.java +++ b/common/src/test/java/io/github/amerebagatelle/mods/nuit/components/RotationTest.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skybox; +package io.github.amerebagatelle.mods.nuit.components; import com.mojang.serialization.JsonOps; import org.junit.jupiter.params.ParameterizedTest; diff --git a/common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/TextureTest.java b/common/src/test/java/io/github/amerebagatelle/mods/nuit/components/TextureTest.java similarity index 92% rename from common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/TextureTest.java rename to common/src/test/java/io/github/amerebagatelle/mods/nuit/components/TextureTest.java index e5724ce5..b582e941 100644 --- a/common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/TextureTest.java +++ b/common/src/test/java/io/github/amerebagatelle/mods/nuit/components/TextureTest.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skybox; +package io.github.amerebagatelle.mods.nuit.components; import com.google.gson.JsonPrimitive; import com.mojang.serialization.JsonOps; diff --git a/common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/WeatherTest.java b/common/src/test/java/io/github/amerebagatelle/mods/nuit/components/WeatherTest.java similarity index 91% rename from common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/WeatherTest.java rename to common/src/test/java/io/github/amerebagatelle/mods/nuit/components/WeatherTest.java index 5253fec4..c5733e4c 100644 --- a/common/src/test/java/io/github/amerebagatelle/mods/nuit/skybox/WeatherTest.java +++ b/common/src/test/java/io/github/amerebagatelle/mods/nuit/components/WeatherTest.java @@ -1,4 +1,4 @@ -package io.github.amerebagatelle.mods.nuit.skybox; +package io.github.amerebagatelle.mods.nuit.components; import com.google.gson.JsonPrimitive; import com.mojang.serialization.JsonOps; diff --git a/fabric/src/main/java/io/github/amerebagatelle/mods/nuit/fabric/NuitClientFabric.java b/fabric/src/main/java/io/github/amerebagatelle/mods/nuit/fabric/NuitClientFabric.java index d42e2499..91ebc95f 100644 --- a/fabric/src/main/java/io/github/amerebagatelle/mods/nuit/fabric/NuitClientFabric.java +++ b/fabric/src/main/java/io/github/amerebagatelle/mods/nuit/fabric/NuitClientFabric.java @@ -6,7 +6,7 @@ import io.github.amerebagatelle.mods.nuit.api.skyboxes.Skybox; import io.github.amerebagatelle.mods.nuit.resource.SkyboxResourceListener; import io.github.amerebagatelle.mods.nuit.screen.SkyboxDebugScreen; -import io.github.amerebagatelle.mods.nuit.skyboxes.SkyboxType; +import io.github.amerebagatelle.mods.nuit.skybox.SkyboxType; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; diff --git a/fabric/src/main/java/io/github/amerebagatelle/mods/nuit/fabric/NuitFabricPlatformHelper.java b/fabric/src/main/java/io/github/amerebagatelle/mods/nuit/fabric/NuitFabricPlatformHelper.java index 7456c8a1..2b3f3c66 100644 --- a/fabric/src/main/java/io/github/amerebagatelle/mods/nuit/fabric/NuitFabricPlatformHelper.java +++ b/fabric/src/main/java/io/github/amerebagatelle/mods/nuit/fabric/NuitFabricPlatformHelper.java @@ -2,7 +2,7 @@ import io.github.amerebagatelle.mods.nuit.api.NuitPlatformHelper; import io.github.amerebagatelle.mods.nuit.api.skyboxes.Skybox; -import io.github.amerebagatelle.mods.nuit.skyboxes.SkyboxType; +import io.github.amerebagatelle.mods.nuit.skybox.SkyboxType; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.core.Registry; diff --git a/neoforge/src/main/java/io/github/amerebagatelle/mods/nuit/neoforge/NuitNeoForge.java b/neoforge/src/main/java/io/github/amerebagatelle/mods/nuit/neoforge/NuitNeoForge.java index 8a6ca597..5f04152e 100644 --- a/neoforge/src/main/java/io/github/amerebagatelle/mods/nuit/neoforge/NuitNeoForge.java +++ b/neoforge/src/main/java/io/github/amerebagatelle/mods/nuit/neoforge/NuitNeoForge.java @@ -5,7 +5,7 @@ import io.github.amerebagatelle.mods.nuit.api.skyboxes.Skybox; import io.github.amerebagatelle.mods.nuit.resource.SkyboxResourceListener; import io.github.amerebagatelle.mods.nuit.screen.SkyboxDebugScreen; -import io.github.amerebagatelle.mods.nuit.skyboxes.SkyboxType; +import io.github.amerebagatelle.mods.nuit.skybox.SkyboxType; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.core.Registry; diff --git a/neoforge/src/main/java/io/github/amerebagatelle/mods/nuit/neoforge/NuitNeoForgePlatformHelper.java b/neoforge/src/main/java/io/github/amerebagatelle/mods/nuit/neoforge/NuitNeoForgePlatformHelper.java index 1590ed58..f2703e62 100644 --- a/neoforge/src/main/java/io/github/amerebagatelle/mods/nuit/neoforge/NuitNeoForgePlatformHelper.java +++ b/neoforge/src/main/java/io/github/amerebagatelle/mods/nuit/neoforge/NuitNeoForgePlatformHelper.java @@ -2,7 +2,7 @@ import io.github.amerebagatelle.mods.nuit.api.NuitPlatformHelper; import io.github.amerebagatelle.mods.nuit.api.skyboxes.Skybox; -import io.github.amerebagatelle.mods.nuit.skyboxes.SkyboxType; +import io.github.amerebagatelle.mods.nuit.skybox.SkyboxType; import net.minecraft.core.Registry; import net.neoforged.fml.loading.FMLPaths;