From 0e84169f9e24ab6cff4914dced4fad1ecce4fde6 Mon Sep 17 00:00:00 2001 From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com> Date: Wed, 28 Apr 2021 02:28:36 +0200 Subject: [PATCH] fix byte expression --- G-Earth/src/main/java/gearth/protocol/HPacket.java | 4 ++-- .../InvalidPacketException.java | 2 +- .../PacketStringUtils.java | 9 ++++++--- .../prediction/StructurePredictor.java | 6 +++--- .../prediction/checkers/BooleanChecker.java | 2 +- .../prediction/checkers/ByteChecker.java | 2 +- .../prediction/checkers/IntegerChecker.java | 2 +- .../prediction/checkers/LongChecker.java | 2 +- .../prediction/checkers/ShortChecker.java | 2 +- .../prediction/checkers/StringChecker.java | 2 +- .../prediction/checkers/TypeChecker.java | 2 +- .../prediction/checkers/TypeCheckerProducer.java | 2 +- 12 files changed, 20 insertions(+), 17 deletions(-) rename G-Earth/src/main/java/gearth/services/{packetrepresentation => packet_representation}/InvalidPacketException.java (55%) rename G-Earth/src/main/java/gearth/services/{packetrepresentation => packet_representation}/PacketStringUtils.java (96%) rename G-Earth/src/main/java/gearth/services/{packetrepresentation => packet_representation}/prediction/StructurePredictor.java (90%) rename G-Earth/src/main/java/gearth/services/{packetrepresentation => packet_representation}/prediction/checkers/BooleanChecker.java (93%) rename G-Earth/src/main/java/gearth/services/{packetrepresentation => packet_representation}/prediction/checkers/ByteChecker.java (90%) rename G-Earth/src/main/java/gearth/services/{packetrepresentation => packet_representation}/prediction/checkers/IntegerChecker.java (97%) rename G-Earth/src/main/java/gearth/services/{packetrepresentation => packet_representation}/prediction/checkers/LongChecker.java (94%) rename G-Earth/src/main/java/gearth/services/{packetrepresentation => packet_representation}/prediction/checkers/ShortChecker.java (95%) rename G-Earth/src/main/java/gearth/services/{packetrepresentation => packet_representation}/prediction/checkers/StringChecker.java (97%) rename G-Earth/src/main/java/gearth/services/{packetrepresentation => packet_representation}/prediction/checkers/TypeChecker.java (90%) rename G-Earth/src/main/java/gearth/services/{packetrepresentation => packet_representation}/prediction/checkers/TypeCheckerProducer.java (91%) diff --git a/G-Earth/src/main/java/gearth/protocol/HPacket.java b/G-Earth/src/main/java/gearth/protocol/HPacket.java index 9a2e65d..f24cf6f 100644 --- a/G-Earth/src/main/java/gearth/protocol/HPacket.java +++ b/G-Earth/src/main/java/gearth/protocol/HPacket.java @@ -3,8 +3,8 @@ package gearth.protocol; import gearth.misc.StringifyAble; import gearth.services.packet_info.PacketInfo; import gearth.services.packet_info.PacketInfoManager; -import gearth.services.packetrepresentation.InvalidPacketException; -import gearth.services.packetrepresentation.PacketStringUtils; +import gearth.services.packet_representation.InvalidPacketException; +import gearth.services.packet_representation.PacketStringUtils; import java.nio.ByteBuffer; import java.nio.charset.Charset; diff --git a/G-Earth/src/main/java/gearth/services/packetrepresentation/InvalidPacketException.java b/G-Earth/src/main/java/gearth/services/packet_representation/InvalidPacketException.java similarity index 55% rename from G-Earth/src/main/java/gearth/services/packetrepresentation/InvalidPacketException.java rename to G-Earth/src/main/java/gearth/services/packet_representation/InvalidPacketException.java index 16f144f..435e5fb 100644 --- a/G-Earth/src/main/java/gearth/services/packetrepresentation/InvalidPacketException.java +++ b/G-Earth/src/main/java/gearth/services/packet_representation/InvalidPacketException.java @@ -1,4 +1,4 @@ -package gearth.services.packetrepresentation; +package gearth.services.packet_representation; public class InvalidPacketException extends Exception { } diff --git a/G-Earth/src/main/java/gearth/services/packetrepresentation/PacketStringUtils.java b/G-Earth/src/main/java/gearth/services/packet_representation/PacketStringUtils.java similarity index 96% rename from G-Earth/src/main/java/gearth/services/packetrepresentation/PacketStringUtils.java rename to G-Earth/src/main/java/gearth/services/packet_representation/PacketStringUtils.java index d83f8e8..ae36a7a 100644 --- a/G-Earth/src/main/java/gearth/services/packetrepresentation/PacketStringUtils.java +++ b/G-Earth/src/main/java/gearth/services/packet_representation/PacketStringUtils.java @@ -1,7 +1,7 @@ -package gearth.services.packetrepresentation; +package gearth.services.packet_representation; import gearth.services.packet_info.PacketInfo; -import gearth.services.packetrepresentation.prediction.StructurePredictor; +import gearth.services.packet_representation.prediction.StructurePredictor; import gearth.protocol.HPacket; import java.nio.ByteBuffer; @@ -231,7 +231,7 @@ public class PacketStringUtils { ).append("\"}"); else if (c == 'd') builder.append("{d:").append(p.readDouble()).append('}'); else if (c == 'f') builder.append("{f:").append(p.readFloat()).append('}'); - else if (c == 'b') builder.append("{b:").append(p.readByte()).append('}'); + else if (c == 'b') builder.append("{b:").append((((int)(p.readByte())) + 256) % 256).append('}'); else if (c == 'B') builder.append("{b:").append(p.readBoolean()).append('}'); else if (c == 'l') builder.append("{l:").append(p.readLong()).append('}'); else if (c == 'u') builder.append("{u:").append(p.readShort()).append('}'); @@ -279,6 +279,9 @@ public class PacketStringUtils { HPacket p2 = fromString("{l}{h:4564}{i:3}{i:0}{s:\"hi\"}{i:0}{i:1}{s:\"how\"}{i:3}{b:1}{b:2}{b:3}{i:2}{s:\"r u\"}{i:1}{b:120}{i:2}{b:true}"); System.out.println(p2); + System.out.println(p2.toExpression()); + + System.out.println(new HPacket("{l}{h:4564}{b:180}").toExpression()); System.out.println(structureEquals( new HPacket("{l}{h:5}{s:\"asdas\"}"), diff --git a/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/StructurePredictor.java b/G-Earth/src/main/java/gearth/services/packet_representation/prediction/StructurePredictor.java similarity index 90% rename from G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/StructurePredictor.java rename to G-Earth/src/main/java/gearth/services/packet_representation/prediction/StructurePredictor.java index 4a40d0a..879cf44 100644 --- a/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/StructurePredictor.java +++ b/G-Earth/src/main/java/gearth/services/packet_representation/prediction/StructurePredictor.java @@ -1,7 +1,7 @@ -package gearth.services.packetrepresentation.prediction; +package gearth.services.packet_representation.prediction; -import gearth.services.packetrepresentation.prediction.checkers.TypeChecker; -import gearth.services.packetrepresentation.prediction.checkers.TypeCheckerProducer; +import gearth.services.packet_representation.prediction.checkers.TypeChecker; +import gearth.services.packet_representation.prediction.checkers.TypeCheckerProducer; import gearth.protocol.HPacket; import java.util.List; diff --git a/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/BooleanChecker.java b/G-Earth/src/main/java/gearth/services/packet_representation/prediction/checkers/BooleanChecker.java similarity index 93% rename from G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/BooleanChecker.java rename to G-Earth/src/main/java/gearth/services/packet_representation/prediction/checkers/BooleanChecker.java index cc94df5..1e7b2b1 100644 --- a/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/BooleanChecker.java +++ b/G-Earth/src/main/java/gearth/services/packet_representation/prediction/checkers/BooleanChecker.java @@ -1,4 +1,4 @@ -package gearth.services.packetrepresentation.prediction.checkers; +package gearth.services.packet_representation.prediction.checkers; import gearth.protocol.HPacket; diff --git a/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/ByteChecker.java b/G-Earth/src/main/java/gearth/services/packet_representation/prediction/checkers/ByteChecker.java similarity index 90% rename from G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/ByteChecker.java rename to G-Earth/src/main/java/gearth/services/packet_representation/prediction/checkers/ByteChecker.java index 2aa1cc9..25792bf 100644 --- a/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/ByteChecker.java +++ b/G-Earth/src/main/java/gearth/services/packet_representation/prediction/checkers/ByteChecker.java @@ -1,4 +1,4 @@ -package gearth.services.packetrepresentation.prediction.checkers; +package gearth.services.packet_representation.prediction.checkers; import gearth.protocol.HPacket; diff --git a/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/IntegerChecker.java b/G-Earth/src/main/java/gearth/services/packet_representation/prediction/checkers/IntegerChecker.java similarity index 97% rename from G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/IntegerChecker.java rename to G-Earth/src/main/java/gearth/services/packet_representation/prediction/checkers/IntegerChecker.java index 0e772be..c1eb164 100644 --- a/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/IntegerChecker.java +++ b/G-Earth/src/main/java/gearth/services/packet_representation/prediction/checkers/IntegerChecker.java @@ -1,4 +1,4 @@ -package gearth.services.packetrepresentation.prediction.checkers; +package gearth.services.packet_representation.prediction.checkers; import gearth.protocol.HPacket; diff --git a/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/LongChecker.java b/G-Earth/src/main/java/gearth/services/packet_representation/prediction/checkers/LongChecker.java similarity index 94% rename from G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/LongChecker.java rename to G-Earth/src/main/java/gearth/services/packet_representation/prediction/checkers/LongChecker.java index 052f892..7c2924f 100644 --- a/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/LongChecker.java +++ b/G-Earth/src/main/java/gearth/services/packet_representation/prediction/checkers/LongChecker.java @@ -1,4 +1,4 @@ -package gearth.services.packetrepresentation.prediction.checkers; +package gearth.services.packet_representation.prediction.checkers; import gearth.protocol.HPacket; diff --git a/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/ShortChecker.java b/G-Earth/src/main/java/gearth/services/packet_representation/prediction/checkers/ShortChecker.java similarity index 95% rename from G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/ShortChecker.java rename to G-Earth/src/main/java/gearth/services/packet_representation/prediction/checkers/ShortChecker.java index 96fd860..f1ffc83 100644 --- a/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/ShortChecker.java +++ b/G-Earth/src/main/java/gearth/services/packet_representation/prediction/checkers/ShortChecker.java @@ -1,4 +1,4 @@ -package gearth.services.packetrepresentation.prediction.checkers; +package gearth.services.packet_representation.prediction.checkers; import gearth.protocol.HPacket; diff --git a/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/StringChecker.java b/G-Earth/src/main/java/gearth/services/packet_representation/prediction/checkers/StringChecker.java similarity index 97% rename from G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/StringChecker.java rename to G-Earth/src/main/java/gearth/services/packet_representation/prediction/checkers/StringChecker.java index 589df8f..40e23a3 100644 --- a/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/StringChecker.java +++ b/G-Earth/src/main/java/gearth/services/packet_representation/prediction/checkers/StringChecker.java @@ -1,4 +1,4 @@ -package gearth.services.packetrepresentation.prediction.checkers; +package gearth.services.packet_representation.prediction.checkers; import gearth.protocol.HPacket; diff --git a/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/TypeChecker.java b/G-Earth/src/main/java/gearth/services/packet_representation/prediction/checkers/TypeChecker.java similarity index 90% rename from G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/TypeChecker.java rename to G-Earth/src/main/java/gearth/services/packet_representation/prediction/checkers/TypeChecker.java index 6348a47..ce01a55 100644 --- a/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/TypeChecker.java +++ b/G-Earth/src/main/java/gearth/services/packet_representation/prediction/checkers/TypeChecker.java @@ -1,4 +1,4 @@ -package gearth.services.packetrepresentation.prediction.checkers; +package gearth.services.packet_representation.prediction.checkers; import gearth.protocol.HPacket; diff --git a/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/TypeCheckerProducer.java b/G-Earth/src/main/java/gearth/services/packet_representation/prediction/checkers/TypeCheckerProducer.java similarity index 91% rename from G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/TypeCheckerProducer.java rename to G-Earth/src/main/java/gearth/services/packet_representation/prediction/checkers/TypeCheckerProducer.java index 33d7d43..1594c7b 100644 --- a/G-Earth/src/main/java/gearth/services/packetrepresentation/prediction/checkers/TypeCheckerProducer.java +++ b/G-Earth/src/main/java/gearth/services/packet_representation/prediction/checkers/TypeCheckerProducer.java @@ -1,4 +1,4 @@ -package gearth.services.packetrepresentation.prediction.checkers; +package gearth.services.packet_representation.prediction.checkers; import gearth.protocol.HPacket;