Bump version

Fix jukebox

README.md

@@ -1,4 +1,4 @@
-# ViaVersion 0.5.7 
+# ViaVersion 0.5.8 
 [![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.8-SNAPSHOT</version>
+    <version>0.5.9-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>ViaVersion</name>

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

@@ -1,14 +1,16 @@
 package us.myles.ViaVersion;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.channel.*;
+import io.netty.channel.ChannelHandler;
 import io.netty.channel.socket.SocketChannel;
+import lombok.Getter;
+import lombok.Setter;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import us.myles.ViaVersion.packets.State;
 
-import java.util.UUID;
-
+@Getter
+@Setter
 public class ConnectionInfo {
     private final SocketChannel channel;
     private Object lastPacket;
@@ -17,6 +19,7 @@ public class ConnectionInfo {
     private String openWindow;
     private int protocol = 0;
     private int compression = 0;
+    private int entityID;
     private boolean active = true;
     private String username;
 
@@ -24,89 +27,33 @@ public class ConnectionInfo {
         this.channel = socketChannel;
     }
 
-    public int getProtocol() {
-        return protocol;
-    }
-
-    public void setProtocol(int protocol) {
-        this.protocol = protocol;
-    }
-
-    public State getState() {
-        return state;
-    }
-
-    public void setState(State state) {
-        this.state = state;
-    }
-
-    public int getCompression() {
-        return compression;
-    }
-
-    public void setCompression(int compression) {
-        this.compression = compression;
-    }
-
-    public Object getLastPacket() {
-        return lastPacket;
-    }
-
-    public void setLastPacket(Object lastPacket) {
-        this.lastPacket = lastPacket;
-    }
-
-    public java.util.UUID getUUID() {
-        return UUID;
-    }
-
-    public void setUUID(UUID UUID) {
-        this.UUID = UUID;
-    }
-
     public Player getPlayer() {
         return UUID == null ? null : Bukkit.getPlayer(UUID);
     }
 
-    public SocketChannel getChannel() {
-        return channel;
-    }
-
-    public boolean isActive() {
-        return active;
-    }
-
     public void setActive(boolean active) {
         this.active = active;
     }
 
-    public void sendRawPacket(final ByteBuf packet) {
+    public void sendRawPacket(final ByteBuf packet, boolean currentThread) {
         final ChannelHandler handler = channel.pipeline().get("encoder");
-        channel.eventLoop().submit(new Runnable() {
-            @Override
-            public void run() {
-                channel.pipeline().context(handler).writeAndFlush(packet);
-            }
-        });
+        if (currentThread) {
+            channel.pipeline().context(handler).writeAndFlush(packet);
+        } else {
+            channel.eventLoop().submit(new Runnable() {
+                @Override
+                public void run() {
+                    channel.pipeline().context(handler).writeAndFlush(packet);
+                }
+            });
+        }
     }
 
-    public String getOpenWindow() {
-        return openWindow;
-    }
-
-    public void setOpenWindow(String openWindow) {
-        this.openWindow = openWindow;
+    public void sendRawPacket(final ByteBuf packet) {
+        sendRawPacket(packet, false);
     }
 
     public void closeWindow() {
         this.openWindow = null;
     }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
 }

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

@@ -184,6 +184,10 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
         return getConfig().getBoolean("prevent-collision", true);
     }
 
+    public boolean isSuppressMetadataErrors() {
+        return getConfig().getBoolean("suppress-metadata-errors", false);
+    }
+
     public boolean isAutoTeam() {
         // Collision has to be enabled first
         if (!isPreventCollision()) return false;

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

@@ -44,24 +44,26 @@ public class ViaVersionCommand implements CommandExecutor {
 
                     sender.sendMessage(color("&8[&61.9&8]: &b" + portedPlayers.toString()));
                     sender.sendMessage(color("&8[&61.8&8]: &b" + normalPlayers.toString()));
-                }
-                if (args[0].equalsIgnoreCase("debug")) {
+                } else if (args[0].equalsIgnoreCase("debug")) {
                     plugin.setDebug(!plugin.isDebug());
                     sender.sendMessage(color("&6Debug mode is now " + (plugin.isDebug() ? "&aenabled" : "&cdisabled")));
-                }
-                if (args[0].equalsIgnoreCase("dontbugme")) {
+                } else if (args[0].equalsIgnoreCase("dontbugme")) {
                     boolean newValue = !plugin.getConfig().getBoolean("checkforupdates", true);
                     plugin.getConfig().set("checkforupdates", newValue);
                     plugin.saveConfig();
                     sender.sendMessage(color("&6We will " + (newValue ? "&anotify you about updates." : "&cnot tell you about updates.")));
-                }
-                if (args[0].equalsIgnoreCase("autoteam")) {
+                } else if (args[0].equalsIgnoreCase("autoteam")) {
                     boolean newValue = !plugin.getConfig().getBoolean("auto-team", true);
                     plugin.getConfig().set("auto-team", newValue);
                     plugin.saveConfig();
                     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."));
                 }
             }
 

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

@@ -6,6 +6,8 @@ import lombok.Setter;
 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.slot.ItemSlotRewriter;
 import us.myles.ViaVersion.slot.ItemSlotRewriter.ItemStack;
 import us.myles.ViaVersion.transformers.OutgoingTransformer;
@@ -117,16 +119,18 @@ public class MetadataRewriter {
                     }
                 }
             } catch (Exception e) {
-                System.out.println("INCLUDE THIS IN YOUR ERROR LOG!");
-                if (type != null)
-                    System.out.println("An error occurred with entity meta data for " + type + " OldID: " + entry.oldID);
-                else
-                    System.out.println("An error occurred with entity meta data for UNKOWN_ENTITY OldID: " + entry.oldID);
-                if (metaIndex != null) {
-                    System.out.println("Old ID: " + metaIndex.getIndex() + " New ID: " + metaIndex.getNewIndex());
-                    System.out.println("Old Type: " + metaIndex.getOldType() + " New Type: " + metaIndex.getNewType());
+                if (!((ViaVersionPlugin) ViaVersion.getInstance()).isSuppressMetadataErrors()) {
+                    System.out.println("INCLUDE THIS IN YOUR ERROR LOG!");
+                    if (type != null)
+                        System.out.println("An error occurred with entity meta data for " + type + " OldID: " + entry.oldID);
+                    else
+                        System.out.println("An error occurred with entity meta data for UNKNOWN_ENTITY OldID: " + entry.oldID);
+                    if (metaIndex != null) {
+                        System.out.println("Old ID: " + metaIndex.getIndex() + " New ID: " + metaIndex.getNewIndex());
+                        System.out.println("Old Type: " + metaIndex.getOldType() + " New Type: " + metaIndex.getNewType());
+                    }
+                    e.printStackTrace();
                 }
-                e.printStackTrace();
             }
         }
         output.writeByte(255);

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

@@ -17,6 +17,7 @@ import java.io.IOException;
 
 public class IncomingTransformer {
     private final ConnectionInfo info;
+    private boolean startedBlocking = false;
 
     public IncomingTransformer(ConnectionInfo info) {
         this.info = info;
@@ -87,14 +88,30 @@ public class IncomingTransformer {
         }
         if (packet == PacketType.PLAY_PLAYER_DIGGING) {
             int status = input.readByte() & 0xFF; // unsign
+            if (status == 5 && startedBlocking) {
+                // stopped blocking
+                startedBlocking = false;
+                sendSecondHandItem(null);
+            }
             if (status == 6) { // item swap
                 throw new CancelException();
             }
             output.writeByte(status);
             // write remaining bytes
-            output.writeBytes(input);
+            Long position = input.readLong();
+            output.writeLong(position);
+
+            int face = input.readUnsignedByte();
+            output.writeByte(face);
             return;
         }
+        if (packet == PacketType.PLAY_HELD_ITEM_CHANGE_REQUEST) {
+            if (startedBlocking) {
+                // stopped blocking
+                startedBlocking = false;
+                sendSecondHandItem(null);
+            }
+        }
         if (packet == PacketType.PLAY_CLICK_WINDOW) {
             // if placed in new slot, reject :)
             int windowID = input.readUnsignedByte();
@@ -268,6 +285,7 @@ public class IncomingTransformer {
             return;
         }
         if (packet == PacketType.PLAY_USE_ITEM) {
+            int hand = PacketUtil.readVarInt(input);
             output.clear();
             PacketUtil.writeVarInt(PacketType.PLAY_PLAYER_BLOCK_PLACEMENT.getPacketID(), output);
             // Simulate using item :)
@@ -275,6 +293,22 @@ public class IncomingTransformer {
             output.writeByte(255);
             // write item in hand
             ItemStack inHand = ViaVersionPlugin.getHandItem(info);
+            if (inHand != null) {
+                if (inHand.getType().name().endsWith("SWORD")) {
+                    // blocking?
+                    if (hand == 0) {
+                        if (!startedBlocking) {
+                            startedBlocking = true;
+                            ItemSlotRewriter.ItemStack shield = new ItemSlotRewriter.ItemStack();
+                            shield.id = 442;
+                            shield.amount = 1;
+                            shield.data = 0;
+                            sendSecondHandItem(shield);
+                        }
+                        throw new CancelException();
+                    }
+                }
+            }
             try {
                 ItemSlotRewriter.ItemStack item = ItemSlotRewriter.ItemStack.fromBukkit(inHand);
                 ItemSlotRewriter.fixIdsFrom1_9To1_8(item);
@@ -296,4 +330,18 @@ public class IncomingTransformer {
         }
         output.writeBytes(input);
     }
+
+    private void sendSecondHandItem(ItemSlotRewriter.ItemStack o) {
+        ByteBuf buf = info.getChannel().alloc().buffer();
+        PacketUtil.writeVarInt(PacketType.PLAY_ENTITY_EQUIPMENT.getNewPacketID(), buf);
+        PacketUtil.writeVarInt(info.getEntityID(), buf);
+        PacketUtil.writeVarInt(1, buf); // slot
+        // write shield
+        try {
+            ItemSlotRewriter.writeItemStack(o, buf);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        info.sendRawPacket(buf);
+    }
 }

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

@@ -1,15 +1,12 @@
 package us.myles.ViaVersion.transformers;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufInputStream;
-import io.netty.buffer.ByteBufOutputStream;
 import org.bukkit.entity.EntityType;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 import org.spacehq.mc.protocol.data.game.chunk.Column;
 import org.spacehq.mc.protocol.util.NetUtil;
-import org.spacehq.opennbt.NBTIO;
 import org.spacehq.opennbt.tag.builtin.ByteTag;
 import org.spacehq.opennbt.tag.builtin.CompoundTag;
 import org.spacehq.opennbt.tag.builtin.StringTag;
@@ -26,8 +23,6 @@ import us.myles.ViaVersion.util.EntityUtil;
 import us.myles.ViaVersion.util.PacketUtil;
 import us.myles.ViaVersion.util.ReflectionUtil;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.*;
 
@@ -106,8 +101,10 @@ public class OutgoingTransformer {
         }
         if (packet == PacketType.PLAY_EFFECT) {
             int effectid = input.readInt();
-            if (effectid >= 1000 && effectid < 2000) //Sound effect
+            if (effectid >= 1000 && effectid < 2000 && effectid != 1005) //Sound effect
                 throw new CancelException();
+            if (effectid == 1005) //Fix jukebox
+                effectid = 1010;
             output.writeInt(effectid);
         }
         if (packet == PacketType.PLAY_ATTACH_ENTITY) {
@@ -566,6 +563,7 @@ public class OutgoingTransformer {
         if (packet == PacketType.PLAY_JOIN_GAME) {
             int id = input.readInt();
             clientEntityTypes.put(id, EntityType.PLAYER);
+            info.setEntityID(id);
             output.writeInt(id);
             output.writeBytes(input);
             return;
@@ -683,12 +681,12 @@ public class OutgoingTransformer {
                         CompoundTag spawn = new CompoundTag("SpawnData");
                         spawn.put(new StringTag("id", entity));
                         tag.put(spawn);
-                        PacketUtil.writeNBT(output,tag);
+                        PacketUtil.writeNBT(output, tag);
                     } else if (tag != null) { // EntityID does not exist
                         CompoundTag spawn = new CompoundTag("SpawnData");
                         spawn.put(new StringTag("id", "AreaEffectCloud")); //Make spawners show up as empty when no EntityId is given.
                         tag.put(spawn);
-                        PacketUtil.writeNBT(output,spawn);
+                        PacketUtil.writeNBT(output, spawn);
                     } else { //There doesn't exist any NBT tag
                         input.readerIndex(index);
                         output.writeBytes(input, input.readableBytes());
@@ -798,9 +796,31 @@ public class OutgoingTransformer {
             return;
         }
         List<MetadataRewriter.Entry> list = MetadataRewriter.readMetadata1_8(type, input);
+        for (MetadataRewriter.Entry entry : list) {
+            handleMetadata(entityID, entry, type);
+        }
         MetadataRewriter.writeMetadata1_9(type, list, output);
     }
 
+    private void handleMetadata(int entityID, MetadataRewriter.Entry entry, EntityType type) {
+        // This handles old IDs
+        if (type == EntityType.PLAYER) {
+            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);
+                } else {
+                    sendSecondHandItem(entityID, null);
+                }
+            }
+        }
+    }
+
 
     private UUID getUUID(int id) {
         if (uuidMap.containsKey(id)) {
@@ -812,4 +832,18 @@ public class OutgoingTransformer {
         }
     }
 
+    private void sendSecondHandItem(int entityID, ItemSlotRewriter.ItemStack o) {
+
+        ByteBuf buf = info.getChannel().alloc().buffer();
+        PacketUtil.writeVarInt(PacketType.PLAY_ENTITY_EQUIPMENT.getNewPacketID(), buf);
+        PacketUtil.writeVarInt(entityID, buf);
+        PacketUtil.writeVarInt(1, buf); // slot
+        // write shield
+        try {
+            ItemSlotRewriter.writeItemStack(o, buf);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        info.sendRawPacket(buf, true);
+    }
 }

src/main/java/us/myles/ViaVersion/update/UpdateUtil.java

@@ -98,7 +98,7 @@ public class UpdateUtil {
             URL url = new URL(URL + PLUGIN + "?" + System.currentTimeMillis());
             HttpURLConnection connection = (HttpURLConnection) url.openConnection();
             connection.setUseCaches(true);
-            connection.addRequestProperty("User-Agent", "Mozilla/4.76");
+            connection.addRequestProperty("User-Agent", "ViaVersion " + ViaVersion.getInstance().getVersion());
             connection.setDoOutput(true);
             BufferedReader br = new BufferedReader(new InputStreamReader(connection.getInputStream()));
             String input;

src/main/resources/config.yml

@@ -8,3 +8,5 @@ sync-chunks: true
 prevent-collision: true
 # If the above is true, should we automatically team players until you do?
 auto-team: true
+# When enabled if certain metadata can't be read we won't tell you about it
+suppress-metadata-errors: false