Skip to content

Commit

Permalink
Fix gacha mapping generation login
Browse files Browse the repository at this point in the history
* Fix `System#out` usage pointed by magix at Grasscutters#568 (review)
* Fix typos for interchange `-` and `_`.
* Fix gacha mapping autogeneration path
  • Loading branch information
mingjun97 authored and Melledy committed May 7, 2022
1 parent 39816f8 commit f1f3bad
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/main/java/emu/grasscutter/Grasscutter.java
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public static void main(String[] args) throws Exception {
Tools.createGmHandbook(); exitEarly = true;
}
case "-gachamap" -> {
Tools.createGachaMapping("./gacha-mapping.js"); exitEarly = true;
Tools.createGachaMapping(Grasscutter.getConfig().DATA_FOLDER + "/gacha_mappings.js"); exitEarly = true;
}
}
}
Expand Down
19 changes: 10 additions & 9 deletions src/main/java/emu/grasscutter/tools/Tools.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,25 +64,26 @@ public static String getLanguageOption() throws Exception {
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] ");

input = new BufferedReader(new InputStreamReader(System.in)).readLine();
stagedMessage += "\nYour choice:[EN] ";
input = Grasscutter.getConsole().readLine(stagedMessage);
if (availableLangList.contains(input.toLowerCase())) {
return input.toUpperCase();
}
Expand Down Expand Up @@ -249,6 +250,6 @@ public static void createGachaMapping(String location, String language) throws E
writer.println("}\n}");
}

Grasscutter.getLogger().info("Mappings generated!");
Grasscutter.getLogger().info("Mappings generated to " + location + " !");
}
}

0 comments on commit f1f3bad

Please sign in to comment.