diff --git a/src/main/java/emu/grasscutter/Grasscutter.java b/src/main/java/emu/grasscutter/Grasscutter.java
index 89c4d8a26b0..51bc3fcc567 100644
--- a/src/main/java/emu/grasscutter/Grasscutter.java
+++ b/src/main/java/emu/grasscutter/Grasscutter.java
@@ -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;
 				}
 			}
 		} 
diff --git a/src/main/java/emu/grasscutter/tools/Tools.java b/src/main/java/emu/grasscutter/tools/Tools.java
index a2bee91f05b..7429c143fe9 100644
--- a/src/main/java/emu/grasscutter/tools/Tools.java
+++ b/src/main/java/emu/grasscutter/tools/Tools.java
@@ -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();
 		}
@@ -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 + " !");
 	}
 }