From 59f6d24c268486480d2e99318f8d2c3f28585dad Mon Sep 17 00:00:00 2001 From: Bella Date: Wed, 19 Feb 2020 11:08:29 -0500 Subject: [PATCH] close #357 and prepare #359 --- src/main/java/me/zeroeightsix/kami/KamiMod.java | 5 ++++- .../me/zeroeightsix/kami/module/modules/capes/Capes.java | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/zeroeightsix/kami/KamiMod.java b/src/main/java/me/zeroeightsix/kami/KamiMod.java index ddd67f147..5ed8b03fb 100644 --- a/src/main/java/me/zeroeightsix/kami/KamiMod.java +++ b/src/main/java/me/zeroeightsix/kami/KamiMod.java @@ -189,7 +189,7 @@ public class KamiMod { ModuleManager.getModules().stream().filter(Module::isEnabled).forEach(Module::enable); - try { // load modules that are on by default // auto enable + try { // load modules that are on by default // autoenable ModuleManager.getModuleByName("InfoOverlay").setEnabled(true); ModuleManager.getModuleByName("InventoryViewer").setEnabled(true); ModuleManager.getModuleByName("Capes").setEnabled(true); @@ -212,6 +212,9 @@ public class KamiMod { if (((PrefixChat) ModuleManager.getModuleByName("PrefixChat")).startupGlobal.getValue()) { ModuleManager.getModuleByName("PrefixChat").setEnabled(true); } + if (((Capes) ModuleManager.getModuleByName("Capes")).startupGlobal.getValue()) { + ModuleManager.getModuleByName("Capes").setEnabled(true); + } } catch (NullPointerException e) { KamiMod.log.error("NPE in loading always enabled modules\n"); diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/capes/Capes.java b/src/main/java/me/zeroeightsix/kami/module/modules/capes/Capes.java index 272ba17ff..f60e4f2f7 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/capes/Capes.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/capes/Capes.java @@ -23,11 +23,12 @@ import java.net.URL; * Updated by S-B99 on 20/12/19 * Updated by 20kdc on 17/02/20 - changed implementation method, made a module again, made async */ -@Module.Info(name = "Capes", category = Module.Category.MISC, description = "Controls the display of KAMI Blue capes.") +@Module.Info(name = "Capes", category = Module.Category.GUI, description = "Controls the display of KAMI Blue capes", showOnArray = Module.ShowOnArray.OFF) public class Capes extends Module { + public Setting startupGlobal = register(Settings.b("Enable Automatically", true)); // This allows controlling if other capes (Mojang, OptiFine) should override the KAMI Blue cape. - public Setting overrideOtherCapes = Settings.b("OverrideOtherCapes", false); + public Setting overrideOtherCapes = Settings.b("Override Mojang / Opti capes", false); public static Capes INSTANCE;