Merge branch 'master' into inventory

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))
+- 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
 - 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

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) {
+    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) {
@@ -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;
     }
 }

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();
 

connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java

@@ -235,7 +235,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(),

connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java

@@ -120,6 +120,8 @@ public class TranslatorsInit {
         Registry.registerJava(ServerEntityMetadataPacket.class, new JavaEntityMetadataTranslator());
         Registry.registerJava(ServerEntityStatusPacket.class, new JavaEntityStatusTranslator());
         Registry.registerJava(ServerEntityEquipmentPacket.class, new JavaEntityEquipmentTranslator());
+        Registry.registerJava(ServerEntityEffectPacket.class, new JavaEntityEffectTranslator());
+        Registry.registerJava(ServerEntityRemoveEffectPacket.class, new JavaEntityRemoveEffectTranslator());
         Registry.registerJava(ServerBossBarPacket.class, new JavaBossBarTranslator());
 
         Registry.registerJava(ServerSpawnExpOrbPacket.class, new JavaSpawnExpOrbTranslator());

connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityEffectTranslator.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.connector.network.translators.java.entity;
+
+import com.github.steveice10.mc.protocol.packet.ingame.server.entity.ServerEntityEffectPacket;
+import com.nukkitx.protocol.bedrock.packet.MobEffectPacket;
+import org.geysermc.connector.entity.Entity;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.PacketTranslator;
+import org.geysermc.connector.utils.EntityUtils;
+
+public class JavaEntityEffectTranslator extends PacketTranslator<ServerEntityEffectPacket> {
+
+    @Override
+    public void translate(ServerEntityEffectPacket packet, GeyserSession session) {
+        Entity entity = session.getEntityCache().getEntityByJavaId(packet.getEntityId());
+        if (packet.getEntityId() == session.getPlayerEntity().getEntityId()) {
+            entity = session.getPlayerEntity();
+        }
+        if (entity == null)
+            return;
+
+        MobEffectPacket mobEffectPacket = new MobEffectPacket();
+        mobEffectPacket.setAmplifier(packet.getAmplifier());
+        mobEffectPacket.setDuration(packet.getDuration());
+        mobEffectPacket.setEvent(MobEffectPacket.Event.ADD);
+        mobEffectPacket.setRuntimeEntityId(entity.getGeyserId());
+        mobEffectPacket.setParticles(packet.isShowParticles());
+        mobEffectPacket.setEffectId(EntityUtils.toBedrockEffectId(packet.getEffect()));
+        session.getUpstream().sendPacket(mobEffectPacket);
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityRemoveEffectTranslator.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.connector.network.translators.java.entity;
+
+import com.github.steveice10.mc.protocol.packet.ingame.server.entity.ServerEntityRemoveEffectPacket;
+import com.nukkitx.protocol.bedrock.packet.MobEffectPacket;
+import org.geysermc.connector.entity.Entity;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.PacketTranslator;
+import org.geysermc.connector.utils.EntityUtils;
+
+public class JavaEntityRemoveEffectTranslator extends PacketTranslator<ServerEntityRemoveEffectPacket> {
+
+    @Override
+    public void translate(ServerEntityRemoveEffectPacket packet, GeyserSession session) {
+        Entity entity = session.getEntityCache().getEntityByJavaId(packet.getEntityId());
+        if (packet.getEntityId() == session.getPlayerEntity().getEntityId()) {
+            entity = session.getPlayerEntity();
+        }
+        if (entity == null)
+            return;
+
+        MobEffectPacket mobEffectPacket = new MobEffectPacket();
+        mobEffectPacket.setEvent(MobEffectPacket.Event.REMOVE);
+        mobEffectPacket.setRuntimeEntityId(entity.getGeyserId());
+        mobEffectPacket.setEffectId(EntityUtils.toBedrockEffectId(packet.getEffect()));
+        session.getUpstream().sendPacket(mobEffectPacket);
+    }
+}

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

@@ -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);
     }
 }

connector/src/main/java/org/geysermc/connector/utils/EntityUtils.java

@@ -25,20 +25,32 @@
 
 package org.geysermc.connector.utils;
 
+import com.github.steveice10.mc.protocol.data.game.entity.Effect;
 import com.github.steveice10.mc.protocol.data.game.entity.type.MobType;
 import com.github.steveice10.mc.protocol.data.game.entity.type.object.ObjectType;
 import org.geysermc.connector.entity.type.EntityType;
 
 public class EntityUtils {
 
-    public static MobType toJavaEntity(EntityType type) {
+    public static int toBedrockEffectId(Effect effect) {
-        try {
+        switch (effect) {
-            return MobType.valueOf(type.name());
+            case GLOWING:
-        } catch (IllegalArgumentException ex) {
+            case LUCK:
-            return null;
+            case UNLUCK:
+            case DOLPHINS_GRACE:
+            case BAD_OMEN:
+            case HERO_OF_THE_VILLAGE:
+                return 0;
+            case LEVITATION:
+                return 24;
+            case CONDUIT_POWER:
+                return 26;
+            case SLOW_FALLING:
+                return 27;
+            default:
+                return effect.ordinal() + 1;
         }
     }
-
     public static EntityType toBedrockEntity(MobType type) {
         try {
             return EntityType.valueOf(type.name());