From 1aea00036f0c93befbd65a28704cfd2626165da2 Mon Sep 17 00:00:00 2001
From: Phenomax <phenomax@minora.io>
Date: Mon, 7 Mar 2016 16:22:11 +0100
Subject: [PATCH] [~] smaller bugfixes] [~] switched back to jdk 7

---
 pom.xml                                       |  4 +--
 .../mc/protocol/data/game/chunk/Column.java   | 20 ++++---------
 .../us/myles/ViaVersion/ConnectionInfo.java   |  7 ++++-
 .../us/myles/ViaVersion/ViaVersionPlugin.java | 23 ++++++++++-----
 .../myles/ViaVersion/armor/ArmorListener.java | 16 ++++++----
 .../ViaVersion/handlers/ViaEncodeHandler.java | 29 +++++++++++--------
 .../myles/ViaVersion/metadata/MetaIndex.java  | 10 +++++--
 .../ViaVersion/metadata/MetadataRewriter.java |  2 +-
 .../transformers/OutgoingTransformer.java     | 20 +++++++++----
 .../us/myles/ViaVersion/util/PacketUtil.java  |  5 ++--
 10 files changed, 81 insertions(+), 55 deletions(-)

diff --git a/pom.xml b/pom.xml
index 99d101a23..8dfd3410a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,8 +68,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.5.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>${jdkVersion}</source>
+                    <target>${jdkVersion}</target>
                     <!--
                     <testSource>${testJreVersion}</testSource>
                     <testTarget>${testJreVersion}</testTarget>
diff --git a/src/main/java/org/spacehq/mc/protocol/data/game/chunk/Column.java b/src/main/java/org/spacehq/mc/protocol/data/game/chunk/Column.java
index cf90c45b5..6b84cbf43 100644
--- a/src/main/java/org/spacehq/mc/protocol/data/game/chunk/Column.java
+++ b/src/main/java/org/spacehq/mc/protocol/data/game/chunk/Column.java
@@ -1,5 +1,10 @@
 package org.spacehq.mc.protocol.data.game.chunk;
 
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
 public class Column {
     private int x;
     private int z;
@@ -43,26 +48,11 @@ public class Column {
         this.biomeData = biomeData;
     }
 
-    public int getX() {
-        return this.x;
-    }
-
-    public int getZ() {
-        return this.z;
-    }
-
-    public Chunk[] getChunks() {
-        return this.chunks;
-    }
 
     public boolean hasBiomeData() {
         return this.biomeData != null;
     }
 
-    public byte[] getBiomeData() {
-        return this.biomeData;
-    }
-
     public boolean hasSkylight() {
         return this.skylight;
     }
diff --git a/src/main/java/us/myles/ViaVersion/ConnectionInfo.java b/src/main/java/us/myles/ViaVersion/ConnectionInfo.java
index 7db4361bd..2e7dbf2b4 100644
--- a/src/main/java/us/myles/ViaVersion/ConnectionInfo.java
+++ b/src/main/java/us/myles/ViaVersion/ConnectionInfo.java
@@ -82,7 +82,12 @@ public class ConnectionInfo {
 
     public void sendRawPacket(final ByteBuf packet) {
         final ChannelHandler handler = channel.pipeline().get("encoder");
-        channel.eventLoop().submit((Runnable) () -> channel.pipeline().context(handler).writeAndFlush(packet));
+        channel.eventLoop().submit(new Runnable() {
+            @Override
+            public void run() {
+                channel.pipeline().context(handler).writeAndFlush(packet);
+            }
+        });
     }
 
     public String getOpenWindow() {
diff --git a/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java b/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java
index 63389b9ed..e6cd9e365 100644
--- a/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java
+++ b/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java
@@ -31,6 +31,7 @@ import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
@@ -42,11 +43,14 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
 
     public static ItemStack getHandItem(final ConnectionInfo info) {
         try {
-            return Bukkit.getScheduler().callSyncMethod(Bukkit.getPluginManager().getPlugin("ViaVersion"), () -> {
-                if (info.getPlayer() != null) {
-                    return info.getPlayer().getItemInHand();
+            return Bukkit.getScheduler().callSyncMethod(Bukkit.getPluginManager().getPlugin("ViaVersion"), new Callable<ItemStack>() {
+                @Override
+                public ItemStack call() throws Exception {
+                    if (info.getPlayer() != null) {
+                        return info.getPlayer().getItemInHand();
+                    }
+                    return null;
                 }
-                return null;
             }).get(10, TimeUnit.SECONDS);
         } catch (Exception e) {
             System.out.println("Error fetching hand item ");
@@ -182,7 +186,7 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
 
     public boolean isAutoTeam() {
         // Collision has to be enabled first
-        if(!isPreventCollision()) return false;
+        if (!isPreventCollision()) return false;
         return getConfig().getBoolean("auto-team", true);
     }
 
@@ -196,9 +200,12 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
 
     public void run(final Runnable runnable, boolean wait) {
         try {
-            Future f = Bukkit.getScheduler().callSyncMethod(Bukkit.getPluginManager().getPlugin("ViaVersion"), () -> {
-                runnable.run();
-                return true;
+            Future f = Bukkit.getScheduler().callSyncMethod(Bukkit.getPluginManager().getPlugin("ViaVersion"), new Callable<Boolean>() {
+                @Override
+                public Boolean call() throws Exception {
+                    runnable.run();
+                    return true;
+                }
             });
             if (wait) {
                 f.get(10, TimeUnit.SECONDS);
diff --git a/src/main/java/us/myles/ViaVersion/armor/ArmorListener.java b/src/main/java/us/myles/ViaVersion/armor/ArmorListener.java
index 2614591b3..1e7001977 100644
--- a/src/main/java/us/myles/ViaVersion/armor/ArmorListener.java
+++ b/src/main/java/us/myles/ViaVersion/armor/ArmorListener.java
@@ -71,9 +71,12 @@ public class ArmorListener implements Listener {
                 if (ArmorType.isArmor(e.getMaterial())) {
                     final Player player = e.getPlayer();
                     // Due to odd bugs it's 3 ticks later
-                    Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> {
-                        if (ViaVersion.getInstance().isPorted(player)) {
-                            sendArmorUpdate(player);
+                    Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
+                        @Override
+                        public void run() {
+                            if (ViaVersion.getInstance().isPorted(player)) {
+                                sendArmorUpdate(player);
+                            }
                         }
                     }, 3L);
                 }
@@ -87,12 +90,13 @@ public class ArmorListener implements Listener {
     }
 
     public void sendDelayedArmorUpdate(final Player player) {
-        Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> {
-
+        Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
+            @Override
+            public void run() {
                 if (ViaVersion.getInstance().isPorted(player)) {
                     sendArmorUpdate(player);
                 }
-
+            }
         });
     }
 }
\ No newline at end of file
diff --git a/src/main/java/us/myles/ViaVersion/handlers/ViaEncodeHandler.java b/src/main/java/us/myles/ViaVersion/handlers/ViaEncodeHandler.java
index e13a3e154..5d55251f0 100644
--- a/src/main/java/us/myles/ViaVersion/handlers/ViaEncodeHandler.java
+++ b/src/main/java/us/myles/ViaVersion/handlers/ViaEncodeHandler.java
@@ -24,6 +24,7 @@ public class ViaEncodeHandler extends MessageToByteEncoder {
     }
 
 
+
     @Override
     protected void encode(final ChannelHandlerContext ctx, Object o, final ByteBuf bytebuf) throws Exception {
         // handle the packet type
@@ -37,18 +38,22 @@ public class ViaEncodeHandler extends MessageToByteEncoder {
                 final Object world = ReflectionUtil.get(o, "world", ReflectionUtil.nms("World"));
                 Class<?> mapChunk = ReflectionUtil.nms("PacketPlayOutMapChunk");
                 final Constructor constructor = mapChunk.getDeclaredConstructor(ReflectionUtil.nms("Chunk"), boolean.class, int.class);
-                Runnable chunks = () -> {
+                Runnable chunks = new Runnable() {
 
-                    for (int i = 0; i < locX.length; i++) {
-                        int x = locX[i];
-                        int z = locZ[i];
-                        // world invoke function
-                        try {
-                            Object chunk = ReflectionUtil.nms("World").getDeclaredMethod("getChunkAt", int.class, int.class).invoke(world, x, z);
-                            Object packet = constructor.newInstance(chunk, true, 65535);
-                            ctx.pipeline().writeAndFlush(packet);
-                        } catch (InstantiationException | InvocationTargetException | NoSuchMethodException | IllegalAccessException | ClassNotFoundException e) {
-                            e.printStackTrace();
+                    @Override
+                    public void run() {
+
+                        for (int i = 0; i < locX.length; i++) {
+                            int x = locX[i];
+                            int z = locZ[i];
+                            // world invoke function
+                            try {
+                                Object chunk = ReflectionUtil.nms("World").getDeclaredMethod("getChunkAt", int.class, int.class).invoke(world, x, z);
+                                Object packet = constructor.newInstance(chunk, true, 65535);
+                                ctx.pipeline().writeAndFlush(packet);
+                            } catch (InstantiationException | InvocationTargetException | ClassNotFoundException | IllegalAccessException | NoSuchMethodException e) {
+                                e.printStackTrace();
+                            }
                         }
                     }
                 };
@@ -56,7 +61,7 @@ public class ViaEncodeHandler extends MessageToByteEncoder {
 //                if (ViaVersion.getInstance().isSyncedChunks()) {
 //                    ((ViaVersionPlugin) ViaVersion.getInstance()).run(chunks, false);
 //                } else {
-                    chunks.run();
+                chunks.run();
 //                }
                 bytebuf.readBytes(bytebuf.readableBytes());
                 throw new CancelException();
diff --git a/src/main/java/us/myles/ViaVersion/metadata/MetaIndex.java b/src/main/java/us/myles/ViaVersion/metadata/MetaIndex.java
index 38f75d6a1..35e0b61d0 100644
--- a/src/main/java/us/myles/ViaVersion/metadata/MetaIndex.java
+++ b/src/main/java/us/myles/ViaVersion/metadata/MetaIndex.java
@@ -1,10 +1,8 @@
 package us.myles.ViaVersion.metadata;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.bukkit.entity.*;
 
-@AllArgsConstructor
 @Getter
 public enum MetaIndex {
 
@@ -140,6 +138,14 @@ public enum MetaIndex {
         this.newType = newType;
     }
 
+    MetaIndex(Class<?> type, int index, Type oldType, int newIndex, NewType newType) {
+        this.clazz = type;
+        this.index = index;
+        this.oldType = oldType;
+        this.newIndex = newIndex;
+        this.newType = newType;
+    }
+
     public static MetaIndex getIndex(EntityType type, int index) {
         Class<? extends org.bukkit.entity.Entity> entityClass = type.getEntityClass();
         if (entityClass == null) {
diff --git a/src/main/java/us/myles/ViaVersion/metadata/MetadataRewriter.java b/src/main/java/us/myles/ViaVersion/metadata/MetadataRewriter.java
index 15483099f..8ff470911 100644
--- a/src/main/java/us/myles/ViaVersion/metadata/MetadataRewriter.java
+++ b/src/main/java/us/myles/ViaVersion/metadata/MetadataRewriter.java
@@ -50,7 +50,7 @@ public class MetadataRewriter {
                             }
                             output.writeBoolean(toWrite != null);
                             if (toWrite != null)
-                                PacketUtil.writeUUID((UUID) toWrite, output);
+                                PacketUtil.writeUUID(toWrite, output);
                             break;
                         case BlockID:
                             // if we have both sources :))
diff --git a/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java b/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java
index 8432f040f..df1792855 100644
--- a/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java
+++ b/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java
@@ -3,7 +3,6 @@ package us.myles.ViaVersion.transformers;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufInputStream;
 import io.netty.buffer.ByteBufOutputStream;
-import lombok.RequiredArgsConstructor;
 import org.bukkit.entity.EntityType;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
@@ -34,7 +33,7 @@ import java.util.*;
 
 import static us.myles.ViaVersion.util.PacketUtil.*;
 
-@RequiredArgsConstructor
+
 public class OutgoingTransformer {
 
     private final ViaVersionPlugin plugin = (ViaVersionPlugin) ViaVersion.getInstance();
@@ -46,6 +45,10 @@ public class OutgoingTransformer {
     private boolean cancel = false;
     private boolean autoTeam = false;
 
+    public OutgoingTransformer(ConnectionInfo info) {
+        this.info = info;
+    }
+
     public static String fixJson(String line) {
         if (line == null || line.equalsIgnoreCase("null")) {
             line = "{\"text\":\"\"}";
@@ -654,7 +657,12 @@ public class OutgoingTransformer {
                     if (autoTeam && name.equalsIgnoreCase(info.getUsername())) {
                         if (mode == 4) {
                             // since removing add to auto team
-                            plugin.run(() -> sendTeamPacket(true), false);
+                            plugin.run(new Runnable() {
+                                @Override
+                                public void run() {
+                                    sendTeamPacket(true);
+                                }
+                            }, false);
                         } else {
                             // since adding remove from auto team
                             sendTeamPacket(false);
@@ -746,7 +754,9 @@ public class OutgoingTransformer {
             if (info.getLastPacket().getClass().getName().endsWith("PacketPlayOutMapChunkBulk")) {
                 try {
                     sk = ReflectionUtil.get(info.getLastPacket(), "d", boolean.class);
-                } catch (NoSuchFieldException | IllegalAccessException e) {
+                } catch (NoSuchFieldException e) {
+                    e.printStackTrace();
+                } catch (IllegalAccessException e) {
                     e.printStackTrace();
                 }
             }
@@ -810,4 +820,4 @@ public class OutgoingTransformer {
         }
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/us/myles/ViaVersion/util/PacketUtil.java b/src/main/java/us/myles/ViaVersion/util/PacketUtil.java
index d1e74f88d..7d8519301 100644
--- a/src/main/java/us/myles/ViaVersion/util/PacketUtil.java
+++ b/src/main/java/us/myles/ViaVersion/util/PacketUtil.java
@@ -332,7 +332,7 @@ public class PacketUtil {
 
         // Data Array Length
         byte[] blockData = convertBlockArray(chunk.getBlocks());
-        writeVarInt(blockData.length / 8, buffer); // Notchian is divide by 8
+        writeVarInt((blockData != null ? blockData.length : 0) / 8, buffer); // Notchian is divide by 8
 
         buffer.writeBytes(blockData);
         // Block Light
@@ -356,9 +356,8 @@ public class PacketUtil {
     }
 
     private static BitSet append(BitSet base, int index, MagicBitSet toAdd) {
-        int length = index;
         for (int i = 0; i < toAdd.getTrueLength(); i++) {
-            base.set(length + i, toAdd.get(i));
+            base.set(index + i, toAdd.get(i));
         }
         return base;
     }