diff --git a/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/CloakFeatureRenderer.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/cosmetics/CloakFeatureRenderer.java similarity index 99% rename from versions/1.21.4/src/main/java/org/saturnclient/cosmetics/CloakFeatureRenderer.java rename to versions/1.21.4/src/main/java/org/saturnclient/impl/cosmetics/CloakFeatureRenderer.java index 18df3d2..86cfd8b 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/CloakFeatureRenderer.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/cosmetics/CloakFeatureRenderer.java @@ -1,9 +1,10 @@ -package org.saturnclient.cosmetics; +package org.saturnclient.impl.cosmetics; import java.util.Arrays; import org.saturnclient.client.player.SaturnPlayer; import org.saturnclient.config.Config; +import org.saturnclient.cosmetics.Cloaks; import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.render.RenderLayer; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/HatFeatureRenderer.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/cosmetics/HatFeatureRenderer.java similarity index 90% rename from versions/1.21.4/src/main/java/org/saturnclient/cosmetics/HatFeatureRenderer.java rename to versions/1.21.4/src/main/java/org/saturnclient/impl/cosmetics/HatFeatureRenderer.java index d49511d..f5a723d 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/HatFeatureRenderer.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/cosmetics/HatFeatureRenderer.java @@ -1,8 +1,8 @@ -package org.saturnclient.cosmetics; +package org.saturnclient.impl.cosmetics; import org.saturnclient.client.player.SaturnPlayer; -import org.saturnclient.cosmetics.obj.MtlLoader; -import org.saturnclient.cosmetics.obj.ObjModel; +import org.saturnclient.impl.cosmetics.obj.MtlLoader; +import org.saturnclient.impl.cosmetics.obj.ObjModel; import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.render.VertexConsumerProvider; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/obj/MtlLoader.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/cosmetics/obj/MtlLoader.java similarity index 97% rename from versions/1.21.4/src/main/java/org/saturnclient/cosmetics/obj/MtlLoader.java rename to versions/1.21.4/src/main/java/org/saturnclient/impl/cosmetics/obj/MtlLoader.java index fe65072..11b06d3 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/obj/MtlLoader.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/cosmetics/obj/MtlLoader.java @@ -1,4 +1,4 @@ -package org.saturnclient.cosmetics.obj; +package org.saturnclient.impl.cosmetics.obj; import java.io.IOException; import java.io.InputStream; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/obj/ObjModel.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/cosmetics/obj/ObjModel.java similarity index 98% rename from versions/1.21.4/src/main/java/org/saturnclient/cosmetics/obj/ObjModel.java rename to versions/1.21.4/src/main/java/org/saturnclient/impl/cosmetics/obj/ObjModel.java index bfe2ac1..3e7237e 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/obj/ObjModel.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/cosmetics/obj/ObjModel.java @@ -1,4 +1,4 @@ -package org.saturnclient.cosmetics.obj; +package org.saturnclient.impl.cosmetics.obj; import java.io.IOException; import java.io.InputStream; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/obj/ObjRenderer.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/cosmetics/obj/ObjRenderer.java similarity index 98% rename from versions/1.21.4/src/main/java/org/saturnclient/cosmetics/obj/ObjRenderer.java rename to versions/1.21.4/src/main/java/org/saturnclient/impl/cosmetics/obj/ObjRenderer.java index 498e4f0..27635a2 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/obj/ObjRenderer.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/cosmetics/obj/ObjRenderer.java @@ -1,4 +1,4 @@ -package org.saturnclient.cosmetics.obj; +package org.saturnclient.impl.cosmetics.obj; import java.io.IOException; import java.io.InputStream; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/utils/IdentifierUtils.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/cosmetics/utils/IdentifierUtils.java similarity index 98% rename from versions/1.21.4/src/main/java/org/saturnclient/cosmetics/utils/IdentifierUtils.java rename to versions/1.21.4/src/main/java/org/saturnclient/impl/cosmetics/utils/IdentifierUtils.java index 1fb2e4e..4215c57 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/utils/IdentifierUtils.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/cosmetics/utils/IdentifierUtils.java @@ -1,4 +1,4 @@ -package org.saturnclient.cosmetics.utils; +package org.saturnclient.impl.cosmetics.utils; import org.saturnclient.common.ref.asset.IdentifierRef; import org.saturnclient.saturnclient.SaturnClient; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MinecraftClientMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MinecraftClientMixin.java index 5fddcb6..328917d 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MinecraftClientMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MinecraftClientMixin.java @@ -8,8 +8,8 @@ import org.jetbrains.annotations.Nullable; import org.saturnclient.common.ref.asset.IdentifierRef; import org.saturnclient.common.ref.game.MinecraftClientRef; import org.saturnclient.common.ref.render.WindowRef; +import org.saturnclient.impl.ui.SaturnScreenFabric; import org.saturnclient.ui.SaturnScreen; -import org.saturnclient.ui.SaturnScreenFabric; import org.saturnclient.ui.screens.TitleMenu; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/RenderMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/RenderMixin.java index ec9d8eb..7b45975 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/RenderMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/RenderMixin.java @@ -9,11 +9,11 @@ import org.saturnclient.feature.Feature; import org.saturnclient.feature.FeatureLayout; import org.saturnclient.feature.FeatureManager; import org.saturnclient.feature.HudFeature; +import org.saturnclient.impl.ui.RenderScopeImpl; +import org.saturnclient.impl.ui.SaturnScreenFabric; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.mixin.DrawContextAccessor; import org.saturnclient.ui.RenderScope; -import org.saturnclient.ui.RenderScopeImpl; -import org.saturnclient.ui.SaturnScreenFabric; import org.saturnclient.ui.screens.HudEditor; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/provider/SaturnProviderImpl.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/provider/SaturnProviderImpl.java index c7cec3d..3f2a9bf 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/provider/SaturnProviderImpl.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/provider/SaturnProviderImpl.java @@ -6,7 +6,7 @@ import java.util.UUID; import org.saturnclient.common.provider.SaturnProvider; import org.saturnclient.common.ref.asset.IdentifierRef; import org.saturnclient.common.ref.game.MinecraftClientRef; -import org.saturnclient.cosmetics.utils.IdentifierUtils; +import org.saturnclient.impl.cosmetics.utils.IdentifierUtils; import org.saturnclient.saturnclient.SaturnClient; import dev.kosmx.playerAnim.api.layered.AnimationStack; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/EntityDrawerImpl.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/ui/EntityDrawerImpl.java similarity index 96% rename from versions/1.21.4/src/main/java/org/saturnclient/ui/EntityDrawerImpl.java rename to versions/1.21.4/src/main/java/org/saturnclient/impl/ui/EntityDrawerImpl.java index 1204db2..9f9781f 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/EntityDrawerImpl.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/ui/EntityDrawerImpl.java @@ -1,10 +1,12 @@ -package org.saturnclient.ui; +package org.saturnclient.impl.ui; import org.jetbrains.annotations.Nullable; import org.joml.Quaternionf; import org.joml.Vector3f; import org.saturnclient.common.ref.render.QuaternionfRef; import org.saturnclient.saturnclient.SaturnClient; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; import org.saturnclient.ui.components.SkinPreview.EntityDrawer; import net.minecraft.client.render.DiffuseLighting; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/RenderScopeImpl.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/ui/RenderScopeImpl.java similarity index 99% rename from versions/1.21.4/src/main/java/org/saturnclient/ui/RenderScopeImpl.java rename to versions/1.21.4/src/main/java/org/saturnclient/impl/ui/RenderScopeImpl.java index 1955070..18e1ff9 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/RenderScopeImpl.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/ui/RenderScopeImpl.java @@ -1,4 +1,4 @@ -package org.saturnclient.ui; +package org.saturnclient.impl.ui; import java.util.ArrayDeque; import java.util.Deque; @@ -17,6 +17,7 @@ import org.saturnclient.common.ref.game.ItemStackRef; import org.saturnclient.common.ref.render.MatrixStackRef; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.mixin.DrawContextAccessor; +import org.saturnclient.ui.RenderScope; import org.saturnclient.ui.resources.Fonts; import org.saturnclient.ui.resources.SvgTexture; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/SaturnScreenFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/ui/SaturnScreenFabric.java similarity index 97% rename from versions/1.21.4/src/main/java/org/saturnclient/ui/SaturnScreenFabric.java rename to versions/1.21.4/src/main/java/org/saturnclient/impl/ui/SaturnScreenFabric.java index 2afca4c..9f21dcd 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/SaturnScreenFabric.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/ui/SaturnScreenFabric.java @@ -1,9 +1,11 @@ -package org.saturnclient.ui; +package org.saturnclient.impl.ui; import java.time.Duration; import java.time.Instant; import org.saturnclient.saturnclient.mixin.DrawContextAccessor; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.SaturnScreen.ScreenProvider; import net.minecraft.client.MinecraftClient; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java index e872556..370b12c 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java @@ -15,11 +15,11 @@ import org.saturnclient.impl.provider.GLFWProviderImpl; import org.saturnclient.impl.provider.ModuleProviderFabric; import org.saturnclient.impl.provider.RefConstructorImpl; import org.saturnclient.impl.provider.SaturnProviderImpl; +import org.saturnclient.impl.ui.EntityDrawerImpl; +import org.saturnclient.impl.ui.SaturnScreenFabric; +import org.saturnclient.saturnclient.event.KeyInputHandler; import org.saturnclient.config.Config; import org.saturnclient.config.manager.ConfigManager; -import org.saturnclient.saturnclient.event.KeyInputHandler; -import org.saturnclient.ui.EntityDrawerImpl; -import org.saturnclient.ui.SaturnScreenFabric; import org.saturnclient.ui.components.SkinPreview; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java index 0c44972..d006f22 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java @@ -6,9 +6,9 @@ import net.minecraft.client.option.KeyBinding; import net.minecraft.client.util.InputUtil; import org.saturnclient.config.Config; +import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.client.ServiceClient; import org.saturnclient.common.provider.Providers; -import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.ui.screens.EmoteWheel; import org.saturnclient.ui.screens.ShiftMenu; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java index 74b1f5f..518494c 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java @@ -1,6 +1,5 @@ package org.saturnclient.saturnclient.mixin; -import org.saturnclient.saturnclient.SaturnClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.font.TextRenderer.TextLayerType; import net.minecraft.client.render.VertexConsumerProvider; @@ -16,6 +15,7 @@ import net.minecraft.util.math.Vec3d; import org.saturnclient.client.player.Roles; import org.saturnclient.client.player.SaturnPlayer; +import org.saturnclient.saturnclient.SaturnClient; import java.util.UUID; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java index 97cef55..0363dad 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java @@ -7,8 +7,8 @@ import net.minecraft.client.render.entity.model.PlayerEntityModel; import net.minecraft.client.render.entity.state.PlayerEntityRenderState; import net.minecraft.entity.player.PlayerEntity; -import org.saturnclient.cosmetics.CloakFeatureRenderer; -import org.saturnclient.cosmetics.HatFeatureRenderer; +import org.saturnclient.impl.cosmetics.CloakFeatureRenderer; +import org.saturnclient.impl.cosmetics.HatFeatureRenderer; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/SetScreenMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/SetScreenMixin.java index 01f2b84..061d641 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/SetScreenMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/SetScreenMixin.java @@ -1,7 +1,7 @@ package org.saturnclient.saturnclient.mixin; import org.saturnclient.config.Config; -import org.saturnclient.ui.SaturnScreenFabric; +import org.saturnclient.impl.ui.SaturnScreenFabric; import org.saturnclient.ui.screens.TitleMenu; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/SplashOverlayMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/SplashOverlayMixin.java index 4449442..ecc4823 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/SplashOverlayMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/SplashOverlayMixin.java @@ -4,8 +4,8 @@ import java.util.Optional; import java.util.function.Consumer; import org.saturnclient.config.Theme; +import org.saturnclient.impl.ui.RenderScopeImpl; import org.saturnclient.ui.RenderScope; -import org.saturnclient.ui.RenderScopeImpl; import org.saturnclient.ui.resources.Textures; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite;