From 81ea78e003a27d3813746921813cde327c6ecff3 Mon Sep 17 00:00:00 2001
From: Matsv <mats@matsv.nl>
Date: Sun, 14 May 2017 14:34:51 +0200
Subject: [PATCH] Update dependencies fix #662

---
 common/pom.xml                                  |  2 +-
 .../ViaVersion/api/minecraft/chunks/Chunk.java  |  2 +-
 .../ViaVersion/api/minecraft/item/Item.java     |  2 +-
 .../java/us/myles/ViaVersion/api/type/Type.java |  2 +-
 .../api/type/types/minecraft/NBTType.java       |  4 ++--
 .../protocol1_11to1_10/ItemRewriter.java        |  4 ++--
 .../Protocol1_9_1_2TO1_9_3_4.java               |  2 +-
 .../chunks/BlockEntity.java                     |  2 +-
 .../chunks/Chunk1_9_3_4.java                    |  2 +-
 .../types/Chunk1_9_3_4Type.java                 |  2 +-
 .../Protocol1_9_3TO1_9_1_2.java                 |  6 +++---
 .../chunks/Chunk1_9_1_2.java                    |  2 +-
 .../chunks/FakeTileEntity.java                  |  6 +++---
 .../types/Chunk1_9_1_2Type.java                 |  2 +-
 .../protocol1_9to1_8/ItemRewriter.java          |  8 ++++----
 .../protocol1_9to1_8/chunks/Chunk1_9to1_8.java  |  2 +-
 .../protocol1_9to1_8/packets/WorldPackets.java  |  4 ++--
 .../providers/CommandBlockProvider.java         |  2 +-
 .../storage/CommandBlockStorage.java            |  4 ++--
 jar/pom.xml                                     |  2 +-
 pom.xml                                         | 17 +++++++++--------
 21 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index eb9de6be4..bb6455a7f 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.18-SNAPSHOT</version>
+            <version>1.18</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/common/src/main/java/us/myles/ViaVersion/api/minecraft/chunks/Chunk.java b/common/src/main/java/us/myles/ViaVersion/api/minecraft/chunks/Chunk.java
index ef9fe2654..c17ed7f6f 100644
--- a/common/src/main/java/us/myles/ViaVersion/api/minecraft/chunks/Chunk.java
+++ b/common/src/main/java/us/myles/ViaVersion/api/minecraft/chunks/Chunk.java
@@ -1,6 +1,6 @@
 package us.myles.ViaVersion.api.minecraft.chunks;
 
-import org.spacehq.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 
 import java.util.List;
 
diff --git a/common/src/main/java/us/myles/ViaVersion/api/minecraft/item/Item.java b/common/src/main/java/us/myles/ViaVersion/api/minecraft/item/Item.java
index 9bb8df568..1cb84a78f 100644
--- a/common/src/main/java/us/myles/ViaVersion/api/minecraft/item/Item.java
+++ b/common/src/main/java/us/myles/ViaVersion/api/minecraft/item/Item.java
@@ -1,7 +1,7 @@
 package us.myles.ViaVersion.api.minecraft.item;
 
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import lombok.*;
-import org.spacehq.opennbt.tag.builtin.CompoundTag;
 
 @Getter
 @Setter
diff --git a/common/src/main/java/us/myles/ViaVersion/api/type/Type.java b/common/src/main/java/us/myles/ViaVersion/api/type/Type.java
index be9d577ec..3115b24b7 100644
--- a/common/src/main/java/us/myles/ViaVersion/api/type/Type.java
+++ b/common/src/main/java/us/myles/ViaVersion/api/type/Type.java
@@ -1,8 +1,8 @@
 package us.myles.ViaVersion.api.type;
 
 
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import lombok.Getter;
-import org.spacehq.opennbt.tag.builtin.CompoundTag;
 import us.myles.ViaVersion.api.minecraft.EulerAngle;
 import us.myles.ViaVersion.api.minecraft.Position;
 import us.myles.ViaVersion.api.minecraft.Vector;
diff --git a/common/src/main/java/us/myles/ViaVersion/api/type/types/minecraft/NBTType.java b/common/src/main/java/us/myles/ViaVersion/api/type/types/minecraft/NBTType.java
index 76b8e66c1..fcca9de66 100644
--- a/common/src/main/java/us/myles/ViaVersion/api/type/types/minecraft/NBTType.java
+++ b/common/src/main/java/us/myles/ViaVersion/api/type/types/minecraft/NBTType.java
@@ -1,11 +1,11 @@
 package us.myles.ViaVersion.api.type.types.minecraft;
 
+import com.github.steveice10.opennbt.NBTIO;
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufInputStream;
 import io.netty.buffer.ByteBufOutputStream;
-import org.spacehq.opennbt.NBTIO;
-import org.spacehq.opennbt.tag.builtin.CompoundTag;
 import us.myles.ViaVersion.api.type.Type;
 
 import java.io.DataInput;
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_11to1_10/ItemRewriter.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_11to1_10/ItemRewriter.java
index 61ebcdea6..7239d4873 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_11to1_10/ItemRewriter.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_11to1_10/ItemRewriter.java
@@ -1,9 +1,9 @@
 package us.myles.ViaVersion.protocols.protocol1_11to1_10;
 
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
-import org.spacehq.opennbt.tag.builtin.CompoundTag;
-import org.spacehq.opennbt.tag.builtin.StringTag;
 import us.myles.ViaVersion.api.minecraft.item.Item;
 
 public class ItemRewriter {
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2TO1_9_3_4.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2TO1_9_3_4.java
index 97e95a36f..3a5781d26 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2TO1_9_3_4.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2TO1_9_3_4.java
@@ -1,6 +1,6 @@
 package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4;
 
-import org.spacehq.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.api.minecraft.Position;
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/BlockEntity.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/BlockEntity.java
index 5aa9f4f46..af5dcb257 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/BlockEntity.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/BlockEntity.java
@@ -1,7 +1,7 @@
 package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks;
 
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import lombok.Getter;
-import org.spacehq.opennbt.tag.builtin.CompoundTag;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.Via;
 import us.myles.ViaVersion.api.data.UserConnection;
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/Chunk1_9_3_4.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/Chunk1_9_3_4.java
index 49b003b32..6f899ff61 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/Chunk1_9_3_4.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/Chunk1_9_3_4.java
@@ -1,8 +1,8 @@
 package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks;
 
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import org.spacehq.opennbt.tag.builtin.CompoundTag;
 import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
 
 import java.util.List;
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/types/Chunk1_9_3_4Type.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/types/Chunk1_9_3_4Type.java
index c1552692e..8d3b05e5f 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/types/Chunk1_9_3_4Type.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/types/Chunk1_9_3_4Type.java
@@ -1,8 +1,8 @@
 package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.types;
 
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import org.spacehq.opennbt.tag.builtin.CompoundTag;
 import us.myles.ViaVersion.api.minecraft.Environment;
 import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
 import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection;
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/Protocol1_9_3TO1_9_1_2.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/Protocol1_9_3TO1_9_1_2.java
index 564c2ff09..fb8bb8c54 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/Protocol1_9_3TO1_9_1_2.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/Protocol1_9_3TO1_9_1_2.java
@@ -1,8 +1,8 @@
 package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2;
 
-import org.spacehq.opennbt.tag.builtin.CompoundTag;
-import org.spacehq.opennbt.tag.builtin.IntTag;
-import org.spacehq.opennbt.tag.builtin.StringTag;
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.opennbt.tag.builtin.IntTag;
+import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.api.minecraft.Position;
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/Chunk1_9_1_2.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/Chunk1_9_1_2.java
index 30cf942c5..078686be9 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/Chunk1_9_1_2.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/Chunk1_9_1_2.java
@@ -1,8 +1,8 @@
 package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.chunks;
 
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import org.spacehq.opennbt.tag.builtin.CompoundTag;
 import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
 
 import java.util.List;
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/FakeTileEntity.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/FakeTileEntity.java
index 62250aff1..769ee1390 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/FakeTileEntity.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/FakeTileEntity.java
@@ -1,8 +1,8 @@
 package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.chunks;
 
-import org.spacehq.opennbt.tag.builtin.CompoundTag;
-import org.spacehq.opennbt.tag.builtin.IntTag;
-import org.spacehq.opennbt.tag.builtin.StringTag;
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.opennbt.tag.builtin.IntTag;
+import com.github.steveice10.opennbt.tag.builtin.StringTag;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/types/Chunk1_9_1_2Type.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/types/Chunk1_9_1_2Type.java
index a1459db83..6fbfafbf8 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/types/Chunk1_9_1_2Type.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/types/Chunk1_9_1_2Type.java
@@ -1,8 +1,8 @@
 package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.types;
 
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import org.spacehq.opennbt.tag.builtin.CompoundTag;
 import us.myles.ViaVersion.api.Via;
 import us.myles.ViaVersion.api.minecraft.Environment;
 import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ItemRewriter.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ItemRewriter.java
index 6f663e37f..de1472f90 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ItemRewriter.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ItemRewriter.java
@@ -1,9 +1,9 @@
 package us.myles.ViaVersion.protocols.protocol1_9to1_8;
 
-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 com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.opennbt.tag.builtin.ListTag;
+import com.github.steveice10.opennbt.tag.builtin.StringTag;
+import com.github.steveice10.opennbt.tag.builtin.Tag;
 import us.myles.ViaVersion.api.minecraft.item.Item;
 
 import java.util.Collections;
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/chunks/Chunk1_9to1_8.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/chunks/Chunk1_9to1_8.java
index ea6d5815c..41ec9fbc7 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/chunks/Chunk1_9to1_8.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/chunks/Chunk1_9to1_8.java
@@ -1,9 +1,9 @@
 package us.myles.ViaVersion.protocols.protocol1_9to1_8.chunks;
 
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
-import org.spacehq.opennbt.tag.builtin.CompoundTag;
 import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
 
 import java.util.Collections;
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/WorldPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/WorldPackets.java
index 95b18584e..5ab050a9e 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/WorldPackets.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/WorldPackets.java
@@ -1,10 +1,10 @@
 package us.myles.ViaVersion.protocols.protocol1_9to1_8.packets;
 
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import com.google.common.base.Optional;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import org.spacehq.opennbt.tag.builtin.CompoundTag;
-import org.spacehq.opennbt.tag.builtin.StringTag;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.Via;
 import us.myles.ViaVersion.api.minecraft.Position;
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/providers/CommandBlockProvider.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/providers/CommandBlockProvider.java
index 573f5b212..2f4a9cf8c 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/providers/CommandBlockProvider.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/providers/CommandBlockProvider.java
@@ -1,7 +1,7 @@
 package us.myles.ViaVersion.protocols.protocol1_9to1_8.providers;
 
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.google.common.base.Optional;
-import org.spacehq.opennbt.tag.builtin.CompoundTag;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.api.minecraft.Position;
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/CommandBlockStorage.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/CommandBlockStorage.java
index 75628d926..8a0356203 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/CommandBlockStorage.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/CommandBlockStorage.java
@@ -1,10 +1,10 @@
 package us.myles.ViaVersion.protocols.protocol1_9to1_8.storage;
 
+import com.github.steveice10.opennbt.tag.builtin.ByteTag;
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.google.common.base.Optional;
 import lombok.Getter;
 import lombok.Setter;
-import org.spacehq.opennbt.tag.builtin.ByteTag;
-import org.spacehq.opennbt.tag.builtin.CompoundTag;
 import us.myles.ViaVersion.api.Pair;
 import us.myles.ViaVersion.api.data.StoredObject;
 import us.myles.ViaVersion.api.data.UserConnection;
diff --git a/jar/pom.xml b/jar/pom.xml
index e8c2b1a84..a91436fff 100644
--- a/jar/pom.xml
+++ b/jar/pom.xml
@@ -46,7 +46,7 @@
                     <minimizeJar>false</minimizeJar>
                     <relocations>
                         <relocation>
-                            <pattern>org.spacehq.opennbt</pattern>
+                            <pattern>com.github.steveice10.opennbt</pattern>
                             <shadedPattern>us.myles.viaversion.libs.opennbt</shadedPattern>
                         </relocation>
                         <relocation>
diff --git a/pom.xml b/pom.xml
index 6ccc4768c..ade1df87b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,17 +44,17 @@
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots</url>
         </repository>
 
-        <!-- SpaceHQ Repo-->
-        <repository>
-            <id>spacehq-repo</id>
-            <url>https://repo.spacehq.org/content/repositories/releases/</url>
-        </repository>
-
         <!-- Bungee repo -->
         <repository>
             <id>bungeecord-repo</id>
             <url>https://oss.sonatype.org/content/repositories/snapshots</url>
         </repository>
+
+        <!-- ViaVersion repo -->
+        <repository>
+            <id>viaversion-repo</id>
+            <url>https://repo.viaversion.com</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -76,10 +76,11 @@
         </dependency>
 
         <!-- OpenNBT Library -->
+        <!--Version 1.0 is conflicting with Maven Central (2012)-->
         <dependency>
-            <groupId>org.spacehq</groupId>
+            <groupId>com.github.steveice10</groupId>
             <artifactId>opennbt</artifactId>
-            <version>1.1</version>
+            <version>1.1-SNAPSHOT</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>