Merge branch 'master' of https://github.com/MylesIsCool/ViaVersion into dev

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>

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;
 

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

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;

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;

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 {
@@ -97,6 +97,7 @@ public class ItemRewriter {
                 }
             }
         }
+        if (item.getAmount() <= 0) item.setAmount((byte) 1);
     }
 
     public static void toServer(Item item) {

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;

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;

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;

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;

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 com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import org.spacehq.opennbt.tag.builtin.IntTag;
+import com.github.steveice10.opennbt.tag.builtin.IntTag;
-import org.spacehq.opennbt.tag.builtin.StringTag;
+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;

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;

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 com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import org.spacehq.opennbt.tag.builtin.IntTag;
+import com.github.steveice10.opennbt.tag.builtin.IntTag;
-import org.spacehq.opennbt.tag.builtin.StringTag;
+import com.github.steveice10.opennbt.tag.builtin.StringTag;
 
 import java.util.Arrays;
 import java.util.List;

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;

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 com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import org.spacehq.opennbt.tag.builtin.ListTag;
+import com.github.steveice10.opennbt.tag.builtin.ListTag;
-import org.spacehq.opennbt.tag.builtin.StringTag;
+import com.github.steveice10.opennbt.tag.builtin.StringTag;
-import org.spacehq.opennbt.tag.builtin.Tag;
+import com.github.steveice10.opennbt.tag.builtin.Tag;
 import us.myles.ViaVersion.api.minecraft.item.Item;
 
 import java.util.Collections;

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;

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;

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;

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;

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>

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>