Update to 0.5.3, add inventory title tracking so we're working towards some of the inventory bugs with new ones.

Added proper update message (based on checkplys)

README.md

@@ -1,4 +1,4 @@
-# ViaVersion 0.5.2
+# ViaVersion 0.5.3
 **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,7 +5,7 @@
 
     <groupId>us.myles</groupId>
     <artifactId>ViaVersion</artifactId>
-    <version>0.5.2</version>
+    <version>0.5.3</version>
     <build>
         <finalName>ViaVersion-${project.version}</finalName>
         <plugins>

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

@@ -30,7 +30,7 @@ public class NetUtil {
             }
         }
 
-        if(fullChunk) {
+        if(fullChunk && column.getBiomeData() != null) {
             out.writeBytes(column.getBiomeData());
         }
 
@@ -103,7 +103,8 @@ public class NetUtil {
         }
 
         byte biomeData[] = null;
-        if(isFullChunk) {
+        if(isFullChunk && (pos + 256 <= input.length)) {
+
             biomeData = new byte[256];
             System.arraycopy(input, pos, biomeData, 0, biomeData.length);
         }

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

@@ -1,4 +1,4 @@
 package us.myles.ViaVersion;
 
-public class CancelException extends Exception{
+public class CancelException extends Exception {
 }

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

@@ -14,6 +14,7 @@ public class ConnectionInfo {
     private Object lastPacket;
     private java.util.UUID UUID;
     private State state = State.HANDSHAKE;
+    private String openWindow;
     private int protocol = 0;
     private int compression = 0;
     private boolean active = true;
@@ -87,4 +88,16 @@ public class ConnectionInfo {
             }
         });
     }
+
+    public String getOpenWindow() {
+        return openWindow;
+    }
+
+    public void setOpenWindow(String openWindow) {
+        this.openWindow = openWindow;
+    }
+
+    public void closeWindow() {
+        this.openWindow = null;
+    }
 }

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

@@ -7,6 +7,8 @@ import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.socket.SocketChannel;
 import org.bukkit.Bukkit;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -19,8 +21,12 @@ 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.update.UpdateListener;
+import us.myles.ViaVersion.update.UpdateUtil;
 import us.myles.ViaVersion.util.ReflectionUtil;
 
+import java.io.File;
+import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Map;
@@ -33,12 +39,15 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
 
     private final Map<UUID, ConnectionInfo> portedPlayers = new ConcurrentHashMap<UUID, ConnectionInfo>();
     private boolean debug = false;
+    private FileConfiguration config;
+    private File configFile;
 
     @Override
     public void onEnable() {
         ViaVersion.setInstance(this);
         if (System.getProperty("ViaVersion") != null) {
             getLogger().severe("ViaVersion is already loaded, we don't support reloads. Please reboot if you wish to update.");
+            getLogger().severe("Some features may not work.");
             return;
         }
 
@@ -51,6 +60,21 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
             e.printStackTrace();
         }
 
+        this.config = getFileConfiguration();
+        if (!config.contains("checkforupdates")) {
+            config.set("checkforupdates", true);
+            try {
+                config.save(configFile);
+            } catch (IOException e1) {
+                this.getLogger().info("Unabled to write config.yml!");
+                e1.printStackTrace();
+            }
+        }
+        if (config.getBoolean("checkforupdates")) {
+            Bukkit.getPluginManager().registerEvents(new UpdateListener(this), this);
+            UpdateUtil.sendUpdateMessage(this);
+        }
+
         Bukkit.getPluginManager().registerEvents(new Listener() {
             @EventHandler
             public void onPlayerQuit(PlayerQuitEvent e) {
@@ -127,9 +151,23 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
         portedPlayers.remove(clientID);
     }
 
+    private FileConfiguration getFileConfiguration() {
+        if (!this.getDataFolder().exists())
+            this.getDataFolder().mkdirs();
+        this.configFile = new File(this.getDataFolder(), "config.yml");
+        if (!this.configFile.exists())
+            try {
+                this.configFile.createNewFile();
+            } catch (IOException e) {
+                this.getLogger().info("Unable to create config.yml!");
+                e.printStackTrace();
+            }
+        return YamlConfiguration.loadConfiguration(this.configFile);
+    }
+
     public static ItemStack getHandItem(final ConnectionInfo info) {
         try {
-            return Bukkit.getScheduler().callSyncMethod(getPlugin(ViaVersionPlugin.class), new Callable<ItemStack>() {
+            return Bukkit.getScheduler().callSyncMethod(Bukkit.getPluginManager().getPlugin("ViaVersion"), new Callable<ItemStack>() {
                 @Override
                 public ItemStack call() throws Exception {
                     if (info.getPlayer() != null) {
@@ -144,4 +182,4 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
             return null;
         }
     }
-}
+}

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

@@ -28,6 +28,7 @@ public class ViaVersionCommand implements CommandExecutor {
                 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 dontbugme &7- &6Toggle checking for updates."));
             } else if (args.length == 1) {
                 if (args[0].equalsIgnoreCase("list")) {
                     List<String> portedPlayers = new ArrayList<String>();
@@ -47,6 +48,12 @@ public class ViaVersionCommand implements CommandExecutor {
                     plugin.setDebug(!plugin.isDebug());
                     sender.sendMessage(color("&6Debug mode is now " + (plugin.isDebug() ? "&aenabled" : "&cdisabled")));
                 }
+                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.")));
+                }
             }
 
         }

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

@@ -136,6 +136,9 @@ public class IncomingTransformer {
             ItemSlotRewriter.rewrite1_9To1_8(input, output);
             return;
         }
+        if (packet == PacketType.PLAY_CLOSE_WINDOW_REQUEST) {
+            info.closeWindow();
+        }
         if (packet == PacketType.PLAY_CLIENT_SETTINGS) {
             String locale = PacketUtil.readString(input);
             PacketUtil.writeString(locale, output);

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

@@ -411,14 +411,23 @@ public class OutgoingTransformer {
         if (packet == PacketType.PLAY_OPEN_WINDOW) {
             int windowId = input.readUnsignedByte();
             String type = readString(input);
+            info.setOpenWindow(type);
             String windowTitle = readString(input);
 
             output.writeByte(windowId);
             writeString(type, output);
             writeString(fixJson(windowTitle), output);
+            int slots = input.readUnsignedByte();
+            if(type.equals("minecraft:brewing_stand")){
+                slots = slots + 1; // new slot
+            }
+            output.writeByte(slots);
             output.writeBytes(input);
             return;
         }
+        if (packet == PacketType.PLAY_CLOSE_WINDOW) {
+            info.closeWindow();
+        }
         if (packet == PacketType.PLAY_SET_SLOT) {
             int windowId = input.readUnsignedByte();
             output.writeByte(windowId);
@@ -656,10 +665,14 @@ public class OutgoingTransformer {
         if (line == null || line.equalsIgnoreCase("null")) {
             line = "{\"text\":\"\"}";
         } else {
-            if (!line.startsWith("\"") && !line.startsWith("{"))
-                line = "\"" + line + "\"";
-            if (line.startsWith("\""))
+            if (!line.startsWith("\"") && !line.startsWith("{")) {
+                JSONObject obj = new JSONObject();
+                obj.put("text", line);
+                line = obj.toJSONString();
+            }
+            if (line.startsWith("\"")) {
                 line = "{\"text\":" + line + "}";
+            }
         }
         try {
             new JSONParser().parse(line);

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

@@ -0,0 +1,24 @@
+package us.myles.ViaVersion.update;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.plugin.Plugin;
+
+public class UpdateListener implements Listener {
+	
+	private Plugin plugin;
+	
+	public UpdateListener(Plugin plugin) {
+		this.plugin = plugin;
+	}
+	
+	@EventHandler
+	public void onJoin(PlayerJoinEvent e) {
+		if(e.getPlayer().hasPermission("viaversion.update")
+				&& plugin.getConfig().getBoolean("checkforupdates", true)) {
+			UpdateUtil.sendUpdateMessage(e.getPlayer().getUniqueId(), plugin);
+		}
+	}
+
+}

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

@@ -0,0 +1,108 @@
+package us.myles.ViaVersion.update;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.scheduler.BukkitRunnable;
+import us.myles.ViaVersion.api.ViaVersion;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.UUID;
+
+public class UpdateUtil {
+
+    private final static String URL = "https://api.spiget.org/v1/resources/";
+    private final static int PLUGIN = 19254;
+
+    public final static String PREFIX = ChatColor.GREEN + "" + ChatColor.BOLD + "[ViaVersion] " + ChatColor.GREEN;
+
+    public static void sendUpdateMessage(final UUID uuid, final Plugin plugin) {
+        new BukkitRunnable() {
+
+            @Override
+            public void run() {
+                final String message = getUpdateMessage(false);
+                if (message != null) {
+                    new BukkitRunnable() {
+
+                        @Override
+                        public void run() {
+                            Player p = Bukkit.getPlayer(uuid);
+                            if (p != null) {
+                                p.sendMessage(PREFIX + message);
+                            }
+                        }
+                    }.runTask(plugin);
+                }
+            }
+        }.runTaskAsynchronously(plugin);
+    }
+
+    public static void sendUpdateMessage(final Plugin plugin) {
+        new BukkitRunnable() {
+
+            @Override
+            public void run() {
+                final String message = getUpdateMessage(true);
+                if (message != null) {
+                    new BukkitRunnable() {
+
+                        @Override
+                        public void run() {
+                            plugin.getLogger().warning(message);
+                        }
+                    }.runTask(plugin);
+                }
+            }
+        }.runTaskAsynchronously(plugin);
+    }
+
+    private static String getUpdateMessage(boolean console) {
+        if (ViaVersion.getInstance().getVersion().equals("${project.version}")) {
+            return "You are using a debug/custom version, consider updating.";
+        }
+
+        Version current = new Version(ViaVersion.getInstance().getVersion());
+        Version newest = new Version(getNewestVersion());
+        if (current.compareTo(newest) < 0)
+            return "There is a newer version available: " + newest.toString();
+        else if (console) {
+            return "You are running a newer version than is released!";
+        }
+        return null;
+    }
+
+    private static String getNewestVersion() {
+        String result = "";
+        try {
+            URL url = new URL(URL + PLUGIN + "?" + System.currentTimeMillis());
+            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+            connection.setUseCaches(true);
+            connection.addRequestProperty("User-Agent", "Mozilla/4.76");
+            connection.setDoOutput(true);
+            BufferedReader br = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+            String input;
+            String content = "";
+            while ((input = br.readLine()) != null) {
+                content = content + input;
+            }
+            br.close();
+            JsonParser parser = new JsonParser();
+            JsonObject statistics = (JsonObject) parser.parse(content);
+            result = statistics.get("version").getAsString();
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+}

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

@@ -0,0 +1,65 @@
+package us.myles.ViaVersion.update;
+
+import org.apache.commons.lang.StringUtils;
+
+public class Version implements Comparable<Version> {
+    private int[] parts;
+
+    public Version(String value) {
+        if (value == null)
+            throw new IllegalArgumentException("Version can not be null");
+
+        if (value.matches("^[0-9]+(\\.[0-9]+)*$") == false)
+            throw new IllegalArgumentException("Invalid version format");
+
+        String[] split = value.split("\\.");
+        parts = new int[split.length];
+
+        for (int i = 0; i < split.length; i += 1)
+            parts[i] = Integer.parseInt(split[i]);
+    }
+
+    @Override
+    public String toString() {
+        String[] split = new String[parts.length];
+
+        for (int i = 0; i < parts.length; i += 1)
+            split[i] = String.valueOf(parts[i]);
+
+        return StringUtils.join(split, ".");
+    }
+
+    public static int compare(Version verA, Version verB) {
+        if (verA == verB) return 0;
+        if (verA == null) return -1;
+        if (verB == null) return 1;
+
+        int max = Math.max(verA.parts.length, verB.parts.length);
+
+        for (int i = 0; i < max; i += 1) {
+            int partA = i < verA.parts.length ? verA.parts[i] : 0;
+            int partB = i < verB.parts.length ? verB.parts[i] : 0;
+            if (partA < partB) return -1;
+            if (partA > partB) return 1;
+        }
+
+        return 0;
+    }
+
+    @Override
+    public int compareTo(Version that) {
+        return compare(this, that);
+    }
+
+    public static boolean equals(Version verA, Version verB) {
+        if (verA == verB) return true;
+        if (verA == null) return false;
+        if (verB == null) return false;
+        return compare(verA, verB) == 0;
+    }
+
+    @Override
+    public boolean equals(Object that) {
+        return that instanceof Version && equals(this, (Version) that);
+    }
+}

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

@@ -8,6 +8,8 @@ import io.netty.buffer.ByteBufOutputStream;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageDecoder;
 import io.netty.handler.codec.MessageToByteEncoder;
+import org.spacehq.opennbt.NBTIO;
+import org.spacehq.opennbt.tag.builtin.CompoundTag;
 import us.myles.ViaVersion.chunks.MagicBitSet;
 import us.myles.ViaVersion.chunks.PacketChunk;
 import us.myles.ViaVersion.chunks.PacketChunkData;
@@ -26,9 +28,6 @@ import java.util.BitSet;
 import java.util.List;
 import java.util.UUID;
 
-import org.spacehq.opennbt.NBTIO;
-import org.spacehq.opennbt.tag.builtin.CompoundTag;
-
 public class PacketUtil {
     private static Method DECODE_METHOD;
     private static Method ENCODE_METHOD;
@@ -406,7 +405,8 @@ public class PacketUtil {
     public static boolean containsCause(Throwable t, Class<? extends Throwable> c) {
         while (t != null) {
             t = t.getCause();
-            if (c.isAssignableFrom(t.getClass())) return true;
+            if (t != null)
+                if (c.isAssignableFrom(t.getClass())) return true;
         }
         return false;
     }