Bump version

* Rewrite effect ids

* Remove test line

* Remove Lombok unused thingy

* No need to check.

README.md

@@ -1,4 +1,4 @@
-# ViaVersion 0.7.3
+# ViaVersion 0.7.6
 [![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)
 
@@ -20,8 +20,6 @@ Sources:
 
 **wiki.vg** (Protocol info, though I did have to find a lot myself)
 
-**MCProtocolLib** (used for chunk reading & some of writing.)
-
 **OpenNBT** (used for slot rewriting)
 
 

pom.xml

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

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

@@ -1,6 +1,5 @@
 package us.myles.ViaVersion;
 
-import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import org.bukkit.scheduler.BukkitRunnable;
 import us.myles.ViaVersion.api.data.UserConnection;
@@ -34,7 +33,7 @@ public class ViaIdleThread extends BukkitRunnable {
                 long nextIdleUpdate = info.get(MovementTracker.class).getNextIdlePacket();
                 if (nextIdleUpdate <= System.currentTimeMillis()) {
                     ChannelHandlerContext context = PipelineUtil.getContextBefore("decoder", info.getChannel().pipeline());
-                    if(info.getChannel().isOpen()) {
+                    if (info.getChannel().isOpen()) {
                         if (context != null) {
                             context.fireChannelRead(idlePacket);
 

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

@@ -94,6 +94,9 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI, ViaVe
 
         getCommand("viaversion").setExecutor(commandHandler = new ViaCommandHandler());
         getCommand("viaversion").setTabCompleter(commandHandler);
+
+        // Register Protocol Listeners
+        ProtocolRegistry.registerListeners();
     }
 
     @Override
@@ -357,6 +360,11 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI, ViaVe
         return getConfig().getBoolean("use-new-effect-indicator", true);
     }
 
+    @Override
+    public boolean isShowNewDeathMessages() {
+        return getConfig().getBoolean("use-new-deathmessages", false);
+    }
+
     public boolean isSuppressMetadataErrors() {
         return getConfig().getBoolean("suppress-metadata-errors", false);
     }
@@ -385,6 +393,10 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI, ViaVe
         return getConfig().getDouble("hologram-y", -1D);
     }
 
+    public boolean isBlockBreakPatch() {
+        return getConfig().getBoolean("block-break-patch", true);
+    }
+
     public boolean isAutoTeam() {
         // Collision has to be enabled first
         return isPreventCollision() && getConfig().getBoolean("auto-team", true);

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

@@ -30,6 +30,13 @@ public interface ViaVersionConfig {
      */
     boolean isNewEffectIndicator();
 
+    /**
+     * Get if 1.9 clients are shown the new death message on the death screen
+     *
+     * @return true if enabled
+     */
+    boolean isShowNewDeathMessages();
+
     /**
      * Get if metadata errors will be suppressed
      *
@@ -86,4 +93,11 @@ public interface ViaVersionConfig {
      * @return true if automatic teaming is enabled
      */
     boolean isAutoTeam();
+
+    /**
+     * Get if our block break patch is enabled to prevent weird ghost glitches.
+     *
+     * @return true if it is enabled.
+     */
+    boolean isBlockBreakPatch();
 }

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

@@ -75,7 +75,7 @@ public interface BossBar {
      * @param players list of players
      * @return the bossbar instance
      */
-    BossBar addPlayers(Player...players);
+    BossBar addPlayers(Player... players);
 
     /**
      * Remove the bossbar from a player

src/main/java/us/myles/ViaVersion/api/command/ViaSubCommand.java

@@ -67,11 +67,11 @@ public abstract class ViaSubCommand {
     /**
      * Send message formatted / colored
      *
-     * @param sender command sender
+     * @param sender  command sender
      * @param message string message
-     * @param args optional objects
+     * @param args    optional objects
      */
-    public void sendMessage(CommandSender sender, String message, Object... args){
+    public void sendMessage(CommandSender sender, String message, Object... args) {
         ViaCommandHandler.sendMessage(sender, message, args);
     }
 }

src/main/java/us/myles/ViaVersion/api/minecraft/Position.java

@@ -1,12 +1,14 @@
 package us.myles.ViaVersion.api.minecraft;
 
 import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
 
 @AllArgsConstructor
 @Getter
 @ToString
+@EqualsAndHashCode
 public class Position {
     private Long x;
     private Long y;

src/main/java/us/myles/ViaVersion/api/protocol/Protocol.java

@@ -2,11 +2,11 @@ package us.myles.ViaVersion.api.protocol;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import us.myles.ViaVersion.exception.CancelException;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.Pair;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.exception.CancelException;
 import us.myles.ViaVersion.packets.Direction;
 import us.myles.ViaVersion.packets.State;
 
@@ -20,7 +20,6 @@ public abstract class Protocol {
 
     public Protocol() {
         registerPackets();
-        registerListeners();
     }
 
     /**

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

@@ -1,5 +1,6 @@
 package us.myles.ViaVersion.api.protocol;
 
+import org.bukkit.Bukkit;
 import us.myles.ViaVersion.api.Pair;
 import us.myles.ViaVersion.protocols.protocol1_9_1to1_9.Protocol1_9_1TO1_9;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
@@ -11,6 +12,7 @@ public class ProtocolRegistry {
     // Input Version -> Output Version & Protocol (Allows fast lookup)
     private static Map<Integer, Map<Integer, Protocol>> registryMap = new HashMap<>();
     private static Map<Pair<Integer, Integer>, List<Pair<Integer, Protocol>>> pathCache = new HashMap<>();
+    private static List<Protocol> registerList = new ArrayList<>();
 
     static {
         // Register built in protocols
@@ -37,6 +39,12 @@ public class ProtocolRegistry {
 
             registryMap.get(version).put(output, protocol);
         }
+
+        if (Bukkit.getPluginManager().getPlugin("ViaVersion").isEnabled()) {
+            protocol.registerListeners();
+        } else {
+            registerList.add(protocol);
+        }
     }
 
     /**
@@ -51,6 +59,16 @@ public class ProtocolRegistry {
         return false; // No destination for protocol
     }
 
+    /**
+     * Called when the server is enabled, to register any non registered listeners.
+     */
+    public static void registerListeners() {
+        for (Protocol protocol : registerList) {
+            protocol.registerListeners();
+        }
+        registerList.clear();
+    }
+
     /**
      * Calculate a path to get from an input protocol to the servers protocol.
      *

src/main/java/us/myles/ViaVersion/commands/defaultsubs/DebugSubCmd.java

@@ -21,7 +21,7 @@ public class DebugSubCmd extends ViaSubCommand {
         ViaVersionPlugin plugin = (ViaVersionPlugin) ViaVersion.getInstance();
 
         plugin.setDebug(!plugin.isDebug());
-        sendMessage(sender, "&6Debug mode is now %s" , (plugin.isDebug() ? "&aenabled" : "&cdisabled"));
+        sendMessage(sender, "&6Debug mode is now %s", (plugin.isDebug() ? "&aenabled" : "&cdisabled"));
         return true;
     }
 }

src/main/java/us/myles/ViaVersion/commands/defaultsubs/ListSubCmd.java

@@ -30,11 +30,9 @@ public class ListSubCmd extends ViaSubCommand {
         Map<Integer, Set<String>> playerVersions = new HashMap<>();
         for (Player p : Bukkit.getOnlinePlayers()) {
             int playerVersion = ViaVersion.getInstance().getPlayerVersion(p);
-            if (playerVersions.containsKey(playerVersion)) {
-                playerVersions.get(playerVersion).add(p.getName());
-                continue;
-            }
-            playerVersions.put(playerVersion, Collections.singleton(p.getName()));
+            if (!playerVersions.containsKey(playerVersion))
+                playerVersions.put(playerVersion, new HashSet<String>());
+            playerVersions.get(playerVersion).add(p.getName());
         }
         Map<Integer, Set<String>> sorted = new TreeMap<>(playerVersions);
 

src/main/java/us/myles/ViaVersion/exception/InformativeException.java

@@ -21,9 +21,9 @@ public class InformativeException extends Exception {
     }
 
     private String getSource(Class<?> sourceClazz) {
-        if(sourceClazz.isAnonymousClass()){
+        if (sourceClazz.isAnonymousClass()) {
             return sourceClazz.getName() + " (Anonymous)";
-        }else{
+        } else {
             return sourceClazz.getName();
         }
     }

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

@@ -49,10 +49,10 @@ public class ViaEncodeHandler extends MessageToByteEncoder {
             bytebuf.clear();
 
             try {
-                    PacketWrapper wrapper = new PacketWrapper(id, oldPacket, info);
-                    ProtocolInfo protInfo = info.get(ProtocolInfo.class);
-                    protInfo.getPipeline().transform(Direction.OUTGOING, protInfo.getState(), wrapper);
-                    wrapper.writeToBuffer(bytebuf);
+                PacketWrapper wrapper = new PacketWrapper(id, oldPacket, info);
+                ProtocolInfo protInfo = info.get(ProtocolInfo.class);
+                protInfo.getPipeline().transform(Direction.OUTGOING, protInfo.getState(), wrapper);
+                wrapper.writeToBuffer(bytebuf);
             } catch (Exception e) {
                 bytebuf.clear();
                 throw e;

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

@@ -10,15 +10,13 @@ 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.minecraft.item.Item;
 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.protocols.base.ProtocolInfo;
-import us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners.ArmorListener;
-import us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners.BlockListener;
-import us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners.CommandBlockListener;
-import us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners.PaperPatch;
+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.ClientChunks;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.EntityTracker;
@@ -65,23 +63,27 @@ public class Protocol1_9TO1_8 extends Protocol {
         return line;
     }
 
-    public static ItemStack getHandItem(final UserConnection info) {
-        try {
-            return Bukkit.getScheduler().callSyncMethod(Bukkit.getPluginManager().getPlugin("ViaVersion"), new Callable<ItemStack>() {
-                @Override
-                public ItemStack call() throws Exception {
-                    UUID playerUUID = info.get(ProtocolInfo.class).getUuid();
-                    if (Bukkit.getPlayer(playerUUID) != null) {
-                        return Bukkit.getPlayer(playerUUID).getItemInHand();
+    public static Item getHandItem(final UserConnection info) {
+        if(HandItemCache.CACHE){
+            return HandItemCache.getHandItem(info.get(ProtocolInfo.class).getUuid());
+        }else {
+            try {
+                return Bukkit.getScheduler().callSyncMethod(Bukkit.getPluginManager().getPlugin("ViaVersion"), new Callable<Item>() {
+                    @Override
+                    public Item call() throws Exception {
+                        UUID playerUUID = info.get(ProtocolInfo.class).getUuid();
+                        if (Bukkit.getPlayer(playerUUID) != null) {
+                            return Item.getItem(Bukkit.getPlayer(playerUUID).getItemInHand());
+                        }
+                        return null;
                     }
-                    return null;
-                }
-            }).get(10, TimeUnit.SECONDS);
-        } catch (Exception e) {
-            System.out.println("Error fetching hand item: " + e.getClass().getName());
-            if (ViaVersion.getInstance().isDebug())
-                e.printStackTrace();
-            return null;
+                }).get(10, TimeUnit.SECONDS);
+            } catch (Exception e) {
+                System.out.println("Error fetching hand item: " + e.getClass().getName());
+                if (ViaVersion.getInstance().isDebug())
+                    e.printStackTrace();
+                return null;
+            }
         }
     }
 
@@ -99,13 +101,18 @@ public class Protocol1_9TO1_8 extends Protocol {
         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);
-        if(Bukkit.getVersion().toLowerCase().contains("paper")){
+        if (Bukkit.getVersion().toLowerCase().contains("paper")) {
             plugin.getLogger().info("Enabling PaperSpigot patch: Fixes block placement.");
             Bukkit.getPluginManager().registerEvents(new PaperPatch(), plugin);
         }
         if (plugin.getConfig().getBoolean("simulate-pt", true))
             new ViaIdleThread(plugin.getPortedPlayers()).runTaskTimerAsynchronously(plugin, 1L, 1L); // Updates player's idle status
+        if (plugin.getConfig().getBoolean("item-cache", true)) {
+            new HandItemCache().runTaskTimerAsynchronously(plugin, 2L, 2L); // Updates player's items :)
+            HandItemCache.CACHE = true;
+        }
     }
 
     @Override

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

@@ -20,7 +20,7 @@ public class BlockListener implements Listener {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void placeBlock(BlockPlaceEvent e) {
-        if(plugin.isPorted(e.getPlayer())) {
+        if (plugin.isPorted(e.getPlayer())) {
             UserConnection c = plugin.getConnection(e.getPlayer());
             if (!c.get(ProtocolInfo.class).getPipeline().contains(Protocol1_9TO1_8.class)) return;
             Block b = e.getBlockPlaced();

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

@@ -122,11 +122,15 @@ public class CommandBlockListener implements Listener {
     private long[] getPosition(Object obj) throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException {
         return new long[]{
                 (long) ReflectionUtil.getSuper(obj, "a", int.class), //X
-                (long) ReflectionUtil.getSuper(obj, "c", int.class), //Y
-                (long) ReflectionUtil.getSuper(obj, "d", int.class)  //Z
+                (long) ReflectionUtil.getSuper(obj, isR1() ? "b" : "c", int.class), //Y
+                (long) ReflectionUtil.getSuper(obj, isR1() ? "c" : "d", int.class)  //Z
         };
     }
 
+    private boolean isR1() {
+        return ReflectionUtil.getVersion().equals("v1_8_R1");
+    }
+
     private CompoundTag getNBT(Object obj) throws Exception {
         ByteBuf buf = Unpooled.buffer();
         Method m = ReflectionUtil.nms("NBTCompressedStreamTools").getMethod("a", ReflectionUtil.nms("NBTTagCompound"), DataOutput.class);

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

@@ -0,0 +1,65 @@
+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.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;
+
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
+    public void onDeath(PlayerDeathEvent e) {
+        Player p = e.getEntity();
+        if (plugin.isShowNewDeathMessages() && checkGamerule(p.getWorld()) && e.getDeathMessage() != null && checkPipeline(p)) {
+            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) {
+        try {
+            return Boolean.parseBoolean(w.getGameRuleValue("showDeathMessage"));
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    private void sendPacket(final Player p, final String msg) {
+        Bukkit.getScheduler().runTask(plugin, 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.send();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    wrapper.clearInputBuffer();
+                }
+            }
+        });
+    }
+}

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

@@ -0,0 +1,36 @@
+package us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitRunnable;
+import us.myles.ViaVersion.api.minecraft.item.Item;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class HandItemCache extends BukkitRunnable {
+    public static boolean CACHE = false;
+    private static ConcurrentHashMap<UUID, Item> handCache = new ConcurrentHashMap<>();
+
+    public static Item getHandItem(UUID player) {
+        if (!handCache.containsKey(player))
+            return null;
+        return handCache.get(player);
+    }
+
+    @Override
+    public void run() {
+        List<UUID> players = new ArrayList<>(handCache.keySet());
+
+        for (Player p : Bukkit.getOnlinePlayers()) {
+            handCache.put(p.getUniqueId(), Item.getItem(p.getItemInHand()));
+            players.remove(p.getUniqueId());
+        }
+        // Remove offline players
+        for (UUID uuid : players) {
+            handCache.remove(uuid);
+        }
+    }
+}

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

@@ -32,18 +32,18 @@ public class PaperPatch implements Listener {
             } else {
                 if (e.getPlayer().getLocation().getBlock().getRelative(BlockFace.UP).equals(e.getBlock())) {
                     e.setCancelled(true);
-                }else{
+                } else {
                     // Within radius of block
-                    if(Math.abs(diff.getX()) <= 0.8 && Math.abs(diff.getZ()) <= 0.8D){
+                    if (Math.abs(diff.getX()) <= 0.8 && Math.abs(diff.getZ()) <= 0.8D) {
                         // Are they on the edge / shifting ish
-                        if(diff.getY() <= 0.1D && diff.getY() >= -0.1D){
+                        if (diff.getY() <= 0.1D && diff.getY() >= -0.1D) {
                             e.setCancelled(true);
                             return;
                         }
                         BlockFace relative = e.getBlockAgainst().getFace(e.getBlock());
                         // Are they towering up, (handles some latency)
-                        if(relative == BlockFace.UP){
-                            if(diff.getY() < 1D && diff.getY() >= 0D){
+                        if (relative == BlockFace.UP) {
+                            if (diff.getY() < 1D && diff.getY() >= 0D) {
                                 e.setCancelled(true);
                             }
                         }

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

@@ -3,7 +3,6 @@ package us.myles.ViaVersion.protocols.protocol1_9to1_8.metadata;
 import org.bukkit.entity.EntityType;
 import org.bukkit.util.EulerAngle;
 import org.bukkit.util.Vector;
-import us.myles.ViaVersion.ViaVersionPlugin;
 import us.myles.ViaVersion.api.ViaVersion;
 import us.myles.ViaVersion.api.minecraft.item.Item;
 import us.myles.ViaVersion.api.minecraft.metadata.Metadata;

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

@@ -207,7 +207,7 @@ public class EntityPackets {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
                         List<Metadata> metadataList = wrapper.get(Protocol1_9TO1_8.METADATA_LIST, 0);
-                        if(metadataList.size() == 0)
+                        if (metadataList.size() == 0)
                             wrapper.cancel();
                     }
                 });
@@ -252,6 +252,24 @@ public class EntityPackets {
             }
         });
 
+        // Combat Event Packet
+        protocol.registerOutgoing(State.PLAY, 0x42, 0x2C, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); //Event id
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        if (wrapper.get(Type.VAR_INT, 0) == 2) { // entity dead
+                            wrapper.passthrough(Type.VAR_INT); //Player id
+                            wrapper.passthrough(Type.INT); //Entity id
+                            Protocol1_9TO1_8.FIX_JSON.write(wrapper, wrapper.read(Type.STRING));
+                        }
+                    }
+                });
+            }
+        });
 
         /* Packets which do not have any field remapping or handlers */
 
@@ -261,7 +279,6 @@ public class EntityPackets {
         protocol.registerOutgoing(State.PLAY, 0x16, 0x27); // Entity Look Packet
         protocol.registerOutgoing(State.PLAY, 0x14, 0x28); // Entity Packet
 
-        protocol.registerOutgoing(State.PLAY, 0x42, 0x2C); // Combat Event Packet
         protocol.registerOutgoing(State.PLAY, 0x0A, 0x2F); // Use Bed Packet
 
         protocol.registerOutgoing(State.PLAY, 0x1E, 0x31); // Remove Entity Effect Packet

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

@@ -146,10 +146,10 @@ public class InventoryPackets {
                                 Item[] oldStack = wrapper.get(Type.ITEM_ARRAY, 0);
                                 Item[] newStack = new Item[oldStack.length + 1];
                                 for (int i = 0; i < newStack.length; i++) {
-                                    if (i > 3) {
+                                    if (i > 4) {
                                         newStack[i] = oldStack[i - 1];
                                     } else {
-                                        if (i != 3) { // Leave index 3 blank
+                                        if (i != 4) { // Leave index 3 blank
                                             newStack[i] = oldStack[i];
                                         }
                                     }

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

@@ -253,6 +253,22 @@ public class PlayerPackets {
             }
         });
 
+        // Respawn Packet
+        protocol.registerOutgoing(State.PLAY, 0x07, 0x33, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        // Client unloads chunks on respawn, take note
+                        ClientChunks cc = wrapper.user().get(ClientChunks.class);
+                        cc.getBulkChunks().clear();
+                        cc.getLoadedChunks().clear();
+                    }
+                });
+            }
+        });
+
         /* Removed packets */
 
         // Map Bulk
@@ -290,7 +306,6 @@ public class PlayerPackets {
         protocol.registerOutgoing(State.PLAY, 0x39, 0x2B); // Player Abilities Packet
         protocol.registerOutgoing(State.PLAY, 0x00, 0x1F); // Keep Alive Packet
         protocol.registerOutgoing(State.PLAY, 0x48, 0x32); // Resource Pack Send Packet
-        protocol.registerOutgoing(State.PLAY, 0x07, 0x33); // Respawn Packet
         protocol.registerOutgoing(State.PLAY, 0x43, 0x36); // Camera Packet
         protocol.registerOutgoing(State.PLAY, 0x2B, 0x1E); // Change Game State Packet
 

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

@@ -290,7 +290,7 @@ public class SpawnPackets {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
                         short item = wrapper.read(Type.SHORT);
-                        System.out.println(item);
+//                        System.out.println(item);
                         if (item != 0) {
                             PacketWrapper packet = new PacketWrapper(0x3C, null, wrapper.user());
                             packet.write(Type.VAR_INT, wrapper.get(Type.VAR_INT, 0));

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

@@ -6,7 +6,6 @@ import org.spacehq.opennbt.tag.builtin.StringTag;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.ViaVersion;
 import us.myles.ViaVersion.api.minecraft.Position;
-import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
 import us.myles.ViaVersion.api.minecraft.item.Item;
 import us.myles.ViaVersion.api.protocol.Protocol;
 import us.myles.ViaVersion.api.remapper.PacketHandler;
@@ -17,6 +16,7 @@ import us.myles.ViaVersion.packets.State;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.ArmorType;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.ItemRewriter;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.sounds.Effect;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.sounds.SoundEffect;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.ClientChunks;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.EntityTracker;
@@ -49,12 +49,8 @@ public class WorldPackets {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
                         int id = wrapper.get(Type.INT, 0);
-                        if (id >= 1000 && id < 2000 && id != 1005) { // Sound Effect
-                            wrapper.cancel();
-                        }
-                        if (id == 1005) { // Fix jukebox
-                            id = 1010;
-                        }
+
+                        id = Effect.getNewId(id);
                         wrapper.set(Type.INT, 0, id);
                     }
                 });
@@ -118,14 +114,9 @@ public class WorldPackets {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
                         ClientChunks clientChunks = wrapper.user().get(ClientChunks.class);
-                        Chunk chunk = wrapper.passthrough(new ChunkType(clientChunks));
-                        if (chunk.isUnloadPacket()) {
-                            PacketWrapper unload = wrapper.create(0x1D);
-                            unload.write(Type.INT, chunk.getX());
-                            unload.write(Type.INT, chunk.getZ());
-                            unload.send();
-                            wrapper.cancel();
-                        }
+                        wrapper.passthrough(new ChunkType(clientChunks));
+                        // eat any other data (Usually happens with unload packets)
+                        wrapper.read(Type.REMAINING_BYTES);
                     }
                 });
             }
@@ -182,11 +173,34 @@ public class WorldPackets {
                 });
             }
         });
+
+        // Block Change Packet
+        protocol.registerOutgoing(State.PLAY, 0x23, 0x0B, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.POSITION);
+                map(Type.VAR_INT);
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        Position pos = wrapper.user().get(EntityTracker.class).getCurrentlyDigging();
+                        if (pos != null) {
+                            if (wrapper.get(Type.POSITION, 0).equals(pos)) {
+                                // cancel this one
+                                if (wrapper.get(Type.VAR_INT, 0) != 0) {
+                                    wrapper.cancel();
+                                    wrapper.user().get(EntityTracker.class).setCurrentlyDigging(null);
+                                }
+                            }
+                        }
+                    }
+                });
+            }
+        });
         /* Packets which do not have any field remapping or handlers */
 
         protocol.registerOutgoing(State.PLAY, 0x25, 0x08); // Block Break Animation Packet
         protocol.registerOutgoing(State.PLAY, 0x24, 0x0A); // Block Action Packet
-        protocol.registerOutgoing(State.PLAY, 0x23, 0x0B); // Block Change Packet
         protocol.registerOutgoing(State.PLAY, 0x22, 0x10); // Multi Block Change Packet
         protocol.registerOutgoing(State.PLAY, 0x27, 0x1C); // Explosion Packet
         protocol.registerOutgoing(State.PLAY, 0x2A, 0x22); // Particle Packet
@@ -236,6 +250,26 @@ public class WorldPackets {
                         }
                     }
                 });
+                // Digging patch (prevents it glitching)
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        if(!ViaVersion.getConfig().isBlockBreakPatch()) return;
+
+                        EntityTracker entityTracker = wrapper.user().get(EntityTracker.class);
+                        final Position block = wrapper.get(Type.POSITION, 0);
+                        int status = wrapper.get(Type.UNSIGNED_BYTE, 0);
+                        if (status == 0) {
+                            entityTracker.setCurrentlyDigging(null);
+                        }
+                        if (status == 1) {
+                            entityTracker.setCurrentlyDigging(null);
+                        }
+                        if (status == 2) {
+                            entityTracker.setCurrentlyDigging(block);
+                        }
+                    }
+                });
             }
         });
 
@@ -254,7 +288,7 @@ public class WorldPackets {
                         wrapper.write(Type.LONG, -1L);
                         wrapper.write(Type.BYTE, (byte) 255);
                         // Write item in hand
-                        Item item = Item.getItem(Protocol1_9TO1_8.getHandItem(wrapper.user()));
+                        Item item = Protocol1_9TO1_8.getHandItem(wrapper.user());
                         // Blocking patch
                         if (ViaVersion.getConfig().isShieldBlocking()) {
                             if (item != null) {
@@ -334,7 +368,7 @@ public class WorldPackets {
                 create(new ValueCreator() {
                     @Override
                     public void write(PacketWrapper wrapper) throws Exception {
-                        Item item = Item.getItem(Protocol1_9TO1_8.getHandItem(wrapper.user()));
+                        Item item = Protocol1_9TO1_8.getHandItem(wrapper.user());
                         wrapper.write(Type.ITEM, item); // 3 - Item
                     }
                 });

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/sounds/Effect.java

@@ -0,0 +1,44 @@
+package us.myles.ViaVersion.protocols.protocol1_9to1_8.sounds;
+
+import java.util.HashMap;
+
+public class Effect {
+
+    private static HashMap<Integer, Integer> effects;
+
+    static {
+        effects = new HashMap<>();
+        addRewrite(1005, 1010); //Play music disc
+        addRewrite(1003, 1005); //Iron door open
+        addRewrite(1006, 1011); //Iron door close
+        addRewrite(1004, 1009); //Fizz / Fire extinguished
+        addRewrite(1007, 1015); //Ghast charge / warns
+        addRewrite(1008, 1016); //Ghast shoot
+        addRewrite(1009, 1016); //Ghast shoot (Lower volume according to wiki.vg)
+        addRewrite(1010, 1019); //Zombie attacks wood door
+        addRewrite(1011, 1020); //Zombie attacks metal door
+        addRewrite(1012, 1021); //Zombie breaks  wood door
+        addRewrite(1014, 1024); //Wither shoot
+        addRewrite(1015, 1025); //Bat takeoff / aka herobrine
+        addRewrite(1016, 1026); //Zombie inject
+        addRewrite(1017, 1027); //Zombie villager converted
+        addRewrite(1020, 1029); //Anvil break
+        addRewrite(1021, 1030); //Anvil use
+        addRewrite(1022, 1031); //Anvil land
+
+    }
+
+    public static int getNewId(int id) {
+        if (!contains(id))
+            return id;
+        return effects.get(id);
+    }
+
+    public static boolean contains(int oldId) {
+        return effects.containsKey(oldId);
+    }
+
+    private static void addRewrite(int oldId, int newId) {
+        effects.put(oldId, newId);
+    }
+}

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/sounds/SoundEffect.java

@@ -260,9 +260,10 @@ public enum SoundEffect {
     private final boolean breaksound;
 
     private static HashMap<String, SoundEffect> effects;
+
     static {
-        effects = new HashMap<String, SoundEffect>();
-        for(SoundEffect e : SoundEffect.values()) {
+        effects = new HashMap<>();
+        for (SoundEffect e : SoundEffect.values()) {
             effects.put(e.getName(), e);
         }
     }
@@ -283,7 +284,7 @@ public enum SoundEffect {
 
     public static SoundEffect getByName(String name) {
         name = name.toLowerCase();
-        if(effects.containsKey(name))
+        if (effects.containsKey(name))
             return effects.get(name);
         return null;
     }

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

@@ -22,6 +22,7 @@ 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.protocols.base.ProtocolInfo;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.metadata.NewType;
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -43,6 +44,8 @@ public class EntityTracker extends StoredObject {
     private Long lastPlaceBlock = -1L;
     @Setter
     private int entityID;
+    @Setter
+    private Position currentlyDigging = null;
     private boolean teamExists = false;
 
     public EntityTracker(UserConnection user) {
@@ -89,21 +92,21 @@ public class EntityTracker extends StoredObject {
     }
 
     public boolean interactedBlockRecently(int x, int y, int z) {
-        if(blockInteractions.size() == 0)
+        if (blockInteractions.size() == 0)
             return false;
         Iterator<Position> it = blockInteractions.asMap().keySet().iterator();
-        while(it.hasNext()) {
+        while (it.hasNext()) {
             Position p = it.next();
-            if(p.getX() == x)
-                if(p.getY() == y)
-                    if(p.getZ() == z)
+            if (p.getX() == x)
+                if (p.getY() == y)
+                    if (p.getZ() == z)
                         return true;
         }
         return false;
     }
 
     public void addBlockInteraction(Position p) {
-        blockInteractions.put(p,Material.AIR);
+        blockInteractions.put(p, Material.AIR);
     }
 
     public void handleMetadata(int entityID, List<Metadata> metadataList) {
@@ -126,6 +129,12 @@ public class EntityTracker extends StoredObject {
                 }
             }
 
+            if (type == EntityType.SKELETON) {
+                if ((getMetaByIndex(metadataList, 12)) == null) {
+                    metadataList.add(new Metadata(12, NewType.Boolean.getTypeID(), Type.BOOLEAN, true));
+                }
+            }
+
             if (type == EntityType.PLAYER) {
                 if (metadata.getId() == 0) {
                     // Byte
@@ -143,9 +152,12 @@ public class EntityTracker extends StoredObject {
                 }
             }
             if (type == EntityType.ARMOR_STAND && ((ViaVersionPlugin) ViaVersion.getInstance()).isHologramPatch()) {
-                if (metadata.getId() == 0) {
+                if (metadata.getId() == 0 && getMetaByIndex(metadataList, 10) != null) {
+                    Metadata meta = getMetaByIndex(metadataList, 10); //Only happens if the armorstand is small
                     byte data = (byte) metadata.getValue();
-                    if ((data & 0x20) == 0x20) {
+                    // Check invisible | Check small | Check if custom name is empty | Check if custom name visible is true
+                    if ((data & 0x20) == 0x20 && ((byte) meta.getValue() & 0x01) == 0x01
+                            && ((String) getMetaByIndex(metadataList, 2).getValue()).length() != 0 && (boolean) getMetaByIndex(metadataList, 3).getValue()) {
                         if (!knownHolograms.contains(entityID)) {
                             knownHolograms.add(entityID);
                             try {
@@ -200,6 +212,13 @@ public class EntityTracker extends StoredObject {
         }
     }
 
+    public Metadata getMetaByIndex(List<Metadata> list, int index) {
+        for (Metadata meta : list)
+            if (index == meta.getId())
+                return meta;
+        return null;
+    }
+
     public void sendTeamPacket(boolean b) {
         PacketWrapper wrapper = new PacketWrapper(0x41, null, getUser());
         wrapper.write(Type.STRING, "viaversion"); // Use viaversion as name

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

@@ -1,7 +1,6 @@
 package us.myles.ViaVersion.util;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelPipeline;
 import io.netty.handler.codec.ByteToMessageDecoder;

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

@@ -22,6 +22,10 @@ public class ReflectionUtil {
         return Class.forName(BASE + "." + className);
     }
 
+    public static String getVersion() {
+        return BASE.substring(BASE.lastIndexOf('.') + 1);
+    }
+
     public static Object invokeStatic(Class<?> clazz, String method) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
         Method m = clazz.getDeclaredMethod(method);
         return m.invoke(null);

src/main/resources/config.yml

@@ -22,6 +22,12 @@ bossbar-patch: true
 bossbar-anti-flicker: false
 # This will show the new effect indicator in the top-right corner for 1.9 players.
 use-new-effect-indicator: true
+# Show the new death messages for 1.9 on the death screen
+use-new-deathmessages: false
 # This will suppress the following error: 'Unable to get entity for ID: xxxx'
 # This error message means one of you plugins is sending bad packets!
-suppress-entityid-errors: false
+suppress-entityid-errors: false
+# Our patch for block breaking issue, if you have issues with block updates then disable this.
+block-break-patch: true
+# Should we cache our items, this will prevent server from being lagged out, however the cost is a constant task caching items
+item-cache: true