Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2025-02-03 05:55:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix gacha mapping generation login

Browse Source 
* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/emu/grasscutter/Grasscutter.java
View File

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

19
src/main/java/emu/grasscutter/tools/Tools.java
View File

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