Fix gacha mapping generation login

* Fix `System#out` usage pointed by magix at https://github.com/Grasscutters/Grasscutter/pull/568#pullrequestreview-965271278
* Fix typos for interchange `-` and `_`.
* Fix gacha mapping autogeneration path
This commit is contained in:
mingjun97 2022-05-06 22:47:36 -07:00 committed by Melledy
parent 34df864e1c
commit ff52255ac7
2 changed files with 11 additions and 10 deletions

View File

@ -77,7 +77,7 @@ public final class Grasscutter {
Tools.createGmHandbook(); exitEarly = true;
}
case "-gachamap" -> {
Tools.createGachaMapping("./gacha-mapping.js"); exitEarly = true;
Tools.createGachaMapping(Grasscutter.getConfig().DATA_FOLDER + "/gacha_mappings.js"); exitEarly = true;
}
}
}

View File

@ -64,25 +64,26 @@ public final class Tools {
if (availableLangList.size() == 1) {
return availableLangList.get(0).toUpperCase();
}
System.out.println("The following languages mappings are available, please select one: [default: EN]");
String groupedLangList = "> ";
String stagedMessage = "";
stagedMessage += "The following languages mappings are available, please select one: [default: EN]\n";
String groupedLangList = ">\t";
int groupedLangCount = 0;
String input = "";
for (String availableLanguage: availableLangList){
groupedLangCount++;
groupedLangList = groupedLangList + "" + availableLanguage + "\t";
if (groupedLangCount == 6) {
System.out.println(groupedLangList);
stagedMessage += groupedLangList + "\n";
groupedLangCount = 0;
groupedLangList = "> ";
groupedLangList = ">\t";
}
}
if (groupedLangCount > 0) {
System.out.println(groupedLangList);
stagedMessage += groupedLangList + "\n";
}
System.out.print("\nYour choice:[EN] ");
stagedMessage += "\nYour choice:[EN] ";
input = new BufferedReader(new InputStreamReader(System.in)).readLine();
input = Grasscutter.getConsole().readLine(stagedMessage);
if (availableLangList.contains(input.toLowerCase())) {
return input.toUpperCase();
}
@ -249,6 +250,6 @@ final class ToolsWithLanguageOption {
writer.println("}\n}");
}
Grasscutter.getLogger().info("Mappings generated!");
Grasscutter.getLogger().info("Mappings generated to " + location + " !");
}
}