Improved module implementation structure

versions/1.21.4/src/main/java/org/saturnclient/impl/modules/entity/CameraOverriddenEntity.java

@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules;
+package org.saturnclient.impl.modules.entity;
 
 public interface CameraOverriddenEntity {
     float freelook$getCameraPitch();

versions/1.21.4/src/main/java/org/saturnclient/impl/modules/entity/EntityModuleFabric.java

@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules;
+package org.saturnclient.impl.modules.entity;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.entity.Entity;

versions/1.21.4/src/main/java/org/saturnclient/impl/modules/entity/HealthRenderState.java

@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules;
+package org.saturnclient.impl.modules.entity;
 
 import org.saturnclient.common.module.EntityModule;
 

versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/entity/CameraMixin.java

@@ -1,7 +1,7 @@
-package org.saturnclient.impl.modules.mixins;
+package org.saturnclient.impl.modules.mixins.entity;
 
 import org.saturnclient.feature.features.FreelookFeature;
-import org.saturnclient.impl.modules.CameraOverriddenEntity;
+import org.saturnclient.impl.modules.entity.CameraOverriddenEntity;
 import org.saturnclient.saturnclient.SaturnClient;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/entity/EntityMixin.java

@@ -1,7 +1,7 @@
-package org.saturnclient.impl.modules.mixins;
+package org.saturnclient.impl.modules.mixins.entity;
 
 import org.saturnclient.feature.features.FreelookFeature;
-import org.saturnclient.impl.modules.CameraOverriddenEntity;
+import org.saturnclient.impl.modules.entity.CameraOverriddenEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;

versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/misc/NametagsMixin.java

@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules.mixins;
+package org.saturnclient.impl.modules.mixins.misc;
 
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.EntityRenderer;
@@ -8,8 +8,9 @@ import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 
 import org.saturnclient.feature.features.NametagsFeature;
-import org.saturnclient.impl.modules.EntityModuleFabric;
+import org.saturnclient.impl.modules.entity.EntityModuleFabric;
-import org.saturnclient.impl.modules.HealthRenderState;
+import org.saturnclient.impl.modules.entity.HealthRenderState;
+import org.saturnclient.impl.modules.mixins.render.LivingEntityRenderStateMixin;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;

versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/render/GameRendererMixin.java

@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules.mixins;
+package org.saturnclient.impl.modules.mixins.render;
 
 import net.minecraft.client.render.GameRenderer;
 

versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/render/LightmapTextureManagerMixin.java

@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules.mixins;
+package org.saturnclient.impl.modules.mixins.render;
 
 // Code approach adapted from Gamma Utils: https://github.com/Sjouwer/gamma-utils
 

versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/render/LivingEntityRenderStateMixin.java

@@ -1,9 +1,10 @@
-package org.saturnclient.impl.modules.mixins;
+package org.saturnclient.impl.modules.mixins.render;
 
 import net.minecraft.client.render.entity.state.LivingEntityRenderState;
 
 import org.saturnclient.common.module.EntityModule;
-import org.saturnclient.impl.modules.HealthRenderState;
+import org.saturnclient.impl.modules.entity.HealthRenderState;
+import org.saturnclient.impl.modules.mixins.misc.NametagsMixin;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 

versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/render/LivingEntityRendererMixin.java

@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules.mixins;
+package org.saturnclient.impl.modules.mixins.render;
 
 import net.minecraft.client.render.entity.LivingEntityRenderer;
 import net.minecraft.client.render.entity.state.LivingEntityRenderState;
@@ -8,7 +8,7 @@ import net.minecraft.entity.passive.PassiveEntity;
 import net.minecraft.entity.player.PlayerEntity;
 
 import org.saturnclient.common.module.EntityModule;
-import org.saturnclient.impl.modules.HealthRenderState;
+import org.saturnclient.impl.modules.entity.HealthRenderState;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/render/RenderMixin.java

@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules.mixins;
+package org.saturnclient.impl.modules.mixins.render;
 
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;

versions/1.21.4/src/main/java/org/saturnclient/impl/modules/mixins/world/TpsMixin.java

@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules.mixins;
+package org.saturnclient.impl.modules.mixins.world;
 
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.network.packet.s2c.play.WorldTimeUpdateS2CPacket;

versions/1.21.4/src/main/java/org/saturnclient/impl/modules/network/NetworkModuleFabric.java

@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules;
+package org.saturnclient.impl.modules.network;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.PlayerListEntry;

versions/1.21.4/src/main/java/org/saturnclient/impl/modules/player/PlayerModuleFabric.java

@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules;
+package org.saturnclient.impl.modules.player;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;

versions/1.21.4/src/main/java/org/saturnclient/impl/modules/render/RenderModuleFabric.java

@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules;
+package org.saturnclient.impl.modules.render;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.Perspective;

versions/1.21.4/src/main/java/org/saturnclient/impl/modules/world/WorldModuleFabric.java

@@ -1,4 +1,4 @@
-package org.saturnclient.impl.modules;
+package org.saturnclient.impl.modules.world;
 
 import net.minecraft.client.MinecraftClient;
 

versions/1.21.4/src/main/java/org/saturnclient/impl/provider/ModuleProviderFabric.java

@@ -3,11 +3,11 @@ package org.saturnclient.impl.provider;
 import net.minecraft.client.MinecraftClient;
 
 import org.saturnclient.common.provider.ModuleProvider;
-import org.saturnclient.impl.modules.EntityModuleFabric;
+import org.saturnclient.impl.modules.entity.EntityModuleFabric;
-import org.saturnclient.impl.modules.NetworkModuleFabric;
+import org.saturnclient.impl.modules.network.NetworkModuleFabric;
-import org.saturnclient.impl.modules.PlayerModuleFabric;
+import org.saturnclient.impl.modules.player.PlayerModuleFabric;
-import org.saturnclient.impl.modules.RenderModuleFabric;
+import org.saturnclient.impl.modules.render.RenderModuleFabric;
-import org.saturnclient.impl.modules.WorldModuleFabric;
+import org.saturnclient.impl.modules.world.WorldModuleFabric;
 import org.saturnclient.common.module.*;
 
 /**

versions/1.21.4/src/main/resources/mods.mixins.json

@@ -4,15 +4,15 @@
   "package": "org.saturnclient.impl.modules.mixins",
   "compatibilityLevel": "JAVA_21",
   "client": [
-    "GameRendererMixin",
+    "render.GameRendererMixin",
-    "LightmapTextureManagerMixin",
+    "render.LightmapTextureManagerMixin",
-    "LivingEntityRendererMixin",
+    "render.LivingEntityRendererMixin",
-    "LivingEntityRenderStateMixin",
+    "render.LivingEntityRenderStateMixin",
-    "NametagsMixin",
+    "misc.NametagsMixin",
-    "RenderMixin",
+    "render.RenderMixin",
-    "TpsMixin",
+    "world.TpsMixin",
-    "CameraMixin",
+    "entity.CameraMixin",
-    "EntityMixin"
+    "entity.EntityMixin"
   ],
   "injectors": {
     "defaultRequire": 1