From 4e6d9b3c411a326aa45ebfec8938a37008a210a5 Mon Sep 17 00:00:00 2001 From: EmotionalLove Date: Tue, 17 Dec 2019 07:32:16 -0800 Subject: [PATCH 1/3] ModuleManager lookup fixes. --- .../kami/gui/kami/DisplayGuiScreen.java | 1 - .../kami/module/ModuleManager.java | 25 +++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/DisplayGuiScreen.java b/src/main/java/me/zeroeightsix/kami/gui/kami/DisplayGuiScreen.java index 7a088d766..3e95ed05e 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/DisplayGuiScreen.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/DisplayGuiScreen.java @@ -9,7 +9,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.shader.Framebuffer; -import net.minecraft.launchwrapper.LogWrapper; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; diff --git a/src/main/java/me/zeroeightsix/kami/module/ModuleManager.java b/src/main/java/me/zeroeightsix/kami/module/ModuleManager.java index 782cfbef4..e2b9699b7 100644 --- a/src/main/java/me/zeroeightsix/kami/module/ModuleManager.java +++ b/src/main/java/me/zeroeightsix/kami/module/ModuleManager.java @@ -27,14 +27,15 @@ public class ModuleManager { public static ArrayList modules = new ArrayList<>(); /** - * Lookup map for getting by name + * Lookup map for getting by **original** name */ - static HashMap lookup = new HashMap<>(); + static HashMap lookup = new HashMap<>(); public static void updateLookup() { lookup.clear(); - for (Module m : modules) - lookup.put(m.getName().toLowerCase(), m); + for (int i = 0; i < modules.size(); i++) { + lookup.put(modules.get(i).getOriginalName(), i); + } } public static void initialize() { @@ -43,7 +44,6 @@ public class ModuleManager { try { Module module = (Module) aClass.getConstructor().newInstance(); modules.add(module); - // lookup.put(module.getName().toLowerCase(), module); } catch (InvocationTargetException e) { e.getCause().printStackTrace(); System.err.println("Couldn't initiate module " + aClass.getSimpleName() + "! Err: " + e.getClass().getSimpleName() + ", message: " + e.getMessage()); @@ -53,15 +53,16 @@ public class ModuleManager { } }); KamiMod.log.info("Modules initialised"); - getModules().sort(Comparator.comparing(Module::getName)); + getModules().sort(Comparator.comparing(Module::getOriginalName)); + updateLookup(); } public static void onUpdate() { - modules.stream().filter(module -> module.alwaysListening || module.isEnabled()).forEach(module -> module.onUpdate()); + modules.stream().filter(module -> module.alwaysListening || module.isEnabled()).forEach(Module::onUpdate); } public static void onRender() { - modules.stream().filter(module -> module.alwaysListening || module.isEnabled()).forEach(module -> module.onRender()); + modules.stream().filter(module -> module.alwaysListening || module.isEnabled()).forEach(Module::onRender); } public static void onWorldRender(RenderWorldLastEvent event) { @@ -84,7 +85,7 @@ public class ModuleManager { Minecraft.getMinecraft().profiler.endSection(); modules.stream().filter(module -> module.alwaysListening || module.isEnabled()).forEach(module -> { - Minecraft.getMinecraft().profiler.startSection(module.getName()); + Minecraft.getMinecraft().profiler.startSection(module.getOriginalName()); module.onWorldRender(e); Minecraft.getMinecraft().profiler.endSection(); }); @@ -101,8 +102,6 @@ public class ModuleManager { // GlStateManager.popMatrix(); KamiTessellator.releaseGL(); Minecraft.getMinecraft().profiler.endSection(); - - Minecraft.getMinecraft().profiler.endSection(); } public static void onBind(int eventKey) { @@ -118,9 +117,9 @@ public class ModuleManager { return modules; } + public static Module getModuleByName(String name) { - return lookup.get(name.toLowerCase()); -// return getModules().stream().filter(module -> module.getName().equalsIgnoreCase(name)).findFirst().orElse(null); + return modules.get(lookup.get(name.toLowerCase())); } public static boolean isModuleEnabled(String moduleName) { From eb1ca39bec68a3726cb364db04104acc1369ca0d Mon Sep 17 00:00:00 2001 From: EmotionalLove Date: Tue, 17 Dec 2019 07:49:54 -0800 Subject: [PATCH 2/3] ModuleManager lookup fixes. --- src/main/java/me/zeroeightsix/kami/KamiMod.java | 3 ++- src/main/java/me/zeroeightsix/kami/module/Module.java | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/zeroeightsix/kami/KamiMod.java b/src/main/java/me/zeroeightsix/kami/KamiMod.java index 7a2171135..9aac88e8f 100644 --- a/src/main/java/me/zeroeightsix/kami/KamiMod.java +++ b/src/main/java/me/zeroeightsix/kami/KamiMod.java @@ -130,7 +130,8 @@ public class KamiMod { loadConfiguration(); KamiMod.log.info("Settings loaded"); - ModuleManager.updateLookup(); // generate the lookup table after settings are loaded to make custom module names work + // custom names aren't known at compile-time + //ModuleManager.updateLookup(); // generate the lookup table after settings are loaded to make custom module names work new Capes(); KamiMod.log.info("Capes init!\n"); diff --git a/src/main/java/me/zeroeightsix/kami/module/Module.java b/src/main/java/me/zeroeightsix/kami/module/Module.java index c62d26929..210bbc0a2 100644 --- a/src/main/java/me/zeroeightsix/kami/module/Module.java +++ b/src/main/java/me/zeroeightsix/kami/module/Module.java @@ -4,7 +4,6 @@ import com.google.common.base.Converter; import com.google.gson.JsonElement; import com.google.gson.JsonPrimitive; import me.zeroeightsix.kami.KamiMod; -import me.zeroeightsix.kami.event.events.PacketEvent; import me.zeroeightsix.kami.event.events.RenderEvent; import me.zeroeightsix.kami.setting.Setting; import me.zeroeightsix.kami.setting.Settings; From 12d9bd1c54f2229c604542f3f672a721c2c356c7 Mon Sep 17 00:00:00 2001 From: EmotionalLove Date: Tue, 17 Dec 2019 07:38:42 -0800 Subject: [PATCH 3/3] updateLookup() should store in lowercase --- src/main/java/me/zeroeightsix/kami/module/ModuleManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/zeroeightsix/kami/module/ModuleManager.java b/src/main/java/me/zeroeightsix/kami/module/ModuleManager.java index e2b9699b7..d49f95124 100644 --- a/src/main/java/me/zeroeightsix/kami/module/ModuleManager.java +++ b/src/main/java/me/zeroeightsix/kami/module/ModuleManager.java @@ -34,7 +34,7 @@ public class ModuleManager { public static void updateLookup() { lookup.clear(); for (int i = 0; i < modules.size(); i++) { - lookup.put(modules.get(i).getOriginalName(), i); + lookup.put(modules.get(i).getOriginalName().toLowerCase(), i); } }