Skip to content

Commit

Permalink
Log mods and directories in separate lines to match up Fabric Loader'…
Browse files Browse the repository at this point in the history
…s behavior
  • Loading branch information
EZForever committed Jul 24, 2021
1 parent 7f8c38d commit 62a243d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -223,16 +223,16 @@ private static void injectMods(Map<String, Set<String>> modDirs, Set<String> loa
modText = "Loading {} additional mods";
break;
case 1:
modText = "Loading {} additional mod: {}";
modText = "Loading {} additional mod:\n{}";
break;
default:
modText = "Loading {} additional mods: {}";
modText = "Loading {} additional mods:\n{}";
break;
}

LOGGER.info("[ThatOrThis] " + modText, candidates.size(), candidates.stream()
.map((ModCandidate candidate) -> String.format("%s@%s", candidate.getInfo().getId(), candidate.getInfo().getVersion().getFriendlyString()))
.collect(Collectors.joining(", ")));
.map((ModCandidate candidate) -> String.format("\t- %s@%s", candidate.getInfo().getId(), candidate.getInfo().getVersion().getFriendlyString()))
.collect(Collectors.joining("\n")));

List<ModCandidate> candidatesToFix = new ArrayList<>();
for(ModCandidate candidate : candidates) {
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/io/github/ezforever/thatorthis/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

class Main {
private static final Logger LOGGER = LogManager.getLogger("thatorthis/main");
Expand All @@ -27,14 +28,14 @@ static void run() {
modDirText = "Loading mods from {} additional directories";
break;
case 1:
modDirText = "Loading mods from {} additional directory: {}";
modDirText = "Loading mods from {} additional directory:\n{}";
break;
default:
modDirText = "Loading mods from {} additional directories: {}";
modDirText = "Loading mods from {} additional directories:\n{}";
break;
}
LOGGER.info("[ThatOrThis] " + modDirText,
modDirs.size(), String.join(", ", modDirs.keySet()));
modDirs.size(), modDirs.keySet().stream().map((String x) -> "\t- " + x).collect(Collectors.joining("\n")));

FabricInternals.hook(modDirs);
}
Expand Down

0 comments on commit 62a243d

Please sign in to comment.