diff options
7 files changed, 13 insertions, 24 deletions
diff --git a/serverlist-server/pom.xml b/serverlist-server/pom.xml index a8cdbd6..8a5c3d0 100644 --- a/serverlist-server/pom.xml +++ b/serverlist-server/pom.xml @@ -45,14 +45,6 @@ <goals> <goal>shade</goal> </goals> - <configuration> - <relocations> - <relocation> - <pattern>org.cloudburstmc.protocol</pattern> - <shadedPattern>com.pyratron.pugmatt.protocol</shadedPattern> - </relocation> - </relocations> - </configuration> </execution> </executions> </plugin> @@ -111,13 +103,13 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.12.7.1</version> + <version>2.15.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-yaml</artifactId> - <version>2.9.8</version> + <version>2.15.0</version> <scope>compile</scope> </dependency> diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BedrockConnect.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BedrockConnect.java index b568b4e..92a6f23 100644 --- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BedrockConnect.java +++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BedrockConnect.java @@ -19,7 +19,7 @@ import java.sql.SQLException; import java.util.*; public class BedrockConnect { - private static String release = "1.61"; + private static String release = "1.62"; private static Config config; private static Database database; diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/BCPlayer.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/BCPlayer.java index c1d519e..085d0c6 100644 --- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/BCPlayer.java +++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/BCPlayer.java @@ -140,13 +140,13 @@ public class BCPlayer { TextPacket text = new TextPacket(); text.setType(TextPacket.Type.TIP); - text.setMessage("==!!== Crouch or punch to re-trigger the popup ==!!=="); + text.setMessage(BedrockConnect.getConfig().getLanguage().getWording("retriggerMsg", "tip")); text.setXuid(uuid); session.sendPacket(text); TextPacket text2 = new TextPacket(); text2.setType(TextPacket.Type.RAW); - text2.setMessage("\n\n\n\n\n\n\n\n\n\n\n\n\n\n==!!== Crouch or punch to re-trigger the popup ==!!==\n\n\n\n\n\n\n\n\n\n\n"); + text2.setMessage(BedrockConnect.getConfig().getLanguage().getWording("retriggerMsg", "chat")); text2.setXuid(uuid); session.sendPacket(text2); } diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/BedrockProtocol.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/BedrockProtocol.java index ea59752..5ded7d1 100644 --- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/BedrockProtocol.java +++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/BedrockProtocol.java @@ -29,7 +29,7 @@ public class BedrockProtocol { /** * Latest available version */ - public static final BedrockCodec DEFAULT_BEDROCK_CODEC = Bedrock_v859.CODEC; + public static final BedrockCodec DEFAULT_BEDROCK_CODEC = Bedrock_v859.CODEC.toBuilder().protocolVersion(860).minecraftVersion("1.21.124").build(); /** @@ -64,6 +64,7 @@ public class BedrockProtocol { SUPPORTED_BEDROCK_CODECS.add(Bedrock_v819.CODEC); SUPPORTED_BEDROCK_CODECS.add(Bedrock_v827.CODEC); SUPPORTED_BEDROCK_CODECS.add(Bedrock_v844.CODEC); + SUPPORTED_BEDROCK_CODECS.add(Bedrock_v859.CODEC); SUPPORTED_BEDROCK_CODECS.add(DEFAULT_BEDROCK_CODEC); } diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/PacketHandler.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/PacketHandler.java index 939cea5..e9f7b0e 100644 --- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/PacketHandler.java +++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/PacketHandler.java @@ -1,7 +1,5 @@ package main.com.pyratron.pugmatt.bedrockconnect.server; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.JsonNodeType; import main.com.pyratron.pugmatt.bedrockconnect.*; import main.com.pyratron.pugmatt.bedrockconnect.config.Whitelist; import main.com.pyratron.pugmatt.bedrockconnect.config.Custom.CustomEntry; @@ -20,17 +18,10 @@ import org.cloudburstmc.protocol.bedrock.data.AttributeData; import org.cloudburstmc.protocol.bedrock.data.PacketCompressionAlgorithm; import org.cloudburstmc.protocol.bedrock.packet.*; import org.cloudburstmc.protocol.bedrock.util.ChainValidationResult; -import org.cloudburstmc.protocol.bedrock.util.ChainValidationResult.IdentityClaims; import org.cloudburstmc.protocol.bedrock.util.ChainValidationResult.IdentityData; import org.cloudburstmc.protocol.bedrock.util.EncryptionUtils; -import org.cloudburstmc.protocol.bedrock.util.JsonUtils; import org.cloudburstmc.protocol.common.PacketSignal; -import org.jose4j.json.internal.json_simple.JSONObject; -import org.jose4j.jws.JsonWebSignature; -import org.jose4j.lang.JoseException; - import java.security.PublicKey; -import java.security.interfaces.ECPublicKey; import java.util.*; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/gui/UIForms.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/gui/UIForms.java index 874372f..f4363f8 100644 --- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/gui/UIForms.java +++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/server/gui/UIForms.java @@ -48,7 +48,7 @@ public class UIForms { mf.setFormId(UIForms.MAIN); JsonObject out = UIComponents.createForm("form", BedrockConnect.getConfig().getLanguage().getWording("main", "heading")); - out.addProperty("content", ""); + out.addProperty("content", BedrockConnect.getConfig().getLanguage().getWording("main", "message")); JsonArray buttons = new JsonArray(); CustomEntry[] customServers = BedrockConnect.getConfig().getCustomServers(); diff --git a/serverlist-server/src/main/resources/language.json b/serverlist-server/src/main/resources/language.json index 6f85e7c..ce606b2 100644 --- a/serverlist-server/src/main/resources/language.json +++ b/serverlist-server/src/main/resources/language.json @@ -9,6 +9,7 @@ }, "main": { "heading": "ServerList", + "message": "", "connectBtn" : "Connect to a Server", "manageBtn" : "Manage Server List", "exitBtn": "Exit Server List" @@ -43,6 +44,10 @@ "serverGroup": { "backBtn": "Back To List" }, + "retriggerMsg": { + "tip": "Crouch or punch to re-trigger the popup", + "chat": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n==!!== Crouch or punch to re-trigger the popup ==!!==\n\n\n\n\n\n\n\n\n\n\n" + }, "error": { "heading": "Error", "addressLarge": "Address is too large. (Must be 253 characters or less)", |