diff --git a/src/main/java/org/saturnclient/modules/ModManager.java b/src/main/java/org/saturnclient/modules/ModManager.java index 9df1859..fa3324c 100644 --- a/src/main/java/org/saturnclient/modules/ModManager.java +++ b/src/main/java/org/saturnclient/modules/ModManager.java @@ -3,39 +3,18 @@ package org.saturnclient.modules; import java.util.ArrayList; import java.util.List; -import org.saturnclient.modules.mods.*; - public class ModManager { - public static final List ENABLED_MODS = new ArrayList<>(); - public static final Module[] ALL_MODS = { - // new Crosshair(), - // new AutoSprint(), - new ArmorDisplay(), - // new Fps(), - // new StatusEffects(), - // new Coordinates(), - // new Freelook(), - // new Keystrokes(), - // new Fullbright(), - // new NoFog(), - // new DayCounter(), - // new Speedometer(), - // new Zoom(), - // new HealthDisplay(), - // new Nametags(), - // new Ping(), - // new Tps(), - // new Clock() - }; + public static List ENABLED_MODS = new ArrayList<>(); + public static Module[] MODS = {}; - public static void init() { - // Pre-filter enabled modules to avoid checking every tick + public static void init(ModuleProvider provider) { + MODS = provider.getMods(); updateEnabledModules(); } public static synchronized void updateEnabledModules() { ENABLED_MODS.clear(); - for (Module m : ALL_MODS) { + for (Module m : MODS) { if (m.isEnabled()) { ENABLED_MODS.add(m); } @@ -43,6 +22,10 @@ public class ModManager { } public static Module[] getAllMods() { - return ALL_MODS; + return MODS; + } + + public interface ModuleProvider { + Module[] getMods(); } } diff --git a/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java b/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java index 3b09d40..69cad5e 100644 --- a/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java +++ b/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java @@ -13,7 +13,7 @@ public class ArmorDisplay extends Module implements HudMod { private static Property enabled = Property.bool(false); private static ModDimensions dimensions = new ModDimensions(40, 75); - private static Property useMainHand = Property.bool(false); + private static Property useMainHand = Property.bool(true); private final ArmorDisplayInterface minecraft;