FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2024-11-14 19:25:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Make crash-report-info print mods in a tree form (#2157)

Browse source 
* Make `crash-report-info` print mods in a tree form

* Bump required loader version

* Add mods to a list and sort instead of using a TreeSet

* Remove the `:` between id and version and change style in loop

(cherry picked from commit a6b0947818)
This commit is contained in:
altrisi 2022-05-20 19:17:41 +02:00 committed by modmuss50
parent 1e43a8d519
commit f47870e61f
2 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
fabric-crash-report-info-v1/src/main/java/net/fabricmc/fabric/mixin/crash/report/info/MixinCrashReport.java
View file

@ -16,8 +16,8 @@
package net.fabricmc.fabric.mixin.crash.report.info;
import java.util.Map;
import java.util.TreeMap;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.function.Supplier;
import org.spongepowered.asm.mixin.Mixin;
@ -39,22 +39,36 @@ public abstract class MixinCrashReport {
@Inject(at = @At("RETURN"), method = "<init>")
private void fillSystemDetails(CallbackInfo info) {
addSection("Fabric Mods", () -> {
Map<String, String> mods = new TreeMap<>();
ArrayList<ModContainer> topLevelMods = new ArrayList<>();
for (ModContainer container : FabricLoader.getInstance().getAllMods()) {
mods.put(container.getMetadata().getId(), container.getMetadata().getName() + " " + container.getMetadata().getVersion().getFriendlyString());
if (container.getContainingMod().isEmpty()) {
topLevelMods.add(container);
}
}
StringBuilder modString = new StringBuilder();
for (String id : mods.keySet()) {
modString.append("\n\t\t");
modString.append(id);
modString.append(": ");
modString.append(mods.get(id));
}
appendMods(modString, 2, topLevelMods);
return modString.toString();
});
}
private static void appendMods(StringBuilder modString, int depth, ArrayList<ModContainer> mods) {
mods.sort(Comparator.comparing(mod -> mod.getMetadata().getId()));
for (ModContainer mod : mods) {
modString.append('\n');
modString.append("\t".repeat(depth));
modString.append(mod.getMetadata().getId());
modString.append(' ');
modString.append(mod.getMetadata().getVersion().getFriendlyString());
if (!mod.getContainedMods().isEmpty()) {
ArrayList<ModContainer> childMods = new ArrayList<>(mod.getContainedMods());
appendMods(modString, depth + 1, childMods);
}
}
}
}

2
fabric-crash-report-info-v1/src/main/resources/fabric.mod.json
View file

@ -16,7 +16,7 @@
"FabricMC"
],
"depends": {
"fabricloader": ">=0.4.0"
"fabricloader": ">=0.13.0"
},
"description": "Adds Fabric-related debug info to crash reports.",
"mixins": [