Bug fixes

LyonLv · May 7, 2022 · e6cb97a · e6cb97a
1 parent 59b24aa
commit e6cb97a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 304 deletions.
diff --git a/src/main/java/emu/grasscutter/Grasscutter.java b/src/main/java/emu/grasscutter/Grasscutter.java
@@ -70,12 +70,20 @@ public static void main(String[] args) throws Exception {
     	Crypto.loadKeys(); // Load keys from buffers.
 
 		// Parse arguments.
+		boolean exitEarly = false;
 		for (String arg : args) {
 			switch (arg.toLowerCase()) {
-				case "-handbook" -> Tools.createGmHandbook();
-				case "-gachamap" -> Tools.createGachaMapping("./gacha-mapping.js");
+				case "-handbook" -> {
+					Tools.createGmHandbook(); exitEarly = true;
+				}
+				case "-gachamap" -> {
+					Tools.createGachaMapping("./gacha-mapping.js"); exitEarly = true;
+				}
 			}
-		}
+		} 
+
+		// Exit early if argument sets it.
+		if(exitEarly) System.exit(0);
 
 		// Initialize server.
 		Grasscutter.getLogger().info(translate("messages.status.starting"));

diff --git a/src/main/java/emu/grasscutter/server/game/GameServerPacketHandler.java b/src/main/java/emu/grasscutter/server/game/GameServerPacketHandler.java
@@ -14,6 +14,7 @@
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
+@SuppressWarnings("unchecked")
 public class GameServerPacketHandler {
 	private final Int2ObjectMap<PacketHandler> handlers;
 

diff --git a/src/main/java/emu/grasscutter/tools/Tools.java b/src/main/java/emu/grasscutter/tools/Tools.java
@@ -93,7 +93,6 @@ public static void createGmHandbook() throws Exception {
 		}
 
 		Grasscutter.getLogger().info("GM Handbook generated!");
-		System.exit(0);
 	}
 
 	@SuppressWarnings("deprecation")
@@ -183,6 +182,5 @@ public static void createGachaMapping(String location) throws Exception {
 		}
 
 		Grasscutter.getLogger().info("Mappings generated!");
-		System.exit(0);
 	}
 }
diff --git a/src/main/java/emu/grasscutter/utils/Language.java b/src/main/java/emu/grasscutter/utils/Language.java
@@ -40,7 +40,7 @@ private Language(String fileName) {
         @Nullable JsonObject languageData = null;
 
         try {
-            InputStream file = Grasscutter.class.getResourceAsStream("/lang/" + fileName);
+            InputStream file = Grasscutter.class.getResourceAsStream("/languages/" + fileName);
             languageData = Grasscutter.getGsonFactory().fromJson(Utils.readFromInputStream(file), JsonObject.class);
         } catch (Exception exception) {
             Grasscutter.getLogger().error("Failed to load language file: " + fileName, exception);

diff --git a/src/main/resources/languages/en_US.json b/src/main/resources/languages/en_US.json