String encoding fix
This commit is contained in:
@@ -25,13 +25,13 @@ import io.anuke.ucore.entities.Entities;
|
|||||||
|
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
import java.nio.charset.Charset;
|
import java.nio.charset.Charset;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
|
||||||
import static io.anuke.mindustry.Vars.*;
|
import static io.anuke.mindustry.Vars.*;
|
||||||
|
|
||||||
/** Class for specifying read/write methods for code generation.*/
|
/** Class for specifying read/write methods for code generation.*/
|
||||||
@SuppressWarnings("unused")
|
@SuppressWarnings("unused")
|
||||||
public class TypeIO{
|
public class TypeIO{
|
||||||
private static final Charset charset = Charset.forName("UTF-8");
|
|
||||||
|
|
||||||
@WriteClass(Player.class)
|
@WriteClass(Player.class)
|
||||||
public static void writePlayer(ByteBuffer buffer, Player player){
|
public static void writePlayer(ByteBuffer buffer, Player player){
|
||||||
@@ -329,19 +329,29 @@ public class TypeIO{
|
|||||||
@WriteClass(String.class)
|
@WriteClass(String.class)
|
||||||
public static void writeString(ByteBuffer buffer, String string){
|
public static void writeString(ByteBuffer buffer, String string){
|
||||||
if(string != null){
|
if(string != null){
|
||||||
|
Charset charset = Charset.defaultCharset();
|
||||||
|
byte[] nameBytes = charset.toString().getBytes(StandardCharsets.UTF_8);
|
||||||
|
buffer.put((byte)nameBytes.length);
|
||||||
|
buffer.put(nameBytes);
|
||||||
|
|
||||||
byte[] bytes = string.getBytes(charset);
|
byte[] bytes = string.getBytes(charset);
|
||||||
buffer.putShort((short) bytes.length);
|
buffer.putShort((short) bytes.length);
|
||||||
buffer.put(bytes);
|
buffer.put(bytes);
|
||||||
}else{
|
}else{
|
||||||
buffer.putShort((short) -1);
|
buffer.put((byte) -1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ReadClass(String.class)
|
@ReadClass(String.class)
|
||||||
public static String readString(ByteBuffer buffer){
|
public static String readString(ByteBuffer buffer){
|
||||||
short length = buffer.getShort();
|
byte length = buffer.get();
|
||||||
if(length != -1){
|
if(length != -1){
|
||||||
byte[] bytes = new byte[length];
|
byte[] cbytes = new byte[length];
|
||||||
|
buffer.get(cbytes);
|
||||||
|
Charset charset = Charset.forName(new String(cbytes, StandardCharsets.UTF_8));
|
||||||
|
|
||||||
|
short slength = buffer.getShort();
|
||||||
|
byte[] bytes = new byte[slength];
|
||||||
buffer.get(bytes);
|
buffer.get(bytes);
|
||||||
return new String(bytes, charset);
|
return new String(bytes, charset);
|
||||||
}else{
|
}else{
|
||||||
|
|||||||
Reference in New Issue
Block a user