Merge branch 'master' of https://github.com/MylesIsCool/ViaVersion

README.md

@@ -1,4 +1,4 @@
-# ViaVersion 0.9.6
+# ViaVersion 0.9.8
 [![Build Status](https://travis-ci.org/MylesIsCool/ViaVersion.svg?branch=master)](https://travis-ci.org/MylesIsCool/ViaVersion)
 [![Gitter](https://badges.gitter.im/MylesIsCool/ViaVersion.svg)](https://gitter.im/MylesIsCool/ViaVersion)
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>us.myles</groupId>
     <artifactId>viaversion</artifactId>
-    <version>0.9.6</version>
+    <version>0.9.8</version>
     <packaging>jar</packaging>
 
     <name>ViaVersion</name>

src/main/java/us/myles/ViaVersion/ViaConfig.java

@@ -180,4 +180,9 @@ public class ViaConfig implements ViaVersionConfig {
     public String getBlockedDisconnectMsg() {
         return plugin.getConfig().getString("block-disconnect-msg", "You are using an unsupported Minecraft version!");
     }
+
+    @Override
+    public String getReloadDisconnectMsg() {
+        return plugin.getConfig().getString("reload-disconnect-msg", "Server reload, please rejoin!");
+    }
 }

src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java

@@ -7,6 +7,7 @@ import io.netty.channel.ChannelInitializer;
 import io.netty.channel.socket.SocketChannel;
 import lombok.Getter;
 import lombok.NonNull;
+import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.PluginDescriptionFile;
@@ -79,7 +80,7 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
             if (Bukkit.getPluginManager().getPlugin("ProtocolLib") != null) {
                 getLogger().severe("ViaVersion is already loaded, we're going to kick all the players... because otherwise we'll crash because of ProtocolLib.");
                 for (Player player : Bukkit.getOnlinePlayers()) {
-                    player.kickPlayer("Server reload, please rejoin!");
+                    player.kickPlayer(ChatColor.translateAlternateColorCodes('&', getConf().getReloadDisconnectMsg()));
                 }
 
             } else {

src/main/java/us/myles/ViaVersion/api/PacketWrapper.java

@@ -282,31 +282,44 @@ public class PacketWrapper {
      * @param skipCurrentPipeline - Skip the current pipeline
      * @throws Exception if it fails to write
      */
-    public ChannelFuture send(Class<? extends Protocol> packetProtocol, boolean skipCurrentPipeline) throws Exception {
+    public void send(Class<? extends Protocol> packetProtocol, boolean skipCurrentPipeline) throws Exception {
         if (!isCancelled()) {
-            // Apply current pipeline
-            List<Protocol> protocols = new ArrayList<>(user().get(ProtocolInfo.class).getPipeline().pipes());
-            // Other way if outgoing
-            Collections.reverse(protocols);
-            int index = 0;
-            for (int i = 0; i < protocols.size(); i++) {
-                if (protocols.get(i).getClass().equals(packetProtocol)) {
-                    index = skipCurrentPipeline ? (i + 1) : (i);
-                    break;
-                }
-            }
-
-            // Reset reader before we start
-            resetReader();
-
-            // Apply other protocols
-            apply(Direction.OUTGOING, user().get(ProtocolInfo.class).getState(), index, protocols);
-            // Send
-            ByteBuf output = inputBuffer == null ? Unpooled.buffer() : inputBuffer.alloc().buffer();
-            writeToBuffer(output);
-            return user().sendRawPacketFuture(output);
+            ByteBuf output = constructPacket(packetProtocol, skipCurrentPipeline);
+            user().sendRawPacket(output);
         }
-        return user().getChannel().newFailedFuture(new Exception("Cancelled packet"));
+    }
+
+    /**
+     * Let the packet go through the protocol pipes and write it to ByteBuf
+     *
+     * @param packetProtocol      - The protocol version of the packet.
+     * @param skipCurrentPipeline - Skip the current pipeline
+     * @return Packet buffer
+     * @throws Exception if it fails to write
+     */
+    private ByteBuf constructPacket(Class<? extends Protocol> packetProtocol, boolean skipCurrentPipeline) throws Exception {
+        // Apply current pipeline
+        List<Protocol> protocols = new ArrayList<>(user().get(ProtocolInfo.class).getPipeline().pipes());
+        // Other way if outgoing
+        Collections.reverse(protocols);
+        int index = 0;
+        for (int i = 0; i < protocols.size(); i++) {
+            if (protocols.get(i).getClass().equals(packetProtocol)) {
+                index = skipCurrentPipeline ? (i + 1) : (i);
+                break;
+            }
+        }
+
+        // Reset reader before we start
+        resetReader();
+
+        // Apply other protocols
+        apply(Direction.OUTGOING, user().get(ProtocolInfo.class).getState(), index, protocols);
+        // Send
+        ByteBuf output = inputBuffer == null ? Unpooled.buffer() : inputBuffer.alloc().buffer();
+        writeToBuffer(output);
+
+        return output;
     }
 
     /**
@@ -332,7 +345,11 @@ public class PacketWrapper {
      * @throws Exception if it fails to write
      */
     public ChannelFuture sendFuture(Class<? extends Protocol> packetProtocol) throws Exception {
-        return send(packetProtocol, true);
+        if (!isCancelled()) {
+            ByteBuf output = constructPacket(packetProtocol, true);
+            return user().sendRawPacketFuture(output);
+        }
+        return user().getChannel().newFailedFuture(new Exception("Cancelled packet"));
     }
 
     /**

src/main/java/us/myles/ViaVersion/api/ViaListener.java

@@ -0,0 +1,75 @@
+package us.myles.ViaVersion.api;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Listener;
+import us.myles.ViaVersion.ViaVersionPlugin;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.protocol.Protocol;
+import us.myles.ViaVersion.protocols.base.ProtocolInfo;
+
+import java.util.UUID;
+
+@Getter(AccessLevel.PROTECTED)
+@RequiredArgsConstructor
+public abstract class ViaListener implements Listener {
+    private final ViaVersionPlugin plugin;
+    private final Class<? extends Protocol> requiredPipeline;
+    private boolean registered = false;
+
+    /**
+     * Get the UserConnection from a player
+     *
+     * @param player Player object
+     * @return The UserConnection
+     */
+    protected UserConnection getUserConnection(@NonNull Player player) {
+        return getUserConnection(player.getUniqueId());
+    }
+
+    /**
+     * Get the UserConnection from an UUID
+     *
+     * @param uuid UUID object
+     * @return The UserConnection
+     */
+    protected UserConnection getUserConnection(@NonNull UUID uuid) {
+        if (!plugin.isPorted(uuid)) return null;
+        return plugin.getConnection(uuid);
+    }
+
+    /**
+     * Checks if the player is on the selected pipe
+     *
+     * @param player Player Object
+     * @return True if on pipe
+     */
+    protected boolean isOnPipe(Player player) {
+        return isOnPipe(player.getUniqueId());
+    }
+
+    /**
+     * Checks if the UUID is on the selected pipe
+     *
+     * @param uuid UUID Object
+     * @return True if on pipe
+     */
+    protected boolean isOnPipe(UUID uuid) {
+        UserConnection userConnection = getUserConnection(uuid);
+        return userConnection != null &&
+                userConnection.get(ProtocolInfo.class).getPipeline().contains(requiredPipeline);
+    }
+
+    /**
+     * Register as Bukkit event
+     */
+    public void register() {
+        if (registered) return;
+
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
+        registered = true;
+    }
+}

src/main/java/us/myles/ViaVersion/api/ViaVersionConfig.java

@@ -209,4 +209,12 @@ public interface ViaVersionConfig {
      * @return Disconnect message
      */
     String getBlockedDisconnectMsg();
+
+    /**
+     * Get the message sent to players being kicked on reload.
+     * Players are kicked to stop the server crashing
+     *
+     * @return Disconnect message
+     */
+    String getReloadDisconnectMsg();
 }

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

@@ -1,4 +1,4 @@
-package us.myles.ViaVersion.protocols.protocol1_9to1_8.types;
+package us.myles.ViaVersion.api.type.types.version;
 
 
 import io.netty.buffer.ByteBuf;
@@ -6,7 +6,7 @@ import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
 import us.myles.ViaVersion.api.type.types.minecraft.MetaTypeTemplate;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.metadata.MetadataTypes;
 
-public class MetadataType extends MetaTypeTemplate {
+public class Metadata1_8Type extends MetaTypeTemplate {
 
     @Override
     public Metadata read(ByteBuf buffer) throws Exception {
@@ -20,12 +20,6 @@ public class MetadataType extends MetaTypeTemplate {
 
     @Override
     public void write(ByteBuf buffer, Metadata object) throws Exception {
-        if (object == null) {
-            buffer.writeByte(255);
-        } else {
-            buffer.writeByte(object.getId());
-            buffer.writeByte(object.getTypeID());
-            object.getType().write(buffer, object.getValue());
-        }
+        throw new UnsupportedOperationException("1.8 Metadata writing is not implemented!");
     }
 }

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

@@ -1,11 +1,11 @@
-package us.myles.ViaVersion.protocols.protocol1_10to1_9_3.types;
+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.MetaTypeTemplate;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.metadata.NewType;
 
-public class Meta1_10Type extends MetaTypeTemplate {
+public class Metadata1_9Type extends MetaTypeTemplate {
 
     @Override
     public Metadata read(ByteBuf buffer) throws Exception {

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

@@ -1,21 +1,20 @@
-package us.myles.ViaVersion.protocols.protocol1_9to1_8.types;
+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 us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class MetadataListType extends MetaListTypeTemplate {
+public class MetadataList1_8Type extends MetaListTypeTemplate {
 
     @Override
     public List<Metadata> read(ByteBuf buffer) throws Exception {
         List<Metadata> list = new ArrayList<>();
         Metadata m;
         do {
-            m = Protocol1_9TO1_8.METADATA.read(buffer);
+            m = Types1_8.METADATA.read(buffer);
             if (m != null) {
                 list.add(m);
             }
@@ -26,10 +25,6 @@ public class MetadataListType extends MetaListTypeTemplate {
 
     @Override
     public void write(ByteBuf buffer, List<Metadata> object) throws Exception {
-        for (Metadata m : object) {
-            Protocol1_9TO1_8.METADATA.write(buffer, m);
-        }
-        // Write end of list
-        Protocol1_9TO1_8.METADATA.write(buffer, null);
+        throw new UnsupportedOperationException("1.8 MetadataList writing is not implemented");
     }
 }

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

@@ -0,0 +1,33 @@
+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_9Type extends MetaListTypeTemplate {
+
+    @Override
+    public List<Metadata> read(ByteBuf buffer) throws Exception {
+        List<Metadata> list = new ArrayList<>();
+        Metadata meta;
+        do {
+            meta = Types1_9.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_9.METADATA.write(buffer, m);
+
+        // Write end of list
+        Types1_9.METADATA.write(buffer, null);
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/types/version/Types1_8.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_8 {
+    /**
+     * Metadata list type for 1.8
+     */
+    public static Type<List<Metadata>> METADATA_LIST = new MetadataList1_8Type();
+
+    /**
+     * Metadata type for 1.8
+     */
+    public static Type<Metadata> METADATA = new Metadata1_8Type();
+}

src/main/java/us/myles/ViaVersion/api/type/types/version/Types1_9.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_9 {
+    /**
+     * Metadata list type for 1.9
+     */
+    public static final Type<List<Metadata>> METADATA_LIST = new MetadataList1_9Type();
+
+    /**
+     * Metadata type for 1.9
+     */
+    public static final Type<Metadata> METADATA = new Metadata1_9Type();
+}

src/main/java/us/myles/ViaVersion/protocols/protocol1_10to1_9_3/Protocol1_10To1_9_3_4.java

@@ -8,21 +8,36 @@ import us.myles.ViaVersion.api.remapper.PacketHandler;
 import us.myles.ViaVersion.api.remapper.PacketRemapper;
 import us.myles.ViaVersion.api.remapper.ValueTransformer;
 import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.types.version.Metadata1_9Type;
+import us.myles.ViaVersion.api.type.types.version.MetadataList1_9Type;
+import us.myles.ViaVersion.api.type.types.version.Types1_9;
 import us.myles.ViaVersion.packets.State;
 import us.myles.ViaVersion.protocols.protocol1_10to1_9_3.storage.ResourcePackTracker;
-import us.myles.ViaVersion.protocols.protocol1_10to1_9_3.types.Meta1_10Type;
-import us.myles.ViaVersion.protocols.protocol1_10to1_9_3.types.MetaList1_10Type;
 
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 public class Protocol1_10To1_9_3_4 extends Protocol {
-    public static final Type<List<Metadata>> METADATA_LIST = new MetaList1_10Type();
-    public static final Type<Metadata> METADATA = new Meta1_10Type();
+    @Deprecated
+    public static final Type<List<Metadata>> METADATA_LIST = new MetadataList1_9Type();
+    @Deprecated
+    public static final Type<Metadata> METADATA = new Metadata1_9Type();
+
     public static ValueTransformer<Short, Float> toNewPitch = new ValueTransformer<Short, Float>(Type.FLOAT) {
         @Override
         public Float transform(PacketWrapper wrapper, Short inputValue) throws Exception {
             return inputValue / 63.5F;
-
+        }
+    };
+    public static ValueTransformer<List<Metadata>, List<Metadata>> transformMetadata = new ValueTransformer<List<Metadata>, List<Metadata>>(Types1_9.METADATA_LIST) {
+        @Override
+        public List<Metadata> transform(PacketWrapper wrapper, List<Metadata> inputValue) throws Exception {
+            List<Metadata> metaList = new CopyOnWriteArrayList<>(inputValue);
+            for (Metadata m : metaList) {
+                if (m.getId() >= 5)
+                    m.setId(m.getId() + 1);
+            }
+            return metaList;
         }
     };
 
@@ -69,7 +84,7 @@ public class Protocol1_10To1_9_3_4 extends Protocol {
             @Override
             public void registerMap() {
                 map(Type.VAR_INT); // 0 - Entity ID
-                map(METADATA_LIST); // 1 - Metadata list
+                map(Types1_9.METADATA_LIST, transformMetadata); // 1 - Metadata list
             }
         });
 
@@ -89,7 +104,7 @@ public class Protocol1_10To1_9_3_4 extends Protocol {
                 map(Type.SHORT); // 9 - Velocity X
                 map(Type.SHORT); // 10 - Velocity Y
                 map(Type.SHORT); // 11 - Velocity Z
-                map(METADATA_LIST); // 12 - Metadata
+                map(Types1_9.METADATA_LIST, transformMetadata); // 12 - Metadata
             }
         });
 
@@ -104,7 +119,7 @@ public class Protocol1_10To1_9_3_4 extends Protocol {
                 map(Type.DOUBLE); // 4 - Z
                 map(Type.BYTE); // 5 - Yaw
                 map(Type.BYTE); // 6 - Pitch
-                map(METADATA_LIST); // 7 - Metadata list
+                map(Types1_9.METADATA_LIST, transformMetadata); // 7 - Metadata list
             }
         });
 

src/main/java/us/myles/ViaVersion/protocols/protocol1_10to1_9_3/types/MetaList1_10Type.java

@@ -1,41 +0,0 @@
-package us.myles.ViaVersion.protocols.protocol1_10to1_9_3.types;
-
-import io.netty.buffer.ByteBuf;
-import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
-import us.myles.ViaVersion.api.type.Type;
-import us.myles.ViaVersion.api.type.types.minecraft.MetaListTypeTemplate;
-import us.myles.ViaVersion.protocols.protocol1_10to1_9_3.Protocol1_10To1_9_3_4;
-import us.myles.ViaVersion.protocols.protocol1_9to1_8.metadata.NewType;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class MetaList1_10Type extends MetaListTypeTemplate {
-
-    @Override
-    public List<Metadata> read(ByteBuf buffer) throws Exception {
-        List<Metadata> list = new ArrayList<>();
-        Metadata meta;
-        do {
-            meta = Protocol1_10To1_9_3_4.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) {
-            if (m.getId() >= 5)
-                m.setId(m.getId() + 1);
-            if (m.getId() == 4)
-                Protocol1_10To1_9_3_4.METADATA.write(buffer, new Metadata(5, NewType.Boolean.getTypeID(), Type.BOOLEAN, false)); // No gravity metadata
-            Protocol1_10To1_9_3_4.METADATA.write(buffer, m);
-        }
-
-        // Write end of list
-        Protocol1_10To1_9_3_4.METADATA.write(buffer, null);
-    }
-}

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2TO1_9_3_4.java

@@ -10,6 +10,9 @@ 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.packets.State;
+import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks.BlockEntity;
+import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks.Chunk1_9_3_4;
+import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type;
 
 public class Protocol1_9_1_2TO1_9_3_4 extends Protocol {
     public static Type<Chunk> CHUNK = new Chunk1_9_3_4Type();

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/BlockEntity.java

@@ -1,4 +1,4 @@
-package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4;
+package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks;
 
 import lombok.Getter;
 import org.spacehq.opennbt.tag.builtin.CompoundTag;
@@ -7,6 +7,7 @@ import us.myles.ViaVersion.api.ViaVersion;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.api.minecraft.Position;
 import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.Protocol1_9_1_2TO1_9_3_4;
 
 import java.util.List;
 import java.util.Map;

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/Chunk1_9_3_4.java

@@ -1,4 +1,4 @@
-package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4;
+package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/ChunkSection1_9_3_4.java

@@ -1,4 +1,4 @@
-package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4;
+package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks;
 
 import io.netty.buffer.ByteBuf;
 import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection;

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

@@ -1,10 +1,12 @@
-package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4;
+package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.types;
 
 import io.netty.buffer.ByteBuf;
 import org.spacehq.opennbt.tag.builtin.CompoundTag;
 import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
 import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.api.type.types.minecraft.BaseChunkType;
+import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks.Chunk1_9_3_4;
+import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks.ChunkSection1_9_3_4;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/Protocol1_9_3TO1_9_1_2.java

@@ -13,7 +13,9 @@ 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.packets.State;
+import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.chunks.FakeTileEntity;
 import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.types.Chunk1_9_1_2Type;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/Chunk1_9_1_2.java

@@ -1,4 +1,4 @@
-package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2;
+package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.chunks;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/ChunkSection1_9_1_2.java

@@ -1,4 +1,4 @@
-package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2;
+package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.chunks;
 
 import com.google.common.collect.Lists;
 import io.netty.buffer.ByteBuf;

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/FakeTileEntity.java

@@ -1,4 +1,4 @@
-package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2;
+package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.chunks;
 
 import org.bukkit.Material;
 import org.spacehq.opennbt.tag.builtin.CompoundTag;

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/storage/ClientWorld.java

@@ -26,7 +26,8 @@ public class ClientWorld extends StoredObject {
             case 1:
                 return World.Environment.THE_END;
             default:
-                throw new IllegalArgumentException("Invalid environment id:" + id);
+                return World.Environment.NETHER;
+                //throw new IllegalArgumentException("Invalid environment id:" + id);
         }
     }
 }

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/types/Chunk1_9_1_2Type.java

@@ -1,4 +1,4 @@
-package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2;
+package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.types;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -12,6 +12,8 @@ import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.api.type.types.minecraft.BaseChunkType;
 import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 import us.myles.ViaVersion.protocols.protocol1_10to1_9_3.Protocol1_10To1_9_3_4;
+import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.chunks.Chunk1_9_1_2;
+import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.chunks.ChunkSection1_9_1_2;
 import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 
 import java.util.ArrayList;

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/Protocol1_9TO1_8.java

@@ -13,12 +13,12 @@ import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
 import us.myles.ViaVersion.api.protocol.Protocol;
 import us.myles.ViaVersion.api.remapper.ValueTransformer;
 import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.types.version.Metadata1_8Type;
+import us.myles.ViaVersion.api.type.types.version.MetadataList1_8Type;
 import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners.*;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.packets.*;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.*;
-import us.myles.ViaVersion.protocols.protocol1_9to1_8.types.MetadataListType;
-import us.myles.ViaVersion.protocols.protocol1_9to1_8.types.MetadataType;
 
 import java.util.List;
 import java.util.UUID;
@@ -26,8 +26,11 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 
 public class Protocol1_9TO1_8 extends Protocol {
-    public static Type<List<Metadata>> METADATA_LIST = new MetadataListType();
-    public static Type<Metadata> METADATA = new MetadataType();
+    @Deprecated
+    public static Type<List<Metadata>> METADATA_LIST = new MetadataList1_8Type();
+    @Deprecated
+    public static Type<Metadata> METADATA = new Metadata1_8Type();
+
     private static Gson gson = new GsonBuilder().create();
     public static ValueTransformer<String, String> FIX_JSON = new ValueTransformer<String, String>(Type.STRING) {
         @Override
@@ -102,13 +105,15 @@ public class Protocol1_9TO1_8 extends Protocol {
     @Override
     protected void registerListeners() {
         ViaVersionPlugin plugin = (ViaVersionPlugin) Bukkit.getPluginManager().getPlugin("ViaVersion");
-        Bukkit.getPluginManager().registerEvents(new ArmorListener(plugin), plugin);
-        Bukkit.getPluginManager().registerEvents(new CommandBlockListener(plugin), plugin);
-        Bukkit.getPluginManager().registerEvents(new DeathListener(plugin), plugin);
-        Bukkit.getPluginManager().registerEvents(new BlockListener(plugin), plugin);
+
+        new ArmorListener(plugin).register();
+        new CommandBlockListener(plugin).register();
+        new DeathListener(plugin).register();
+        new BlockListener(plugin).register();
+
         if (Bukkit.getVersion().toLowerCase().contains("paper") || Bukkit.getVersion().toLowerCase().contains("taco")) {
             plugin.getLogger().info("Enabling PaperSpigot/TacoSpigot patch: Fixes block placement.");
-            Bukkit.getPluginManager().registerEvents(new PaperPatch(), plugin);
+            new PaperPatch(plugin).register();
         }
         if (plugin.getConf().isStimulatePlayerTick())
             new ViaIdleThread(plugin.getPortedPlayers()).runTaskTimer(plugin, 1L, 1L); // Updates player's idle status

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/listeners/ArmorListener.java

@@ -1,12 +1,10 @@
 package us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners;
 
-import lombok.RequiredArgsConstructor;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.player.PlayerChangedWorldEvent;
@@ -16,30 +14,28 @@ import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.inventory.CraftingInventory;
 import us.myles.ViaVersion.ViaVersionPlugin;
 import us.myles.ViaVersion.api.PacketWrapper;
-import us.myles.ViaVersion.api.ViaVersion;
-import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.ViaListener;
 import us.myles.ViaVersion.api.type.Type;
-import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.ArmorType;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
 
 import java.util.UUID;
 
-@RequiredArgsConstructor
-public class ArmorListener implements Listener {
+public class ArmorListener extends ViaListener {
 
     private static final UUID ARMOR_ATTRIBUTE = UUID.fromString("2AD3F246-FEE1-4E67-B886-69FD380BB150");
-    private final ViaVersionPlugin plugin;
 
-    public static void sendArmorUpdate(Player player) {
+    public ArmorListener(ViaVersionPlugin plugin) {
+        super(plugin, Protocol1_9TO1_8.class);
+    }
+
+    public void sendArmorUpdate(Player player) {
         // Ensure that the player is on our pipe
-        UserConnection userConnection = ((ViaVersionPlugin) ViaVersion.getInstance()).getConnection(player);
-        if (userConnection == null) return;
-        if (!userConnection.get(ProtocolInfo.class).getPipeline().contains(Protocol1_9TO1_8.class)) return;
+        if (!isOnPipe(player)) return;
 
         int armor = ArmorType.calculateArmorPoints(player.getInventory().getArmorContents());
 
-        PacketWrapper wrapper = new PacketWrapper(0x4B, null, userConnection);
+        PacketWrapper wrapper = new PacketWrapper(0x4B, null, getUserConnection(player));
         try {
             wrapper.write(Type.VAR_INT, player.getEntityId()); // Player ID
             wrapper.write(Type.INT, 1); // only 1 property
@@ -61,17 +57,15 @@ public class ArmorListener implements Listener {
         HumanEntity human = e.getWhoClicked();
         if (human instanceof Player && e.getInventory() instanceof CraftingInventory) {
             final Player player = (Player) human;
-            if (ViaVersion.getInstance().isPorted(player)) {
-                if (e.getCurrentItem() != null) {
-                    if (ArmorType.isArmor(e.getCurrentItem().getType())) {
-                        sendDelayedArmorUpdate(player);
-                        return;
-                    }
-                }
-                if (e.getRawSlot() >= 5 && e.getRawSlot() <= 8) {
+            if (e.getCurrentItem() != null) {
+                if (ArmorType.isArmor(e.getCurrentItem().getType())) {
                     sendDelayedArmorUpdate(player);
+                    return;
                 }
             }
+            if (e.getRawSlot() >= 5 && e.getRawSlot() <= 8) {
+                sendDelayedArmorUpdate(player);
+            }
         }
     }
 
@@ -81,12 +75,10 @@ public class ArmorListener implements Listener {
             if (e.getAction() == Action.RIGHT_CLICK_AIR || e.getAction() == Action.RIGHT_CLICK_BLOCK) {
                 final Player player = e.getPlayer();
                 // Due to odd bugs it's 3 ticks later
-                Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
+                Bukkit.getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable() {
                     @Override
                     public void run() {
-                        if (ViaVersion.getInstance().isPorted(player)) {
-                            sendArmorUpdate(player);
-                        }
+                        sendArmorUpdate(player);
                     }
                 }, 3L);
             }
@@ -100,23 +92,20 @@ public class ArmorListener implements Listener {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onRespawn(PlayerRespawnEvent e) {
-        if (ViaVersion.getInstance().isPorted(e.getPlayer()))
-            sendDelayedArmorUpdate(e.getPlayer());
+        sendDelayedArmorUpdate(e.getPlayer());
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onWorldChange(PlayerChangedWorldEvent e) {
-        if (ViaVersion.getInstance().isPorted(e.getPlayer()))
-            sendArmorUpdate(e.getPlayer());
+        sendArmorUpdate(e.getPlayer());
     }
 
     public void sendDelayedArmorUpdate(final Player player) {
-        Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
+        if (!isOnPipe(player)) return; // Don't start a task if the player is not on the pipe
+        Bukkit.getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable() {
             @Override
             public void run() {
-                if (ViaVersion.getInstance().isPorted(player)) {
-                    sendArmorUpdate(player);
-                }
+                sendArmorUpdate(player);
             }
         });
     }

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/listeners/BlockListener.java

@@ -1,30 +1,28 @@
 package us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners;
 
-import lombok.RequiredArgsConstructor;
 import org.bukkit.block.Block;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockPlaceEvent;
 import us.myles.ViaVersion.ViaVersionPlugin;
-import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.ViaListener;
 import us.myles.ViaVersion.api.minecraft.Position;
-import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.EntityTracker;
 
-@RequiredArgsConstructor
-public class BlockListener implements Listener {
+public class BlockListener extends ViaListener {
 
-    private final ViaVersionPlugin plugin;
+    public BlockListener(ViaVersionPlugin plugin) {
+        super(plugin, Protocol1_9TO1_8.class);
+    }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void placeBlock(BlockPlaceEvent e) {
-        if (plugin.isPorted(e.getPlayer())) {
-            UserConnection c = plugin.getConnection(e.getPlayer());
-            if (!c.get(ProtocolInfo.class).getPipeline().contains(Protocol1_9TO1_8.class)) return;
+        if (isOnPipe(e.getPlayer())) {
             Block b = e.getBlockPlaced();
-            plugin.getConnection(e.getPlayer()).get(EntityTracker.class).addBlockInteraction(new Position((long) b.getX(), (long) b.getY(), (long) b.getZ()));
+            getUserConnection(e.getPlayer())
+                    .get(EntityTracker.class)
+                    .addBlockInteraction(new Position((long) b.getX(), (long) b.getY(), (long) b.getZ()));
         }
     }
 }

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/listeners/CommandBlockListener.java

@@ -3,14 +3,12 @@ package us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufOutputStream;
 import io.netty.buffer.Unpooled;
-import lombok.RequiredArgsConstructor;
 import org.bukkit.Bukkit;
 import org.bukkit.block.Block;
 import org.bukkit.block.CommandBlock;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerChangedWorldEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
@@ -20,11 +18,10 @@ import org.spacehq.opennbt.tag.builtin.ByteTag;
 import org.spacehq.opennbt.tag.builtin.CompoundTag;
 import us.myles.ViaVersion.ViaVersionPlugin;
 import us.myles.ViaVersion.api.PacketWrapper;
-import us.myles.ViaVersion.api.ViaVersion;
+import us.myles.ViaVersion.api.ViaListener;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.api.minecraft.Position;
 import us.myles.ViaVersion.api.type.Type;
-import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
 import us.myles.ViaVersion.util.ReflectionUtil;
 
@@ -32,10 +29,11 @@ import java.io.DataOutput;
 import java.io.DataOutputStream;
 import java.lang.reflect.Method;
 
-@RequiredArgsConstructor
-public class CommandBlockListener implements Listener {
+public class CommandBlockListener extends ViaListener {
 
-    private final ViaVersionPlugin plugin;
+    public CommandBlockListener(ViaVersionPlugin plugin) {
+        super(plugin, Protocol1_9TO1_8.class);
+    }
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
     public void onJoin(PlayerJoinEvent e) {
@@ -44,7 +42,9 @@ public class CommandBlockListener implements Listener {
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onRespawn(final PlayerRespawnEvent e) {
-        Bukkit.getScheduler().runTaskLater(plugin, new Runnable() {
+        if (!isOnPipe(e.getPlayer())) return;
+
+        Bukkit.getScheduler().runTaskLater(getPlugin(), new Runnable() {
             @Override
             public void run() {
                 sendOp(e.getPlayer());
@@ -59,12 +59,7 @@ public class CommandBlockListener implements Listener {
 
     @EventHandler(ignoreCancelled = true)
     public void onInteract(PlayerInteractEvent e) {
-        if (e.getAction() == Action.RIGHT_CLICK_BLOCK && plugin.isPorted(e.getPlayer()) && e.getPlayer().isOp()) {
-            // Ensure that the player is on our pipe
-            UserConnection userConnection = ((ViaVersionPlugin) ViaVersion.getInstance()).getConnection(e.getPlayer());
-            if (userConnection == null) return;
-            if (!userConnection.get(ProtocolInfo.class).getPipeline().contains(Protocol1_9TO1_8.class)) return;
-
+        if (e.getAction() == Action.RIGHT_CLICK_BLOCK && isOnPipe(e.getPlayer()) && e.getPlayer().isOp()) {
             try {
                 sendCommandBlockPacket(e.getClickedBlock(), e.getPlayer());
             } catch (Exception ex) {
@@ -74,16 +69,13 @@ public class CommandBlockListener implements Listener {
     }
 
     private void sendOp(Player p) {
-        if (p.isOp() && plugin.isPorted(p)) {
-            // Ensure that the player is on our pipe
-            UserConnection userConnection = ((ViaVersionPlugin) ViaVersion.getInstance()).getConnection(p);
-            if (userConnection == null) return;
-            if (!userConnection.get(ProtocolInfo.class).getPipeline().contains(Protocol1_9TO1_8.class)) return;
-
+        if (p.isOp() && isOnPipe(p)) {
             try {
-                PacketWrapper wrapper = new PacketWrapper(0x1B, null, userConnection); // Entity status
-                wrapper.write(Type.INT, p.getEntityId());
+                PacketWrapper wrapper = new PacketWrapper(0x1B, null, getUserConnection(p)); // Entity status
+
+                wrapper.write(Type.INT, p.getEntityId()); // Entity ID
                 wrapper.write(Type.BYTE, (byte) 26); //Hardcoded op permission level
+
                 wrapper.send(Protocol1_9TO1_8.class);
             } catch (Exception e) {
                 e.printStackTrace();
@@ -99,9 +91,7 @@ public class CommandBlockListener implements Listener {
         Object tileEntityCommand = ReflectionUtil.get(cmd, "commandBlock", ReflectionUtil.nms("TileEntityCommand"));
         Object updatePacket = ReflectionUtil.invoke(tileEntityCommand, "getUpdatePacket");
 
-        UserConnection userConnection = ((ViaVersionPlugin) ViaVersion.getInstance()).getConnection(player);
-
-        PacketWrapper wrapper = generatePacket(updatePacket, userConnection);
+        PacketWrapper wrapper = generatePacket(updatePacket, getUserConnection(player));
         wrapper.send(Protocol1_9TO1_8.class);
     }
 

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/listeners/DeathListener.java

@@ -1,40 +1,28 @@
 package us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners;
 
-import lombok.RequiredArgsConstructor;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
 import org.bukkit.event.entity.PlayerDeathEvent;
 import us.myles.ViaVersion.ViaVersionPlugin;
 import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.ViaListener;
 import us.myles.ViaVersion.api.ViaVersion;
-import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.api.type.Type;
-import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
 
-@RequiredArgsConstructor
-public class DeathListener implements Listener {
-    private final ViaVersionPlugin plugin;
+public class DeathListener extends ViaListener {
+    public DeathListener(ViaVersionPlugin plugin) {
+        super(plugin, Protocol1_9TO1_8.class);
+    }
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
     public void onDeath(PlayerDeathEvent e) {
         Player p = e.getEntity();
-        if (ViaVersion.getConfig().isShowNewDeathMessages() && checkGamerule(p.getWorld()) && e.getDeathMessage() != null && checkPipeline(p)) {
+        if (isOnPipe(p) && ViaVersion.getConfig().isShowNewDeathMessages() && checkGamerule(p.getWorld()) && e.getDeathMessage() != null)
             sendPacket(p, e.getDeathMessage());
-        }
-    }
-
-    public boolean checkPipeline(Player p) {
-        UserConnection userConnection = plugin.getConnection(p);
-        return userConnection != null && userConnection.get(ProtocolInfo.class).getPipeline().contains(Protocol1_9TO1_8.class);
-    }
-
-    private UserConnection getUserConnection(Player p) {
-        return plugin.getConnection(p);
     }
 
     public boolean checkGamerule(World w) {
@@ -46,19 +34,19 @@ public class DeathListener implements Listener {
     }
 
     private void sendPacket(final Player p, final String msg) {
-        Bukkit.getScheduler().runTask(plugin, new Runnable() {
+        Bukkit.getScheduler().runTask(getPlugin(), new Runnable() {
             @Override
             public void run() {
                 PacketWrapper wrapper = new PacketWrapper(0x2C, null, getUserConnection(p));
                 try {
-                    wrapper.write(Type.VAR_INT, 2);
-                    wrapper.write(Type.VAR_INT, p.getEntityId());
-                    wrapper.write(Type.INT, p.getEntityId());
-                    Protocol1_9TO1_8.FIX_JSON.write(wrapper, msg);
+                    wrapper.write(Type.VAR_INT, 2); // Event - Entity dead
+                    wrapper.write(Type.VAR_INT, p.getEntityId()); // Player ID
+                    wrapper.write(Type.INT, p.getEntityId()); // Entity ID
+                    Protocol1_9TO1_8.FIX_JSON.write(wrapper, msg); // Message
+
                     wrapper.send(Protocol1_9TO1_8.class);
                 } catch (Exception e) {
                     e.printStackTrace();
-                    wrapper.clearInputBuffer();
                 }
             }
         });

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/listeners/PaperPatch.java

@@ -1,17 +1,19 @@
 package us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners;
 
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.block.BlockFace;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockPlaceEvent;
 import us.myles.ViaVersion.ViaVersionPlugin;
-import us.myles.ViaVersion.api.ViaVersion;
-import us.myles.ViaVersion.api.data.UserConnection;
-import us.myles.ViaVersion.protocols.base.ProtocolInfo;
+import us.myles.ViaVersion.api.ViaListener;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
 
-public class PaperPatch implements Listener {
+public class PaperPatch extends ViaListener {
+
+    public PaperPatch(ViaVersionPlugin plugin) {
+        super(plugin, Protocol1_9TO1_8.class);
+    }
 
     /*
     This patch is applied when Paper is detected.
@@ -22,11 +24,12 @@ public class PaperPatch implements Listener {
 
     @EventHandler(ignoreCancelled = true)
     public void onPlace(BlockPlaceEvent e) {
-        if (ViaVersion.getInstance().isPorted(e.getPlayer())) {
-            UserConnection userConnection = ((ViaVersionPlugin) ViaVersion.getInstance()).getConnection(e.getPlayer());
-            if (userConnection == null) return;
-            if (!userConnection.get(ProtocolInfo.class).getPipeline().contains(Protocol1_9TO1_8.class)) return;
+        if (isOnPipe(e.getPlayer())) {
             Location diff = e.getPlayer().getLocation().subtract(e.getBlock().getLocation().add(0.5D, 0, 0.5D));
+            Material block = e.getBlockPlaced().getType();
+            if (!block.isSolid()) {
+                return;
+            }
             if (e.getPlayer().getLocation().getBlock().equals(e.getBlock())) {
                 e.setCancelled(true);
             } else {

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/EntityPackets.java

@@ -10,6 +10,8 @@ import us.myles.ViaVersion.api.remapper.PacketHandler;
 import us.myles.ViaVersion.api.remapper.PacketRemapper;
 import us.myles.ViaVersion.api.remapper.ValueTransformer;
 import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.types.version.Types1_8;
+import us.myles.ViaVersion.api.type.types.version.Types1_9;
 import us.myles.ViaVersion.packets.State;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.ItemRewriter;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
@@ -175,11 +177,11 @@ public class EntityPackets {
             @Override
             public void registerMap() {
                 map(Type.VAR_INT); // 0 - Entity ID
-                map(Protocol1_9TO1_8.METADATA_LIST); // 1 - Metadata List
+                map(Types1_8.METADATA_LIST, Types1_9.METADATA_LIST); // 1 - Metadata List
                 handler(new PacketHandler() {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
-                        List<Metadata> metadataList = wrapper.get(Protocol1_9TO1_8.METADATA_LIST, 0);
+                        List<Metadata> metadataList = wrapper.get(Types1_9.METADATA_LIST, 0);
                         int entityID = wrapper.get(Type.VAR_INT, 0);
                         EntityTracker tracker = wrapper.user().get(EntityTracker.class);
                         if (tracker.getClientEntityTypes().containsKey(entityID)) {
@@ -196,7 +198,7 @@ public class EntityPackets {
                 handler(new PacketHandler() {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
-                        List<Metadata> metadataList = wrapper.get(Protocol1_9TO1_8.METADATA_LIST, 0);
+                        List<Metadata> metadataList = wrapper.get(Types1_9.METADATA_LIST, 0);
                         int entityID = wrapper.get(Type.VAR_INT, 0);
                         EntityTracker tracker = wrapper.user().get(EntityTracker.class);
                         tracker.handleMetadata(entityID, metadataList);
@@ -207,7 +209,7 @@ public class EntityPackets {
                 handler(new PacketHandler() {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
-                        List<Metadata> metadataList = wrapper.get(Protocol1_9TO1_8.METADATA_LIST, 0);
+                        List<Metadata> metadataList = wrapper.get(Types1_9.METADATA_LIST, 0);
                         if (metadataList.size() == 0) {
                             wrapper.cancel();
                         }

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/SpawnPackets.java

@@ -11,6 +11,8 @@ import us.myles.ViaVersion.api.remapper.PacketRemapper;
 import us.myles.ViaVersion.api.remapper.ValueCreator;
 import us.myles.ViaVersion.api.remapper.ValueTransformer;
 import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.types.version.Types1_8;
+import us.myles.ViaVersion.api.type.types.version.Types1_9;
 import us.myles.ViaVersion.packets.State;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.ItemRewriter;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
@@ -107,7 +109,7 @@ public class SpawnPackets {
                                     // TEMP FIX FOR POTIONS UNTIL WE FIGURE OUT HOW TO TRANSFORM SENT PACKETS
                                     Metadata potion = new Metadata(5, NewType.Slot.getTypeID(), Type.ITEM, item);
                                     meta.add(potion);
-                                    wrapper.write(Protocol1_9TO1_8.METADATA_LIST, meta);
+                                    wrapper.write(Types1_9.METADATA_LIST, meta);
                                 }
                             });
                             metaPacket.send(Protocol1_9TO1_8.class);
@@ -206,11 +208,11 @@ public class SpawnPackets {
                 map(Type.SHORT); // 10 - Velocity Y
                 map(Type.SHORT); // 11 - Velocity Z
 
-                map(Protocol1_9TO1_8.METADATA_LIST);
+                map(Types1_8.METADATA_LIST, Types1_9.METADATA_LIST);
                 handler(new PacketHandler() {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
-                        List<Metadata> metadataList = wrapper.get(Protocol1_9TO1_8.METADATA_LIST, 0);
+                        List<Metadata> metadataList = wrapper.get(Types1_9.METADATA_LIST, 0);
                         int entityID = wrapper.get(Type.VAR_INT, 0);
                         EntityTracker tracker = wrapper.user().get(EntityTracker.class);
                         if (tracker.getClientEntityTypes().containsKey(entityID)) {
@@ -225,7 +227,7 @@ public class SpawnPackets {
                 handler(new PacketHandler() {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
-                        List<Metadata> metadataList = wrapper.get(Protocol1_9TO1_8.METADATA_LIST, 0);
+                        List<Metadata> metadataList = wrapper.get(Types1_9.METADATA_LIST, 0);
                         int entityID = wrapper.get(Type.VAR_INT, 0);
                         EntityTracker tracker = wrapper.user().get(EntityTracker.class);
                         tracker.handleMetadata(entityID, metadataList);
@@ -311,12 +313,12 @@ public class SpawnPackets {
                     }
                 });
 
-                map(Protocol1_9TO1_8.METADATA_LIST);
+                map(Types1_8.METADATA_LIST, Types1_9.METADATA_LIST);
 
                 handler(new PacketHandler() {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
-                        List<Metadata> metadataList = wrapper.get(Protocol1_9TO1_8.METADATA_LIST, 0);
+                        List<Metadata> metadataList = wrapper.get(Types1_9.METADATA_LIST, 0);
                         int entityID = wrapper.get(Type.VAR_INT, 0);
                         EntityTracker tracker = wrapper.user().get(EntityTracker.class);
                         if (tracker.getClientEntityTypes().containsKey(entityID)) {
@@ -332,7 +334,7 @@ public class SpawnPackets {
                 handler(new PacketHandler() {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
-                        List<Metadata> metadataList = wrapper.get(Protocol1_9TO1_8.METADATA_LIST, 0);
+                        List<Metadata> metadataList = wrapper.get(Types1_9.METADATA_LIST, 0);
                         int entityID = wrapper.get(Type.VAR_INT, 0);
                         EntityTracker tracker = wrapper.user().get(EntityTracker.class);
                         tracker.handleMetadata(entityID, metadataList);

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

@@ -19,6 +19,7 @@ import us.myles.ViaVersion.api.minecraft.Position;
 import us.myles.ViaVersion.api.minecraft.item.Item;
 import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
 import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.types.version.Types1_9;
 import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.chat.GameMode;
@@ -274,7 +275,7 @@ public class EntityTracker extends StoredObject {
         if (metadataBuffer.containsKey(entityID)) {
             PacketWrapper wrapper = new PacketWrapper(0x39, null, getUser());
             wrapper.write(Type.VAR_INT, entityID);
-            wrapper.write(Protocol1_9TO1_8.METADATA_LIST, metadataBuffer.get(entityID));
+            wrapper.write(Types1_9.METADATA_LIST, metadataBuffer.get(entityID));
             MetadataRewriter.transform(getClientEntityTypes().get(entityID), metadataBuffer.get(entityID));
             handleMetadata(entityID, metadataBuffer.get(entityID));
             if (metadataBuffer.get(entityID).size() > 0) {

src/main/resources/config.yml

@@ -17,6 +17,10 @@ send-supported-versions: false
 block-protocols: []
 # Change the blocked disconnect message
 block-disconnect-msg: "You are using an unsupported Minecraft version!"
+# If you use ProtocolLib, we can't reload without kicking the players.
+# (We don't suggest using reload either, use a plugin manager)
+# You can customise the message we kick people with if you use ProtocolLib here.
+reload-disconnect-msg: "Server reload, please rejoin!"
 #
 #----------------------------------------------------------#
 #                  GLOBAL PACKET LIMITER                    #

src/main/resources/plugin.yml

@@ -3,8 +3,8 @@ main: us.myles.ViaVersion.ViaVersionPlugin
 author: _MylesC
 version: ${project.version}
 load: postworld
-loadbefore: [ProtocolLib, ProxyPipe, SpigotLib, PacketListenerApi, SkinRestorer]
-softdepend: [ProtocolSupport]
+loadbefore: [ProtocolLib, ProxyPipe, SpigotLib, SkinRestorer]
+softdepend: [ProtocolSupport, PacketListenerApi]
 commands:
   viaversion:
     description: Shows ViaVersion Version and more.