diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/NametagsFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/NametagsFabric.java index 6ef217c..c59f0a1 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/NametagsFabric.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/NametagsFabric.java @@ -1,7 +1,7 @@ package org.saturnclient.impl.modules; +import org.saturnclient.modules.HealthRenderState; import org.saturnclient.modules.interfaces.NametagsInterface; -import org.saturnclient.modules.mods.utils.HealthRenderState; import net.minecraft.client.render.entity.state.LivingEntityRenderState; import net.minecraft.text.Text; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/utils/CameraOverriddenEntity.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/CameraOverriddenEntity.java similarity index 81% rename from versions/1.21.4/src/main/java/org/saturnclient/modules/mods/utils/CameraOverriddenEntity.java rename to versions/1.21.4/src/main/java/org/saturnclient/modules/CameraOverriddenEntity.java index 169608f..cefd982 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/utils/CameraOverriddenEntity.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/CameraOverriddenEntity.java @@ -1,4 +1,4 @@ -package org.saturnclient.modules.mods.utils; +package org.saturnclient.modules; public interface CameraOverriddenEntity { float freelook$getCameraPitch(); diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/utils/HealthRenderState.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/HealthRenderState.java similarity index 87% rename from versions/1.21.4/src/main/java/org/saturnclient/modules/mods/utils/HealthRenderState.java rename to versions/1.21.4/src/main/java/org/saturnclient/modules/HealthRenderState.java index 4aff823..4d77e99 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/utils/HealthRenderState.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/HealthRenderState.java @@ -1,4 +1,4 @@ -package org.saturnclient.modules.mods.utils; +package org.saturnclient.modules; import org.saturnclient.modules.interfaces.NametagsInterface.EntityType; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/README.md b/versions/1.21.4/src/main/java/org/saturnclient/modules/README.md deleted file mode 100644 index 0eb81ca..0000000 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# Credits -### Freelook -- https://github.com/Celibistrial/freelook -- https://modrinth.com/mod/freelook - -**The other mods are coded by us, if you have a concern or we missed something feel free to submit a issue with the credits tag** \ No newline at end of file diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/BackgroundRendererMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/BackgroundRendererMixin.java similarity index 95% rename from versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/BackgroundRendererMixin.java rename to versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/BackgroundRendererMixin.java index b34bf23..3526ef5 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/BackgroundRendererMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/BackgroundRendererMixin.java @@ -1,4 +1,4 @@ -package org.saturnclient.modules.mods.mixins; +package org.saturnclient.modules.mixins; import net.minecraft.client.render.BackgroundRenderer; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/CameraMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/CameraMixin.java similarity index 94% rename from versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/CameraMixin.java rename to versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/CameraMixin.java index 7c2cabc..4da24e8 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/CameraMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/CameraMixin.java @@ -1,4 +1,4 @@ -package org.saturnclient.modules.mods.mixins; +package org.saturnclient.modules.mixins; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; @@ -6,8 +6,8 @@ import net.minecraft.client.render.Camera; import net.minecraft.entity.Entity; import net.minecraft.world.BlockView; +import org.saturnclient.modules.CameraOverriddenEntity; import org.saturnclient.modules.mods.Freelook; -import org.saturnclient.modules.mods.utils.CameraOverriddenEntity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/EntityMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/EntityMixin.java similarity index 93% rename from versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/EntityMixin.java rename to versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/EntityMixin.java index 8442b43..6ad53c0 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/EntityMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/EntityMixin.java @@ -1,12 +1,12 @@ -package org.saturnclient.modules.mods.mixins; +package org.saturnclient.modules.mixins; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.entity.Entity; import net.minecraft.util.math.MathHelper; +import org.saturnclient.modules.CameraOverriddenEntity; import org.saturnclient.modules.mods.Freelook; -import org.saturnclient.modules.mods.utils.CameraOverriddenEntity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/GameRendererMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/GameRendererMixin.java similarity index 94% rename from versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/GameRendererMixin.java rename to versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/GameRendererMixin.java index 2518f06..d0d3262 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/GameRendererMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/GameRendererMixin.java @@ -1,4 +1,4 @@ -package org.saturnclient.modules.mods.mixins; +package org.saturnclient.modules.mixins; 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/modules/mods/mixins/LightmapTextureManagerMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LightmapTextureManagerMixin.java similarity index 94% rename from versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/LightmapTextureManagerMixin.java rename to versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LightmapTextureManagerMixin.java index 34289f6..cc4cfaa 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/LightmapTextureManagerMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LightmapTextureManagerMixin.java @@ -1,5 +1,5 @@ // code modified from Gamma utils: https://github.com/Sjouwer/gamma-utils -package org.saturnclient.modules.mods.mixins; +package org.saturnclient.modules.mixins; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import net.minecraft.client.render.LightmapTextureManager; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/LivingEntityRenderStateMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LivingEntityRenderStateMixin.java similarity index 91% rename from versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/LivingEntityRenderStateMixin.java rename to versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LivingEntityRenderStateMixin.java index dfa7476..4f0bd81 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/LivingEntityRenderStateMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LivingEntityRenderStateMixin.java @@ -1,4 +1,4 @@ -package org.saturnclient.modules.mods.mixins; +package org.saturnclient.modules.mixins; import net.minecraft.client.render.entity.state.LivingEntityRenderState; @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; @Mixin(LivingEntityRenderState.class) -public class LivingEntityRenderStateMixin implements org.saturnclient.modules.mods.utils.HealthRenderState { +public class LivingEntityRenderStateMixin implements org.saturnclient.modules.HealthRenderState { @Unique private float saturn$health = 0f; @Unique private float saturn$maxHealth = 1f; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/LivingEntityRendererMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LivingEntityRendererMixin.java similarity index 93% rename from versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/LivingEntityRendererMixin.java rename to versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LivingEntityRendererMixin.java index 1266102..d2e560a 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/LivingEntityRendererMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LivingEntityRendererMixin.java @@ -1,10 +1,11 @@ -package org.saturnclient.modules.mods.mixins; +package org.saturnclient.modules.mixins; import net.minecraft.client.render.entity.LivingEntityRenderer; import net.minecraft.client.render.entity.state.LivingEntityRenderState; +import org.saturnclient.modules.HealthRenderState; import org.saturnclient.modules.interfaces.NametagsInterface.EntityType; -import org.saturnclient.modules.mods.utils.HealthRenderState; + import net.minecraft.entity.LivingEntity; import net.minecraft.entity.mob.HostileEntity; import net.minecraft.entity.passive.PassiveEntity; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/NametagsMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/NametagsMixin.java similarity index 97% rename from versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/NametagsMixin.java rename to versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/NametagsMixin.java index 07d3a28..346e42c 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/NametagsMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/NametagsMixin.java @@ -1,4 +1,4 @@ -package org.saturnclient.modules.mods.mixins; +package org.saturnclient.modules.mixins; import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.entity.EntityRenderer; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/RenderMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/RenderMixin.java similarity index 98% rename from versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/RenderMixin.java rename to versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/RenderMixin.java index c400868..a06f9ea 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/RenderMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/RenderMixin.java @@ -1,4 +1,4 @@ -package org.saturnclient.modules.mods.mixins; +package org.saturnclient.modules.mixins; import org.saturnclient.modules.HudMod; import org.saturnclient.modules.ModDimensions; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/TpsMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/TpsMixin.java similarity index 93% rename from versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/TpsMixin.java rename to versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/TpsMixin.java index 7a9d15e..a7a3751 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/TpsMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/TpsMixin.java @@ -1,4 +1,4 @@ -package org.saturnclient.modules.mods.mixins; +package org.saturnclient.modules.mixins; import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.network.packet.s2c.play.WorldTimeUpdateS2CPacket;