Bump version to 0.5.2

Fix commandblocks

ISSUE_TEMPLATE.md

@@ -2,9 +2,11 @@
 
 ### What version of Spigot are you using? Type /ver
 
-### What plugins are you using? /plugins
+### What plugins are you using? Type /plugins
 
-### How does this error happen? login? using an item? 
+### Are you using any additional software like BungeeCord? If so, what software and version? (Please list your plugins as well)
+
+### How does this error happen? login? Using an item? 
 
 ### Is there an error in the console? Use pastebin.com. Is there a kick message?
 

README.md

@@ -1,4 +1,4 @@
-# ViaVersion 0.5.1
+# ViaVersion 0.5.2
 **Allows the connection of 1.9 clients to 1.8**
 
 This plugin modifies netty to allow connection of 1.9 clients to 1.8,

pom.xml

@@ -5,9 +5,9 @@
 
     <groupId>us.myles</groupId>
     <artifactId>ViaVersion</artifactId>
-    <version>0.5.1</version>
+    <version>0.5.2</version>
     <build>
-        <finalName>ViaVersion-${version}</finalName>
+        <finalName>ViaVersion-${project.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -27,6 +27,7 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <version>3.5.1</version>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <source>1.7</source>

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

@@ -18,6 +18,7 @@ import us.myles.ViaVersion.api.ViaVersionAPI;
 import us.myles.ViaVersion.armor.ArmorListener;
 import us.myles.ViaVersion.commands.ViaVersionCommand;
 import us.myles.ViaVersion.handlers.ViaVersionInitializer;
+import us.myles.ViaVersion.listeners.CommandBlockListener;
 import us.myles.ViaVersion.util.ReflectionUtil;
 
 import java.lang.reflect.Field;
@@ -31,6 +32,7 @@ import java.util.concurrent.TimeUnit;
 public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
 
     private final Map<UUID, ConnectionInfo> portedPlayers = new ConcurrentHashMap<UUID, ConnectionInfo>();
+    private boolean debug = false;
 
     @Override
     public void onEnable() {
@@ -57,8 +59,9 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
         }, this);
 
         Bukkit.getPluginManager().registerEvents(new ArmorListener(this), this);
+        Bukkit.getPluginManager().registerEvents(new CommandBlockListener(this), this);
 
-        getCommand("viaversion").setExecutor(new ViaVersionCommand());
+        getCommand("viaversion").setExecutor(new ViaVersionCommand(this));
     }
 
     public void injectPacketHandler() throws Exception {
@@ -107,6 +110,15 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
         ci.sendRawPacket(packet);
     }
 
+    @Override
+    public boolean isDebug() {
+        return this.debug;
+    }
+
+    public void setDebug(boolean value) {
+        this.debug = value;
+    }
+
     public void addPortedClient(ConnectionInfo info) {
         portedPlayers.put(info.getUUID(), info);
     }

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

@@ -24,4 +24,10 @@ public interface ViaVersionAPI {
      * @throws IllegalArgumentException If not on 1.9 throws IllegalArg
      */
     void sendRawPacket(Player player, ByteBuf packet) throws IllegalArgumentException;
+
+    /**
+     * Obtain if global debug is enabled
+     * @return true if debug is enabled
+     */
+    boolean isDebug();
 }

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

@@ -5,6 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import us.myles.ViaVersion.ViaVersionPlugin;
 import us.myles.ViaVersion.api.ViaVersion;
 
 import java.util.ArrayList;
@@ -14,6 +15,11 @@ import java.util.List;
  * Created by fillefilip8 on 2016-03-03.
  */
 public class ViaVersionCommand implements CommandExecutor {
+    private final ViaVersionPlugin plugin;
+
+    public ViaVersionCommand(ViaVersionPlugin plugin) {
+        this.plugin = plugin;
+    }
 
     @Override
     public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
@@ -37,12 +43,17 @@ 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")) {
+                    plugin.setDebug(!plugin.isDebug());
+                    sender.sendMessage(color("&6Debug mode is now " + (plugin.isDebug() ? "&aenabled" : "&cdisabled")));
+                }
             }
 
         }
         return false;
     }
-    public String color(String string){
+
+    public String color(String string) {
         return string.replace("&", "§");
     }
 }

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

@@ -10,7 +10,6 @@ import us.myles.ViaVersion.util.PacketUtil;
 import us.myles.ViaVersion.util.ReflectionUtil;
 
 import java.lang.reflect.Constructor;
-import java.nio.channels.ClosedChannelException;
 
 public class ViaEncodeHandler extends MessageToByteEncoder {
     private final ConnectionInfo info;

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

@@ -0,0 +1,63 @@
+package us.myles.ViaVersion.listeners;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+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.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import us.myles.ViaVersion.ViaVersionPlugin;
+import us.myles.ViaVersion.packets.PacketType;
+import us.myles.ViaVersion.util.PacketUtil;
+import us.myles.ViaVersion.util.ReflectionUtil;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+public class CommandBlockListener implements Listener {
+    private final ViaVersionPlugin plugin;
+
+    public CommandBlockListener(ViaVersionPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
+    public void onJoin(final PlayerJoinEvent e) {
+        if (e.getPlayer().isOp() && plugin.isPorted(e.getPlayer())) {
+            ByteBuf buf = Unpooled.buffer();
+            PacketUtil.writeVarInt(PacketType.PLAY_ENTITY_STATUS.getNewPacketID(), buf);
+            buf.writeInt(e.getPlayer().getEntityId());
+            buf.writeByte(26);
+            plugin.sendRawPacket(e.getPlayer(), buf);
+        }
+    }
+
+    @EventHandler(ignoreCancelled = true)
+    public void onInteract(PlayerInteractEvent e) {
+        if (e.getAction() == Action.RIGHT_CLICK_BLOCK && plugin.isPorted(e.getPlayer()) && e.getPlayer().isOp()) {
+            try {
+                sendCommandBlockPacket(e.getClickedBlock(), e.getPlayer());
+            } catch (NoSuchFieldException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | ClassNotFoundException e1) {
+                e1.printStackTrace();
+            }
+        }
+    }
+
+    private void sendCommandBlockPacket(Block b, Player player) throws NoSuchFieldException, IllegalAccessException, NoSuchMethodException, InvocationTargetException, ClassNotFoundException {
+        if (!(b.getState() instanceof CommandBlock))
+            return;
+        CommandBlock cmd = (CommandBlock) b.getState();
+
+        Object tileEntityCommand = ReflectionUtil.get(cmd, "commandBlock", ReflectionUtil.nms("TileEntityCommand"));
+        Object updatePacket = ReflectionUtil.invoke(tileEntityCommand, "getUpdatePacket");
+        Object nmsPlayer = ReflectionUtil.invoke(player, "getHandle");
+        Object playerConnection = ReflectionUtil.get(nmsPlayer, "playerConnection", ReflectionUtil.nms("PlayerConnection"));
+        Method sendPacket = playerConnection.getClass().getMethod("sendPacket", ReflectionUtil.nms("Packet"));
+        sendPacket.invoke(playerConnection, updatePacket); //Let the transformer do the work
+    }
+}

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

@@ -1,6 +1,7 @@
 package us.myles.ViaVersion.metadata;
 
 import org.bukkit.entity.*;
+import org.bukkit.entity.minecart.CommandMinecart;
 
 public enum MetaIndex {
 
@@ -105,6 +106,9 @@ public enum MetaIndex {
     MINECART_BLOCK(Minecart.class, 20, Type.Int, 8, NewType.VarInt),
     MINECART_BLOCK_Y(Minecart.class, 21, Type.Int, 9, NewType.VarInt),
     MINECART_SHOWBLOCK(Minecart.class, 22, Type.Byte, 10, NewType.Boolean),
+    // Command minecart (they are still broken)
+    MINECART_COMMANDBLOCK_COMMAND(CommandMinecart.class,23,Type.String,11,NewType.String),
+    MINECART_COMMANDBLOCK_OUTPUT(CommandMinecart.class,24,Type.String,12,NewType.Chat),
     // furnace cart
     FURNACECART_ISPOWERED(org.bukkit.entity.minecart.PoweredMinecart.class, 16, Type.Byte, 11, NewType.Boolean),
     // item drop

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

@@ -117,7 +117,7 @@ public class MetadataRewriter {
                 }
             } catch (Exception e) {
                 if (type != null) {
-                    System.out.println("An error occurred with entity meta data for " + type);
+                    System.out.println("An error occurred with entity meta data for " + type + " 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());
@@ -138,23 +138,23 @@ public class MetadataRewriter {
             MetaIndex index = MetaIndex.getIndex(entityType, id);
             switch (type) {
                 case Byte:
-                    entries.add(new Entry(index, buf.readByte()));
+                    entries.add(new Entry(index, buf.readByte(), id));
                     break;
                 case Short:
-                    entries.add(new Entry(index, buf.readShort()));
+                    entries.add(new Entry(index, buf.readShort(), id));
                     break;
                 case Int:
-                    entries.add(new Entry(index, buf.readInt()));
+                    entries.add(new Entry(index, buf.readInt(), id));
                     break;
                 case Float:
-                    entries.add(new Entry(index, buf.readFloat()));
+                    entries.add(new Entry(index, buf.readFloat(), id));
                     break;
                 case String:
-                    entries.add(new Entry(index, PacketUtil.readString(buf)));
+                    entries.add(new Entry(index, PacketUtil.readString(buf), id));
                     break;
                 case Slot: {
                     try {
-                        entries.add(new Entry(index, ItemSlotRewriter.readItemStack(buf)));
+                        entries.add(new Entry(index, ItemSlotRewriter.readItemStack(buf), id));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -164,14 +164,14 @@ public class MetadataRewriter {
                     int x = buf.readInt();
                     int y = buf.readInt();
                     int z = buf.readInt();
-                    entries.add(new Entry(index, new Vector(x, y, z)));
+                    entries.add(new Entry(index, new Vector(x, y, z), id));
                     break;
                 }
                 case Rotation: {
                     float x = buf.readFloat();
                     float y = buf.readFloat();
                     float z = buf.readFloat();
-                    entries.add(new Entry(index, new EulerAngle(x, y, z)));
+                    entries.add(new Entry(index, new EulerAngle(x, y, z), id));
                     break;
                 }
                 default:
@@ -184,12 +184,14 @@ public class MetadataRewriter {
 
     public static class Entry {
 
+        private final int oldID;
         private MetaIndex index;
         private Object value;
 
-        private Entry(MetaIndex index, Object value) {
+        private Entry(MetaIndex index, Object value, int id) {
             this.index = index;
             this.value = value;
+            this.oldID = id;
         }
     }
 }

src/main/java/us/myles/ViaVersion/slot/ItemSlotRewriter.java

@@ -3,11 +3,15 @@ package us.myles.ViaVersion.slot;
 import io.netty.buffer.ByteBuf;
 import org.bukkit.Material;
 import org.spacehq.opennbt.tag.builtin.CompoundTag;
+import org.spacehq.opennbt.tag.builtin.ListTag;
 import org.spacehq.opennbt.tag.builtin.StringTag;
+import org.spacehq.opennbt.tag.builtin.Tag;
 import us.myles.ViaVersion.CancelException;
+import us.myles.ViaVersion.transformers.OutgoingTransformer;
 import us.myles.ViaVersion.util.PacketUtil;
 
 import java.io.IOException;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -104,7 +108,7 @@ public class ItemSlotRewriter {
                 if (tag == null) {
                     tag = new CompoundTag("tag");
                 }
-                if(item.data >= 16384){
+                if (item.data >= 16384) {
                     item.id = 438; // splash id
                     item.data = (short) (item.data - 8192);
                 }
@@ -116,6 +120,27 @@ public class ItemSlotRewriter {
                 item.tag = tag;
                 item.data = 0;
             }
+            if (item.id == Material.WRITTEN_BOOK.getId()) {
+                CompoundTag tag = item.tag;
+                if (tag == null) {
+                    tag = new CompoundTag("tag");
+                }
+                ListTag pages = tag.get("pages");
+                if (pages == null) {
+                    pages = new ListTag("pages", Collections.<Tag>singletonList(new StringTag(OutgoingTransformer.fixJson(""))));
+                    tag.put(pages);
+                    item.tag = tag;
+                    return;
+                }
+
+                for (int i = 0; i < pages.size(); i++) {
+                    if (!(pages.get(i) instanceof StringTag))
+                        continue;
+                    StringTag page = pages.get(i);
+                    page.setValue(OutgoingTransformer.fixJson(page.getValue()));
+                }
+                item.tag = tag;
+            }
         }
     }
 

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

@@ -198,7 +198,7 @@ public enum SoundEffect {
     MOB_ENDERMEN_SCREAM("mob.endermen.scream", "entity.endermen.scream", SoundCategory.HOSTILE),
     MOB_CAT_HITT("mob.cat.hitt", "entity.cat.hurt", SoundCategory.NEUTRAL),
     MOB_MAGMACUBE_SMALL("mob.magmacube.small", "entity.small_magmacube.squish", SoundCategory.HOSTILE),
-    FIRE_IGNITE("fire.ignite", "item.flintandsteel.use", SoundCategory.BLOCK),
+    FIRE_IGNITE("fire.ignite", "item.flintandsteel.use", SoundCategory.BLOCK, true),
     MOB_ENDERDRAGON_HIT("mob.enderdragon.hit", "entity.enderdragon.hurt", SoundCategory.HOSTILE),
     MOB_ZOMBIE_HURT("mob.zombie.hurt", "entity.zombie_villager.hurt", SoundCategory.HOSTILE),
     RANDOM_EXPLODE("random.explode", "block.end_gateway.spawn", SoundCategory.BLOCK),
@@ -260,6 +260,13 @@ public enum SoundEffect {
         this.name = name;
         this.breaksound = name.startsWith("dig.");
     }
+    
+    SoundEffect(String name, String newname, SoundCategory cat, boolean shouldIgnore) {
+        this.cat = cat;
+        this.newname = newname;
+        this.name = name;
+        this.breaksound = name.startsWith("dig.") || shouldIgnore;
+    }
 
     public static SoundEffect getByName(String name) {
         name = name.toLowerCase();

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

@@ -7,6 +7,7 @@ import org.bukkit.inventory.ItemStack;
 import us.myles.ViaVersion.CancelException;
 import us.myles.ViaVersion.ConnectionInfo;
 import us.myles.ViaVersion.ViaVersionPlugin;
+import us.myles.ViaVersion.api.ViaVersion;
 import us.myles.ViaVersion.packets.PacketType;
 import us.myles.ViaVersion.packets.State;
 import us.myles.ViaVersion.slot.ItemSlotRewriter;
@@ -35,9 +36,11 @@ public class IncomingTransformer {
         if (packet.getPacketID() != -1) {
             packetID = packet.getPacketID();
         }
-//        if (packet != PacketType.PLAY_PLAYER_POSITION_LOOK_REQUEST && packet != PacketType.PLAY_KEEP_ALIVE_REQUEST && packet != PacketType.PLAY_PLAYER_POSITION_REQUEST && packet != PacketType.PLAY_PLAYER_LOOK_REQUEST) {
-//            System.out.println("Packet Type: " + packet + " New ID: " + packetID + " Original: " + original);
-//        }
+        if (ViaVersion.getInstance().isDebug()) {
+            if (packet != PacketType.PLAY_PLAYER_POSITION_LOOK_REQUEST && packet != PacketType.PLAY_KEEP_ALIVE_REQUEST && packet != PacketType.PLAY_PLAYER_POSITION_REQUEST && packet != PacketType.PLAY_PLAYER_LOOK_REQUEST) {
+                System.out.println("Direction " + packet.getDirection().name() + " Packet Type: " + packet + " New ID: " + packetID + " Original: " + original + " Size: " + input.readableBytes());
+            }
+        }
         if (packet == PacketType.PLAY_TP_CONFIRM || packet == PacketType.PLAY_VEHICLE_MOVE_REQUEST) { //TODO handle client-sided horse riding
             throw new CancelException();
         }
@@ -175,13 +178,13 @@ public class IncomingTransformer {
             }
             return;
         }
-        if(packet == PacketType.PLAY_PLUGIN_MESSAGE_REQUEST) {
+        if (packet == PacketType.PLAY_PLUGIN_MESSAGE_REQUEST) {
             String name = PacketUtil.readString(input);
             PacketUtil.writeString(name, output);
             byte[] b = new byte[input.readableBytes()];
             input.readBytes(b);
             // patch books
-            if(name.equals("MC|BSign")){
+            if (name.equals("MC|BSign")) {
                 ByteBuf in = Unpooled.wrappedBuffer(b);
                 try {
                     ItemSlotRewriter.ItemStack stack = ItemSlotRewriter.readItemStack(in);
@@ -192,6 +195,24 @@ public class IncomingTransformer {
                     e.printStackTrace();
                 }
                 return;
+            } else if (name.equals("MC|AutoCmd")) {
+                ByteBuf in = Unpooled.wrappedBuffer(b);
+                int x = in.readInt();
+                int y = in.readInt();
+                int z = in.readInt();
+                String command = PacketUtil.readString(in);
+                boolean flag = in.readBoolean();
+
+                output.clear();
+                PacketUtil.writeVarInt(PacketType.PLAY_PLUGIN_MESSAGE_REQUEST.getPacketID(), output);
+                PacketUtil.writeString("MC|AdvCdm", output);
+                output.writeByte(0);
+                output.writeInt(x);
+                output.writeInt(y);
+                output.writeInt(z);
+                PacketUtil.writeString(command, output);
+                output.writeBoolean(flag);
+                return;
             }
             output.writeBytes(b);
         }

src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: ViaVersion
 main: us.myles.ViaVersion.ViaVersionPlugin
 author: _MylesC
-version: ${version}
+version: ${project.version}
 load: startup
 loadbefore: [ProtocolLib, ProxyPipe]
 commands: