diff --git a/config.yaml b/config.yaml index 811dcd19de..664db06e50 100644 --- a/config.yaml +++ b/config.yaml @@ -307,7 +307,7 @@ server: #Miscellaneous Configuration TIMEZONE: GMT-3 - PACKET_CHARSET: US_ASCII # Defaults to US_ASCII if not set + CHARSET: US-ASCII # Defaults to US-ASCII if not set USE_DISPLAY_NUMBERS_WITH_COMMA: true #Enforce comma on displayed strings (use this when USE_UNITPRICE_WITH_COMMA is active and you still want to display comma-separated values). USE_UNITPRICE_WITH_COMMA: true #Set this accordingly with the layout of the unitPrices on Item.wz XML's, whether it's using commas or dots to represent fractions. MAX_MONITORED_BUFFSTATS: 5 #Limits accounting for "dormant" buff effects, that should take place when stronger stat buffs expires. diff --git a/src/main/java/config/ServerConfig.java b/src/main/java/config/ServerConfig.java index 3bf11c561f..4676162bb8 100644 --- a/src/main/java/config/ServerConfig.java +++ b/src/main/java/config/ServerConfig.java @@ -154,7 +154,7 @@ public class ServerConfig { //Miscellaneous Configuration public String TIMEZONE; - public String PACKET_CHARSET; + public String CHARSET; public boolean USE_DISPLAY_NUMBERS_WITH_COMMA; public boolean USE_UNITPRICE_WITH_COMMA; public byte MAX_MONITORED_BUFFSTATS; diff --git a/src/main/java/constants/string/CharsetConstants.java b/src/main/java/constants/string/CharsetConstants.java index d6870e2632..96d4f751cc 100644 --- a/src/main/java/constants/string/CharsetConstants.java +++ b/src/main/java/constants/string/CharsetConstants.java @@ -24,7 +24,7 @@ import java.util.Optional; public class CharsetConstants { private static final Logger log = LoggerFactory.getLogger(CharsetConstants.class); - public static final Charset PACKET_CHARSET = loadCharset(); + public static final Charset CHARSET = loadCharset(); private enum Language { LANGUAGE_US("US-ASCII"), @@ -56,7 +56,7 @@ public class CharsetConstants { } private static Charset loadCharset() { - String configCharset = YamlConfig.config.server.PACKET_CHARSET; + String configCharset = YamlConfig.config.server.CHARSET; if (configCharset != null) { Language language = Language.fromCharset(configCharset); return Charset.forName(language.getCharset()); diff --git a/src/main/java/net/packet/ByteBufInPacket.java b/src/main/java/net/packet/ByteBufInPacket.java index d682e9f357..19dfdfffc0 100644 --- a/src/main/java/net/packet/ByteBufInPacket.java +++ b/src/main/java/net/packet/ByteBufInPacket.java @@ -50,7 +50,7 @@ public class ByteBufInPacket implements InPacket { short length = readShort(); byte[] stringBytes = new byte[length]; byteBuf.readBytes(stringBytes); - return new String(stringBytes, CharsetConstants.PACKET_CHARSET); + return new String(stringBytes, CharsetConstants.CHARSET); } @Override diff --git a/src/main/java/net/packet/ByteBufOutPacket.java b/src/main/java/net/packet/ByteBufOutPacket.java index 866588c41d..ba3da1d663 100644 --- a/src/main/java/net/packet/ByteBufOutPacket.java +++ b/src/main/java/net/packet/ByteBufOutPacket.java @@ -78,12 +78,12 @@ public class ByteBufOutPacket implements OutPacket { @Override public void writeString(String value) { writeShort((short) value.length()); - writeBytes(value.getBytes(CharsetConstants.PACKET_CHARSET)); + writeBytes(value.getBytes(CharsetConstants.CHARSET)); } @Override public void writeFixedString(String value) { - writeBytes(value.getBytes(CharsetConstants.PACKET_CHARSET)); + writeBytes(value.getBytes(CharsetConstants.CHARSET)); } @Override diff --git a/src/main/java/scripting/AbstractScriptManager.java b/src/main/java/scripting/AbstractScriptManager.java index 187f46b3a0..1df195d82f 100644 --- a/src/main/java/scripting/AbstractScriptManager.java +++ b/src/main/java/scripting/AbstractScriptManager.java @@ -23,6 +23,7 @@ package scripting; import client.MapleClient; import com.oracle.truffle.js.scriptengine.GraalJSScriptEngine; +import constants.string.CharsetConstants; import tools.FilePrinter; import javax.script.*; @@ -55,7 +56,7 @@ public abstract class AbstractScriptManager { enableScriptHostAccess(graalScriptEngine); - try (FileReader fr = new FileReader(scriptFile)) { + try (FileReader fr = new FileReader(scriptFile, CharsetConstants.CHARSET)) { engine.eval(fr); } catch (final ScriptException | IOException t) { FilePrinter.printError(FilePrinter.INVOCABLE + path.substring(12), t, path); diff --git a/src/main/java/tools/HexTool.java b/src/main/java/tools/HexTool.java index 0a2d4f0cf1..0352e1f7f2 100644 --- a/src/main/java/tools/HexTool.java +++ b/src/main/java/tools/HexTool.java @@ -99,7 +99,7 @@ public class HexTool { } } - return new String(ret, CharsetConstants.PACKET_CHARSET); + return new String(ret, CharsetConstants.CHARSET); } /** diff --git a/src/test/java/net/packet/ByteBufInPacketTest.java b/src/test/java/net/packet/ByteBufInPacketTest.java index 8c4b287cf3..3a27dd795a 100644 --- a/src/test/java/net/packet/ByteBufInPacketTest.java +++ b/src/test/java/net/packet/ByteBufInPacketTest.java @@ -83,7 +83,7 @@ class ByteBufInPacketTest { void readString() { final String writtenString = "You have gained experience (+3200)"; byteBuf.writeShortLE(writtenString.length()); - byte[] writtenStringBytes = writtenString.getBytes(CharsetConstants.PACKET_CHARSET); + byte[] writtenStringBytes = writtenString.getBytes(CharsetConstants.CHARSET); byteBuf.writeBytes(writtenStringBytes); String readString = inPacket.readString();