add 1.14.1 support (not tested yet)

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/MetadataRewriter.java

@@ -0,0 +1,37 @@
+package nl.matsv.viabackwards.protocol.protocol1_14to1_14_1;
+
+import us.myles.ViaVersion.api.Via;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.entities.Entity1_14Types;
+import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by Marco Neuhaus on 15.05.2019 for the Project ViaBackwardsFoorcee.
+ */
+public class MetadataRewriter {
+
+    public static void handleMetadata(int entityId, Entity1_14Types.EntityType type, List<Metadata> metadatas, UserConnection connection)  {
+        if (type == null) return;
+
+        for (Metadata metadata : new ArrayList<>(metadatas)) {
+            try {
+                if (type.is(Entity1_14Types.EntityType.VILLAGER) || type.is(Entity1_14Types.EntityType.WANDERING_TRADER)) {
+                    if (metadata.getId() >= 16) {
+                        metadata.setId(metadata.getId() - 1);
+                    }
+                }
+            } catch (Exception e) {
+                metadatas.remove(metadata);
+                if (!Via.getConfig().isSuppressMetadataErrors() || Via.getManager().isDebug()) {
+                    Via.getPlatform().getLogger().warning("An error occurred with entity metadata handler");
+                    Via.getPlatform().getLogger().warning("Metadata: " + metadata);
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/Protocol1_14To1_14_1.java

@@ -0,0 +1,22 @@
+package nl.matsv.viabackwards.protocol.protocol1_14to1_14_1;
+
+import nl.matsv.viabackwards.api.BackwardsProtocol;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.protocols.protocol1_14_1to1_14.packets.EntityPackets;
+import us.myles.ViaVersion.protocols.protocol1_14_1to1_14.storage.EntityTracker;
+
+/**
+ * Created by Marco Neuhaus on 15.05.2019 for the Project ViaBackwardsFoorcee.
+ */
+public class Protocol1_14To1_14_1 extends BackwardsProtocol {
+
+    @Override
+    protected void registerPackets() {
+        EntityPackets.register(this);
+    }
+
+    @Override
+    public void init(UserConnection userConnection) {
+        userConnection.put(new EntityTracker(userConnection));
+    }
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/packets/EntityPackets.java

@@ -0,0 +1,106 @@
+package nl.matsv.viabackwards.protocol.protocol1_14to1_14_1.packets;
+
+import com.google.common.base.Optional;
+import nl.matsv.viabackwards.protocol.protocol1_14to1_14_1.MetadataRewriter;
+import nl.matsv.viabackwards.protocol.protocol1_14to1_14_1.storage.EntityTracker;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.entities.Entity1_14Types;
+import us.myles.ViaVersion.api.entities.Entity1_14Types.EntityType;
+import us.myles.ViaVersion.api.protocol.Protocol;
+import us.myles.ViaVersion.api.remapper.PacketHandler;
+import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.types.version.Types1_14;
+import us.myles.ViaVersion.packets.State;
+
+/**
+ * Created by Marco Neuhaus on 15.05.2019 for the Project ViaBackwardsFoorcee.
+ */
+public class EntityPackets {
+
+    public static void register(Protocol protocol) {
+
+        // Spawn Mob
+        protocol.registerOutgoing(State.PLAY, 0x03, 0x03, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Type.UUID); // 1 - Entity UUID
+                map(Type.VAR_INT); // 2 - Entity Type
+                map(Type.DOUBLE); // 3 - X
+                map(Type.DOUBLE); // 4 - Y
+                map(Type.DOUBLE); // 5 - Z
+                map(Type.BYTE); // 6 - Yaw
+                map(Type.BYTE); // 7 - Pitch
+                map(Type.BYTE); // 8 - Head Pitch
+                map(Type.SHORT); // 9 - Velocity X
+                map(Type.SHORT); // 10 - Velocity Y
+                map(Type.SHORT); // 11 - Velocity Z
+                map(Types1_14.METADATA_LIST); // 12 - Metadata
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int entityId = wrapper.get(Type.VAR_INT, 0);
+                        int type = wrapper.get(Type.VAR_INT, 1);
+
+                        Entity1_14Types.EntityType entType = Entity1_14Types.getTypeFromId(type);
+
+                        // Register Type ID
+                        wrapper.user().get(EntityTracker.class).addEntity(entityId, entType);
+
+                        MetadataRewriter.handleMetadata(entityId, entType, wrapper.get(Types1_14.METADATA_LIST, 0), wrapper.user());
+                    }
+                });
+            }
+        });
+
+        // Spawn Player
+        protocol.registerOutgoing(State.PLAY, 0x05, 0x05, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Type.UUID); // 1 - Player UUID
+                map(Type.DOUBLE); // 2 - X
+                map(Type.DOUBLE); // 3 - Y
+                map(Type.DOUBLE); // 4 - Z
+                map(Type.BYTE); // 5 - Yaw
+                map(Type.BYTE); // 6 - Pitch
+                map(Types1_14.METADATA_LIST); // 7 - Metadata
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int entityId = wrapper.get(Type.VAR_INT, 0);
+
+                        Entity1_14Types.EntityType entType = Entity1_14Types.EntityType.PLAYER;
+
+                        // Register Type ID
+                        wrapper.user().get(EntityTracker.class).addEntity(entityId, entType);
+                        MetadataRewriter.handleMetadata(entityId, entType, wrapper.get(Types1_14.METADATA_LIST, 0), wrapper.user());
+                    }
+                });
+            }
+        });
+
+        // Entity Metadata
+        protocol.registerOutgoing(State.PLAY, 0x43, 0x43, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Types1_14.METADATA_LIST); // 1 - Metadata list
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int entityId = wrapper.get(Type.VAR_INT, 0);
+
+                        Optional<EntityType> type = wrapper.user().get(EntityTracker.class).get(entityId);
+                        MetadataRewriter.handleMetadata(entityId, type.orNull(), wrapper.get(Types1_14.METADATA_LIST, 0), wrapper.user());
+                    }
+                });
+            }
+        });
+    }
+
+}

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/storage/EntityTracker.java

@@ -0,0 +1,49 @@
+package nl.matsv.viabackwards.protocol.protocol1_14to1_14_1.storage;
+
+import com.google.common.base.Optional;
+import lombok.Getter;
+import lombok.Setter;
+import us.myles.ViaVersion.api.data.ExternalJoinGameListener;
+import us.myles.ViaVersion.api.data.StoredObject;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.entities.Entity1_14Types;
+import us.myles.ViaVersion.api.entities.Entity1_14Types.EntityType;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Created by Marco Neuhaus on 15.05.2019 for the Project ViaBackwardsFoorcee.
+ */
+public class EntityTracker  extends StoredObject implements ExternalJoinGameListener {
+    private final Map<Integer, EntityType> clientEntityTypes = new ConcurrentHashMap<>();
+    @Getter
+    @Setter
+    private int clientEntityId;
+
+    public EntityTracker(UserConnection user) {
+        super(user);
+    }
+
+    public void removeEntity(int entityId) {
+        clientEntityTypes.remove(entityId);
+    }
+
+    public void addEntity(int entityId, Entity1_14Types.EntityType type) {
+        clientEntityTypes.put(entityId, type);
+    }
+
+    public boolean has(int entityId) {
+        return clientEntityTypes.containsKey(entityId);
+    }
+
+    public Optional<EntityType> get(int id) {
+        return Optional.fromNullable(clientEntityTypes.get(id));
+    }
+
+    @Override
+    public void onExternalJoinGame(int playerEntityId) {
+        clientEntityId = playerEntityId;
+        clientEntityTypes.put(playerEntityId, Entity1_14Types.EntityType.PLAYER);
+    }
+}

pom.xml

@@ -60,7 +60,7 @@
         <dependency>
             <groupId>us.myles</groupId>
             <artifactId>viaversion</artifactId>
-            <version>2.0.0-19w09a</version>
+            <version>2.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>