exo/game-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ModuleService: Activate modules in changeDisplayState(true) first

Browse Source
This commit is contained in:
extio-de
2026-01-03 20:47:36 +01:00
parent 58fa9cfec4
commit 5c68dd8504
1 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/java/de/extio/game_engine/module/ModuleServiceImpl.java
View File

@@ -183,31 +183,35 @@ public class ModuleServiceImpl implements ModuleService, ApplicationListener<Con
if (module instanceof final AbstractClientModule clientModule && clientModule.isAlwaysDisplay()) { if (module instanceof final AbstractClientModule clientModule && clientModule.isAlwaysDisplay()) {
this.changeDisplayState(clientModule.getId(), true); this.changeDisplayState(clientModule.getId(), true);
} }
this.modulesActive.add(module); this.doActivateModule(id, module);
this.sortModules(this.modulesActive);
synchronized (this.modulesActive) {
this.modulesActiveView = List.copyOf(this.modulesActive);
this.modulesActiveClientModulesView = this.modulesActive.stream()
.filter(m -> m instanceof AbstractClientModule)
.map(m -> (AbstractClientModule) m)
.toList();
}
synchronized (this.executorCallbackMap) {
final var subscriptions = module.executorCallbackSubscriptions();
if (subscriptions != null) {
for (final var subscription : subscriptions) {
executorCallbackMap.computeIfAbsent(subscription, k -> Collections.synchronizedList(new ArrayList<>())).add(module);
}
}
}
this.invokeSafe(module, AbstractModule::onActivate);
LOGGER.info("Activated {}", id);
} }
} }
}); });
} }
private void doActivateModule(final String id, final AbstractModule module) {
this.modulesActive.add(module);
this.sortModules(this.modulesActive);
synchronized (this.modulesActive) {
this.modulesActiveView = List.copyOf(this.modulesActive);
this.modulesActiveClientModulesView = this.modulesActive.stream()
.filter(m -> m instanceof AbstractClientModule)
.map(m -> (AbstractClientModule) m)
.toList();
}
synchronized (this.executorCallbackMap) {
final var subscriptions = module.executorCallbackSubscriptions();
if (subscriptions != null) {
for (final var subscription : subscriptions) {
executorCallbackMap.computeIfAbsent(subscription, k -> Collections.synchronizedList(new ArrayList<>())).add(module);
}
}
}
this.invokeSafe(module, AbstractModule::onActivate);
LOGGER.info("Activated {}", id);
}
@Override @Override
public void deactivateAll() { public void deactivateAll() {
for (final AbstractModule module : this.modulesActiveView) { for (final AbstractModule module : this.modulesActiveView) {
@@ -225,6 +229,10 @@ public class ModuleServiceImpl implements ModuleService, ApplicationListener<Con
final boolean doDisplay = display || clientModule.isAlwaysDisplay(); final boolean doDisplay = display || clientModule.isAlwaysDisplay();
if (doDisplay && !curDisplayed) { if (doDisplay && !curDisplayed) {
if (this.modulesActiveView.stream().noneMatch(mod -> mod.getId().equals(id))) {
this.doActivateModule(id, clientModule);
}
this.modulesDisplayed.add(clientModule); this.modulesDisplayed.add(clientModule);
clientModule.setDisplayed(true); clientModule.setDisplayed(true);
LOGGER.info("Displayed {}", id); LOGGER.info("Displayed {}", id);