Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-17 17:34:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
KingRainbow44
2022-05-06 21:04:39 -04:00
parent f1079953c1
commit c11e83c48f
5 changed files with 13 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,12 +70,20 @@ public final class Grasscutter {
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"));

1
src/main/java/emu/grasscutter/server/game/GameServerPacketHandler.java
View File

@@ -14,6 +14,7 @@ import emu.grasscutter.server.game.GameSession.SessionState;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
@SuppressWarnings("unchecked")
public class GameServerPacketHandler {
private final Int2ObjectMap<PacketHandler> handlers;

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

@@ -93,7 +93,6 @@ public final class Tools {
}
Grasscutter.getLogger().info("GM Handbook generated!");
System.exit(0);
}
@SuppressWarnings("deprecation")
@@ -183,6 +182,5 @@ public final class Tools {
}
Grasscutter.getLogger().info("Mappings generated!");
System.exit(0);
}
}

2
src/main/java/emu/grasscutter/utils/Language.java
View File

@@ -40,7 +40,7 @@ public final class Language {
@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);