Bump version to 0.6.0-SNAPSHOT

Stop error fetching hand item spamming console.

README.md

@@ -1,4 +1,4 @@
-# ViaVersion 0.5.8 
+# ViaVersion 0.5.9
 [![Build Status](https://travis-ci.org/MylesIsCool/ViaVersion.svg?branch=master)](https://travis-ci.org/MylesIsCool/ViaVersion)
 **Allows the connection of 1.9 clients to 1.8**
 

pom.xml

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

src/main/java/org/spacehq/mc/protocol/util/NetUtil.java

@@ -47,18 +47,21 @@ public class NetUtil {
         // 2 = Get block light.
         // 3 = Get sky light.
         Chunk[] chunks = new Chunk[16];
-
+        int chunkCount = 0;
         for (int pass = 0; pass < 4; pass++) {
+            if(pass == 1){
+                if(chunkCount == 0) return null;
+            }
             for (int ind = 0; ind < 16; ind++) {
                 if ((bitmask & 1 << ind) != 0) {
                     if (pass == 0) {
+                        chunkCount++;
                         // Block length + Blocklight length
                         expected += (4096 * 2) + 2048;
                     }
 
                     if (pass == 1) {
                         chunks[ind] = new Chunk(sky || hasSkyLight);
-
                         buf.position(pos / 2);
                         int buffPos = buf.position();
                         // convert short array to new one

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

@@ -4,7 +4,6 @@ import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelInitializer;
-import io.netty.channel.ChannelPipeline;
 import io.netty.channel.socket.SocketChannel;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -25,9 +24,11 @@ import us.myles.ViaVersion.handlers.ViaVersionInitializer;
 import us.myles.ViaVersion.listeners.CommandBlockListener;
 import us.myles.ViaVersion.update.UpdateListener;
 import us.myles.ViaVersion.update.UpdateUtil;
+import us.myles.ViaVersion.util.ListWrapper;
 import us.myles.ViaVersion.util.ReflectionUtil;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -53,8 +54,9 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
                 }
             }).get(10, TimeUnit.SECONDS);
         } catch (Exception e) {
-            System.out.println("Error fetching hand item ");
-            e.printStackTrace();
+            System.out.println("Error fetching hand item: " + e.getClass().getName());
+            if (ViaVersion.getInstance().isDebug())
+                e.printStackTrace();
             return null;
         }
     }
@@ -70,13 +72,8 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
         }
 
         getLogger().info("ViaVersion " + getDescription().getVersion() + " is now enabled, injecting. (Allows 1.8 to be accessed via 1.9)");
-        try {
-            injectPacketHandler();
-            System.setProperty("ViaVersion", getDescription().getVersion());
-        } catch (Exception e) {
-            getLogger().severe("Unable to inject handlers, are you on 1.8? ");
-            e.printStackTrace();
-        }
+        injectPacketHandler();
+
         if (getConfig().getBoolean("checkforupdates"))
             UpdateUtil.sendUpdateMessage(this);
 
@@ -94,39 +91,75 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
         getCommand("viaversion").setExecutor(new ViaVersionCommand(this));
     }
 
-    public void injectPacketHandler() throws Exception {
-        Class<?> serverClazz = ReflectionUtil.nms("MinecraftServer");
-        Object server = ReflectionUtil.invokeStatic(serverClazz, "getServer");
-        Object connection = serverClazz.getDeclaredMethod("getServerConnection").invoke(server);
-        // loop through all fields checking if list
-        boolean injected = false;
-        for (Field field : connection.getClass().getDeclaredFields()) {
-            field.setAccessible(true);
-            Object value = field.get(connection);
-            if (value instanceof List) {
-                for (Object o : (List) value) {
-                    if (o instanceof ChannelFuture) {
-                        ChannelFuture future = (ChannelFuture) o;
-                        ChannelPipeline pipeline = future.channel().pipeline();
-                        ChannelHandler bootstrapAcceptor = pipeline.first();
-                        try {
-                            ChannelInitializer<SocketChannel> oldInit = ReflectionUtil.get(bootstrapAcceptor, "childHandler", ChannelInitializer.class);
-                            ChannelInitializer newInit = new ViaVersionInitializer(oldInit);
-
-                            ReflectionUtil.set(bootstrapAcceptor, "childHandler", newInit);
-                        } catch (NoSuchFieldException e) {
-                            // field not found
-                            throw new Exception("Unable to find childHandler, blame " + bootstrapAcceptor.getClass().getName());
+    public void injectPacketHandler() {
+        try {
+            Class<?> serverClazz = ReflectionUtil.nms("MinecraftServer");
+            Object server = ReflectionUtil.invokeStatic(serverClazz, "getServer");
+            Object connection = serverClazz.getDeclaredMethod("getServerConnection").invoke(server);
+            if (connection == null) {
+                System.out.println("connection is null!!");
+                //try others
+                for (Method m : serverClazz.getDeclaredMethods()) {
+                    if (m.getReturnType() != null && !m.getName().equals("getServerConnection")) {
+                        if (m.getReturnType().getSimpleName().equals("ServerConnection")) {
+                            if (m.getParameterTypes().length == 0) {
+                                connection = m.invoke(server);
+                            }
+                        }
+                    }
+                }
+                if (connection == null) {
+                    getLogger().warning("We failed to find the ServerConnection? :(");
+                    return;
+                }
+            }
+            if (connection != null) {
+                for (Field field : connection.getClass().getDeclaredFields()) {
+                    field.setAccessible(true);
+                    Object value = field.get(connection);
+                    if (value instanceof List) {
+                        // Inject the list
+                        field.set(connection, new ListWrapper((List) value) {
+                            @Override
+                            public void handleAdd(Object o) {
+                                if (o instanceof ChannelFuture) {
+                                    inject((ChannelFuture) o);
+                                }
+                            }
+                        });
+                        // Iterate through current list
+                        for (Object o : (List) value) {
+                            if (o instanceof ChannelFuture) {
+                                inject((ChannelFuture) o);
+                            } else {
+                                break; // not the right list.
+                            }
                         }
-                        injected = true;
-                    } else {
-                        break; // not the right list.
                     }
                 }
             }
+            System.setProperty("ViaVersion", getDescription().getVersion());
+        } catch (Exception e) {
+            getLogger().severe("Unable to inject handlers, are you on 1.8? ");
+            e.printStackTrace();
         }
-        if (!injected) {
-            throw new Exception("Could not find server to inject (Please ensure late-bind in your spigot.yml is false)");
+    }
+
+    private void inject(ChannelFuture future) {
+        try {
+            ChannelHandler bootstrapAcceptor = future.channel().pipeline().first();
+            try {
+                ChannelInitializer<SocketChannel> oldInit = ReflectionUtil.get(bootstrapAcceptor, "childHandler", ChannelInitializer.class);
+                ChannelInitializer newInit = new ViaVersionInitializer(oldInit);
+
+                ReflectionUtil.set(bootstrapAcceptor, "childHandler", newInit);
+            } catch (NoSuchFieldException e) {
+                // field not found
+                throw new Exception("Unable to find childHandler, blame " + bootstrapAcceptor.getClass().getName());
+            }
+        } catch (Exception e) {
+            getLogger().severe("Have you got late-bind enabled with something else? (ProtocolLib?)");
+            e.printStackTrace();
         }
     }
 
@@ -215,8 +248,9 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
                 f.get(10, TimeUnit.SECONDS);
             }
         } catch (Exception e) {
-            System.out.println("Failed to run task.");
-            e.printStackTrace();
+            System.out.println("Failed to run task: " + e.getClass().getName());
+            if (ViaVersion.getInstance().isDebug())
+                e.printStackTrace();
         }
     }
 }

src/main/java/us/myles/ViaVersion/api/boss/BossBar.java

@@ -13,6 +13,13 @@ public interface BossBar {
      */
     void setTitle(String title);
 
+    /**
+     * Get the current title
+     *
+     * @return the title
+     */
+    String getTitle();
+
     /**
      * Change the health
      *
@@ -21,11 +28,11 @@ public interface BossBar {
     void setHealth(float health);
 
     /**
-     * Get the bossbar color
+     * Get the health
      *
-     * @return
+     * @return float between 0F - 1F
      */
-    BossColor getColor();
+    float getHealth();
 
     /**
      * Yay colors!
@@ -34,6 +41,13 @@ public interface BossBar {
      */
     void setColor(BossColor color);
 
+    /**
+     * Get the bossbar color
+     *
+     * @return
+     */
+    BossColor getColor();
+
     /**
      * Change the bosbar style
      *
@@ -41,6 +55,13 @@ public interface BossBar {
      */
     void setStyle(BossStyle style);
 
+    /**
+     * Get the bosbar style
+     *
+     * @return BossStyle
+     */
+    BossStyle getStyle();
+
     /**
      * Show the bossbar to a player.
      *

src/main/java/us/myles/ViaVersion/commands/ViaVersionCommand.java

@@ -20,16 +20,11 @@ public class ViaVersionCommand implements CommandExecutor {
 
     private final ViaVersionPlugin plugin;
 
-
     @Override
     public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
         if (sender.hasPermission("viaversion.admin")) {
             if (args.length == 0) {
-                sender.sendMessage(color("&aViaVersion &c" + ViaVersion.getInstance().getVersion()));
-                sender.sendMessage(color("&6Commands:"));
-                sender.sendMessage(color("&2/viaversion list &7- &6Shows lists of all 1.9 clients and 1.8 clients."));
-                sender.sendMessage(color("&2/viaversion autoteam &7- &6Toggle automatically teaming to prevent colliding."));
-                sender.sendMessage(color("&2/viaversion dontbugme &7- &6Toggle checking for updates."));
+                sendHelp(sender);
             } else if (args.length == 1) {
                 if (args[0].equalsIgnoreCase("list")) {
                     List<String> portedPlayers = new ArrayList<>();
@@ -59,11 +54,7 @@ public class ViaVersionCommand implements CommandExecutor {
                     sender.sendMessage(color("&6We will " + (newValue ? "&aautomatically team players" : "&cno longer auto team players")));
                     sender.sendMessage(color("&6All players will need to re-login for the change to take place."));
                 } else {
-                    sender.sendMessage(color("&aViaVersion &c" + ViaVersion.getInstance().getVersion()));
-                    sender.sendMessage(color("&6Commands:"));
-                    sender.sendMessage(color("&2/viaversion list &7- &6Shows lists of all 1.9 clients and 1.8 clients."));
-                    sender.sendMessage(color("&2/viaversion autoteam &7- &6Toggle automatically teaming to prevent colliding."));
-                    sender.sendMessage(color("&2/viaversion dontbugme &7- &6Toggle checking for updates."));
+                    sendHelp(sender);
                 }
             }
 
@@ -71,6 +62,15 @@ public class ViaVersionCommand implements CommandExecutor {
         return false;
     }
 
+    public void sendHelp(CommandSender sender){
+        sender.sendMessage(color("&aViaVersion &c" + ViaVersion.getInstance().getVersion()));
+        sender.sendMessage(color("&6Commands:"));
+        sender.sendMessage(color("&2/viaversion list &7- &6Shows lists of all 1.9 clients and 1.8 clients."));
+        sender.sendMessage(color("&2/viaversion debug &7- &6Toggle debug mode"));
+        sender.sendMessage(color("&2/viaversion autoteam &7- &6Toggle automatically teaming to prevent colliding."));
+        sender.sendMessage(color("&2/viaversion dontbugme &7- &6Toggle checking for updates."));
+    }
+
     public String color(String string) {
         return string.replace("&", "§");
     }

src/main/java/us/myles/ViaVersion/handlers/ViaDecodeHandler.java

@@ -34,7 +34,7 @@ public class ViaDecodeHandler extends ByteToMessageDecoder {
                     incomingTransformer.transform(id, bytebuf, newPacket);
                     bytebuf.clear();
                     bytebuf = newPacket;
-                } catch (CancelException e) {
+                } catch (Exception e) {
                     bytebuf.clear();
                     throw e;
                 }

src/main/java/us/myles/ViaVersion/handlers/ViaEncodeHandler.java

@@ -73,7 +73,7 @@ public class ViaEncodeHandler extends MessageToByteEncoder {
             bytebuf.clear();
             try {
                 outgoingTransformer.transform(id, oldPacket, bytebuf);
-            } catch (CancelException e) {
+            } catch (Exception e) {
                 bytebuf.clear();
                 throw e;
             } finally {

src/main/java/us/myles/ViaVersion/metadata/MetaIndex.java

@@ -33,6 +33,7 @@ public enum MetaIndex {
     PLAYER_HUMAN_BYTE(HumanEntity.class, 16, Type.Byte, NewType.Discontinued), // unused on 1.8
     PLAYER_ADDITIONAL_HEARTS(HumanEntity.class, 17, Type.Float, 10, NewType.Float),
     PLAYER_SCORE(HumanEntity.class, 18, Type.Int, 11, NewType.VarInt),
+    PLAYER_HAND(HumanEntity.class, -1, Type.NonExistent, 5, NewType.Byte), // new in 1.9
     // horse
     HORSE_INFO(Horse.class, 16, Type.Int, 12, NewType.Byte),
     HORSE_TYPE(Horse.class, 19, Type.Byte, 13, NewType.VarInt),

src/main/java/us/myles/ViaVersion/metadata/MetadataRewriter.java

@@ -40,6 +40,16 @@ public class MetadataRewriter {
                             if (metaIndex.getOldType() == Type.Int) {
                                 output.writeByte(((Integer) value).byteValue());
                             }
+                            // After writing the last one
+                            if (metaIndex == MetaIndex.ENTITY_STATUS && type == EntityType.PLAYER) {
+                                output.writeByte(MetaIndex.PLAYER_HAND.getNewIndex());
+                                output.writeByte(MetaIndex.PLAYER_HAND.getNewType().getTypeID());
+                                if ((((Byte) value) & 0x10) == 0x10) { // Player eating/aiming/drinking
+                                    output.writeByte(1); // Using main hand
+                                } else {
+                                    output.writeByte(0); // Not using any hand to stop animation
+                                }
+                            }
                             break;
                         case OptUUID:
                             String owner = (String) value;

src/main/java/us/myles/ViaVersion/metadata/Type.java

@@ -13,7 +13,8 @@ public enum Type {
     String(4),
     Slot(5),
     Position(6),
-    Rotation(7);
+    Rotation(7),
+    NonExistent(-1);
     private final int typeID;
 
     public static Type byId(int id) {

src/main/java/us/myles/ViaVersion/transformers/IncomingTransformer.java

@@ -275,14 +275,13 @@ public class IncomingTransformer {
             } catch (Exception e) {
                 e.printStackTrace();
             }
-
-            short curX = input.readUnsignedByte();
-            output.writeByte(curX);
-            short curY = input.readUnsignedByte();
-            output.writeByte(curY);
-            short curZ = input.readUnsignedByte();
-            output.writeByte(curZ);
-            return;
+	        short curX = input.readUnsignedByte();
+	        output.writeByte(curX);
+	        short curY = input.readUnsignedByte();
+	        output.writeByte(curY);
+	        short curZ = input.readUnsignedByte();
+	        output.writeByte(curZ);
+	        return;
         }
         if (packet == PacketType.PLAY_USE_ITEM) {
             int hand = PacketUtil.readVarInt(input);
@@ -317,9 +316,9 @@ public class IncomingTransformer {
                 e.printStackTrace();
             }
 
-            output.writeByte(-1);
-            output.writeByte(-1);
-            output.writeByte(-1);
+            output.writeByte(0); //Is zero in 1.8, not -1
+            output.writeByte(0);
+            output.writeByte(0);
             return;
         }
         if (packet == PacketType.PLAY_CREATIVE_INVENTORY_ACTION) {

src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java

@@ -1,6 +1,7 @@
 package us.myles.ViaVersion.transformers;
 
 import io.netty.buffer.ByteBuf;
+import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
@@ -37,6 +38,7 @@ public class OutgoingTransformer {
     private final Map<Integer, UUID> uuidMap = new HashMap<>();
     private final Map<Integer, EntityType> clientEntityTypes = new HashMap<>();
     private final Map<Integer, Integer> vehicleMap = new HashMap<>();
+    private final Set<Integer> validBlocking = new HashSet<>();
     private boolean autoTeam = false;
 
     public OutgoingTransformer(ConnectionInfo info) {
@@ -317,7 +319,24 @@ public class OutgoingTransformer {
                 slot += 1; // add 1 so it's now 2-5
             }
             PacketUtil.writeVarInt(slot, output);
-
+            if (slot == 0) {
+                // Read aheat for sword
+                input.markReaderIndex();
+                short itemID = input.readShort();
+                if (itemID != -1) {
+                    Material m = Material.getMaterial(itemID);
+                    if (m != null) {
+                        if (m.name().endsWith("SWORD")) {
+                            validBlocking.add(id);
+                        } else {
+                            validBlocking.remove(id);
+                        }
+                    }
+                } else {
+                    validBlocking.remove(id);
+                }
+                input.resetReaderIndex();
+            }
             ItemSlotRewriter.rewrite1_8To1_9(input, output);
             return;
         }
@@ -751,6 +770,9 @@ public class OutgoingTransformer {
                 }
             }
             Column read = NetUtil.readOldChunkData(chunkX, chunkZ, groundUp, bitMask, data, true, sk);
+            if (read == null) {
+                throw new CancelException();
+            }
             // Write chunk section array :((
             ByteBuf temp = output.alloc().buffer();
             try {
@@ -808,12 +830,15 @@ public class OutgoingTransformer {
             if (entry.getOldID() == 0) {
                 // Byte
                 byte data = (byte) entry.getValue();
+
                 if ((data & 0x10) == 0x10) {
-                    ItemSlotRewriter.ItemStack shield = new ItemSlotRewriter.ItemStack();
-                    shield.id = 442;
-                    shield.amount = 1;
-                    shield.data = 0;
-                    sendSecondHandItem(entityID, shield);
+                    if (validBlocking.contains(entityID)) {
+                        ItemSlotRewriter.ItemStack shield = new ItemSlotRewriter.ItemStack();
+                        shield.id = 442;
+                        shield.amount = 1;
+                        shield.data = 0;
+                        sendSecondHandItem(entityID, shield);
+                    }
                 } else {
                     sendSecondHandItem(entityID, null);
                 }

src/main/java/us/myles/ViaVersion/util/ListWrapper.java

@@ -0,0 +1,138 @@
+package us.myles.ViaVersion.util;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+
+public abstract class ListWrapper implements List {
+    private final List list;
+
+    public ListWrapper(List inputList) {
+        this.list = inputList;
+    }
+
+    public abstract void handleAdd(Object o);
+
+    @Override
+    public int size() {
+        return this.list.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return this.list.isEmpty();
+    }
+
+    @Override
+    public boolean contains(Object o) {
+        return this.list.contains(o);
+    }
+
+    @Override
+    public Iterator iterator() {
+        return this.list.iterator();
+    }
+
+    @Override
+    public Object[] toArray() {
+        return this.list.toArray();
+    }
+
+    @Override
+    public boolean add(Object o) {
+        handleAdd(o);
+        return this.list.add(o);
+    }
+
+    @Override
+    public boolean remove(Object o) {
+        return this.list.remove(o);
+    }
+
+    @Override
+    public boolean addAll(Collection c) {
+        for (Object o : c) {
+            handleAdd(o);
+        }
+        return this.list.addAll(c);
+    }
+
+    @Override
+    public boolean addAll(int index, Collection c) {
+        for (Object o : c) {
+            handleAdd(o);
+        }
+        return this.list.addAll(index, c);
+    }
+
+    @Override
+    public void clear() {
+        this.list.clear();
+    }
+
+    @Override
+    public Object get(int index) {
+        return this.list.get(index);
+    }
+
+    @Override
+    public Object set(int index, Object element) {
+        return this.list.set(index, element);
+    }
+
+    @Override
+    public void add(int index, Object element) {
+        this.list.add(index, element);
+    }
+
+    @Override
+    public Object remove(int index) {
+        return this.list.remove(index);
+    }
+
+    @Override
+    public int indexOf(Object o) {
+        return this.list.indexOf(o);
+    }
+
+    @Override
+    public int lastIndexOf(Object o) {
+        return this.list.lastIndexOf(o);
+    }
+
+    @Override
+    public ListIterator listIterator() {
+        return this.list.listIterator();
+    }
+
+    @Override
+    public ListIterator listIterator(int index) {
+        return this.listIterator(index);
+    }
+
+    @Override
+    public List subList(int fromIndex, int toIndex) {
+        return this.list.subList(fromIndex, toIndex);
+    }
+
+    @Override
+    public boolean retainAll(Collection c) {
+        return this.list.retainAll(c);
+    }
+
+    @Override
+    public boolean removeAll(Collection c) {
+        return this.list.removeAll(c);
+    }
+
+    @Override
+    public boolean containsAll(Collection c) {
+        return this.list.containsAll(c);
+    }
+
+    @Override
+    public Object[] toArray(Object[] a) {
+        return this.list.toArray(a);
+    }
+}