Merge pull request #113 from GeyserMC/feature/1.15-je-1.14-be

Merge 1.15 Java and 1.14 Bedrock changes into master

connector/pom.xml

@@ -103,7 +103,7 @@
         <dependency>
             <groupId>com.github.steveice10</groupId>
             <artifactId>mcprotocollib</artifactId>
-            <version>1.14.4-2-SNAPSHOT</version>
+            <version>1.15.1-1-SNAPSHOT</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>

connector/src/main/java/org/geysermc/connector/GeyserConnector.java

@@ -68,6 +68,7 @@ import java.util.concurrent.TimeUnit;
 public class GeyserConnector implements Connector {
 
     public static final BedrockPacketCodec BEDROCK_PACKET_CODEC = Bedrock_v388.V388_CODEC;
+    public static final int BEDROCK_1_14_PROTOCOL_VERSION = 389;
 
     public static final String NAME = "Geyser";
     public static final String VERSION = "1.0-SNAPSHOT";

connector/src/main/java/org/geysermc/connector/entity/living/AbstractHorseEntity.java

@@ -27,7 +27,6 @@ package org.geysermc.connector.entity.living;
 
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
 import com.nukkitx.math.vector.Vector3f;
-import com.nukkitx.protocol.bedrock.data.EntityData;
 import org.geysermc.connector.entity.type.EntityType;
 import org.geysermc.connector.network.session.GeyserSession;
 

connector/src/main/java/org/geysermc/connector/entity/living/AgeableEntity.java

@@ -26,6 +26,7 @@
 package org.geysermc.connector.entity.living;
 
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.MetadataType;
 import com.nukkitx.math.vector.Vector3f;
 import com.nukkitx.protocol.bedrock.data.EntityFlag;
 import org.geysermc.connector.entity.type.EntityType;
@@ -39,8 +40,14 @@ public class AgeableEntity extends CreatureEntity {
 
     @Override
     public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
-        if (entityMetadata.getId() == 14) {
+        if (entityMetadata.getId() == 15) {
-            metadata.getFlags().setFlag(EntityFlag.BABY, (boolean) entityMetadata.getValue());
+            // TODO: Figure out why this value sometimes returns an integer
+            // At the time of writing this, the value here sometimes returns as an int
+            // rather than a boolean for donkeys. The wiki.vg documentation is lacking at the
+            // time of writing this, but once this value is known, the bug will be fixed accordingly.
+            if (entityMetadata.getType() == MetadataType.BOOLEAN) {
+                metadata.getFlags().setFlag(EntityFlag.BABY, (boolean) entityMetadata.getValue());
+            }
         }
 
         super.updateBedrockMetadata(entityMetadata, session);

connector/src/main/java/org/geysermc/connector/entity/living/InsentientEntity.java

@@ -41,7 +41,7 @@ public class InsentientEntity extends LivingEntity {
 
     @Override
     public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
-        if (entityMetadata.getId() == 13 && entityMetadata.getType() == MetadataType.BYTE) {
+        if (entityMetadata.getId() == 14 && entityMetadata.getType() == MetadataType.BYTE) {
             byte xd = (byte) entityMetadata.getValue();
             metadata.getFlags().setFlag(EntityFlag.NO_AI, (xd & 0x01) == 0x01);
         }

connector/src/main/java/org/geysermc/connector/entity/living/horse/HorseEntity.java

@@ -40,7 +40,7 @@ public class HorseEntity extends AbstractHorseEntity {
 
     @Override
     public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
-        if (entityMetadata.getId() == 17) {
+        if (entityMetadata.getId() == 18) {
             metadata.put(EntityData.VARIANT, (int) entityMetadata.getValue());
         }
 

connector/src/main/java/org/geysermc/connector/entity/living/horse/LlamaEntity.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2019 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.entity.living.horse;
+
+import com.nukkitx.math.vector.Vector3f;
+import org.geysermc.connector.entity.living.ChestedHorseEntity;
+import org.geysermc.connector.entity.type.EntityType;
+
+public class LlamaEntity extends ChestedHorseEntity {
+
+    public LlamaEntity(long entityId, long geyserId, EntityType entityType, Vector3f position, Vector3f motion, Vector3f rotation) {
+        super(entityId, geyserId, entityType, position, motion, rotation);
+    }
+}

connector/src/main/java/org/geysermc/connector/entity/living/monster/GuardianEntity.java

@@ -41,7 +41,7 @@ public class GuardianEntity extends MonsterEntity {
 
     @Override
     public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
-        if (entityMetadata.getId() == 15) {
+        if (entityMetadata.getId() == 16) {
             Entity entity = session.getEntityCache().getEntityByJavaId((int) entityMetadata.getValue());
             if (entity != null) {
                 metadata.put(EntityData.TARGET_EID, entity.getGeyserId());

connector/src/main/java/org/geysermc/connector/entity/type/EntityType.java

@@ -29,6 +29,7 @@ import lombok.Getter;
 import org.geysermc.connector.entity.*;
 import org.geysermc.connector.entity.living.*;
 import org.geysermc.connector.entity.living.horse.HorseEntity;
+import org.geysermc.connector.entity.living.horse.LlamaEntity;
 import org.geysermc.connector.entity.living.monster.GuardianEntity;
 import org.geysermc.connector.entity.living.monster.ZombieEntity;
 
@@ -47,14 +48,15 @@ public enum EntityType {
     BAT(AmbientEntity.class, 19, 0.9f, 0.5f),
     IRON_GOLEM(GolemEntity.class, 20, 2.7f, 1.4f),
     SNOW_GOLEM(GolemEntity.class, 21, 1.9f, 0.7f),
-    OCELOT(TameableEntity.class, 22, 0.35f, 0.3f),
+    OCELOT(AgeableEntity.class, 22, 0.35f, 0.3f),
     HORSE(HorseEntity.class, 23, 1.6f, 1.3965f),
     DONKEY(ChestedHorseEntity.class, 24, 1.6f, 1.3965f),
     MULE(ChestedHorseEntity.class, 25, 1.6f, 1.3965f),
     SKELETON_HORSE(AbstractHorseEntity.class, 26, 1.6f, 1.3965f),
     ZOMBIE_HORSE(AbstractHorseEntity.class, 27, 1.6f, 1.3965f),
     POLAR_BEAR(AnimalEntity.class, 28, 1.4f, 1.3f),
-    LLAMA(ChestedHorseEntity.class, 29, 1.87f, 0.9f),
+    LLAMA(LlamaEntity.class, 29, 1.87f, 0.9f),
+    TRADER_LLAMA(LlamaEntity.class, 29, 1.187f, 0.9f),
     PARROT(TameableEntity.class, 30, 0.9f, 0.5f),
     DOLPHIN(WaterEntity.class, 31, 0.6f, 0.9f),
     ZOMBIE(ZombieEntity.class, 32, 1.8f, 0.6f, 0.6f, 1.62f),
@@ -140,7 +142,8 @@ public enum EntityType {
     TROPICAL_FISH(AbstractFishEntity.class, 111, 0.6f, 0.6f),
     COD(AbstractFishEntity.class, 112, 0.25f, 0.5f),
     PANDA(AnimalEntity.class, 113, 1.25f, 1.125f, 1.825f),
-    FOX(AnimalEntity.class, 121, 0.5f, 1.25f);
+    FOX(AnimalEntity.class, 121, 0.5f, 1.25f),
+    BEE(InsentientEntity.class, 122, 0.6f, 0.6f);
 
     private Class<? extends Entity> entityClass;
     private final int type;

connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java

@@ -45,8 +45,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
 
     @Override
     public boolean handle(LoginPacket loginPacket) {
-        if (loginPacket.getProtocolVersion() != GeyserConnector.BEDROCK_PACKET_CODEC.getProtocolVersion()) {
+        if (loginPacket.getProtocolVersion() != GeyserConnector.BEDROCK_1_14_PROTOCOL_VERSION) {
-            connector.getLogger().debug("unsupported");
             session.getUpstream().disconnect("Unsupported Bedrock version. Are you running an outdated version?");
             return true;
         }

connector/src/main/resources/mappings

@@ -1 +1 @@
-Subproject commit 3d4147f001266d01eae6b8479428ca77bb5bf0c3
+Subproject commit 0f3d65b65076b16fc7dc9226230b31291b8f2cde