Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use modules instead of moduleInstances.values() to access modules #5069

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use modules instead of moduleInstances.values() to access modules #5069

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
876837d
Accesses modules instead of moduleInstances.values() for the list of …
PoTheMagicDragon Dec 28, 2024
5235c20
Simplifies module removal logic
PoTheMagicDragon Dec 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions src/main/java/meteordevelopment/meteorclient/systems/modules/Modules.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public <T extends Module> T get(Class<T> klass) {
}

public Module get(String name) {
for (Module module : moduleInstances.values()) {
for (Module module : modules) {
if (module.name.equalsIgnoreCase(name)) return module;
}

Expand All @@ -151,15 +151,15 @@ public List<Module> getGroup(Category category) {
}

public Collection<Module> getAll() {
return moduleInstances.values();
return modules;
}

public List<Module> getList() {
return modules;
}

public int getCount() {
return moduleInstances.values().size();
return modules.size();
}

public List<Module> getActive() {
Expand All @@ -171,7 +171,7 @@ public List<Module> getActive() {
public Set<Module> searchTitles(String text) {
Map<Module, Integer> modules = new ValueComparableMap<>(Comparator.naturalOrder());

for (Module module : this.moduleInstances.values()) {
for (Module module : this.modules) {
int score = Utils.searchLevenshteinDefault(module.title, text, false);
if (Config.get().moduleAliases.get()) {
for (String alias : module.aliases) {
Expand All @@ -188,7 +188,7 @@ public Set<Module> searchTitles(String text) {
public Set<Module> searchSettingTitles(String text) {
Map<Module, Integer> modules = new ValueComparableMap<>(Comparator.naturalOrder());

for (Module module : this.moduleInstances.values()) {
for (Module module : this.modules) {
int lowest = Integer.MAX_VALUE;
for (SettingGroup sg : module.settings) {
for (Setting<?> setting : sg) {
Expand Down Expand Up @@ -288,7 +288,7 @@ private void onMouseButton(MouseButtonEvent event) {
private void onAction(boolean isKey, int value, int modifiers, boolean isPress) {
if (mc.currentScreen != null || Input.isKeyPressed(GLFW.GLFW_KEY_F3)) return;

for (Module module : moduleInstances.values()) {
for (Module module : modules) {
if (module.keybind.matches(isKey, value, modifiers) && (isPress || (module.toggleOnBindRelease && module.isActive()))) {
module.toggle();
module.sendToggledMsg();
Expand All @@ -302,7 +302,7 @@ private void onAction(boolean isKey, int value, int modifiers, boolean isPress)
private void onOpenScreen(OpenScreenEvent event) {
if (!Utils.canUpdate()) return;

for (Module module : moduleInstances.values()) {
for (Module module : modules) {
if (module.toggleOnBindRelease && module.isActive()) {
module.toggle();
module.sendToggledMsg();
Expand Down Expand Up @@ -380,7 +380,7 @@ public void add(Module module) {

// Remove the previous module with the same name
AtomicReference<Module> removedModule = new AtomicReference<>();
if (moduleInstances.values().removeIf(module1 -> {
if (modules.removeIf(module1 -> {
if (module1.name.equals(module.name)) {
removedModule.set(module1);
module1.settings.unregisterColorSettings();
Expand All @@ -390,6 +390,7 @@ public void add(Module module) {

return false;
})) {
moduleInstances.remove(removedModule.getClass(), removedModule.get());
getGroup(removedModule.get().category).remove(removedModule.get());
}

Expand Down