diff --git a/common b/common index 709ad4f..da6576e 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 709ad4fbf02c42c96c7d36c696e76fca95ff5548 +Subproject commit da6576e4edb9985fd9d862862c2346abf0b6e783 diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/ArmorDisplayFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/ArmorDisplayFabric.java index 4e0d386..7c5a86d 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/ArmorDisplayFabric.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/ArmorDisplayFabric.java @@ -1,7 +1,7 @@ package org.saturnclient.impl.modules; import org.saturnclient.common.ref.game.ItemStackRef; -import org.saturnclient.modules.interfaces.ArmorDisplayInterface; +import org.saturnclient.feature.interfaces.ArmorDisplayInterface; import net.minecraft.client.MinecraftClient; import net.minecraft.entity.EquipmentSlot; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/AutoSprintFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/AutoSprintFabric.java index 2b552fe..d8c55bb 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/AutoSprintFabric.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/AutoSprintFabric.java @@ -1,6 +1,6 @@ package org.saturnclient.impl.modules; -import org.saturnclient.modules.interfaces.AutoSprintInterface; +import org.saturnclient.feature.interfaces.AutoSprintInterface; import net.minecraft.client.MinecraftClient; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/CoordinatesFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/CoordinatesFabric.java index e80e3f6..4ab766e 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/CoordinatesFabric.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/CoordinatesFabric.java @@ -1,6 +1,6 @@ package org.saturnclient.impl.modules; -import org.saturnclient.modules.interfaces.CoordinatesInterface; +import org.saturnclient.feature.interfaces.CoordinatesInterface; import net.minecraft.client.MinecraftClient; import net.minecraft.util.math.Vec3d; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/CrosshairFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/CrosshairFabric.java index c900365..448a1bb 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/CrosshairFabric.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/CrosshairFabric.java @@ -1,6 +1,6 @@ package org.saturnclient.impl.modules; -import org.saturnclient.modules.interfaces.CrosshairInterface; +import org.saturnclient.feature.interfaces.CrosshairInterface; import net.minecraft.client.MinecraftClient; import net.minecraft.entity.Entity; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/DayCounterFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/DayCounterFabric.java index d0eb046..747cacb 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/DayCounterFabric.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/DayCounterFabric.java @@ -1,6 +1,6 @@ package org.saturnclient.impl.modules; -import org.saturnclient.modules.interfaces.DayCounterInterface; +import org.saturnclient.feature.interfaces.DayCounterInterface; import net.minecraft.client.MinecraftClient; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/FpsFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/FpsFabric.java index c051b6d..f1e2524 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/FpsFabric.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/FpsFabric.java @@ -1,6 +1,6 @@ package org.saturnclient.impl.modules; -import org.saturnclient.modules.interfaces.FpsInterface; +import org.saturnclient.feature.interfaces.FpsInterface; import net.minecraft.client.MinecraftClient; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/FreelookFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/FreelookFabric.java index 2298d93..c866f4d 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/FreelookFabric.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/FreelookFabric.java @@ -1,6 +1,6 @@ package org.saturnclient.impl.modules; -import org.saturnclient.modules.interfaces.FreelookInterface; +import org.saturnclient.feature.interfaces.FreelookInterface; import net.minecraft.client.MinecraftClient; import net.minecraft.client.option.Perspective; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/HealthDisplayFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/HealthDisplayFabric.java index 2f4ba34..eb9a0d3 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/HealthDisplayFabric.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/HealthDisplayFabric.java @@ -1,6 +1,6 @@ package org.saturnclient.impl.modules; -import org.saturnclient.modules.interfaces.HealthDisplayInterface; +import org.saturnclient.feature.interfaces.HealthDisplayInterface; import net.minecraft.client.MinecraftClient; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/KeystrokesFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/KeystrokesFabric.java index ac0e8fa..b0a8b42 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/KeystrokesFabric.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/KeystrokesFabric.java @@ -1,6 +1,6 @@ package org.saturnclient.impl.modules; -import org.saturnclient.modules.interfaces.KeystrokesInterface; +import org.saturnclient.feature.interfaces.KeystrokesInterface; import net.minecraft.client.MinecraftClient; 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 c59f0a1..067831f 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.feature.interfaces.NametagsInterface; import org.saturnclient.modules.HealthRenderState; -import org.saturnclient.modules.interfaces.NametagsInterface; 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/impl/modules/PingFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/PingFabric.java index e7e40d3..e707fea 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/PingFabric.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/PingFabric.java @@ -1,6 +1,6 @@ package org.saturnclient.impl.modules; -import org.saturnclient.modules.interfaces.PingInterface; +import org.saturnclient.feature.interfaces.PingInterface; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayNetworkHandler; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/SpeedometerFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/SpeedometerFabric.java index 8b5f271..9fcb83e 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/SpeedometerFabric.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/SpeedometerFabric.java @@ -1,6 +1,6 @@ package org.saturnclient.impl.modules; -import org.saturnclient.modules.interfaces.SpeedometerInterface; +import org.saturnclient.feature.interfaces.SpeedometerInterface; import net.minecraft.client.MinecraftClient; import net.minecraft.entity.Entity; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/StatusEffectsFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/StatusEffectsFabric.java index aedcdaa..c8c40ce 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/StatusEffectsFabric.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/StatusEffectsFabric.java @@ -5,7 +5,7 @@ import java.util.stream.Collectors; import java.util.Arrays; import org.saturnclient.common.ref.asset.SpriteRef; -import org.saturnclient.modules.interfaces.StatusEffectsInterface; +import org.saturnclient.feature.interfaces.StatusEffectsInterface; import net.minecraft.client.MinecraftClient; import net.minecraft.client.texture.StatusEffectSpriteManager; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/provider/FabricModuleProvider.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/provider/FabricModuleProvider.java index 6639513..4c02706 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/provider/FabricModuleProvider.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/provider/FabricModuleProvider.java @@ -1,13 +1,13 @@ package org.saturnclient.impl.provider; -import org.saturnclient.modules.Module; -import org.saturnclient.modules.ModManager.ModuleProvider; -import org.saturnclient.modules.mods.*; +import org.saturnclient.feature.Feature; +import org.saturnclient.feature.FeatureManager.ModuleProvider; +import org.saturnclient.feature.features.*; import org.saturnclient.impl.modules.*; public class FabricModuleProvider implements ModuleProvider { - public static final Module[] MODS = { + public static final Feature[] MODS = { new ArmorDisplay(new ArmorDisplayFabric()), new AutoSprint(new AutoSprintFabric()), new Coordinates(new CoordinatesFabric()), @@ -31,7 +31,7 @@ public class FabricModuleProvider implements ModuleProvider { }; @Override - public Module[] getMods() { + public Feature[] getMods() { return MODS; } } \ No newline at end of file diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/HealthRenderState.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/HealthRenderState.java index 4d77e99..bb03145 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/HealthRenderState.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/HealthRenderState.java @@ -1,6 +1,6 @@ package org.saturnclient.modules; -import org.saturnclient.modules.interfaces.NametagsInterface.EntityType; +import org.saturnclient.feature.interfaces.NametagsInterface.EntityType; public interface HealthRenderState { float saturn$getHealth(); diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/BackgroundRendererMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/BackgroundRendererMixin.java index 3526ef5..4952100 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/BackgroundRendererMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/BackgroundRendererMixin.java @@ -1,9 +1,9 @@ package org.saturnclient.modules.mixins; import net.minecraft.client.render.BackgroundRenderer; - -import org.saturnclient.modules.mods.NoFog; import net.minecraft.entity.Entity; + +import org.saturnclient.feature.features.NoFog; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.ModifyVariable; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/CameraMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/CameraMixin.java index 4da24e8..caa09e3 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/CameraMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/CameraMixin.java @@ -6,8 +6,8 @@ import net.minecraft.client.render.Camera; import net.minecraft.entity.Entity; import net.minecraft.world.BlockView; +import org.saturnclient.feature.features.Freelook; import org.saturnclient.modules.CameraOverriddenEntity; -import org.saturnclient.modules.mods.Freelook; 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/mixins/EntityMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/EntityMixin.java index 6ad53c0..ca7a7fc 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/EntityMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/EntityMixin.java @@ -5,8 +5,8 @@ import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.entity.Entity; import net.minecraft.util.math.MathHelper; +import org.saturnclient.feature.features.Freelook; import org.saturnclient.modules.CameraOverriddenEntity; -import org.saturnclient.modules.mods.Freelook; 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/mixins/GameRendererMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/GameRendererMixin.java index d0d3262..d1040d5 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/GameRendererMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/GameRendererMixin.java @@ -1,10 +1,10 @@ package org.saturnclient.modules.mixins; +import org.saturnclient.feature.features.Zoom; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import org.saturnclient.modules.mods.Zoom; import net.minecraft.client.render.GameRenderer; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LightmapTextureManagerMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LightmapTextureManagerMixin.java index cc4cfaa..16d8c7f 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LightmapTextureManagerMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LightmapTextureManagerMixin.java @@ -3,7 +3,8 @@ package org.saturnclient.modules.mixins; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import net.minecraft.client.render.LightmapTextureManager; -import org.saturnclient.modules.mods.Fullbright; + +import org.saturnclient.feature.features.Fullbright; 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/mixins/LivingEntityRenderStateMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LivingEntityRenderStateMixin.java index 4f0bd81..1c22369 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LivingEntityRenderStateMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LivingEntityRenderStateMixin.java @@ -2,7 +2,7 @@ package org.saturnclient.modules.mixins; import net.minecraft.client.render.entity.state.LivingEntityRenderState; -import org.saturnclient.modules.interfaces.NametagsInterface.EntityType; +import org.saturnclient.feature.interfaces.NametagsInterface.EntityType; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LivingEntityRendererMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LivingEntityRendererMixin.java index d2e560a..2261e31 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LivingEntityRendererMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LivingEntityRendererMixin.java @@ -3,8 +3,8 @@ package org.saturnclient.modules.mixins; import net.minecraft.client.render.entity.LivingEntityRenderer; import net.minecraft.client.render.entity.state.LivingEntityRenderState; +import org.saturnclient.feature.interfaces.NametagsInterface.EntityType; import org.saturnclient.modules.HealthRenderState; -import org.saturnclient.modules.interfaces.NametagsInterface.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.mob.HostileEntity; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/NametagsMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/NametagsMixin.java index 346e42c..7a0fcf8 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/NametagsMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/NametagsMixin.java @@ -7,8 +7,8 @@ import net.minecraft.client.render.entity.state.LivingEntityRenderState; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; +import org.saturnclient.feature.features.Nametags; import org.saturnclient.impl.modules.NametagsFabric; -import org.saturnclient.modules.mods.Nametags; 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/mixins/RenderMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/RenderMixin.java index bc4835c..25ef20e 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/RenderMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/RenderMixin.java @@ -1,8 +1,8 @@ package org.saturnclient.modules.mixins; -import org.saturnclient.modules.HudMod; -import org.saturnclient.modules.ModDimensions; -import org.saturnclient.modules.ModManager; +import org.saturnclient.feature.HudFeature; +import org.saturnclient.feature.FeatureLayout; +import org.saturnclient.feature.FeatureManager; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.mixin.DrawContextAccessor; import org.saturnclient.ui.RenderScope; @@ -30,9 +30,9 @@ public class RenderMixin { RenderScope renderScope = new RenderScopeImpl(context.getMatrices(), ((DrawContextAccessor) context).getVertexConsumers()); - for (org.saturnclient.modules.Module m : ModManager.ENABLED_MODS) { - if (m instanceof HudMod && m.isEnabled()) { - ModDimensions dim = ((HudMod) m).getDimensions(); + for (org.saturnclient.feature.Feature m : FeatureManager.ENABLED_MODS) { + if (m instanceof HudFeature && m.isEnabled()) { + FeatureLayout dim = ((HudFeature) m).getDimensions(); renderScope.getMatrixStack().push(); @@ -45,7 +45,7 @@ public class RenderMixin { dim.bgColor.value); } - ((HudMod) m).renderHud(renderScope); + ((HudFeature) m).renderHud(renderScope); renderScope.getMatrixStack().pop(); } else { diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/TpsMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/TpsMixin.java index a7a3751..0c56d80 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/TpsMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/TpsMixin.java @@ -2,7 +2,8 @@ package org.saturnclient.modules.mixins; import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.network.packet.s2c.play.WorldTimeUpdateS2CPacket; -import org.saturnclient.modules.mods.Tps; + +import org.saturnclient.feature.features.Tps; 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/SaturnClient.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java index ada9a0b..ebb7bde 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 @@ -8,13 +8,13 @@ import net.minecraft.client.MinecraftClient; import org.saturnclient.client.ServiceClient; import org.saturnclient.cosmetics.Emotes; import org.saturnclient.cosmetics.Hats; +import org.saturnclient.feature.FeatureManager; import org.saturnclient.cosmetics.Cloaks; import org.saturnclient.common.provider.Providers; import org.saturnclient.impl.provider.FabricModuleProvider; import org.saturnclient.impl.provider.GLFWProviderImpl; import org.saturnclient.impl.provider.RefConstructorImpl; import org.saturnclient.impl.provider.SaturnProviderImpl; -import org.saturnclient.modules.ModManager; import org.saturnclient.config.Config; import org.saturnclient.config.manager.ConfigManager; import org.saturnclient.saturnclient.event.KeyInputHandler; @@ -44,7 +44,7 @@ public class SaturnClient implements ModInitializer { SkinPreview.DRAWER = new EntityDrawerImpl(); Config.init(); - ModManager.init(new FabricModuleProvider()); + FeatureManager.init(new FabricModuleProvider()); client.execute(() -> { SaturnScreenFabric.preload(client); @@ -53,7 +53,7 @@ public class SaturnClient implements ModInitializer { ClientLifecycleEvents.CLIENT_STOPPING.register(_o -> ConfigManager.save()); ClientTickEvents.END_CLIENT_TICK.register(client -> { - for (org.saturnclient.modules.Module m : ModManager.ENABLED_MODS) { + for (org.saturnclient.feature.Feature m : FeatureManager.ENABLED_MODS) { m.tick(); } });