Mirror von
https://github.com/GeyserMC/Geyser.git
synchronisiert 2024-12-25 15:50:14 +01:00
Merge remote-tracking branch 'origin/master'
Dieser Commit ist enthalten in:
Commit
51050e3868
@ -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
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
@ -42,7 +42,8 @@ public enum DeviceOS {
|
||||
DEDICATED,
|
||||
ORBIS,
|
||||
NX,
|
||||
SWITCH;
|
||||
SWITCH,
|
||||
XBOX_ONE;
|
||||
|
||||
private static final DeviceOS[] VALUES = values();
|
||||
|
||||
|
@ -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(),
|
||||
|
@ -34,9 +34,9 @@ public class JavaUpdateTimeTranslator extends PacketTranslator<ServerUpdateTimeP
|
||||
|
||||
@Override
|
||||
public void translate(ServerUpdateTimePacket packet, GeyserSession session) {
|
||||
// https://minecraft.gamepedia.com/Day-night_cycle#24-hour_Minecraft_day
|
||||
SetTimePacket setTimePacket = new SetTimePacket();
|
||||
setTimePacket.setTime((int) Math.abs(packet.getTime()));
|
||||
|
||||
setTimePacket.setTime((int) Math.abs(packet.getTime()) % 24000);
|
||||
session.getUpstream().sendPacket(setTimePacket);
|
||||
}
|
||||
}
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren