1.1.1 release

bukkit/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bungee/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>us.myles</groupId>
             <artifactId>viaversion-common</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1</version>
         </dependency>
     </dependencies>
 </project>

bungee/src/main/java/us/myles/ViaVersion/bungee/providers/BungeeVersionProvider.java

@@ -4,10 +4,13 @@ import com.google.common.collect.Lists;
 import net.md_5.bungee.api.ProxyServer;
 import us.myles.ViaVersion.api.Via;
 import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.protocol.ProtocolVersion;
 import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 import us.myles.ViaVersion.protocols.base.VersionProvider;
 import us.myles.ViaVersion.util.ReflectionUtil;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class BungeeVersionProvider extends VersionProvider {
@@ -28,21 +31,26 @@ public class BungeeVersionProvider extends VersionProvider {
             return super.getServerProtocol(user);
         // TODO Have one constant list forever until restart? (Might limit plugins if they change this)
         List<Integer> list = ReflectionUtil.getStatic(ref, "SUPPORTED_VERSION_IDS", List.class);
+        List<Integer> sorted = new ArrayList<>(list);
+        Collections.sort(sorted);
 
         ProtocolInfo info = user.get(ProtocolInfo.class);
 
         // Bungee supports it
-        if (list.contains(info.getProtocolVersion()))
+        if (sorted.contains(info.getProtocolVersion()))
             return info.getProtocolVersion();
 
         // Older than bungee supports, get the lowest version
-        if (info.getProtocolVersion() < list.get(0)) {
+        if (info.getProtocolVersion() < sorted.get(0)) {
             return getLowestSupportedVersion();
         }
 
-        // Loop through all protocols to get the closest protocol id that bungee supports
-        for (Integer protocol : Lists.reverse(list)) {
-            if (info.getProtocolVersion() > protocol)
+        // Loop through all protocols to get the closest protocol id that bungee supports (and that viaversion does too)
+
+        // TODO: This needs a better fix, i.e checking ProtocolRegistry to see if it would work.
+        // This is more of a workaround for snapshot support by bungee.
+        for (Integer protocol : Lists.reverse(sorted)) {
+            if (info.getProtocolVersion() > protocol && ProtocolVersion.isRegistered(protocol))
                 return protocol;
         }
 

common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java

@@ -41,9 +41,8 @@ public class ProtocolRegistry {
 
         registerProtocol(new Protocol1_11To1_10(), Collections.singletonList(ProtocolVersion.v1_11.getId()), ProtocolVersion.v1_10.getId());
         registerProtocol(new Protocol1_11_1To1_11(), Collections.singletonList(ProtocolVersion.v1_11_1.getId()), ProtocolVersion.v1_11.getId());
-
-        // Snapshot
         registerProtocol(new Protocol1_12To1_11_1(), Collections.singletonList(ProtocolVersion.v1_12.getId()), ProtocolVersion.v1_11_1.getId());
+
     }
 
     /**

common/src/main/java/us/myles/ViaVersion/api/type/types/version/Metadata1_12Type.java

@@ -0,0 +1,29 @@
+package us.myles.ViaVersion.api.type.types.version;
+
+import io.netty.buffer.ByteBuf;
+import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
+import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_12;
+import us.myles.ViaVersion.api.type.types.minecraft.MetaTypeTemplate;
+
+public class Metadata1_12Type extends MetaTypeTemplate {
+    @Override
+    public Metadata read(ByteBuf buffer) throws Exception {
+        short index = buffer.readUnsignedByte();
+
+        if (index == 0xff) return null; //End of metadata
+        MetaType1_12 type = MetaType1_12.byId(buffer.readByte());
+
+        return new Metadata(index, type, type.getType().read(buffer));
+    }
+
+    @Override
+    public void write(ByteBuf buffer, Metadata object) throws Exception {
+        if (object == null) {
+            buffer.writeByte(255);
+        } else {
+            buffer.writeByte(object.getId());
+            buffer.writeByte(object.getMetaType().getTypeID());
+            object.getMetaType().getType().write(buffer, object.getValue());
+        }
+    }
+}

common/src/main/java/us/myles/ViaVersion/api/type/types/version/MetadataList1_12Type.java

@@ -0,0 +1,32 @@
+package us.myles.ViaVersion.api.type.types.version;
+
+import io.netty.buffer.ByteBuf;
+import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
+import us.myles.ViaVersion.api.type.types.minecraft.MetaListTypeTemplate;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MetadataList1_12Type extends MetaListTypeTemplate {
+    @Override
+    public List<Metadata> read(ByteBuf buffer) throws Exception {
+        List<Metadata> list = new ArrayList<>();
+        Metadata meta;
+        do {
+            meta = Types1_12.METADATA.read(buffer);
+            if (meta != null)
+                list.add(meta);
+        } while (meta != null);
+
+        return list;
+    }
+
+    @Override
+    public void write(ByteBuf buffer, List<Metadata> object) throws Exception {
+        for (Metadata m : object)
+            Types1_12.METADATA.write(buffer, m);
+
+        // Write end of list
+        Types1_12.METADATA.write(buffer, null);
+    }
+}

common/src/main/java/us/myles/ViaVersion/api/type/types/version/Types1_12.java

@@ -0,0 +1,18 @@
+package us.myles.ViaVersion.api.type.types.version;
+
+import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
+import us.myles.ViaVersion.api.type.Type;
+
+import java.util.List;
+
+public class Types1_12 {
+    /**
+     * Metadata list type for 1.12
+     */
+    public static final Type<List<Metadata>> METADATA_LIST = new MetadataList1_12Type();
+
+    /**
+     * Metadata type for 1.12
+     */
+    public static final Type<Metadata> METADATA = new Metadata1_12Type();
+}

common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/types/Chunk1_9_3_4Type.java

@@ -3,6 +3,7 @@ package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.types;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import us.myles.ViaVersion.api.Via;
 import us.myles.ViaVersion.api.minecraft.Environment;
 import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
 import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection;
@@ -61,6 +62,13 @@ public class Chunk1_9_3_4Type extends PartialType<Chunk, ClientWorld> {
 
         List<CompoundTag> nbtData = new ArrayList<>(Arrays.asList(Type.NBT_ARRAY.read(input)));
 
+        // Read all the remaining bytes (workaround for #681)
+        if (input.readableBytes() > 0) {
+            byte[] array = Type.REMAINING_BYTES.read(input);
+            if (Via.getManager().isDebug())
+                System.out.println("Found " + array.length + " more bytes than expected while reading the chunk: " + chunkX + "/" + chunkZ);
+        }
+
         return new Chunk1_9_3_4(chunkX, chunkZ, groundUp, primaryBitmask, sections, biomeData, nbtData);
     }
 

common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/EntityTracker.java

@@ -3,7 +3,6 @@ package us.myles.ViaVersion.protocols.protocol1_9to1_8.storage;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.Sets;
-import io.netty.buffer.ByteBuf;
 import lombok.Getter;
 import lombok.Setter;
 import us.myles.ViaVersion.api.PacketWrapper;
@@ -25,7 +24,6 @@ import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.chat.GameMode;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.metadata.MetadataRewriter;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.providers.BossBarProvider;
-import us.myles.ViaVersion.protocols.protocol1_9to1_8.providers.BulkChunkTranslatorProvider;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.providers.EntityIdProvider;
 
 import java.util.*;
@@ -182,14 +180,13 @@ public class EntityTracker extends StoredObject {
                             knownHolograms.add(entityID);
                             try {
                                 // Send movement
-                                ByteBuf buf = getUser().getChannel().alloc().buffer();
-                                Type.VAR_INT.write(buf, 0x25); // Relative Move Packet
-                                Type.VAR_INT.write(buf, entityID);
-                                buf.writeShort(0);
-                                buf.writeShort((short) (128D * (Via.getConfig().getHologramYOffset() * 32D)));
-                                buf.writeShort(0);
-                                buf.writeBoolean(true);
-                                getUser().sendRawPacket(buf, false);
+                                PacketWrapper wrapper = new PacketWrapper(0x25, null, getUser());
+                                wrapper.write(Type.VAR_INT, entityID);
+                                wrapper.write(Type.SHORT, (short) 0);
+                                wrapper.write(Type.SHORT, (short) (128D * (Via.getConfig().getHologramYOffset() * 32D)));
+                                wrapper.write(Type.SHORT, (short) 0);
+                                wrapper.write(Type.BOOLEAN, true);
+                                wrapper.send(Protocol1_9TO1_8.class, true, false);
                             } catch (Exception ignored) {
                             }
                         }

jar/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>viaversion-jar</name>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>us.myles</groupId>
     <artifactId>viaversion-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
     <packaging>pom</packaging>
 
     <name>viaversion-parent</name>

sponge-legacy/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sponge/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>