Version bump

Rename 1_9_1 PRE to just 1_9_1

README.md

@@ -1,10 +1,69 @@
-# ViaVersion API Dev
+# ViaVersion 0.7.2
+[![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)
+
+**Allows the connection of 1.9 clients to 1.8**
+
+This plugin modifies netty to allow connection of 1.9 clients to 1.8,
+
+###*Don't use late bind*
+
+This uses our new API, we currently don't have javadocs yet but look at one of our protocols on how to get started then use ProtocolRegistry.registerProtocol()
+
+This took 100s hours of work, so if you enjoy this consider looking into contacting me and supporting my projects.
+
+**Contributor Chat:** https://gitter.im/MylesIsCool/ViaVersion
 
 
-This is an experimental branch, but soon to be live.
+Sources:
+--------
 
-(The only issues would be really really complex protocol pipelines...) 
-(But I don't see them happening any time soon)
+**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)
+
+
+
+Contributors:
+--------
+
+**Myself** (harhar)
+
+**Matsv/StamBoom**
+
+**HugoDaBosss**
+
+**SanderGielisse**
+
+**Paulomart**
+
+**gigosaurus**
+
+**fillefilip8**
+
+**lenis0012**
+
+
+
+Releases / Dev Builds:
+--------
+You can find official releases here:
+
+https://www.spigotmc.org/resources/viaversion.19254/history
+
+
+----------
+
+You can find unofficial dev builds here:
+
+**fillefilip8's Build Server:** http://build.fillecraft.com:8080/job/ViaVersion
+
+**sgdc3's Build Server:** http://ci.xephi.fr/job/ViaVersion/
+**sgdc3's Maven:** http://ci.xephi.fr/plugin/repository/everything/
+
+**JavaDocs:** https://jd.matsv.nl/
 
 License:
 --------

pom.xml

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

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

@@ -1,10 +1,13 @@
 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;
 import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.MovementTracker;
+import us.myles.ViaVersion.util.PipelineUtil;
 import us.myles.ViaVersion.util.ReflectionUtil;
 
 import java.util.Map;
@@ -30,8 +33,14 @@ public class ViaIdleThread extends BukkitRunnable {
             if (info.get(ProtocolInfo.class).getPipeline().contains(Protocol1_9TO1_8.class)) {
                 long nextIdleUpdate = info.get(MovementTracker.class).getNextIdlePacket();
                 if (nextIdleUpdate <= System.currentTimeMillis()) {
-                    info.getChannel().pipeline().fireChannelRead(idlePacket);
-                    info.get(MovementTracker.class).incrementIdlePacket();
+                    ChannelHandlerContext context = PipelineUtil.getContextBefore("decoder", info.getChannel().pipeline());
+                    if(info.getChannel().isOpen()) {
+                        if (context != null) {
+                            context.fireChannelRead(idlePacket);
+
+                            info.get(MovementTracker.class).incrementIdlePacket();
+                        }
+                    }
                 }
             }
         }

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

@@ -70,8 +70,7 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI, ViaVe
 
         getLogger().info("ViaVersion " + getDescription().getVersion() + " is now enabled, injecting.");
         injectPacketHandler();
-        if (getConfig().getBoolean("simulate-pt", true))
-            new ViaIdleThread(portedPlayers).runTaskTimerAsynchronously(this, 1L, 1L); // Updates player's idle status
+
 
         if (isCheckForUpdates())
             UpdateUtil.sendUpdateMessage(this);
@@ -359,4 +358,8 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI, ViaVe
                 e.printStackTrace();
         }
     }
+
+    public Map<UUID, UserConnection> getPortedPlayers() {
+        return portedPlayers;
+    }
 }

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

@@ -11,6 +11,7 @@ import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.api.type.TypeConverter;
 import us.myles.ViaVersion.exception.InformativeException;
 import us.myles.ViaVersion.handlers.ViaDecodeHandler;
+import us.myles.ViaVersion.util.PipelineUtil;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -52,7 +53,7 @@ public class PacketWrapper {
         }
 
         Exception e = new ArrayIndexOutOfBoundsException("Could not find type " + type.getTypeName() + " at " + index);
-        throw new InformativeException(e).set("Type", type.getTypeName()).set("Index", index).set("Packet ID", getId());
+        throw new InformativeException(e).set("Type", type.getTypeName()).set("Index", index).set("Packet ID", getId()).set("Data", packetValues);
     }
 
     /**
@@ -92,7 +93,7 @@ public class PacketWrapper {
             try {
                 return type.read(inputBuffer);
             } catch (Exception e) {
-                throw new InformativeException(e).set("Type", type.getTypeName()).set("Packet ID", getId());
+                throw new InformativeException(e).set("Type", type.getTypeName()).set("Packet ID", getId()).set("Data", packetValues);
             }
         } else {
             Pair<Type, Object> read = readableObjects.poll();
@@ -103,7 +104,7 @@ public class PacketWrapper {
                     return read(type); // retry
                 } else {
                     Exception e = new IOException("Unable to read type " + type.getTypeName() + ", found " + read.getKey().getTypeName());
-                    throw new InformativeException(e).set("Type", type.getTypeName()).set("Packet ID", getId());
+                    throw new InformativeException(e).set("Type", type.getTypeName()).set("Packet ID", getId()).set("Data", packetValues);
                 }
             }
         }
@@ -172,7 +173,7 @@ public class PacketWrapper {
                 }
                 packetValue.getKey().write(buffer, value);
             } catch (Exception e) {
-                throw new InformativeException(e).set("Index", index).set("Type", packetValue.getKey().getTypeName()).set("Packet ID", getId());
+                throw new InformativeException(e).set("Index", index).set("Type", packetValue.getKey().getTypeName()).set("Packet ID", getId()).set("Data", packetValues);
             }
             index++;
         }
@@ -265,6 +266,12 @@ public class PacketWrapper {
         this.packetValues.clear();
     }
 
+    /**
+     * Send the current packet to the server.
+     * (Ensure the ID is suitable for the server version)
+     *
+     * @throws Exception If it failed to write
+     */
     public void sendToServer() throws Exception {
         if (!isCancelled()) {
             ByteBuf output = inputBuffer == null ? Unpooled.buffer() : inputBuffer.alloc().buffer();
@@ -272,15 +279,7 @@ public class PacketWrapper {
 
             writeToBuffer(output);
 
-            boolean mark = false;
-            for (String s : user().getChannel().pipeline().names()) {
-                if (mark) {
-                    user().getChannel().pipeline().context(user().getChannel().pipeline().get(s)).fireChannelRead(output);
-                    return;
-                }
-                if (s.equalsIgnoreCase("decompress"))
-                    mark = true;
-            }
+            PipelineUtil.getContextBefore("decompress", user().getChannel().pipeline()).fireChannelRead(output);
         }
     }
 }

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

@@ -3,12 +3,10 @@ package us.myles.ViaVersion.api;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
-import lombok.ToString;
 
 @Getter
 @Setter
 @EqualsAndHashCode
-@ToString
 public class Pair<X, Y> {
     private X key;
     private Y value;
@@ -17,4 +15,9 @@ public class Pair<X, Y> {
         this.key = key;
         this.value = value;
     }
+
+    @Override
+    public String toString() {
+        return "Pair{" + key + ", " + value + '}';
+    }
 }

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

@@ -2,9 +2,11 @@ package us.myles.ViaVersion.api.minecraft;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.ToString;
 
 @AllArgsConstructor
 @Getter
+@ToString
 public class Position {
     private Long x;
     private Long y;

src/main/java/us/myles/ViaVersion/api/minecraft/chunks/Chunk.java

@@ -2,9 +2,11 @@ package us.myles.ViaVersion.api.minecraft.chunks;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import lombok.ToString;
 
 @RequiredArgsConstructor
 @Getter
+@ToString
 public class Chunk {
     private final int x;
     private final int z;

src/main/java/us/myles/ViaVersion/api/minecraft/item/Item.java

@@ -1,9 +1,6 @@
 package us.myles.ViaVersion.api.minecraft.item;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.*;
 import org.bukkit.inventory.ItemStack;
 import org.spacehq.opennbt.tag.builtin.CompoundTag;
 
@@ -11,6 +8,7 @@ import org.spacehq.opennbt.tag.builtin.CompoundTag;
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
+@ToString
 public class Item {
     private short id;
     private byte amount;

src/main/java/us/myles/ViaVersion/api/minecraft/metadata/Metadata.java

@@ -13,4 +13,14 @@ public class Metadata {
     private int typeID;
     private Type type;
     private Object value;
+
+    @Override
+    public String toString() {
+        return "Metadata{" +
+                "id=" + id +
+                ", typeID=" + typeID +
+                ", type=" + type +
+                ", value=" + value +
+                '}';
+    }
 }

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

@@ -83,7 +83,7 @@ public class ProtocolPipeline extends Protocol {
 
             // For 1.8/1.9 server version, eventually we'll probably get an API for this...
             if (ProtocolRegistry.SERVER_PROTOCOL >= ProtocolVersion.V1_8 &&
-                    ProtocolRegistry.SERVER_PROTOCOL <= ProtocolVersion.V1_9_1_PRE2) {
+                    ProtocolRegistry.SERVER_PROTOCOL <= ProtocolVersion.V1_9_2) {
 
                 PacketType type;
                 if (ProtocolRegistry.SERVER_PROTOCOL == ProtocolVersion.V1_8) {

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

@@ -15,7 +15,7 @@ public class ProtocolRegistry {
     static {
         // Register built in protocols
         registerProtocol(new Protocol1_9TO1_8(), Collections.singletonList(ProtocolVersion.V1_9), ProtocolVersion.V1_8);
-        registerProtocol(new Protocol1_9_1TO1_9(), Collections.singletonList(ProtocolVersion.V1_9_1_PRE2), ProtocolVersion.V1_9);
+        registerProtocol(new Protocol1_9_1TO1_9(), Arrays.asList(ProtocolVersion.V1_9_1, ProtocolVersion.V1_9_2), ProtocolVersion.V1_9);
     }
 
     /**

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

@@ -8,5 +8,6 @@ public class ProtocolVersion {
     public static final int V1_8 = 47;
 
     public static final int V1_9 = 107;
-    public static final int V1_9_1_PRE2 = 108;
+    public static final int V1_9_1 = 108; // used for 1.9.1
+    public static final int V1_9_2 = 109;
 }

src/main/java/us/myles/ViaVersion/api/type/Type.java

@@ -77,4 +77,9 @@ public abstract class Type<T> implements ByteBufReader<T>, ByteBufWriter<T> {
         this.outputClass = outputClass;
         this.typeName = typeName;
     }
+
+    @Override
+    public String toString() {
+        return "Type|" + getTypeName();
+    }
 }

src/main/java/us/myles/ViaVersion/protocols/base/BaseProtocol.java

@@ -40,14 +40,14 @@ public class BaseProtocol extends Protocol {
                         try {
                             JSONObject json = (JSONObject) new JSONParser().parse(originalStatus);
                             JSONObject version = (JSONObject) json.get("version");
-
                             if (ProtocolRegistry.SERVER_PROTOCOL == -1) {
                                 Long original = (Long) version.get("protocol");
                                 ProtocolRegistry.SERVER_PROTOCOL = original.intValue();
                             }
                             List<Pair<Integer, Protocol>> protocols = ProtocolRegistry.getProtocolPath(info.getProtocolVersion(), ProtocolRegistry.SERVER_PROTOCOL);
                             if (protocols != null) {
-                                version.put("protocol", info.getProtocolVersion());
+                                if ((long) version.get("protocol") != 9999) //Fix serverlistplus
+                                    version.put("protocol", info.getProtocolVersion());
                             } else {
                                 // not compatible :(, *plays very sad violin*
                                 wrapper.user().setActive(false);

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

@@ -5,6 +5,7 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import org.bukkit.Bukkit;
 import org.bukkit.inventory.ItemStack;
+import us.myles.ViaVersion.ViaIdleThread;
 import us.myles.ViaVersion.ViaVersionPlugin;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.ViaVersion;
@@ -103,6 +104,8 @@ public class Protocol1_9TO1_8 extends Protocol {
             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
     }
 
     @Override

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

@@ -43,7 +43,7 @@ public class PaperPatch implements Listener {
                         BlockFace relative = e.getBlockAgainst().getFace(e.getBlock());
                         // Are they towering up, (handles some latency)
                         if(relative == BlockFace.UP){
-                            if(diff.getY() <= 1.1D && diff.getY() >= 0D){
+                            if(diff.getY() < 1D && diff.getY() >= 0D){
                                 e.setCancelled(true);
                             }
                         }

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

@@ -141,7 +141,7 @@ public class MetadataRewriter {
                 }
             } catch (Exception e) {
                 list.remove(entry);
-                if (!((ViaVersionPlugin) ViaVersion.getInstance()).isSuppressMetadataErrors()) {
+                if (!ViaVersion.getConfig().isSuppressMetadataErrors() || ViaVersion.getInstance().isDebug()) {
                     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.getId());

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

@@ -157,7 +157,7 @@ public class EntityPackets {
                         Item stack = wrapper.get(Type.ITEM, 0);
 
                         if (stack != null) {
-                            if(Material.getMaterial(stack.getId()) != null) {
+                            if (Material.getMaterial(stack.getId()) != null) {
                                 if (Material.getMaterial(stack.getId()).name().endsWith("SWORD")) {
                                     entityTracker.getValidBlocking().add(entityID);
                                     return;
@@ -184,7 +184,7 @@ public class EntityPackets {
                         EntityTracker tracker = wrapper.user().get(EntityTracker.class);
                         if (tracker.getClientEntityTypes().containsKey(entityID)) {
                             MetadataRewriter.transform(tracker.getClientEntityTypes().get(entityID), metadataList);
-                        } else if (!ViaVersion.getConfig().isUnknownEntitiesSuppressed()) {
+                        } else if (!ViaVersion.getConfig().isUnknownEntitiesSuppressed() || ViaVersion.getInstance().isDebug()) {
                             System.out.println("Unable to find entity for metadata, entity ID: " + entityID);
                             metadataList.clear();
                         }
@@ -225,9 +225,28 @@ public class EntityPackets {
             }
         });
 
+
+        // Update Entity NBT
+        protocol.registerOutgoing(State.PLAY, 0x49, 0x49, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+//                        int id = wrapper.read(Type.VAR_INT);
+//                        CompoundTag tag = wrapper.read(Type.NBT);
+//                        System.out.println(id + " - " + tag);
+                        wrapper.cancel();
+                    }
+                });
+            }
+        });
+
+
         /* Packets which do not have any field remapping or handlers */
 
         protocol.registerOutgoing(State.PLAY, 0x20, 0x4B); // Entity Properties Packet
+
         protocol.registerOutgoing(State.PLAY, 0x1A, 0x1B); // Entity Status Packet
         protocol.registerOutgoing(State.PLAY, 0x16, 0x27); // Entity Look Packet
         protocol.registerOutgoing(State.PLAY, 0x14, 0x28); // Entity Packet

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

@@ -15,6 +15,7 @@ import us.myles.ViaVersion.packets.State;
 import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.PlayerMovementMapper;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.ClientChunks;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.EntityTracker;
 
 public class PlayerPackets {
@@ -145,7 +146,7 @@ public class PlayerPackets {
                 // Parse this info
                 handler(new PacketHandler() {
                     @Override
-                    public void handle(PacketWrapper wrapper) throws Exception{
+                    public void handle(PacketWrapper wrapper) throws Exception {
                         int entityID = wrapper.get(Type.INT, 0);
                         EntityTracker tracker = wrapper.user().get(EntityTracker.class);
                         tracker.getClientEntityTypes().put(entityID, EntityType.PLAYER);
@@ -221,6 +222,7 @@ public class PlayerPackets {
                 });
             }
         });
+
         // Packet Plugin Message Outgoing
         protocol.registerOutgoing(State.PLAY, 0x3F, 0x18, new PacketRemapper() {
             @Override
@@ -239,23 +241,30 @@ public class PlayerPackets {
             }
         });
 
-        /* Removed packets */
-
-        // Map Bulk
-        protocol.registerOutgoing(State.PLAY, 0x26, 0x26, new PacketRemapper() {
+        // Update Health Packet
+        protocol.registerOutgoing(State.PLAY, 0x06, 0x3E, new PacketRemapper() {
             @Override
             public void registerMap() {
+                map(Type.FLOAT); // 0 - Health
                 handler(new PacketHandler() {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
-                        wrapper.cancel();
+                        float health = wrapper.get(Type.FLOAT, 0);
+                        if (health <= 0) {
+                            // Client unloads chunks on respawn, take note
+                            ClientChunks cc = wrapper.user().get(ClientChunks.class);
+                            cc.getBulkChunks().clear();
+                            cc.getLoadedChunks().clear();
+                        }
                     }
                 });
             }
         });
 
-        // Update Entity NBT
-        protocol.registerOutgoing(State.PLAY, 0x49, 0x49, new PacketRemapper() {
+        /* Removed packets */
+
+        // Map Bulk
+        protocol.registerOutgoing(State.PLAY, 0x26, 0x26, new PacketRemapper() {
             @Override
             public void registerMap() {
                 handler(new PacketHandler() {
@@ -299,7 +308,6 @@ public class PlayerPackets {
 
         protocol.registerOutgoing(State.PLAY, 0x05, 0x43); // Spawn Position Packet
         protocol.registerOutgoing(State.PLAY, 0x1F, 0x3D); // Set XP Packet
-        protocol.registerOutgoing(State.PLAY, 0x06, 0x3E); // Update Health Packet
         protocol.registerOutgoing(State.PLAY, 0x0D, 0x49); // Collect Item Packet
 
         /* Incoming Packets */

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

@@ -241,17 +241,19 @@ public class WorldPackets {
                         // Write item in hand
                         Item item = Item.getItem(Protocol1_9TO1_8.getHandItem(wrapper.user()));
                         // Blocking patch
-                        if (item != null) {
-                            if (Material.getMaterial(item.getId()) != null) {
-                                if (Material.getMaterial(item.getId()).name().endsWith("SWORD")) {
-                                    if (hand == 0) {
-                                        EntityTracker tracker = wrapper.user().get(EntityTracker.class);
-                                        if (!tracker.isBlocking()) {
-                                            tracker.setBlocking(true);
-                                            Item shield = new Item((short) 442, (byte) 1, (short) 0, null);
-                                            tracker.setSecondHand(shield);
+                        if (ViaVersion.getConfig().isShieldBlocking()) {
+                            if (item != null) {
+                                if (Material.getMaterial(item.getId()) != null) {
+                                    if (Material.getMaterial(item.getId()).name().endsWith("SWORD")) {
+                                        if (hand == 0) {
+                                            EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                                            if (!tracker.isBlocking()) {
+                                                tracker.setBlocking(true);
+                                                Item shield = new Item((short) 442, (byte) 1, (short) 0, null);
+                                                tracker.setSecondHand(shield);
+                                            }
+                                            wrapper.cancel();
                                         }
-                                        wrapper.cancel();
                                     }
                                 }
                             }

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

@@ -1,7 +1,9 @@
 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;
 import io.netty.handler.codec.MessageToByteEncoder;
 
@@ -57,4 +59,16 @@ public class PipelineUtil {
         }
         return false;
     }
+
+    public static ChannelHandlerContext getContextBefore(String name, ChannelPipeline pipeline) {
+        boolean mark = false;
+        for (String s : pipeline.names()) {
+            if (mark) {
+                return pipeline.context(pipeline.get(s));
+            }
+            if (s.equalsIgnoreCase(name))
+                mark = true;
+        }
+        return null;
+    }
 }