Apple/Geyser
1
0
Fork 0
forked from GeyserMC/Geyser
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
RednedEpic 2020-03-17 11:43:28 -05:00
commit 51050e3868
5 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -28,12 +28,12 @@ Take a look [here](https://github.com/GeyserMC/Geyser/wiki#Setup) for how to set
- Donate: https://patreon.com/GeyserMC - Donate: https://patreon.com/GeyserMC
## What's Left to be Added/Fixed ## What's Left to be Added/Fixed
- Inventories ([#67](https://github.com/GeyserMC/Geyser/pull/67)) - Inventories ([`inventory`](https://github.com/GeyserMC/Geyser/tree/inventory))
- Crafting ([#67](https://github.com/GeyserMC/Geyser/pull/67)) - Crafting ([`inventory`](https://github.com/GeyserMC/Geyser/tree/inventory))
- Creative Mode ([#67](https://github.com/GeyserMC/Geyser/pull/67)) - Creative Mode ([`inventory`](https://github.com/GeyserMC/Geyser/tree/inventory))
- Sounds - Sounds
- Block Particles - 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 - Some Entity Flags
## Compiling ## Compiling

10
common/src/main/java/org/geysermc/floodgate/util/BedrockData.java
View file

@ -13,15 +13,15 @@ public class BedrockData {
private String version; private String version;
private String username; private String username;
private UUID bedrockId; private String xuid;
private int deviceId; private int deviceId;
private String languageCode; private String languageCode;
private int inputMode; private int inputMode;
private String ip; private String ip;
private int dataLength; private int dataLength;
public BedrockData(String version, String username, UUID bedrockId, int deviceId, String languageCode, int inputMode, String ip) { public BedrockData(String version, String username, String xuid, int deviceId, String languageCode, int inputMode, String ip) {
this(version, username, bedrockId, deviceId, languageCode, inputMode, ip, EXPECTED_LENGTH); this(version, username, xuid, deviceId, languageCode, inputMode, ip, EXPECTED_LENGTH);
} }
public static BedrockData fromString(String data) { public static BedrockData fromString(String data) {
@ -29,7 +29,7 @@ public class BedrockData {
if (split.length != EXPECTED_LENGTH) return null; if (split.length != EXPECTED_LENGTH) return null;
return new BedrockData( 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 split[4], Integer.parseInt(split[5]), split[6], split.length
); );
} }
@ -40,7 +40,7 @@ public class BedrockData {
@Override @Override
public String toString() { 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; inputMode +'\0'+ ip;
} }
} }

3
common/src/main/java/org/geysermc/floodgate/util/DeviceOS.java
View file

@ -42,7 +42,8 @@ public enum DeviceOS {
DEDICATED, DEDICATED,
ORBIS, ORBIS,
NX, NX,
SWITCH; SWITCH,
XBOX_ONE;
private static final DeviceOS[] VALUES = values(); private static final DeviceOS[] VALUES = values();

2
connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
View file

@ -221,7 +221,7 @@ public class GeyserSession implements CommandSender {
encrypted = EncryptionUtil.encryptBedrockData(publicKey, new BedrockData( encrypted = EncryptionUtil.encryptBedrockData(publicKey, new BedrockData(
clientData.getGameVersion(), clientData.getGameVersion(),
authData.getName(), authData.getName(),
authData.getUUID(), authData.getXboxUUID(),
clientData.getDeviceOS().ordinal(), clientData.getDeviceOS().ordinal(),
clientData.getLanguageCode(), clientData.getLanguageCode(),
clientData.getCurrentInputMode().ordinal(), clientData.getCurrentInputMode().ordinal(),

4
connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaUpdateTimeTranslator.java
View file

@ -34,9 +34,9 @@ public class JavaUpdateTimeTranslator extends PacketTranslator<ServerUpdateTimeP
@Override @Override
public void translate(ServerUpdateTimePacket packet, GeyserSession session) { public void translate(ServerUpdateTimePacket packet, GeyserSession session) {
// https://minecraft.gamepedia.com/Day-night_cycle#24-hour_Minecraft_day
SetTimePacket setTimePacket = new SetTimePacket(); SetTimePacket setTimePacket = new SetTimePacket();
setTimePacket.setTime((int) Math.abs(packet.getTime())); setTimePacket.setTime((int) Math.abs(packet.getTime()) % 24000);
session.getUpstream().sendPacket(setTimePacket); session.getUpstream().sendPacket(setTimePacket);
} }
} }