Improved module implementation structure

This commit is contained in:
2026-03-20 19:42:41 +01:00
parent 787ffd7bcb
commit 01da8b8198
19 changed files with 39 additions and 37 deletions
+1 -1
Submodule common updated: 215aaf0fd0...e734dc58a2
@@ -1,4 +1,4 @@
package org.saturnclient.impl.modules;
package org.saturnclient.impl.modules.entity;
public interface CameraOverriddenEntity {
float freelook$getCameraPitch();
@@ -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;
@@ -1,4 +1,4 @@
package org.saturnclient.impl.modules;
package org.saturnclient.impl.modules.entity;
import org.saturnclient.common.module.EntityModule;
@@ -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;
@@ -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;
@@ -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.HealthRenderState;
import org.saturnclient.impl.modules.entity.EntityModuleFabric;
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;
@@ -1,4 +1,4 @@
package org.saturnclient.impl.modules.mixins;
package org.saturnclient.impl.modules.mixins.render;
import net.minecraft.client.render.GameRenderer;
@@ -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
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -1,4 +1,4 @@
package org.saturnclient.impl.modules;
package org.saturnclient.impl.modules.world;
import net.minecraft.client.MinecraftClient;
@@ -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.NetworkModuleFabric;
import org.saturnclient.impl.modules.PlayerModuleFabric;
import org.saturnclient.impl.modules.RenderModuleFabric;
import org.saturnclient.impl.modules.WorldModuleFabric;
import org.saturnclient.impl.modules.entity.EntityModuleFabric;
import org.saturnclient.impl.modules.network.NetworkModuleFabric;
import org.saturnclient.impl.modules.player.PlayerModuleFabric;
import org.saturnclient.impl.modules.render.RenderModuleFabric;
import org.saturnclient.impl.modules.world.WorldModuleFabric;
import org.saturnclient.common.module.*;
/**
@@ -4,15 +4,15 @@
"package": "org.saturnclient.impl.modules.mixins",
"compatibilityLevel": "JAVA_21",
"client": [
"GameRendererMixin",
"LightmapTextureManagerMixin",
"LivingEntityRendererMixin",
"LivingEntityRenderStateMixin",
"NametagsMixin",
"RenderMixin",
"TpsMixin",
"CameraMixin",
"EntityMixin"
"render.GameRendererMixin",
"render.LightmapTextureManagerMixin",
"render.LivingEntityRendererMixin",
"render.LivingEntityRenderStateMixin",
"misc.NametagsMixin",
"render.RenderMixin",
"world.TpsMixin",
"entity.CameraMixin",
"entity.EntityMixin"
],
"injectors": {
"defaultRequire": 1