Refact module to feature

src/main/java/org/saturnclient/common/provider/GLFWProvider.java

@@ -1,9 +1,9 @@
 package org.saturnclient.common.provider;
 
 public interface GLFWProvider {
-    public abstract boolean isKeyPressed(int key);
+    public boolean isKeyPressed(int key);
 
-    public abstract String getKeyName(int key);
+    public String getKeyName(int key);
 
     /** Printable keys. */
     public static final int GLFW_KEY_SPACE = 32,

src/main/java/org/saturnclient/common/provider/ModuleProvider.java

@@ -0,0 +1,5 @@
+package org.saturnclient.common.provider;
+
+public interface ModuleProvider {
+    
+}

src/main/java/org/saturnclient/common/provider/RefConstructorProvider.java

@@ -4,9 +4,9 @@ import org.saturnclient.common.ref.asset.IdentifierRef;
 import org.saturnclient.common.ref.render.TextRef;
 
 public interface RefConstructorProvider {
-    public abstract IdentifierRef identifier(String namespace, String path);
+    public IdentifierRef identifier(String namespace, String path);
 
-    public abstract IdentifierRef identifier(String fullPath);
+    public IdentifierRef identifier(String fullPath);
 
-    public abstract TextRef text(String text);
+    public TextRef text(String text);
 }

src/main/java/org/saturnclient/feature/Feature.java

@@ -1,4 +1,4 @@
-package org.saturnclient.modules;
+package org.saturnclient.feature;
 
 import org.saturnclient.common.ref.asset.IdentifierRef;
 import org.saturnclient.config.manager.ConfigManager;
@@ -6,11 +6,11 @@ import org.saturnclient.config.manager.Property.NamedProperty;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.resources.Textures;
 
-public abstract class Module {
+public abstract class Feature {
-    private final ModuleDetails details;
+    private final FeatureDetails details;
     private final ConfigManager configManager;
 
-    public Module(ModuleDetails details, NamedProperty<?>... props) {
+    public Feature(FeatureDetails details, NamedProperty<?>... props) {
         this.details = details;
         configManager = new ConfigManager(details.name);
         for (NamedProperty<?> prop : props) {
@@ -28,7 +28,7 @@ public abstract class Module {
 
     public final void setEnabled(boolean e) {
         onEnabled(e);
-        ModManager.updateEnabledModules();
+        FeatureManager.updateEnabledModules();
     }
 
     public abstract void onEnabled(boolean e);

src/main/java/org/saturnclient/feature/FeatureDetails.java

@@ -1,38 +1,38 @@
-package org.saturnclient.modules;
+package org.saturnclient.feature;
 
-public class ModuleDetails {
+public class FeatureDetails {
     public String name;
     public String namespace;
     public String description;
     public String version;
     public String[] tags = {};
 
-    public ModuleDetails(String name, String namespace) {
+    public FeatureDetails(String name, String namespace) {
         this.name = name;
         this.namespace = namespace;
     }
 
-    public ModuleDetails name(String name) {
+    public FeatureDetails name(String name) {
         this.name = name;
         return this;
     }
 
-    public ModuleDetails namespace(String namespace) {
+    public FeatureDetails namespace(String namespace) {
         this.namespace = namespace;
         return this;
     }
 
-    public ModuleDetails description(String description) {
+    public FeatureDetails description(String description) {
         this.description = description;
         return this;
     }
 
-    public ModuleDetails version(String version) {
+    public FeatureDetails version(String version) {
         this.version = version;
         return this;
     }
 
-    public ModuleDetails tags(String... tags) {
+    public FeatureDetails tags(String... tags) {
         this.tags = tags;
         return this;
     }

src/main/java/org/saturnclient/feature/FeatureLayout.java

@@ -1,11 +1,11 @@
-package org.saturnclient.modules;
+package org.saturnclient.feature;
 
 import java.util.Map;
 
 import org.saturnclient.config.manager.Property;
 import org.saturnclient.config.manager.Property.NamedProperty;
 
-public class ModDimensions {
+public class FeatureLayout {
     public Property<Integer> x = Property.integer(0);
     public Property<Integer> y = Property.integer(0);
     public Property<Float> scale = Property.floatProp(1.0f);
@@ -29,22 +29,22 @@ public class ModDimensions {
                 "Font", font)).named("In-Game Display");
     }
 
-    public ModDimensions() {
+    public FeatureLayout() {
     }
 
-    public ModDimensions(int width, int height) {
+    public FeatureLayout(int width, int height) {
         this.width = width;
         this.height = height;
     }
 
-    public ModDimensions(int x, int y, int width, int height) {
+    public FeatureLayout(int x, int y, int width, int height) {
         this.x.value = x;
         this.y.value = y;
         this.width = width;
         this.height = height;
     }
 
-    public ModDimensions(int x, int y, int width, int height, float scale) {
+    public FeatureLayout(int x, int y, int width, int height, float scale) {
         this.x.value = x;
         this.y.value = y;
         this.scale.value = scale;

src/main/java/org/saturnclient/feature/FeatureManager.java

@@ -1,11 +1,11 @@
-package org.saturnclient.modules;
+package org.saturnclient.feature;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class ModManager {
+public class FeatureManager {
-    public static List<Module> ENABLED_MODS = new ArrayList<>();
+    public static List<Feature> ENABLED_MODS = new ArrayList<>();
-    public static Module[] MODS = {};
+    public static Feature[] MODS = {};
 
     public static void init(ModuleProvider provider) {
         MODS = provider.getMods();
@@ -14,18 +14,18 @@ public class ModManager {
 
     public static synchronized void updateEnabledModules() {
         ENABLED_MODS.clear();
-        for (Module m : MODS) {
+        for (Feature m : MODS) {
             if (m.isEnabled()) {
                 ENABLED_MODS.add(m);
             }
         }
     }
 
-    public static Module[] getAllMods() {
+    public static Feature[] getAllMods() {
         return MODS;
     }
 
     public interface ModuleProvider {
-        Module[] getMods();
+        Feature[] getMods();
     }
 }

src/main/java/org/saturnclient/feature/HudFeature.java

@@ -1,9 +1,9 @@
-package org.saturnclient.modules;
+package org.saturnclient.feature;
 
 import org.saturnclient.ui.RenderScope;
 
-public interface HudMod {
+public interface HudFeature {
-    public ModDimensions getDimensions();
+    public FeatureLayout getDimensions();
 
     public void renderDummy(RenderScope scope);
 

src/main/java/org/saturnclient/feature/features/ArmorDisplay.java

@@ -1,24 +1,24 @@
-package org.saturnclient.modules.mods;
+package org.saturnclient.feature.features;
 
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.modules.interfaces.ArmorDisplayInterface;
 import org.saturnclient.common.ref.game.ItemStackRef;
 import org.saturnclient.config.manager.Property;
+import org.saturnclient.feature.HudFeature;
+import org.saturnclient.feature.FeatureLayout;
+import org.saturnclient.feature.Feature;
+import org.saturnclient.feature.FeatureDetails;
+import org.saturnclient.feature.interfaces.ArmorDisplayInterface;
 import org.saturnclient.ui.RenderScope;
 
-public class ArmorDisplay extends Module implements HudMod {
+public class ArmorDisplay extends Feature implements HudFeature {
 
     private static Property<Boolean> enabled = Property.bool(false);
-    private static ModDimensions dimensions = new ModDimensions(40, 75);
+    private static FeatureLayout dimensions = new FeatureLayout(40, 75);
     private static Property<Boolean> useMainHand = Property.bool(true);
 
     private final ArmorDisplayInterface minecraft;
 
     public ArmorDisplay(ArmorDisplayInterface minecraft) {
-        super(new ModuleDetails("Armor Display", "armor")
+        super(new FeatureDetails("Armor Display", "armor")
                 .description("Displays armor durability")
                 .version("v0.1.0")
                 .tags("Utility"),
@@ -102,7 +102,7 @@ public class ArmorDisplay extends Module implements HudMod {
     }
 
     @Override
-    public ModDimensions getDimensions() {
+    public FeatureLayout getDimensions() {
         return dimensions;
     }
 

src/main/java/org/saturnclient/feature/features/AutoSprint.java

@@ -1,11 +1,11 @@
-package org.saturnclient.modules.mods;
+package org.saturnclient.feature.features;
 
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.modules.interfaces.AutoSprintInterface;
 import org.saturnclient.config.manager.Property;
+import org.saturnclient.feature.Feature;
+import org.saturnclient.feature.FeatureDetails;
+import org.saturnclient.feature.interfaces.AutoSprintInterface;
 
-public class AutoSprint extends Module {
+public class AutoSprint extends Feature {
 
     private static Property<Boolean> enabled = Property.bool(false);
 
@@ -13,7 +13,7 @@ public class AutoSprint extends Module {
 
     public AutoSprint(AutoSprintInterface minecraft) {
         super(
-                new ModuleDetails("Auto Sprint", "sprint")
+                new FeatureDetails("Auto Sprint", "sprint")
                         .description("Makes the player always sprint")
                         .tags("Movement")
                         .version("v0.1.0"),

src/main/java/org/saturnclient/feature/features/Clock.java

@@ -1,24 +1,24 @@
-package org.saturnclient.modules.mods;
+package org.saturnclient.feature.features;
 
 import java.time.format.DateTimeFormatter;
 import java.time.LocalTime;
 
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
 import org.saturnclient.config.manager.Property;
+import org.saturnclient.feature.HudFeature;
+import org.saturnclient.feature.FeatureLayout;
+import org.saturnclient.feature.Feature;
+import org.saturnclient.feature.FeatureDetails;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.resources.Fonts;
 
-public class Clock extends Module implements HudMod {
+public class Clock extends Feature implements HudFeature {
     private static Property<Boolean> enabled = Property.bool(false);
     private static Property<Integer> format = Property.select(0, "24 hour", "12 hour");
     private static Property<Boolean> seconds = Property.bool(false);
-    private static ModDimensions dimensions = new ModDimensions(60, Fonts.getHeight());
+    private static FeatureLayout dimensions = new FeatureLayout(60, Fonts.getHeight());
 
     public Clock() {
-        super(new ModuleDetails("Clock", "clock")
+        super(new FeatureDetails("Clock", "clock")
                 .description("Displays the current real-world time")
                 .version("v0.1.0")
                 .tags("Utility"),
@@ -71,7 +71,7 @@ public class Clock extends Module implements HudMod {
     }
 
     @Override
-    public ModDimensions getDimensions() {
+    public FeatureLayout getDimensions() {
         return dimensions;
     }
 

src/main/java/org/saturnclient/feature/features/Coordinates.java

@@ -1,15 +1,15 @@
-package org.saturnclient.modules.mods;
+package org.saturnclient.feature.features;
 
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.modules.interfaces.CoordinatesInterface;
 import org.saturnclient.config.manager.Property;
+import org.saturnclient.feature.HudFeature;
+import org.saturnclient.feature.FeatureLayout;
+import org.saturnclient.feature.Feature;
+import org.saturnclient.feature.FeatureDetails;
+import org.saturnclient.feature.interfaces.CoordinatesInterface;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.resources.Fonts;
 
-public class Coordinates extends Module implements HudMod {
+public class Coordinates extends Feature implements HudFeature {
 
     private static Property<Boolean> enabled = Property.bool(false);
 
@@ -20,12 +20,12 @@ public class Coordinates extends Module implements HudMod {
             "Newline",
             "Newline annotated");
 
-    private static ModDimensions dimensions = new ModDimensions(40, 18);
+    private static FeatureLayout dimensions = new FeatureLayout(40, 18);
 
     private final CoordinatesInterface minecraft;
 
     public Coordinates(CoordinatesInterface minecraft) {
-        super(new ModuleDetails("Coordinates", "coords")
+        super(new FeatureDetails("Coordinates", "coords")
                 .description("Displays your current coordinates")
                 .version("v0.1.0")
                 .tags("Utility"),
@@ -87,7 +87,7 @@ public class Coordinates extends Module implements HudMod {
     }
 
     @Override
-    public ModDimensions getDimensions() {
+    public FeatureLayout getDimensions() {
         return dimensions;
     }
 

src/main/java/org/saturnclient/feature/features/Crosshair.java

@@ -1,13 +1,13 @@
-package org.saturnclient.modules.mods;
+package org.saturnclient.feature.features;
 
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.modules.interfaces.CrosshairInterface;
 import org.saturnclient.config.manager.Property;
+import org.saturnclient.feature.Feature;
+import org.saturnclient.feature.FeatureDetails;
+import org.saturnclient.feature.interfaces.CrosshairInterface;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.resources.Textures;
 
-public class Crosshair extends Module {
+public class Crosshair extends Feature {
 
     public static Property<Boolean> enabled = Property.bool(false);
 
@@ -15,7 +15,7 @@ public class Crosshair extends Module {
 
     public Crosshair(CrosshairInterface minecraft) {
         super(
-                new ModuleDetails("Crosshair", "crosshair")
+                new FeatureDetails("Crosshair", "crosshair")
                         .description("Changes the crosshair if you're aiming at a entity")
                         .tags("Visuals", "Utility")
                         .version("v0.1.0"),

src/main/java/org/saturnclient/feature/features/DayCounter.java

@@ -1,25 +1,25 @@
-package org.saturnclient.modules.mods;
+package org.saturnclient.feature.features;
 
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.modules.interfaces.DayCounterInterface;
 import org.saturnclient.config.manager.Property;
+import org.saturnclient.feature.HudFeature;
+import org.saturnclient.feature.FeatureLayout;
+import org.saturnclient.feature.Feature;
+import org.saturnclient.feature.FeatureDetails;
+import org.saturnclient.feature.interfaces.DayCounterInterface;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.resources.Fonts;
 
-public class DayCounter extends Module implements HudMod {
+public class DayCounter extends Feature implements HudFeature {
 
     private static Property<Boolean> enabled = Property.bool(false);
-    private static ModDimensions dimensions = new ModDimensions(40, 18);
+    private static FeatureLayout dimensions = new FeatureLayout(40, 18);
 
     private final DayCounterInterface minecraft;
 
     long day = 0;
 
     public DayCounter(DayCounterInterface minecraft) {
-        super(new ModuleDetails("DayCounter", "day")
+        super(new FeatureDetails("DayCounter", "day")
                 .description("Displays the number of days that have passed")
                 .version("v0.1.0")
                 .tags("Utility"),
@@ -60,7 +60,7 @@ public class DayCounter extends Module implements HudMod {
     }
 
     @Override
-    public ModDimensions getDimensions() {
+    public FeatureLayout getDimensions() {
         return dimensions;
     }
 

src/main/java/org/saturnclient/feature/features/Fps.java

@@ -1,23 +1,23 @@
-package org.saturnclient.modules.mods;
+package org.saturnclient.feature.features;
 
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.modules.interfaces.FpsInterface;
 import org.saturnclient.config.manager.Property;
+import org.saturnclient.feature.HudFeature;
+import org.saturnclient.feature.FeatureLayout;
+import org.saturnclient.feature.Feature;
+import org.saturnclient.feature.FeatureDetails;
+import org.saturnclient.feature.interfaces.FpsInterface;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.resources.Fonts;
 
-public class Fps extends Module implements HudMod {
+public class Fps extends Feature implements HudFeature {
 
     private static Property<Boolean> enabled = Property.bool(false);
-    private static ModDimensions dimensions = new ModDimensions(60, Fonts.getHeight());
+    private static FeatureLayout dimensions = new FeatureLayout(60, Fonts.getHeight());
 
     private final FpsInterface minecraft;
 
     public Fps(FpsInterface minecraft) {
-        super(new ModuleDetails("FPS Display", "fps")
+        super(new FeatureDetails("FPS Display", "fps")
                 .description("Displays current FPS")
                 .version("v0.1.0")
                 .tags("Utility"),
@@ -58,7 +58,7 @@ public class Fps extends Module implements HudMod {
     }
 
     @Override
-    public ModDimensions getDimensions() {
+    public FeatureLayout getDimensions() {
         return dimensions;
     }
 }

src/main/java/org/saturnclient/feature/features/Freelook.java

@@ -1,12 +1,12 @@
-package org.saturnclient.modules.mods;
+package org.saturnclient.feature.features;
 
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.modules.interfaces.FreelookInterface;
 import org.saturnclient.common.provider.GLFWProvider;
 import org.saturnclient.config.manager.Property;
+import org.saturnclient.feature.Feature;
+import org.saturnclient.feature.FeatureDetails;
+import org.saturnclient.feature.interfaces.FreelookInterface;
 
-public class Freelook extends Module {
+public class Freelook extends Feature {
 
     private static Property<Boolean> enabled = Property.bool(false);
     private static Property<Boolean> toggle = Property.bool(true);
@@ -20,7 +20,7 @@ public class Freelook extends Module {
 
     public Freelook(FreelookInterface minecraft) {
         super(
-                new ModuleDetails("Freelook", "freelook")
+                new FeatureDetails("Freelook", "freelook")
                         .description("Allows you to look around freely without moving your character")
                         .tags("Movement", "Camera")
                         .version("0.1.0"),

src/main/java/org/saturnclient/feature/features/Fullbright.java

@@ -1,16 +1,16 @@
-package org.saturnclient.modules.mods;
+package org.saturnclient.feature.features;
 
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
 import org.saturnclient.config.manager.Property;
+import org.saturnclient.feature.Feature;
+import org.saturnclient.feature.FeatureDetails;
 
-public class Fullbright extends Module {
+public class Fullbright extends Feature {
     private static Property<Boolean> enabled = Property.bool(false);
     private static Property<Integer> brightness = Property.integer(100);
 
     public Fullbright() {
         super(
-                new ModuleDetails("Fullbright", "fullbright")
+                new FeatureDetails("Fullbright", "fullbright")
                         .description("Allows you to see in the dark")
                         .tags("Camera")
                         .version("v0.1.0"),

src/main/java/org/saturnclient/feature/features/HealthDisplay.java

@@ -1,26 +1,26 @@
-package org.saturnclient.modules.mods;
+package org.saturnclient.feature.features;
 
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.modules.interfaces.HealthDisplayInterface;
 import org.saturnclient.config.manager.Property;
+import org.saturnclient.feature.HudFeature;
+import org.saturnclient.feature.FeatureLayout;
+import org.saturnclient.feature.Feature;
+import org.saturnclient.feature.FeatureDetails;
+import org.saturnclient.feature.interfaces.HealthDisplayInterface;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.resources.Fonts;
 
-public class HealthDisplay extends Module implements HudMod {
+public class HealthDisplay extends Feature implements HudFeature {
 
     private static Property<Boolean> enabled = Property.bool(false);
     private static Property<Integer> displayMode = Property.select(0, "Health", "Hearts");
     private static Property<Integer> decimals = Property.select(0, "0", "1", "2");
 
-    private static ModDimensions dimensions = new ModDimensions(40, 18);
+    private static FeatureLayout dimensions = new FeatureLayout(40, 18);
 
     private final HealthDisplayInterface minecraft;
 
     public HealthDisplay(HealthDisplayInterface minecraft) {
-        super(new ModuleDetails("Health display", "health")
+        super(new FeatureDetails("Health display", "health")
                 .description("Displays your current health")
                 .version("v0.1.0")
                 .tags("Utility"),
@@ -73,8 +73,7 @@ public class HealthDisplay extends Module implements HudMod {
                 0,
                 0,
                 dimensions.font.value,
-                dimensions.fgColor.value
+                dimensions.fgColor.value);
-        );
 
         dimensions.width = Fonts.getWidth(text, dimensions.font.value);
         dimensions.height = 18 * text.split("\n").length;
@@ -86,7 +85,7 @@ public class HealthDisplay extends Module implements HudMod {
     }
 
     @Override
-    public ModDimensions getDimensions() {
+    public FeatureLayout getDimensions() {
         return dimensions;
     }
 

src/main/java/org/saturnclient/feature/features/Keystrokes.java

@@ -1,14 +1,14 @@
-package org.saturnclient.modules.mods;
+package org.saturnclient.feature.features;
 
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.modules.interfaces.KeystrokesInterface;
 import org.saturnclient.config.manager.Property;
+import org.saturnclient.feature.HudFeature;
+import org.saturnclient.feature.FeatureLayout;
+import org.saturnclient.feature.Feature;
+import org.saturnclient.feature.FeatureDetails;
+import org.saturnclient.feature.interfaces.KeystrokesInterface;
 import org.saturnclient.ui.RenderScope;
 
-public class Keystrokes extends Module implements HudMod {
+public class Keystrokes extends Feature implements HudFeature {
 
     private static final Property<Boolean> enabled = Property.bool(false);
     private static final Property<Boolean> showMouse = Property.bool(true);
@@ -17,7 +17,7 @@ public class Keystrokes extends Module implements HudMod {
     private static final Property<Integer> clickBg = Property.color(0xFFCCCCCC);
     private static final Property<Integer> clickFg = Property.color(0xFFFFFFFF);
 
-    private static final ModDimensions dimensions = new ModDimensions(78, 54);
+    private static final FeatureLayout dimensions = new FeatureLayout(78, 54);
 
     private final KeystrokesInterface minecraft;
 
@@ -32,7 +32,7 @@ public class Keystrokes extends Module implements HudMod {
     private static final int SPACE_HEIGHT = 19;
 
     public Keystrokes(KeystrokesInterface minecraft) {
-        super(new ModuleDetails("Keystrokes", "keystrokes")
+        super(new FeatureDetails("Keystrokes", "keystrokes")
                 .description("Displays movement keystrokes")
                 .version("v0.2.0")
                 .tags("Utility"),
@@ -145,7 +145,7 @@ public class Keystrokes extends Module implements HudMod {
     }
 
     @Override
-    public ModDimensions getDimensions() {
+    public FeatureLayout getDimensions() {
         return dimensions;
     }
 

src/main/java/org/saturnclient/feature/features/Nametags.java

@@ -1,11 +1,11 @@
-package org.saturnclient.modules.mods;
+package org.saturnclient.feature.features;
 
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
 import org.saturnclient.config.manager.Property;
-import org.saturnclient.modules.interfaces.NametagsInterface;
+import org.saturnclient.feature.Feature;
+import org.saturnclient.feature.FeatureDetails;
+import org.saturnclient.feature.interfaces.NametagsInterface;
 
-public class Nametags extends Module {
+public class Nametags extends Feature {
 
     private static Property<Boolean> enabled = Property.bool(false);
     private static Property<Boolean> healthDisplay = Property.bool(false);
@@ -29,7 +29,7 @@ public class Nametags extends Module {
     };
 
     public Nametags(NametagsInterface minecraft) {
-        super(new ModuleDetails("Nametags", "nametags")
+        super(new FeatureDetails("Nametags", "nametags")
                 .description("Allows you to modify entity nametags")
                 .tags("Camera", "Utility")
                 .version("0.1.0"),

src/main/java/org/saturnclient/feature/features/NoFog.java

@@ -1,16 +1,16 @@
-package org.saturnclient.modules.mods;
+package org.saturnclient.feature.features;
 
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
 import org.saturnclient.config.manager.Property;
+import org.saturnclient.feature.Feature;
+import org.saturnclient.feature.FeatureDetails;
 
-public class NoFog extends Module {
+public class NoFog extends Feature {
     private static Property<Boolean> enabled = Property.bool(false);
     private static Property<Boolean> liquids = Property.bool(false);
 
     public NoFog() {
         super(
-                new ModuleDetails("No Fog", "nofog")
+                new FeatureDetails("No Fog", "nofog")
                         .description("Stops fog from rendering")
                         .tags("Camera")
                         .version("v0.1.0"),

src/main/java/org/saturnclient/feature/features/Ping.java

@@ -1,23 +1,23 @@
-package org.saturnclient.modules.mods;
+package org.saturnclient.feature.features;
 
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
 import org.saturnclient.config.manager.Property;
-import org.saturnclient.modules.interfaces.PingInterface;
+import org.saturnclient.feature.HudFeature;
+import org.saturnclient.feature.FeatureLayout;
+import org.saturnclient.feature.Feature;
+import org.saturnclient.feature.FeatureDetails;
+import org.saturnclient.feature.interfaces.PingInterface;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.resources.Fonts;
 
-public class Ping extends Module implements HudMod {
+public class Ping extends Feature implements HudFeature {
 
     private static Property<Boolean> enabled = Property.bool(false);
-    private static ModDimensions dimensions = new ModDimensions(60, Fonts.getHeight());
+    private static FeatureLayout dimensions = new FeatureLayout(60, Fonts.getHeight());
 
     private final PingInterface pingProvider;
 
     public Ping(PingInterface pingProvider) {
-        super(new ModuleDetails("Ping Display", "ping")
+        super(new FeatureDetails("Ping Display", "ping")
                 .description("Displays ping")
                 .version("v0.1.0")
                 .tags("Utility"),
@@ -53,7 +53,7 @@ public class Ping extends Module implements HudMod {
     }
 
     @Override
-    public ModDimensions getDimensions() {
+    public FeatureLayout getDimensions() {
         return dimensions;
     }
 }

src/main/java/org/saturnclient/feature/features/Speedometer.java

@@ -1,27 +1,27 @@
-package org.saturnclient.modules.mods;
+package org.saturnclient.feature.features;
 
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
 import org.saturnclient.config.manager.Property;
-import org.saturnclient.modules.interfaces.SpeedometerInterface;
+import org.saturnclient.feature.HudFeature;
+import org.saturnclient.feature.FeatureLayout;
+import org.saturnclient.feature.Feature;
+import org.saturnclient.feature.FeatureDetails;
+import org.saturnclient.feature.interfaces.SpeedometerInterface;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.resources.Fonts;
 
-public class Speedometer extends Module implements HudMod {
+public class Speedometer extends Feature implements HudFeature {
 
     private static Property<Boolean> enabled = Property.bool(false);
     private static Property<Integer> axis = Property.select(1, "Absolute", "X axis", "Y axis");
     private static Property<Integer> unitText = Property.select(0, "None", "Blocks/s", "blocks/s", "b/s");
     private static Property<Boolean> speedText = Property.bool(true);
-    private static ModDimensions dimensions = new ModDimensions(40, 18);
+    private static FeatureLayout dimensions = new FeatureLayout(40, 18);
 
     private final SpeedometerInterface provider;
     private double speed = 0.;
 
     public Speedometer(SpeedometerInterface provider) {
-        super(new ModuleDetails("Speedometer", "speed")
+        super(new FeatureDetails("Speedometer", "speed")
                 .description("Displays your current speed")
                 .version("v0.1.0")
                 .tags("Utility"),
@@ -85,7 +85,7 @@ public class Speedometer extends Module implements HudMod {
     }
 
     @Override
-    public ModDimensions getDimensions() {
+    public FeatureLayout getDimensions() {
         return dimensions;
     }
 

src/main/java/org/saturnclient/feature/features/StatusEffects.java

@@ -1,24 +1,24 @@
-package org.saturnclient.modules.mods;
+package org.saturnclient.feature.features;
 
 import java.util.List;
 
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
-import org.saturnclient.modules.interfaces.StatusEffectsInterface;
 import org.saturnclient.config.manager.Property;
+import org.saturnclient.feature.HudFeature;
+import org.saturnclient.feature.FeatureLayout;
+import org.saturnclient.feature.Feature;
+import org.saturnclient.feature.FeatureDetails;
+import org.saturnclient.feature.interfaces.StatusEffectsInterface;
 import org.saturnclient.ui.RenderScope;
 
-public class StatusEffects extends Module implements HudMod {
+public class StatusEffects extends Feature implements HudFeature {
 
     public static Property<Boolean> enabled = Property.bool(false);
-    private static ModDimensions dimensions = new ModDimensions(60, 0);
+    private static FeatureLayout dimensions = new FeatureLayout(60, 0);
 
     private final StatusEffectsInterface provider;
 
     public StatusEffects(StatusEffectsInterface provider) {
-        super(new ModuleDetails("Status effects", "effect")
+        super(new FeatureDetails("Status effects", "effect")
                 .description("Displays status effects")
                 .version("v0.1.0")
                 .tags("Utility"),
@@ -32,7 +32,8 @@ public class StatusEffects extends Module implements HudMod {
         int row = 0;
 
         for (StatusEffectsInterface.Effect effect : effects) {
-            if (!effect.shouldShowIcon()) continue;
+            if (!effect.shouldShowIcon())
+                continue;
 
             scope.drawSpriteStretched(effect.getIcon(), 0, 18 * row, 16, 16);
             scope.drawText(0.5f, getDurationAsString(effect), 18, 18 * row + 3, dimensions.font.value, -1);
@@ -70,7 +71,7 @@ public class StatusEffects extends Module implements HudMod {
     }
 
     @Override
-    public ModDimensions getDimensions() {
+    public FeatureLayout getDimensions() {
         return dimensions;
     }
 

src/main/java/org/saturnclient/feature/features/Tps.java

@@ -1,16 +1,16 @@
-package org.saturnclient.modules.mods;
+package org.saturnclient.feature.features;
 
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
 import org.saturnclient.config.manager.Property;
+import org.saturnclient.feature.HudFeature;
+import org.saturnclient.feature.FeatureLayout;
+import org.saturnclient.feature.Feature;
+import org.saturnclient.feature.FeatureDetails;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.resources.Fonts;
 
-public class Tps extends Module implements HudMod {
+public class Tps extends Feature implements HudFeature {
     private static Property<Boolean> enabled = Property.bool(false);
-    private static ModDimensions dimensions = new ModDimensions(60, Fonts.getHeight());
+    private static FeatureLayout dimensions = new FeatureLayout(60, Fonts.getHeight());
 
     private static long lastWorldAge = -1;
     private static long lastRealTime = -1;
@@ -25,7 +25,7 @@ public class Tps extends Module implements HudMod {
     private static int samplesFilled = 0;
 
     public Tps() {
-        super(new ModuleDetails("TPS Display", "tps")
+        super(new FeatureDetails("TPS Display", "tps")
                 .description("Displays the TPS")
                 .version("v0.1.0")
                 .tags("Utility"),
@@ -94,7 +94,7 @@ public class Tps extends Module implements HudMod {
     }
 
     @Override
-    public ModDimensions getDimensions() {
+    public FeatureLayout getDimensions() {
         return dimensions;
     }
 }

src/main/java/org/saturnclient/feature/features/Zoom.java

@@ -1,11 +1,11 @@
-package org.saturnclient.modules.mods;
+package org.saturnclient.feature.features;
 
-import org.saturnclient.modules.Module;
-import org.saturnclient.modules.ModuleDetails;
 import org.saturnclient.common.provider.GLFWProvider;
 import org.saturnclient.config.manager.Property;
+import org.saturnclient.feature.Feature;
+import org.saturnclient.feature.FeatureDetails;
 
-public class Zoom extends Module {
+public class Zoom extends Feature {
     private static Property<Boolean> enabled = Property.bool(false);
     private static Property<Boolean> toggle = Property.bool(false);
     public static Property<Integer> zoomKey = Property.keybinding(GLFWProvider.GLFW_KEY_C);
@@ -15,7 +15,7 @@ public class Zoom extends Module {
 
     public Zoom() {
         super(
-                new ModuleDetails("Zoom", "zoom")
+                new FeatureDetails("Zoom", "zoom")
                         .description("Allows you to zoom in for a closer view")
                         .tags("Camera", "Utility")
                         .version("0.1.0"),

src/main/java/org/saturnclient/feature/interfaces/ArmorDisplayInterface.java

@@ -1,4 +1,4 @@
-package org.saturnclient.modules.interfaces;
+package org.saturnclient.feature.interfaces;
 
 import org.saturnclient.common.ref.game.ItemStackRef;
 

src/main/java/org/saturnclient/feature/interfaces/AutoSprintInterface.java

@@ -1,4 +1,4 @@
-package org.saturnclient.modules.interfaces;
+package org.saturnclient.feature.interfaces;
 
 public interface AutoSprintInterface {
 

src/main/java/org/saturnclient/feature/interfaces/CoordinatesInterface.java

@@ -1,4 +1,4 @@
-package org.saturnclient.modules.interfaces;
+package org.saturnclient.feature.interfaces;
 
 public interface CoordinatesInterface {
 

src/main/java/org/saturnclient/feature/interfaces/CrosshairInterface.java

@@ -1,4 +1,4 @@
-package org.saturnclient.modules.interfaces;
+package org.saturnclient.feature.interfaces;
 
 public interface CrosshairInterface {
 

src/main/java/org/saturnclient/feature/interfaces/DayCounterInterface.java

@@ -1,4 +1,4 @@
-package org.saturnclient.modules.interfaces;
+package org.saturnclient.feature.interfaces;
 
 public interface DayCounterInterface {
 

src/main/java/org/saturnclient/feature/interfaces/FpsInterface.java

@@ -1,4 +1,4 @@
-package org.saturnclient.modules.interfaces;
+package org.saturnclient.feature.interfaces;
 
 public interface FpsInterface {
 

src/main/java/org/saturnclient/feature/interfaces/FreelookInterface.java

@@ -1,4 +1,4 @@
-package org.saturnclient.modules.interfaces;
+package org.saturnclient.feature.interfaces;
 
 public interface FreelookInterface {
 

src/main/java/org/saturnclient/feature/interfaces/HealthDisplayInterface.java

@@ -1,4 +1,4 @@
-package org.saturnclient.modules.interfaces;
+package org.saturnclient.feature.interfaces;
 
 public interface HealthDisplayInterface {
 

src/main/java/org/saturnclient/feature/interfaces/KeystrokesInterface.java

@@ -1,4 +1,4 @@
-package org.saturnclient.modules.interfaces;
+package org.saturnclient.feature.interfaces;
 
 public interface KeystrokesInterface {
 

src/main/java/org/saturnclient/feature/interfaces/NametagsInterface.java

@@ -1,4 +1,4 @@
-package org.saturnclient.modules.interfaces;
+package org.saturnclient.feature.interfaces;
 
 public interface NametagsInterface {
 

src/main/java/org/saturnclient/feature/interfaces/PingInterface.java

@@ -1,4 +1,4 @@
-package org.saturnclient.modules.interfaces;
+package org.saturnclient.feature.interfaces;
 
 public interface PingInterface {
 

src/main/java/org/saturnclient/feature/interfaces/SpeedometerInterface.java

@@ -1,4 +1,4 @@
-package org.saturnclient.modules.interfaces;
+package org.saturnclient.feature.interfaces;
 
 public interface SpeedometerInterface {
 

src/main/java/org/saturnclient/feature/interfaces/StatusEffectsInterface.java

@@ -1,4 +1,4 @@
-package org.saturnclient.modules.interfaces;
+package org.saturnclient.feature.interfaces;
 
 import java.util.List;
 

src/main/java/org/saturnclient/ui/components/SaturnModule.java

@@ -1,8 +1,8 @@
 package org.saturnclient.ui.components;
 
-import org.saturnclient.modules.Module;
 import org.saturnclient.common.provider.Providers;
 import org.saturnclient.config.Theme;
+import org.saturnclient.feature.Feature;
 import org.saturnclient.ui.Element;
 import org.saturnclient.ui.ElementContext;
 import org.saturnclient.ui.RenderScope;
@@ -13,13 +13,13 @@ import org.saturnclient.ui.screens.ConfigEditor;
 
 public class SaturnModule extends Element {
 
-    private final Module mod;
+        private final Feature mod;
 
         static int p = 10; // padding
         static int s = 14; // settings icon size
         static int expand = 5; // settings icon click area
 
-    public SaturnModule(Module mod) {
+        public SaturnModule(Feature mod) {
                 this.mod = mod;
                 this.width = 160;
                 this.height = 50;

src/main/java/org/saturnclient/ui/screens/HudEditor.java

@@ -1,11 +1,11 @@
 package org.saturnclient.ui.screens;
 
-import org.saturnclient.modules.HudMod;
-import org.saturnclient.modules.ModDimensions;
-import org.saturnclient.modules.ModManager;
-import org.saturnclient.modules.Module;
 import org.saturnclient.common.ref.render.MatrixStackRef;
 import org.saturnclient.config.manager.ConfigManager;
+import org.saturnclient.feature.HudFeature;
+import org.saturnclient.feature.FeatureLayout;
+import org.saturnclient.feature.FeatureManager;
+import org.saturnclient.feature.Feature;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.SaturnScreen;
 
@@ -13,17 +13,17 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class HudEditor extends SaturnScreen {
-    private final List<HudMod> hudMods = new ArrayList<>();
+    private final List<HudFeature> hudMods = new ArrayList<>();
-    private HudMod draggingMod = null;
+    private HudFeature draggingMod = null;
     private boolean resizing = false;
     private int offsetX, offsetY;
     private static final int RESIZE_MARGIN = 3;
 
     public HudEditor() {
         super("HUD Editor");
-        for (Module m : ModManager.ENABLED_MODS) {
+        for (Feature m : FeatureManager.ENABLED_MODS) {
-            if (m.isEnabled() && m instanceof HudMod) {
+            if (m.isEnabled() && m instanceof HudFeature) {
-                hudMods.add((HudMod) m);
+                hudMods.add((HudFeature) m);
             }
         }
     }
@@ -32,8 +32,8 @@ public class HudEditor extends SaturnScreen {
     public boolean mouseClicked(double mouseX, double mouseY, int button) {
         if (button == 0) {
             for (int m = hudMods.size() - 1; m >= 0; m--) {
-                HudMod mod = hudMods.get(m);
+                HudFeature mod = hudMods.get(m);
-                ModDimensions dim = mod.getDimensions();
+                FeatureLayout dim = mod.getDimensions();
 
                 // Check if clicking the corner for resizing
                 if (isCorner(mouseX, mouseY, dim)) {
@@ -69,7 +69,7 @@ public class HudEditor extends SaturnScreen {
     @Override
     public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
         if (draggingMod != null) {
-            ModDimensions dim = draggingMod.getDimensions();
+            FeatureLayout dim = draggingMod.getDimensions();
 
             if (resizing) {
                 // Scale based on cursor movement
@@ -90,8 +90,8 @@ public class HudEditor extends SaturnScreen {
 
     @Override
     public void render(RenderScope renderScope, int mouseX, int mouseY, float delta, long elapsed) {
-        for (HudMod mod : hudMods) {
+        for (HudFeature mod : hudMods) {
-            ModDimensions dim = mod.getDimensions();
+            FeatureLayout dim = mod.getDimensions();
             MatrixStackRef matrices = renderScope.getMatrixStack();
             matrices.push();
 
@@ -113,12 +113,12 @@ public class HudEditor extends SaturnScreen {
         }
     }
 
-    private boolean isInside(double mouseX, double mouseY, ModDimensions dim) {
+    private boolean isInside(double mouseX, double mouseY, FeatureLayout dim) {
         return mouseX >= dim.x.value && mouseX <= dim.x.value + (dim.width * dim.scale.value) &&
                 mouseY >= dim.y.value && mouseY <= dim.y.value + (dim.height * dim.scale.value);
     }
 
-    private boolean isCorner(double mouseX, double mouseY, ModDimensions dim) {
+    private boolean isCorner(double mouseX, double mouseY, FeatureLayout dim) {
         float rightX = dim.x.value + dim.width * dim.scale.value;
         float bottomY = dim.y.value + dim.height * dim.scale.value;
 

src/main/java/org/saturnclient/ui/screens/ModMenu.java

@@ -1,8 +1,8 @@
 package org.saturnclient.ui.screens;
 
-import org.saturnclient.modules.ModManager;
-import org.saturnclient.modules.Module;
 import org.saturnclient.config.AnimationConfig;
+import org.saturnclient.feature.FeatureManager;
+import org.saturnclient.feature.Feature;
 import org.saturnclient.ui.SaturnScreen;
 import org.saturnclient.ui.anim.SlideFade;
 import org.saturnclient.ui.components.SaturnModule;
@@ -29,7 +29,7 @@ public class ModMenu extends SaturnScreen {
 
         AnimationStagger moduleStagger = new AnimationStagger(AnimationConfig.modMenu);
 
-        for (Module mod : ModManager.MODS) {
+        for (Feature mod : FeatureManager.MODS) {
             moduleStagger.draw(
                     new SaturnModule(mod)
                             .position((160 + g) * col, (50 + g) * row)