diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/types/Metadata1_8Type.java b/src/main/java/us/myles/ViaVersion/api/type/types/version/Metadata1_8Type.java similarity index 93% rename from src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/types/Metadata1_8Type.java rename to src/main/java/us/myles/ViaVersion/api/type/types/version/Metadata1_8Type.java index e02b24194..651b86e2f 100644 --- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/types/Metadata1_8Type.java +++ b/src/main/java/us/myles/ViaVersion/api/type/types/version/Metadata1_8Type.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.protocols.protocol1_9to1_8.types; +package us.myles.ViaVersion.api.type.types.version; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_10to1_9_3/types/Metadata1_9Type.java b/src/main/java/us/myles/ViaVersion/api/type/types/version/Metadata1_9Type.java similarity index 93% rename from src/main/java/us/myles/ViaVersion/protocols/protocol1_10to1_9_3/types/Metadata1_9Type.java rename to src/main/java/us/myles/ViaVersion/api/type/types/version/Metadata1_9Type.java index 980076a1d..fb541263c 100644 --- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_10to1_9_3/types/Metadata1_9Type.java +++ b/src/main/java/us/myles/ViaVersion/api/type/types/version/Metadata1_9Type.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.protocols.protocol1_10to1_9_3.types; +package us.myles.ViaVersion.api.type.types.version; import io.netty.buffer.ByteBuf; import us.myles.ViaVersion.api.minecraft.metadata.Metadata; diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/types/MetadataList1_8Type.java b/src/main/java/us/myles/ViaVersion/api/type/types/version/MetadataList1_8Type.java similarity index 86% rename from src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/types/MetadataList1_8Type.java rename to src/main/java/us/myles/ViaVersion/api/type/types/version/MetadataList1_8Type.java index beadec9a4..5e2810f11 100644 --- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/types/MetadataList1_8Type.java +++ b/src/main/java/us/myles/ViaVersion/api/type/types/version/MetadataList1_8Type.java @@ -1,9 +1,8 @@ -package us.myles.ViaVersion.protocols.protocol1_9to1_8.types; +package us.myles.ViaVersion.api.type.types.version; import io.netty.buffer.ByteBuf; import us.myles.ViaVersion.api.minecraft.metadata.Metadata; import us.myles.ViaVersion.api.type.types.minecraft.MetaListTypeTemplate; -import us.myles.ViaVersion.api.type.types.minecraft.Types1_8; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_10to1_9_3/types/MetadataList1_9Type.java b/src/main/java/us/myles/ViaVersion/api/type/types/version/MetadataList1_9Type.java similarity index 87% rename from src/main/java/us/myles/ViaVersion/protocols/protocol1_10to1_9_3/types/MetadataList1_9Type.java rename to src/main/java/us/myles/ViaVersion/api/type/types/version/MetadataList1_9Type.java index bc01e8c9f..665e62fa6 100644 --- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_10to1_9_3/types/MetadataList1_9Type.java +++ b/src/main/java/us/myles/ViaVersion/api/type/types/version/MetadataList1_9Type.java @@ -1,9 +1,8 @@ -package us.myles.ViaVersion.protocols.protocol1_10to1_9_3.types; +package us.myles.ViaVersion.api.type.types.version; import io.netty.buffer.ByteBuf; import us.myles.ViaVersion.api.minecraft.metadata.Metadata; import us.myles.ViaVersion.api.type.types.minecraft.MetaListTypeTemplate; -import us.myles.ViaVersion.api.type.types.minecraft.Types1_9; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/us/myles/ViaVersion/api/type/types/minecraft/Types1_8.java b/src/main/java/us/myles/ViaVersion/api/type/types/version/Types1_8.java similarity index 65% rename from src/main/java/us/myles/ViaVersion/api/type/types/minecraft/Types1_8.java rename to src/main/java/us/myles/ViaVersion/api/type/types/version/Types1_8.java index 40c39d3b8..cb0241801 100644 --- a/src/main/java/us/myles/ViaVersion/api/type/types/minecraft/Types1_8.java +++ b/src/main/java/us/myles/ViaVersion/api/type/types/version/Types1_8.java @@ -1,9 +1,7 @@ -package us.myles.ViaVersion.api.type.types.minecraft; +package us.myles.ViaVersion.api.type.types.version; import us.myles.ViaVersion.api.minecraft.metadata.Metadata; import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_9to1_8.types.Metadata1_8Type; -import us.myles.ViaVersion.protocols.protocol1_9to1_8.types.MetadataList1_8Type; import java.util.List; diff --git a/src/main/java/us/myles/ViaVersion/api/type/types/minecraft/Types1_9.java b/src/main/java/us/myles/ViaVersion/api/type/types/version/Types1_9.java similarity index 65% rename from src/main/java/us/myles/ViaVersion/api/type/types/minecraft/Types1_9.java rename to src/main/java/us/myles/ViaVersion/api/type/types/version/Types1_9.java index e4fac7efb..2917c4d39 100644 --- a/src/main/java/us/myles/ViaVersion/api/type/types/minecraft/Types1_9.java +++ b/src/main/java/us/myles/ViaVersion/api/type/types/version/Types1_9.java @@ -1,9 +1,7 @@ -package us.myles.ViaVersion.api.type.types.minecraft; +package us.myles.ViaVersion.api.type.types.version; import us.myles.ViaVersion.api.minecraft.metadata.Metadata; import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_10to1_9_3.types.Metadata1_9Type; -import us.myles.ViaVersion.protocols.protocol1_10to1_9_3.types.MetadataList1_9Type; import java.util.List; diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_10to1_9_3/Protocol1_10To1_9_3_4.java b/src/main/java/us/myles/ViaVersion/protocols/protocol1_10to1_9_3/Protocol1_10To1_9_3_4.java index cce2b0fcd..70fbf44df 100644 --- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_10to1_9_3/Protocol1_10To1_9_3_4.java +++ b/src/main/java/us/myles/ViaVersion/protocols/protocol1_10to1_9_3/Protocol1_10To1_9_3_4.java @@ -8,11 +8,11 @@ import us.myles.ViaVersion.api.remapper.PacketHandler; import us.myles.ViaVersion.api.remapper.PacketRemapper; import us.myles.ViaVersion.api.remapper.ValueTransformer; import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.api.type.types.minecraft.Types1_9; +import us.myles.ViaVersion.api.type.types.version.Metadata1_9Type; +import us.myles.ViaVersion.api.type.types.version.MetadataList1_9Type; +import us.myles.ViaVersion.api.type.types.version.Types1_9; import us.myles.ViaVersion.packets.State; import us.myles.ViaVersion.protocols.protocol1_10to1_9_3.storage.ResourcePackTracker; -import us.myles.ViaVersion.protocols.protocol1_10to1_9_3.types.Metadata1_9Type; -import us.myles.ViaVersion.protocols.protocol1_10to1_9_3.types.MetadataList1_9Type; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2TO1_9_3_4.java b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2TO1_9_3_4.java index dd97ba530..87617f53a 100644 --- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2TO1_9_3_4.java +++ b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2TO1_9_3_4.java @@ -10,6 +10,9 @@ import us.myles.ViaVersion.api.remapper.PacketHandler; import us.myles.ViaVersion.api.remapper.PacketRemapper; import us.myles.ViaVersion.api.type.Type; import us.myles.ViaVersion.packets.State; +import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks.BlockEntity; +import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks.Chunk1_9_3_4; +import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type; public class Protocol1_9_1_2TO1_9_3_4 extends Protocol { public static Type CHUNK = new Chunk1_9_3_4Type(); diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/BlockEntity.java b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/BlockEntity.java similarity index 93% rename from src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/BlockEntity.java rename to src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/BlockEntity.java index 4d6c15246..96ca9f985 100644 --- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/BlockEntity.java +++ b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/BlockEntity.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4; +package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks; import lombok.Getter; import org.spacehq.opennbt.tag.builtin.CompoundTag; @@ -7,6 +7,7 @@ import us.myles.ViaVersion.api.ViaVersion; import us.myles.ViaVersion.api.data.UserConnection; import us.myles.ViaVersion.api.minecraft.Position; import us.myles.ViaVersion.api.type.Type; +import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.Protocol1_9_1_2TO1_9_3_4; import java.util.List; import java.util.Map; diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Chunk1_9_3_4.java b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/Chunk1_9_3_4.java similarity index 89% rename from src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Chunk1_9_3_4.java rename to src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/Chunk1_9_3_4.java index 3592a9241..1abfcb43a 100644 --- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Chunk1_9_3_4.java +++ b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/Chunk1_9_3_4.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4; +package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/ChunkSection1_9_3_4.java b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/ChunkSection1_9_3_4.java similarity index 93% rename from src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/ChunkSection1_9_3_4.java rename to src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/ChunkSection1_9_3_4.java index 97b15cdb9..4f90852c7 100644 --- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/ChunkSection1_9_3_4.java +++ b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/ChunkSection1_9_3_4.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4; +package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks; import io.netty.buffer.ByteBuf; import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection; diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Chunk1_9_3_4Type.java b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/types/Chunk1_9_3_4Type.java similarity index 88% rename from src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Chunk1_9_3_4Type.java rename to src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/types/Chunk1_9_3_4Type.java index 78d3d88f6..947d737cf 100644 --- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Chunk1_9_3_4Type.java +++ b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/types/Chunk1_9_3_4Type.java @@ -1,10 +1,12 @@ -package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4; +package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.types; import io.netty.buffer.ByteBuf; import org.spacehq.opennbt.tag.builtin.CompoundTag; import us.myles.ViaVersion.api.minecraft.chunks.Chunk; import us.myles.ViaVersion.api.type.Type; import us.myles.ViaVersion.api.type.types.minecraft.BaseChunkType; +import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks.Chunk1_9_3_4; +import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks.ChunkSection1_9_3_4; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/Protocol1_9_3TO1_9_1_2.java b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/Protocol1_9_3TO1_9_1_2.java index 24a672176..b00d9ab48 100644 --- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/Protocol1_9_3TO1_9_1_2.java +++ b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/Protocol1_9_3TO1_9_1_2.java @@ -13,7 +13,9 @@ import us.myles.ViaVersion.api.remapper.PacketHandler; import us.myles.ViaVersion.api.remapper.PacketRemapper; import us.myles.ViaVersion.api.type.Type; import us.myles.ViaVersion.packets.State; +import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.chunks.FakeTileEntity; import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; +import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.types.Chunk1_9_1_2Type; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/Chunk1_9_1_2.java b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/Chunk1_9_1_2.java similarity index 88% rename from src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/Chunk1_9_1_2.java rename to src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/Chunk1_9_1_2.java index 13b290e9c..30cf942c5 100644 --- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/Chunk1_9_1_2.java +++ b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/Chunk1_9_1_2.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2; +package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.chunks; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/ChunkSection1_9_1_2.java b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/ChunkSection1_9_1_2.java similarity index 99% rename from src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/ChunkSection1_9_1_2.java rename to src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/ChunkSection1_9_1_2.java index 42221cece..17993598f 100644 --- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/ChunkSection1_9_1_2.java +++ b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/ChunkSection1_9_1_2.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2; +package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.chunks; import com.google.common.collect.Lists; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/FakeTileEntity.java b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/FakeTileEntity.java similarity index 97% rename from src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/FakeTileEntity.java rename to src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/FakeTileEntity.java index c94ecf497..adeab98fd 100644 --- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/FakeTileEntity.java +++ b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/FakeTileEntity.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2; +package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.chunks; import org.bukkit.Material; import org.spacehq.opennbt.tag.builtin.CompoundTag; diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/Chunk1_9_1_2Type.java b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/types/Chunk1_9_1_2Type.java similarity index 94% rename from src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/Chunk1_9_1_2Type.java rename to src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/types/Chunk1_9_1_2Type.java index 8ae6957c2..cb5d31c10 100644 --- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/Chunk1_9_1_2Type.java +++ b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/types/Chunk1_9_1_2Type.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2; +package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.types; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -12,6 +12,8 @@ import us.myles.ViaVersion.api.type.Type; import us.myles.ViaVersion.api.type.types.minecraft.BaseChunkType; import us.myles.ViaVersion.protocols.base.ProtocolInfo; import us.myles.ViaVersion.protocols.protocol1_10to1_9_3.Protocol1_10To1_9_3_4; +import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.chunks.Chunk1_9_1_2; +import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.chunks.ChunkSection1_9_1_2; import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; import java.util.ArrayList; diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/Protocol1_9TO1_8.java b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/Protocol1_9TO1_8.java index 06d38b821..05cc8bcb8 100644 --- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/Protocol1_9TO1_8.java +++ b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/Protocol1_9TO1_8.java @@ -13,12 +13,12 @@ import us.myles.ViaVersion.api.minecraft.metadata.Metadata; import us.myles.ViaVersion.api.protocol.Protocol; import us.myles.ViaVersion.api.remapper.ValueTransformer; import us.myles.ViaVersion.api.type.Type; +import us.myles.ViaVersion.api.type.types.version.Metadata1_8Type; +import us.myles.ViaVersion.api.type.types.version.MetadataList1_8Type; import us.myles.ViaVersion.protocols.base.ProtocolInfo; import us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners.*; import us.myles.ViaVersion.protocols.protocol1_9to1_8.packets.*; import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.*; -import us.myles.ViaVersion.protocols.protocol1_9to1_8.types.Metadata1_8Type; -import us.myles.ViaVersion.protocols.protocol1_9to1_8.types.MetadataList1_8Type; import java.util.List; import java.util.UUID; diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/EntityPackets.java b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/EntityPackets.java index ae5335719..fa53b14d5 100644 --- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/EntityPackets.java +++ b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/EntityPackets.java @@ -10,8 +10,8 @@ import us.myles.ViaVersion.api.remapper.PacketHandler; import us.myles.ViaVersion.api.remapper.PacketRemapper; import us.myles.ViaVersion.api.remapper.ValueTransformer; import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.api.type.types.minecraft.Types1_8; -import us.myles.ViaVersion.api.type.types.minecraft.Types1_9; +import us.myles.ViaVersion.api.type.types.version.Types1_8; +import us.myles.ViaVersion.api.type.types.version.Types1_9; import us.myles.ViaVersion.packets.State; import us.myles.ViaVersion.protocols.protocol1_9to1_8.ItemRewriter; import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8; diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/SpawnPackets.java b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/SpawnPackets.java index 475fe06f8..0ae3c7e70 100644 --- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/SpawnPackets.java +++ b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/SpawnPackets.java @@ -11,8 +11,8 @@ import us.myles.ViaVersion.api.remapper.PacketRemapper; import us.myles.ViaVersion.api.remapper.ValueCreator; import us.myles.ViaVersion.api.remapper.ValueTransformer; import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.api.type.types.minecraft.Types1_8; -import us.myles.ViaVersion.api.type.types.minecraft.Types1_9; +import us.myles.ViaVersion.api.type.types.version.Types1_8; +import us.myles.ViaVersion.api.type.types.version.Types1_9; import us.myles.ViaVersion.packets.State; import us.myles.ViaVersion.protocols.protocol1_9to1_8.ItemRewriter; import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8; diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/EntityTracker.java b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/EntityTracker.java index 3e32fb868..298da7263 100644 --- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/EntityTracker.java +++ b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/EntityTracker.java @@ -19,7 +19,7 @@ import us.myles.ViaVersion.api.minecraft.Position; import us.myles.ViaVersion.api.minecraft.item.Item; import us.myles.ViaVersion.api.minecraft.metadata.Metadata; import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.api.type.types.minecraft.Types1_9; +import us.myles.ViaVersion.api.type.types.version.Types1_9; 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.chat.GameMode;