Skip to content

Commit 8fe1550

Browse files
camnwaltermattco98
authored andcommitted
Modules: Preserve order of modules for dependency requirements
1 parent a6881fd commit 8fe1550

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

src/main/java/com/chattriggers/ctjs/internal/mixins/SystemDetailsMixin.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.spongepowered.asm.mixin.injection.Inject;
1111
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
1212

13+
import java.util.ArrayList;
1314
import java.util.Comparator;
1415
import java.util.List;
1516
import java.util.function.Supplier;
@@ -22,7 +23,7 @@ public abstract class SystemDetailsMixin {
2223
@Inject(method = "<init>", at = @At("RETURN"))
2324
private void addModules(CallbackInfo ci) {
2425
addSection("ChatTriggers Modules", () -> {
25-
List<Module> modules = ModuleManager.INSTANCE.getCachedModules();
26+
List<Module> modules = new ArrayList<>(ModuleManager.INSTANCE.getCachedModules());
2627
modules.sort(Comparator.comparing(Module::getName));
2728

2829
StringBuilder sb = new StringBuilder();

src/main/kotlin/com/chattriggers/ctjs/internal/engine/module/ModuleUpdater.kt

-3
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,6 @@ object ModuleUpdater : Initializer {
112112
}
113113

114114
cachedModules.add(module)
115-
cachedModules.sortWith { a, b ->
116-
a.name.compareTo(b.name)
117-
}
118115
return listOf(module) + (module.metadata.requires?.map {
119116
importModule(it, module.name)
120117
}?.flatten() ?: emptyList())

src/main/kotlin/com/chattriggers/ctjs/internal/engine/module/ModulesGui.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ object ModulesGui : UScreen(unlocalizedName = "Modules") {
4747
window.exit.draw((middle + width / 2f - 17) / 2f, (window.scroll + 99f) / 2f)
4848

4949
window.height = 125f
50-
ModuleManager.cachedModules.forEach {
50+
ModuleManager.cachedModules.sortedBy { it.name }.forEach {
5151
window.height += it.draw(middle - width / 2f, window.scroll + window.height, width)
5252
}
5353

0 commit comments

Comments
 (0)