From 9f36ba14cd32c7e1f9f0dac21602dfb2f711a658 Mon Sep 17 00:00:00 2001 From: Tim203 Date: Wed, 11 Mar 2020 23:03:12 +0100 Subject: [PATCH 1/4] Added the Xbox One as DeviceOS --- common/src/main/java/org/geysermc/floodgate/util/DeviceOS.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/org/geysermc/floodgate/util/DeviceOS.java b/common/src/main/java/org/geysermc/floodgate/util/DeviceOS.java index ee14fc90b..0705d1694 100644 --- a/common/src/main/java/org/geysermc/floodgate/util/DeviceOS.java +++ b/common/src/main/java/org/geysermc/floodgate/util/DeviceOS.java @@ -42,7 +42,8 @@ public enum DeviceOS { DEDICATED, ORBIS, NX, - SWITCH; + SWITCH, + XBOX_ONE; private static final DeviceOS[] VALUES = values(); From 79164927803748bb6f30e1fc74afcbd160b1f80f Mon Sep 17 00:00:00 2001 From: Redned Date: Sat, 14 Mar 2020 13:41:54 -0500 Subject: [PATCH 2/4] Update links to a few of what's left/needs adding to it's new location --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1cd56040d..8a0197972 100644 --- a/README.md +++ b/README.md @@ -28,12 +28,12 @@ Take a look [here](https://github.com/GeyserMC/Geyser/wiki#Setup) for how to set - Donate: https://patreon.com/GeyserMC ## What's Left to be Added/Fixed -- Inventories ([#67](https://github.com/GeyserMC/Geyser/pull/67)) -- Crafting ([#67](https://github.com/GeyserMC/Geyser/pull/67)) -- Creative Mode ([#67](https://github.com/GeyserMC/Geyser/pull/67)) +- Inventories ([`inventory`](https://github.com/GeyserMC/Geyser/tree/inventory)) +- Crafting ([`inventory`](https://github.com/GeyserMC/Geyser/tree/inventory)) +- Creative Mode ([`inventory`](https://github.com/GeyserMC/Geyser/tree/inventory)) - Sounds - Block Particles -- Block Entities ([`block-entities`](https://github.com/GeyserMC/Geyser/tree/block-entities)) +- Block Entities ([`inventory`](https://github.com/GeyserMC/Geyser/tree/inventory)) - Some Entity Flags ## Compiling From e203cfd4a7509f459e8910120d8b039ed425125e Mon Sep 17 00:00:00 2001 From: RednedEpic Date: Sat, 14 Mar 2020 14:02:58 -0500 Subject: [PATCH 3/4] Move back to XUID for Floodgate The normal identity UUID caused problems and caused the bedrock client to crash when using Floodgate. This was likely because on bedrock edition, it's a version 3 UUID opposed to java edition which uses version 4. --- .../java/org/geysermc/floodgate/util/BedrockData.java | 10 +++++----- .../connector/network/session/GeyserSession.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/src/main/java/org/geysermc/floodgate/util/BedrockData.java b/common/src/main/java/org/geysermc/floodgate/util/BedrockData.java index a94a20727..dc895a79d 100644 --- a/common/src/main/java/org/geysermc/floodgate/util/BedrockData.java +++ b/common/src/main/java/org/geysermc/floodgate/util/BedrockData.java @@ -13,15 +13,15 @@ public class BedrockData { private String version; private String username; - private UUID bedrockId; + private String xuid; private int deviceId; private String languageCode; private int inputMode; private String ip; private int dataLength; - public BedrockData(String version, String username, UUID bedrockId, int deviceId, String languageCode, int inputMode, String ip) { - this(version, username, bedrockId, deviceId, languageCode, inputMode, ip, EXPECTED_LENGTH); + public BedrockData(String version, String username, String xuid, int deviceId, String languageCode, int inputMode, String ip) { + this(version, username, xuid, deviceId, languageCode, inputMode, ip, EXPECTED_LENGTH); } public static BedrockData fromString(String data) { @@ -29,7 +29,7 @@ public class BedrockData { if (split.length != EXPECTED_LENGTH) return null; return new BedrockData( - split[0], split[1], UUID.fromString(split[2]), Integer.parseInt(split[3]), + split[0], split[1], split[2], Integer.parseInt(split[3]), split[4], Integer.parseInt(split[5]), split[6], split.length ); } @@ -40,7 +40,7 @@ public class BedrockData { @Override public String toString() { - return version +'\0'+ username +'\0'+ bedrockId +'\0'+ deviceId +'\0'+ languageCode +'\0'+ + return version +'\0'+ username +'\0'+ xuid +'\0'+ deviceId +'\0'+ languageCode +'\0'+ inputMode +'\0'+ ip; } } diff --git a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java index b443f9638..a2d8a7263 100644 --- a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java +++ b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java @@ -221,7 +221,7 @@ public class GeyserSession implements CommandSender { encrypted = EncryptionUtil.encryptBedrockData(publicKey, new BedrockData( clientData.getGameVersion(), authData.getName(), - authData.getUUID(), + authData.getXboxUUID(), clientData.getDeviceOS().ordinal(), clientData.getLanguageCode(), clientData.getCurrentInputMode().ordinal(), From 16c9317a36592de148b5aadd6b62a4804e480d57 Mon Sep 17 00:00:00 2001 From: RednedEpic Date: Sun, 15 Mar 2020 13:20:55 -0500 Subject: [PATCH 4/4] Fix flickering sky if time is too high (Closes #200) This was caused because the max int size is 2,147,483,647, which is what Minecraft: Bedrock Edition uses in the time packet. In Minecraft: Java Edition, a long is used which has a max length of 9,223,372,036,854,775,807, thus causing the sky to bug out. This commit uses the modulus operator with the max time value per-day of 24,000 to retrieve the remainder. --- .../translators/java/world/JavaUpdateTimeTranslator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaUpdateTimeTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaUpdateTimeTranslator.java index e2173e2ca..e820e278e 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaUpdateTimeTranslator.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaUpdateTimeTranslator.java @@ -34,9 +34,9 @@ public class JavaUpdateTimeTranslator extends PacketTranslator