diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 13551a9cd..f8a297ac5 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -16,7 +16,9 @@ sourceSets { dependencies { api(libs.fastutil) - api(libs.vianbt) + api(libs.vianbt) { + exclude("it.unimi.dsi", "fastutil") + } api(libs.gson) implementation(rootProject.libs.text) { exclude("com.google.code.gson", "gson") diff --git a/api/src/main/java/com/viaversion/viaversion/api/data/MappingDataBase.java b/api/src/main/java/com/viaversion/viaversion/api/data/MappingDataBase.java index 7dd457998..03de76d00 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/data/MappingDataBase.java +++ b/api/src/main/java/com/viaversion/viaversion/api/data/MappingDataBase.java @@ -22,9 +22,9 @@ */ package com.viaversion.viaversion.api.data; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.IntArrayTag; -import com.github.steveice10.opennbt.tag.builtin.Tag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.IntArrayTag; +import com.viaversion.nbt.tag.Tag; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.minecraft.RegistryType; import com.viaversion.viaversion.api.minecraft.TagData; diff --git a/api/src/main/java/com/viaversion/viaversion/api/data/MappingDataLoader.java b/api/src/main/java/com/viaversion/viaversion/api/data/MappingDataLoader.java index 75ee0a1fc..3cf27105b 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/data/MappingDataLoader.java +++ b/api/src/main/java/com/viaversion/viaversion/api/data/MappingDataLoader.java @@ -22,15 +22,15 @@ */ package com.viaversion.viaversion.api.data; -import com.github.steveice10.opennbt.tag.builtin.ByteTag; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.IntArrayTag; -import com.github.steveice10.opennbt.tag.builtin.IntTag; -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 com.github.steveice10.opennbt.tag.io.NBTIO; -import com.github.steveice10.opennbt.tag.io.TagReader; +import com.viaversion.nbt.tag.ByteTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.IntArrayTag; +import com.viaversion.nbt.tag.IntTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.StringTag; +import com.viaversion.nbt.tag.Tag; +import com.viaversion.nbt.io.NBTIO; +import com.viaversion.nbt.io.TagReader; import com.google.common.annotations.Beta; import com.google.gson.JsonArray; import com.google.gson.JsonElement; diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/RegistryEntry.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/RegistryEntry.java index b175581ed..61d0ea877 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/RegistryEntry.java +++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/RegistryEntry.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.minecraft; -import com.github.steveice10.opennbt.tag.builtin.Tag; +import com.viaversion.nbt.tag.Tag; import org.checkerframework.checker.nullness.qual.Nullable; public record RegistryEntry(String key, @Nullable Tag tag) { diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/blockentity/BlockEntity.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/blockentity/BlockEntity.java index d3904f000..c139b7bd5 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/blockentity/BlockEntity.java +++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/blockentity/BlockEntity.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.minecraft.blockentity; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import org.checkerframework.checker.nullness.qual.Nullable; public interface BlockEntity { diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/blockentity/BlockEntityImpl.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/blockentity/BlockEntityImpl.java index 91c080bbe..e49efdea5 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/blockentity/BlockEntityImpl.java +++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/blockentity/BlockEntityImpl.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.minecraft.blockentity; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; public record BlockEntityImpl(byte packedXZ, short y, int typeId, CompoundTag tag) implements BlockEntity { diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/BaseChunk.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/BaseChunk.java index 19f2c6583..1fff3c089 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/BaseChunk.java +++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/BaseChunk.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.minecraft.chunks; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity; import java.util.BitSet; import java.util.List; diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/Chunk.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/Chunk.java index 3bcde55ac..2ab85830e 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/Chunk.java +++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/Chunk.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.minecraft.chunks; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity; import java.util.BitSet; import java.util.List; diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/Chunk1_18.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/Chunk1_18.java index 0de32b607..1350cfe99 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/Chunk1_18.java +++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/Chunk1_18.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.minecraft.chunks; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity; import java.util.BitSet; import java.util.List; diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/data/StructuredDataKey.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/data/StructuredDataKey.java index 857fe081f..499a245da 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/data/StructuredDataKey.java +++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/data/StructuredDataKey.java @@ -22,8 +22,8 @@ */ package com.viaversion.viaversion.api.minecraft.data; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.Tag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.Tag; import com.viaversion.viaversion.api.minecraft.GameProfile; import com.viaversion.viaversion.api.minecraft.Holder; import com.viaversion.viaversion.api.minecraft.item.Item; diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/DataItem.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/DataItem.java index fd9a99fe2..0e71f7328 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/DataItem.java +++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/DataItem.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.minecraft.item; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.google.gson.annotations.SerializedName; import com.viaversion.viaversion.api.minecraft.data.StructuredDataContainer; import java.util.Objects; diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/Item.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/Item.java index f1dc2d4a5..e5fc4fca3 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/Item.java +++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/Item.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.minecraft.item; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.minecraft.data.StructuredDataContainer; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/StructuredItem.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/StructuredItem.java index 239c7e237..d37c9793c 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/StructuredItem.java +++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/StructuredItem.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.minecraft.item; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.minecraft.data.StructuredDataContainer; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/ArmorTrimMaterial.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/ArmorTrimMaterial.java index c289c5e20..d3f554aca 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/ArmorTrimMaterial.java +++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/ArmorTrimMaterial.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.minecraft.item.data; -import com.github.steveice10.opennbt.tag.builtin.Tag; +import com.viaversion.nbt.tag.Tag; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.misc.HolderType; import io.netty.buffer.ByteBuf; diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/ArmorTrimPattern.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/ArmorTrimPattern.java index e427a076f..f13fc1516 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/ArmorTrimPattern.java +++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/ArmorTrimPattern.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.minecraft.item.data; -import com.github.steveice10.opennbt.tag.builtin.Tag; +import com.viaversion.nbt.tag.Tag; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.misc.HolderType; import io.netty.buffer.ByteBuf; diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/Bee.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/Bee.java index 28fed564c..a4a62fa2a 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/Bee.java +++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/Bee.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.minecraft.item.data; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.ArrayType; import io.netty.buffer.ByteBuf; diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/BlockPredicate.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/BlockPredicate.java index fdcd04417..77fad4bf2 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/BlockPredicate.java +++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/BlockPredicate.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.minecraft.item.data; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.minecraft.HolderSet; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.ArrayType; diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/FilterableComponent.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/FilterableComponent.java index f8ba9838f..cd89e73bc 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/FilterableComponent.java +++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/FilterableComponent.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.minecraft.item.data; -import com.github.steveice10.opennbt.tag.builtin.Tag; +import com.viaversion.nbt.tag.Tag; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.ArrayType; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/Type.java b/api/src/main/java/com/viaversion/viaversion/api/type/Type.java index 78a751e99..0ed9bee90 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/Type.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/Type.java @@ -22,8 +22,8 @@ */ package com.viaversion.viaversion.api.type; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.Tag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.Tag; import com.google.gson.JsonElement; import com.viaversion.viaversion.api.minecraft.BlockChangeRecord; import com.viaversion.viaversion.api.minecraft.EulerAngle; diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/block/BlockEntityType1_18.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/block/BlockEntityType1_18.java index e2e45580c..d3d933310 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/block/BlockEntityType1_18.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/block/BlockEntityType1_18.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.type.types.block; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity; import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntityImpl; import com.viaversion.viaversion.api.type.Type; diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/block/BlockEntityType1_20_2.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/block/BlockEntityType1_20_2.java index 46dec7d89..6dfd56550 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/block/BlockEntityType1_20_2.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/block/BlockEntityType1_20_2.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.type.types.block; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity; import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntityImpl; import com.viaversion.viaversion.api.type.Type; diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_13.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_13.java index c6704c366..54cf9d1cb 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_13.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_13.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.type.types.chunk; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.minecraft.Environment; import com.viaversion.viaversion.api.minecraft.chunks.BaseChunk; diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_14.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_14.java index 73510f2c6..280d0983c 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_14.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_14.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.type.types.chunk; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.minecraft.chunks.BaseChunk; import com.viaversion.viaversion.api.minecraft.chunks.Chunk; diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_15.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_15.java index 94034f674..ba5326e68 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_15.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_15.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.type.types.chunk; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.minecraft.chunks.BaseChunk; import com.viaversion.viaversion.api.minecraft.chunks.Chunk; diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_16.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_16.java index 5abe4d2f6..23053bed4 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_16.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_16.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.type.types.chunk; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.minecraft.chunks.BaseChunk; import com.viaversion.viaversion.api.minecraft.chunks.Chunk; diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_16_2.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_16_2.java index b1954e758..75cf32a2c 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_16_2.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_16_2.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.type.types.chunk; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.minecraft.chunks.BaseChunk; import com.viaversion.viaversion.api.minecraft.chunks.Chunk; diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_17.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_17.java index 72d32c55b..b55f15467 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_17.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_17.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.type.types.chunk; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.google.common.base.Preconditions; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.minecraft.chunks.BaseChunk; diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_18.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_18.java index e2e2a2a7c..d2c81898c 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_18.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_18.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.type.types.chunk; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.google.common.base.Preconditions; import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity; import com.viaversion.viaversion.api.minecraft.chunks.Chunk; diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_20_2.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_20_2.java index dd6252f78..26dfe556b 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_20_2.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_20_2.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.type.types.chunk; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.google.common.base.Preconditions; import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity; import com.viaversion.viaversion.api.minecraft.chunks.Chunk; diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_9_3.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_9_3.java index 73a4c4eab..94d2ad4ba 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_9_3.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_9_3.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.type.types.chunk; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.minecraft.Environment; import com.viaversion.viaversion.api.minecraft.chunks.BaseChunk; diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/CompoundTagType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/CompoundTagType.java index 4a19faaec..27b3a1b58 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/CompoundTagType.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/CompoundTagType.java @@ -22,7 +22,7 @@ */ package com.viaversion.viaversion.api.type.types.misc; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.type.OptionalType; import com.viaversion.viaversion.api.type.Type; import io.netty.buffer.ByteBuf; diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/NamedCompoundTagType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/NamedCompoundTagType.java index 4d09cc9af..7bbbfa000 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/NamedCompoundTagType.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/NamedCompoundTagType.java @@ -22,9 +22,9 @@ */ package com.viaversion.viaversion.api.type.types.misc; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.Tag; -import com.github.steveice10.opennbt.tag.limiter.TagLimiter; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.Tag; +import com.viaversion.nbt.limiter.TagLimiter; import com.viaversion.viaversion.api.type.OptionalType; import com.viaversion.viaversion.api.type.Type; import io.netty.buffer.ByteBuf; diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/TagType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/TagType.java index ddd79bdcc..ab799f1be 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/TagType.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/TagType.java @@ -22,9 +22,9 @@ */ package com.viaversion.viaversion.api.type.types.misc; -import com.github.steveice10.opennbt.tag.TagRegistry; -import com.github.steveice10.opennbt.tag.builtin.Tag; -import com.github.steveice10.opennbt.tag.limiter.TagLimiter; +import com.viaversion.nbt.io.TagRegistry; +import com.viaversion.nbt.tag.Tag; +import com.viaversion.nbt.limiter.TagLimiter; import com.viaversion.viaversion.api.type.OptionalType; import com.viaversion.viaversion.api.type.Type; import io.netty.buffer.ByteBuf; diff --git a/build-logic/src/main/kotlin/via.shadow-conventions.gradle.kts b/build-logic/src/main/kotlin/via.shadow-conventions.gradle.kts index 2b83f26ac..dcd2212e4 100644 --- a/build-logic/src/main/kotlin/via.shadow-conventions.gradle.kts +++ b/build-logic/src/main/kotlin/via.shadow-conventions.gradle.kts @@ -23,7 +23,6 @@ tasks { fun ShadowJar.configureRelocations() { relocate("com.google.gson", "com.viaversion.viaversion.libs.gson") - relocate("com.github.steveice10.opennbt", "com.viaversion.viaversion.libs.opennbt") relocate("it.unimi.dsi.fastutil", "com.viaversion.viaversion.libs.fastutil") relocate("net.lenni0451.mcstructs", "com.viaversion.viaversion.libs.mcstructs") } diff --git a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/ArmorListener.java b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/ArmorListener.java index a790501b0..5eb5bff0e 100644 --- a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/ArmorListener.java +++ b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/ArmorListener.java @@ -21,9 +21,9 @@ import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.bukkit.listeners.ViaBukkitListener; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ArmorType; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ClientboundPackets1_9; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8; +import com.viaversion.viaversion.protocols.v1_8to1_9.ArmorType; +import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_9; import java.util.UUID; import java.util.logging.Level; import org.bukkit.Bukkit; @@ -47,7 +47,7 @@ public class ArmorListener extends ViaBukkitListener { private static final UUID ARMOR_ATTRIBUTE = UUID.fromString("2AD3F246-FEE1-4E67-B886-69FD380BB150"); public ArmorListener(Plugin plugin) { - super(plugin, Protocol1_9To1_8.class); + super(plugin, Protocol1_8To1_9.class); } public void sendArmorUpdate(Player player) { @@ -68,7 +68,7 @@ public class ArmorListener extends ViaBukkitListener { wrapper.write(Type.UUID, ARMOR_ATTRIBUTE); // armor modifier uuid wrapper.write(Type.DOUBLE, (double) armor); // the modifier value wrapper.write(Type.BYTE, (byte) 0);// the modifier operation, 0 = add number - wrapper.scheduleSend(Protocol1_9To1_8.class); + wrapper.scheduleSend(Protocol1_8To1_9.class); } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) diff --git a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/BlockListener.java b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/BlockListener.java index e1f6a0d35..856d2537f 100644 --- a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/BlockListener.java +++ b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/BlockListener.java @@ -19,8 +19,8 @@ package com.viaversion.viaversion.bukkit.listeners.protocol1_9to1_8; import com.viaversion.viaversion.api.minecraft.Position; import com.viaversion.viaversion.bukkit.listeners.ViaBukkitListener; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.storage.EntityTracker1_9; import org.bukkit.block.Block; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -30,14 +30,14 @@ import org.bukkit.plugin.Plugin; public class BlockListener extends ViaBukkitListener { public BlockListener(Plugin plugin) { - super(plugin, Protocol1_9To1_8.class); + super(plugin, Protocol1_8To1_9.class); } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void placeBlock(BlockPlaceEvent e) { if (isOnPipe(e.getPlayer())) { Block b = e.getBlockPlaced(); - EntityTracker1_9 tracker = getUserConnection(e.getPlayer()).getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = getUserConnection(e.getPlayer()).getEntityTracker(Protocol1_8To1_9.class); tracker.addBlockInteraction(new Position(b.getX(), b.getY(), b.getZ())); } } diff --git a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/DeathListener.java b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/DeathListener.java index 9f140f1ef..efeff951c 100644 --- a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/DeathListener.java +++ b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/DeathListener.java @@ -22,8 +22,8 @@ import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.bukkit.listeners.ViaBukkitListener; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ClientboundPackets1_9; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8; +import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_9; import com.viaversion.viaversion.util.ComponentUtil; import org.bukkit.World; import org.bukkit.entity.Player; @@ -36,7 +36,7 @@ import java.util.logging.Level; public class DeathListener extends ViaBukkitListener { public DeathListener(Plugin plugin) { - super(plugin, Protocol1_9To1_8.class); + super(plugin, Protocol1_8To1_9.class); } @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR) @@ -66,7 +66,7 @@ public class DeathListener extends ViaBukkitListener { wrapper.write(Type.INT, p.getEntityId()); // Entity ID wrapper.write(Type.COMPONENT, ComponentUtil.plainToJson(msg)); // Message - wrapper.scheduleSend(Protocol1_9To1_8.class); + wrapper.scheduleSend(Protocol1_8To1_9.class); } catch (Exception e) { Via.getPlatform().getLogger().log(Level.WARNING, "Failed to send death message", e); } diff --git a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/PaperPatch.java b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/PaperPatch.java index e19c79295..944ab86d2 100644 --- a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/PaperPatch.java +++ b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/PaperPatch.java @@ -19,7 +19,7 @@ package com.viaversion.viaversion.bukkit.listeners.protocol1_9to1_8; import com.viaversion.viaversion.bukkit.listeners.ViaBukkitListener; import com.viaversion.viaversion.bukkit.util.CollisionChecker; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8; +import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; @@ -34,7 +34,7 @@ public class PaperPatch extends ViaBukkitListener { private final CollisionChecker CHECKER = CollisionChecker.getInstance(); public PaperPatch(Plugin plugin) { - super(plugin, Protocol1_9To1_8.class); + super(plugin, Protocol1_8To1_9.class); } /* diff --git a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitBlockConnectionProvider.java b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitBlockConnectionProvider.java index 5d93298ab..d7aa3dab9 100644 --- a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitBlockConnectionProvider.java +++ b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitBlockConnectionProvider.java @@ -18,7 +18,7 @@ package com.viaversion.viaversion.bukkit.providers; import com.viaversion.viaversion.api.connection.UserConnection; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.providers.BlockConnectionProvider; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections.providers.BlockConnectionProvider; import java.util.UUID; import org.bukkit.Bukkit; import org.bukkit.Chunk; diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_15to1_14_4/EntityToggleGlideListener.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_15to1_14_4/EntityToggleGlideListener.java index c35bc7dad..c25d96d64 100644 --- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_15to1_14_4/EntityToggleGlideListener.java +++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_15to1_14_4/EntityToggleGlideListener.java @@ -24,8 +24,8 @@ import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_14; import com.viaversion.viaversion.bukkit.listeners.ViaBukkitListener; -import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; -import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.Protocol1_15To1_14_4; +import com.viaversion.viaversion.protocols.v1_14_4to1_15.Protocol1_14_4To1_15; +import com.viaversion.viaversion.protocols.v1_14_4to1_15.packet.ClientboundPackets1_15; import java.util.Arrays; import java.util.logging.Level; import org.bukkit.entity.Player; @@ -39,7 +39,7 @@ public class EntityToggleGlideListener extends ViaBukkitListener { private boolean swimmingMethodExists; public EntityToggleGlideListener(ViaVersionPlugin plugin) { - super(plugin, Protocol1_15To1_14_4.class); + super(plugin, Protocol1_14_4To1_15.class); try { Player.class.getMethod("isSwimming"); swimmingMethodExists = true; @@ -82,7 +82,7 @@ public class EntityToggleGlideListener extends ViaBukkitListener { // leave 0x80 as 0 to stop gliding packet.write(Types1_14.METADATA_LIST, Arrays.asList(new Metadata(0, Types1_14.META_TYPES.byteType, bitmask))); - packet.scheduleSend(Protocol1_15To1_14_4.class); + packet.scheduleSend(Protocol1_14_4To1_15.class); } } } diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_19_4To1_19_3/ArmorToggleListener.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_19_4To1_19_3/ArmorToggleListener.java index 79b20eeab..7bec8b2a1 100644 --- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_19_4To1_19_3/ArmorToggleListener.java +++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_19_4To1_19_3/ArmorToggleListener.java @@ -19,7 +19,7 @@ package com.viaversion.viaversion.bukkit.listeners.protocol1_19_4To1_19_3; import com.viaversion.viaversion.ViaVersionPlugin; import com.viaversion.viaversion.bukkit.listeners.ViaBukkitListener; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.Protocol1_19_4To1_19_3; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.Protocol1_19_3To1_19_4; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -32,7 +32,7 @@ import org.bukkit.inventory.PlayerInventory; public final class ArmorToggleListener extends ViaBukkitListener { public ArmorToggleListener(final ViaVersionPlugin plugin) { - super(plugin, Protocol1_19_4To1_19_3.class); + super(plugin, Protocol1_19_3To1_19_4.class); } @EventHandler(priority = EventPriority.MONITOR) diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_19to1_18_2/BlockBreakListener.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_19to1_18_2/BlockBreakListener.java index 29e8f1663..98b0e15e2 100644 --- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_19to1_18_2/BlockBreakListener.java +++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_19to1_18_2/BlockBreakListener.java @@ -22,7 +22,7 @@ import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import com.viaversion.viaversion.bukkit.listeners.ViaBukkitListener; import com.viaversion.viaversion.bukkit.util.NMSUtil; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.Protocol1_19To1_18_2; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.Protocol1_18_2To1_19; import org.bukkit.block.Block; import org.bukkit.block.BlockState; import org.bukkit.event.EventHandler; @@ -42,7 +42,7 @@ public final class BlockBreakListener extends ViaBukkitListener { } public BlockBreakListener(ViaVersionPlugin plugin) { - super(plugin, Protocol1_19To1_18_2.class); + super(plugin, Protocol1_18_2To1_19.class); } @EventHandler(priority = EventPriority.MONITOR) diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaLoader.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaLoader.java index f3a1df47a..1f4534ba3 100644 --- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaLoader.java +++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaLoader.java @@ -38,12 +38,12 @@ import com.viaversion.viaversion.bukkit.providers.BukkitAckSequenceProvider; import com.viaversion.viaversion.bukkit.providers.BukkitBlockConnectionProvider; import com.viaversion.viaversion.bukkit.providers.BukkitInventoryQuickMoveProvider; import com.viaversion.viaversion.bukkit.providers.BukkitViaMovementTransmitter; -import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.providers.InventoryQuickMoveProvider; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.ConnectionData; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.providers.BlockConnectionProvider; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.provider.AckSequenceProvider; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.HandItemProvider; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider; +import com.viaversion.viaversion.protocols.v1_11_1to1_12.providers.InventoryQuickMoveProvider; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections.ConnectionData; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections.providers.BlockConnectionProvider; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.provider.AckSequenceProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.HandItemProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.MovementTransmitterProvider; import java.util.HashSet; import java.util.Set; import java.util.UUID; diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitAckSequenceProvider.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitAckSequenceProvider.java index a54fe0787..684fc861a 100644 --- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitAckSequenceProvider.java +++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitAckSequenceProvider.java @@ -21,8 +21,8 @@ import com.viaversion.viaversion.ViaVersionPlugin; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import com.viaversion.viaversion.bukkit.tasks.protocol1_19to1_18_2.AckSequenceTask; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.provider.AckSequenceProvider; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.storage.SequenceStorage; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.provider.AckSequenceProvider; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.storage.SequenceStorage; public final class BukkitAckSequenceProvider extends AckSequenceProvider { diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitInventoryQuickMoveProvider.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitInventoryQuickMoveProvider.java index c70d7eec8..e221d7dbd 100644 --- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitInventoryQuickMoveProvider.java +++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitInventoryQuickMoveProvider.java @@ -23,8 +23,8 @@ import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import com.viaversion.viaversion.bukkit.tasks.protocol1_12to1_11_1.BukkitInventoryUpdateTask; import com.viaversion.viaversion.bukkit.util.NMSUtil; -import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.providers.InventoryQuickMoveProvider; -import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.storage.ItemTransaction; +import com.viaversion.viaversion.protocols.v1_11_1to1_12.providers.InventoryQuickMoveProvider; +import com.viaversion.viaversion.protocols.v1_11_1to1_12.storage.ItemTransaction; import com.viaversion.viaversion.util.ReflectionUtil; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitViaMovementTransmitter.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitViaMovementTransmitter.java index 5578473e9..6c621001d 100644 --- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitViaMovementTransmitter.java +++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitViaMovementTransmitter.java @@ -20,8 +20,8 @@ package com.viaversion.viaversion.bukkit.providers; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.bukkit.util.NMSUtil; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.MovementTracker; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.MovementTransmitterProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.storage.MovementTracker; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/protocol1_12to1_11_1/BukkitInventoryUpdateTask.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/protocol1_12to1_11_1/BukkitInventoryUpdateTask.java index 969b41a94..00cb392cd 100644 --- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/protocol1_12to1_11_1/BukkitInventoryUpdateTask.java +++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/protocol1_12to1_11_1/BukkitInventoryUpdateTask.java @@ -18,7 +18,7 @@ package com.viaversion.viaversion.bukkit.tasks.protocol1_12to1_11_1; import com.viaversion.viaversion.bukkit.providers.BukkitInventoryQuickMoveProvider; -import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.storage.ItemTransaction; +import com.viaversion.viaversion.protocols.v1_11_1to1_12.storage.ItemTransaction; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/protocol1_19to1_18_2/AckSequenceTask.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/protocol1_19to1_18_2/AckSequenceTask.java index a37d286f5..b4baefc01 100644 --- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/protocol1_19to1_18_2/AckSequenceTask.java +++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/protocol1_19to1_18_2/AckSequenceTask.java @@ -21,9 +21,9 @@ import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.ClientboundPackets1_19; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.Protocol1_19To1_18_2; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.storage.SequenceStorage; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.Protocol1_18_2To1_19; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.packet.ClientboundPackets1_19; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.storage.SequenceStorage; import java.util.logging.Level; public final class AckSequenceTask implements Runnable { @@ -42,7 +42,7 @@ public final class AckSequenceTask implements Runnable { try { final PacketWrapper ackPacket = PacketWrapper.create(ClientboundPackets1_19.BLOCK_CHANGED_ACK, connection); ackPacket.write(Type.VAR_INT, sequence); - ackPacket.scheduleSend(Protocol1_19To1_18_2.class); + ackPacket.scheduleSend(Protocol1_18_2To1_19.class); } catch (final Exception e) { Via.getPlatform().getLogger().log(Level.WARNING, "Failed to send block changed ack packet", e); } diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeServerHandler.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeServerHandler.java index 3f7fa4421..6701e9267 100644 --- a/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeServerHandler.java +++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeServerHandler.java @@ -30,11 +30,11 @@ import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.bungee.storage.BungeeStorage; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.packets.InventoryPackets; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ClientboundPackets1_9; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.EntityIdProvider; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.rewriter.ItemPacketRewriter1_13; +import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.EntityIdProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.storage.EntityTracker1_9; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; @@ -173,7 +173,7 @@ public class BungeeServerHandler implements Listener { // Clear auto-team - EntityTracker1_9 oldEntityTracker = user.getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 oldEntityTracker = user.getEntityTracker(Protocol1_8To1_9.class); if (oldEntityTracker != null && oldEntityTracker.isAutoTeam() && oldEntityTracker.isTeamExists()) { oldEntityTracker.sendTeamPacket(false, true); } @@ -183,12 +183,12 @@ public class BungeeServerHandler implements Listener { ProtocolVersion serverProtocolVersion = Via.proxyPlatform().protocolDetectorService().serverProtocolVersion(serverName); if (serverProtocolVersion.olderThanOrEqualTo(ProtocolVersion.v1_8) && storage.getBossbar() != null) { // 1.8 doesn't have BossBar packet // This ensures we can encode it properly as only the 1.9 protocol is currently implemented. - if (user.getProtocolInfo().getPipeline().contains(Protocol1_9To1_8.class)) { + if (user.getProtocolInfo().getPipeline().contains(Protocol1_8To1_9.class)) { for (UUID uuid : storage.getBossbar()) { PacketWrapper wrapper = PacketWrapper.create(ClientboundPackets1_9.BOSSBAR, null, user); wrapper.write(Type.UUID, uuid); wrapper.write(Type.VAR_INT, 1); // remove - wrapper.send(Protocol1_9To1_8.class); + wrapper.send(Protocol1_8To1_9.class); } } storage.getBossbar().clear(); @@ -225,9 +225,9 @@ public class BungeeServerHandler implements Listener { String channel = iterator.next(); String oldChannel = channel; if (toNewId) { - channel = InventoryPackets.getNewPluginChannelId(channel); + channel = ItemPacketRewriter1_13.getNewPluginChannelId(channel); } else { - channel = InventoryPackets.getOldPluginChannelId(channel); + channel = ItemPacketRewriter1_13.getOldPluginChannelId(channel); } if (channel == null) { iterator.remove(); @@ -245,9 +245,9 @@ public class BungeeServerHandler implements Listener { if (brandMessage != null) { String channel = brandMessage.getTag(); if (toNewId) { - channel = InventoryPackets.getNewPluginChannelId(channel); + channel = ItemPacketRewriter1_13.getNewPluginChannelId(channel); } else { - channel = InventoryPackets.getOldPluginChannelId(channel); + channel = ItemPacketRewriter1_13.getOldPluginChannelId(channel); } if (channel != null) { brandMessage.setTag(channel); @@ -260,7 +260,7 @@ public class BungeeServerHandler implements Listener { user.setActive(protocolPath != null); ProxiedPlayer player = storage.getPlayer(); - EntityTracker1_9 newTracker = user.getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 newTracker = user.getEntityTracker(Protocol1_8To1_9.class); if (newTracker != null && Via.getConfig().isAutoTeam()) { String currentTeam = null; for (Team team : player.getScoreboard().getTeams()) { diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/listeners/ElytraPatch.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/listeners/ElytraPatch.java index 498110ee0..6b1c043e7 100644 --- a/bungee/src/main/java/com/viaversion/viaversion/bungee/listeners/ElytraPatch.java +++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/listeners/ElytraPatch.java @@ -24,9 +24,9 @@ import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_9; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_9; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ClientboundPackets1_9; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.storage.EntityTracker1_9; import java.util.Collections; import java.util.logging.Level; import net.md_5.bungee.api.event.ServerConnectedEvent; @@ -44,8 +44,8 @@ public class ElytraPatch implements Listener { UserConnection user = Via.getManager().getConnectionManager().getConnectedClient(event.getPlayer().getUniqueId()); if (user == null) return; - if (user.getProtocolInfo().getPipeline().contains(Protocol1_9To1_8.class)) { - EntityTracker1_9 tracker = user.getEntityTracker(Protocol1_9To1_8.class); + if (user.getProtocolInfo().getPipeline().contains(Protocol1_8To1_9.class)) { + EntityTracker1_9 tracker = user.getEntityTracker(Protocol1_8To1_9.class); int entityId = tracker.getProvidedEntityId(); PacketWrapper wrapper = PacketWrapper.create(ClientboundPackets1_9.ENTITY_METADATA, null, user); @@ -53,7 +53,7 @@ public class ElytraPatch implements Listener { wrapper.write(Type.VAR_INT, entityId); wrapper.write(Types1_9.METADATA_LIST, Collections.singletonList(new Metadata(0, MetaType1_9.Byte, (byte) 0))); - wrapper.scheduleSend(Protocol1_9To1_8.class); + wrapper.scheduleSend(Protocol1_8To1_9.class); } } } diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaLoader.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaLoader.java index e80fa4cc7..c5163fda2 100644 --- a/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaLoader.java +++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaLoader.java @@ -29,9 +29,9 @@ import com.viaversion.viaversion.bungee.providers.BungeeBossBarProvider; import com.viaversion.viaversion.bungee.providers.BungeeEntityIdProvider; import com.viaversion.viaversion.bungee.providers.BungeeMainHandProvider; import com.viaversion.viaversion.bungee.providers.BungeeVersionProvider; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.BossBarProvider; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.EntityIdProvider; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MainHandProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.BossBarProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.EntityIdProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.MainHandProvider; import java.util.HashSet; import java.util.Set; import java.util.concurrent.TimeUnit; diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeBossBarProvider.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeBossBarProvider.java index 0301c2f2f..ea9721d20 100644 --- a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeBossBarProvider.java +++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeBossBarProvider.java @@ -19,7 +19,7 @@ package com.viaversion.viaversion.bungee.providers; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.bungee.storage.BungeeStorage; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.BossBarProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.BossBarProvider; import java.util.UUID; public class BungeeBossBarProvider extends BossBarProvider { diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeEntityIdProvider.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeEntityIdProvider.java index f57b55b8b..913cc8c26 100644 --- a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeEntityIdProvider.java +++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeEntityIdProvider.java @@ -19,7 +19,7 @@ package com.viaversion.viaversion.bungee.providers; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.bungee.storage.BungeeStorage; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.EntityIdProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.EntityIdProvider; import java.lang.reflect.Method; import net.md_5.bungee.api.connection.ProxiedPlayer; diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeMainHandProvider.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeMainHandProvider.java index dd8485493..b9dbc3bd3 100644 --- a/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeMainHandProvider.java +++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeMainHandProvider.java @@ -20,7 +20,7 @@ package com.viaversion.viaversion.bungee.providers; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.ProtocolInfo; import com.viaversion.viaversion.api.connection.UserConnection; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MainHandProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.MainHandProvider; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.logging.Level; diff --git a/common/src/main/java/com/viaversion/viaversion/ViaManagerImpl.java b/common/src/main/java/com/viaversion/viaversion/ViaManagerImpl.java index 90de3aee1..a5985529a 100644 --- a/common/src/main/java/com/viaversion/viaversion/ViaManagerImpl.java +++ b/common/src/main/java/com/viaversion/viaversion/ViaManagerImpl.java @@ -40,8 +40,8 @@ import com.viaversion.viaversion.debug.DebugHandlerImpl; import com.viaversion.viaversion.protocol.ProtocolManagerImpl; import com.viaversion.viaversion.protocol.ServerProtocolVersionRange; import com.viaversion.viaversion.protocol.ServerProtocolVersionSingleton; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.task.TabCompleteThread; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ViaIdleThread; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.task.TabCompleteThread; +import com.viaversion.viaversion.protocols.v1_8to1_9.ViaIdleThread; import com.viaversion.viaversion.scheduler.TaskScheduler; import com.viaversion.viaversion.update.UpdateUtil; import java.util.ArrayList; diff --git a/common/src/main/java/com/viaversion/viaversion/data/entity/DimensionDataImpl.java b/common/src/main/java/com/viaversion/viaversion/data/entity/DimensionDataImpl.java index 78ce7c826..c56695d3e 100644 --- a/common/src/main/java/com/viaversion/viaversion/data/entity/DimensionDataImpl.java +++ b/common/src/main/java/com/viaversion/viaversion/data/entity/DimensionDataImpl.java @@ -17,8 +17,8 @@ */ package com.viaversion.viaversion.data.entity; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.NumberTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.NumberTag; import com.viaversion.viaversion.api.data.entity.DimensionData; public final class DimensionDataImpl implements DimensionData { diff --git a/common/src/main/java/com/viaversion/viaversion/legacy/bossbar/CommonBoss.java b/common/src/main/java/com/viaversion/viaversion/legacy/bossbar/CommonBoss.java index bf4574ca8..de21d8dfa 100644 --- a/common/src/main/java/com/viaversion/viaversion/legacy/bossbar/CommonBoss.java +++ b/common/src/main/java/com/viaversion/viaversion/legacy/bossbar/CommonBoss.java @@ -27,8 +27,8 @@ import com.viaversion.viaversion.api.legacy.bossbar.BossFlag; import com.viaversion.viaversion.api.legacy.bossbar.BossStyle; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ClientboundPackets1_9; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8; +import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_9; import com.viaversion.viaversion.util.ComponentUtil; import java.util.ArrayList; import java.util.Collections; @@ -228,12 +228,12 @@ public class CommonBoss implements BossBar { } private void sendPacketConnection(UserConnection conn, PacketWrapper wrapper) { - if (conn.getProtocolInfo() == null || !conn.getProtocolInfo().getPipeline().contains(Protocol1_9To1_8.class)) { + if (conn.getProtocolInfo() == null || !conn.getProtocolInfo().getPipeline().contains(Protocol1_8To1_9.class)) { connections.remove(conn.getProtocolInfo().getUuid()); return; } try { - wrapper.scheduleSend(Protocol1_9To1_8.class); + wrapper.scheduleSend(Protocol1_8To1_9.class); } catch (Exception e) { Via.getPlatform().getLogger().log(Level.WARNING, "Failed to send bossbar packet", e); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java b/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java index 8ddbc2b22..039c9c272 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java +++ b/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java @@ -41,43 +41,43 @@ import com.viaversion.viaversion.protocol.packet.VersionedPacketTransformerImpl; import com.viaversion.viaversion.protocols.base.BaseProtocol; import com.viaversion.viaversion.protocols.base.BaseProtocol1_16; import com.viaversion.viaversion.protocols.base.BaseProtocol1_7; -import com.viaversion.viaversion.protocols.protocol1_10to1_9_3.Protocol1_10To1_9_3_4; -import com.viaversion.viaversion.protocols.protocol1_11_1to1_11.Protocol1_11_1To1_11; -import com.viaversion.viaversion.protocols.protocol1_11to1_10.Protocol1_11To1_10; -import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.Protocol1_12_1To1_12; -import com.viaversion.viaversion.protocols.protocol1_12_2to1_12_1.Protocol1_12_2To1_12_1; -import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.Protocol1_12To1_11_1; -import com.viaversion.viaversion.protocols.protocol1_13_1to1_13.Protocol1_13_1To1_13; -import com.viaversion.viaversion.protocols.protocol1_13_2to1_13_1.Protocol1_13_2To1_13_1; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2; -import com.viaversion.viaversion.protocols.protocol1_14_1to1_14.Protocol1_14_1To1_14; -import com.viaversion.viaversion.protocols.protocol1_14_2to1_14_1.Protocol1_14_2To1_14_1; -import com.viaversion.viaversion.protocols.protocol1_14_3to1_14_2.Protocol1_14_3To1_14_2; -import com.viaversion.viaversion.protocols.protocol1_14_4to1_14_3.Protocol1_14_4To1_14_3; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.Protocol1_14To1_13_2; -import com.viaversion.viaversion.protocols.protocol1_15_1to1_15.Protocol1_15_1To1_15; -import com.viaversion.viaversion.protocols.protocol1_15_2to1_15_1.Protocol1_15_2To1_15_1; -import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.Protocol1_15To1_14_4; -import com.viaversion.viaversion.protocols.protocol1_16_1to1_16.Protocol1_16_1To1_16; -import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.Protocol1_16_2To1_16_1; -import com.viaversion.viaversion.protocols.protocol1_16_3to1_16_2.Protocol1_16_3To1_16_2; -import com.viaversion.viaversion.protocols.protocol1_16_4to1_16_3.Protocol1_16_4To1_16_3; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.Protocol1_16To1_15_2; -import com.viaversion.viaversion.protocols.protocol1_17_1to1_17.Protocol1_17_1To1_17; -import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.Protocol1_17To1_16_4; -import com.viaversion.viaversion.protocols.protocol1_18_2to1_18.Protocol1_18_2To1_18; -import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.Protocol1_18To1_17_1; -import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.Protocol1_19_1To1_19; -import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.Protocol1_19_3To1_19_1; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.Protocol1_19_4To1_19_3; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.Protocol1_19To1_18_2; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.Protocol1_20_2To1_20; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.Protocol1_20_3To1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20to1_19_4.Protocol1_20To1_19_4; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.Protocol1_20_5To1_20_3; -import com.viaversion.viaversion.protocols.protocol1_9_1to1_9.Protocol1_9_1To1_9; -import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.Protocol1_9_3To1_9_1_2; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8; +import com.viaversion.viaversion.protocols.v1_9_3to1_10.Protocol1_9_3To1_10; +import com.viaversion.viaversion.protocols.v1_11to1_11_1.Protocol1_11To1_11_1; +import com.viaversion.viaversion.protocols.v1_10to1_11.Protocol1_10To1_11; +import com.viaversion.viaversion.protocols.v1_12to1_12_1.Protocol1_12To1_12_1; +import com.viaversion.viaversion.protocols.v1_12_1to1_12_2.Protocol1_12_1To1_12_2; +import com.viaversion.viaversion.protocols.v1_11_1to1_12.Protocol1_11_1To1_12; +import com.viaversion.viaversion.protocols.v1_13to1_13_1.Protocol1_13To1_13_1; +import com.viaversion.viaversion.protocols.v1_13_1to1_13_2.Protocol1_13_1To1_13_2; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.Protocol1_12_2To1_13; +import com.viaversion.viaversion.protocols.v1_14to1_14_1.Protocol1_14To1_14_1; +import com.viaversion.viaversion.protocols.v1_14_1to1_14_2.Protocol1_14_1To1_14_2; +import com.viaversion.viaversion.protocols.v1_14_2to1_14_3.Protocol1_14_2To1_14_3; +import com.viaversion.viaversion.protocols.v1_14_3to1_14_4.Protocol1_14_3To1_14_4; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.Protocol1_13_2To1_14; +import com.viaversion.viaversion.protocols.v1_15to1_15_1.Protocol1_15To1_15_1; +import com.viaversion.viaversion.protocols.v1_15_1to1_15_2.Protocol1_15_1To1_15_2; +import com.viaversion.viaversion.protocols.v1_14_4to1_15.Protocol1_14_4To1_15; +import com.viaversion.viaversion.protocols.v1_16to1_16_1.Protocol1_16To1_16_1; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.Protocol1_16_1To1_16_2; +import com.viaversion.viaversion.protocols.v1_16_2to1_16_3.Protocol1_16_2To1_16_3; +import com.viaversion.viaversion.protocols.v1_16_3to1_16_4.Protocol1_16_3To1_16_4; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.Protocol1_15_2To1_16; +import com.viaversion.viaversion.protocols.v1_17to1_17_1.Protocol1_17To1_17_1; +import com.viaversion.viaversion.protocols.v1_16_4to1_17.Protocol1_16_4To1_17; +import com.viaversion.viaversion.protocols.v1_18to1_18_2.Protocol1_18To1_18_2; +import com.viaversion.viaversion.protocols.v1_17_1to1_18.Protocol1_17_1To1_18; +import com.viaversion.viaversion.protocols.v1_19to1_19_1.Protocol1_19To1_19_1; +import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.Protocol1_19_1To1_19_3; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.Protocol1_19_3To1_19_4; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.Protocol1_18_2To1_19; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.Protocol1_20To1_20_2; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.Protocol1_20_2To1_20_3; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.Protocol1_20_3To1_20_5; +import com.viaversion.viaversion.protocols.v1_19_4to1_20.Protocol1_19_4To1_20; +import com.viaversion.viaversion.protocols.v1_9to1_9_1.Protocol1_9To1_9_1; +import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.Protocol1_9_1To1_9_3; +import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9; import com.viaversion.viaversion.util.Pair; import io.netty.buffer.ByteBuf; import java.util.ArrayList; @@ -139,54 +139,54 @@ public class ProtocolManagerImpl implements ProtocolManager { registerBaseProtocol(new BaseProtocol1_7(), Range.closedOpen(ProtocolVersion.v1_7_2, ProtocolVersion.v1_16)); registerBaseProtocol(new BaseProtocol1_16(), Range.atLeast(ProtocolVersion.v1_16)); - registerProtocol(new Protocol1_9To1_8(), ProtocolVersion.v1_9, ProtocolVersion.v1_8); - registerProtocol(new Protocol1_9_1To1_9(), Arrays.asList(ProtocolVersion.v1_9_1, ProtocolVersion.v1_9_2), ProtocolVersion.v1_9); - registerProtocol(new Protocol1_9_3To1_9_1_2(), ProtocolVersion.v1_9_3, ProtocolVersion.v1_9_2); + registerProtocol(new Protocol1_8To1_9(), ProtocolVersion.v1_9, ProtocolVersion.v1_8); + registerProtocol(new Protocol1_9To1_9_1(), Arrays.asList(ProtocolVersion.v1_9_1, ProtocolVersion.v1_9_2), ProtocolVersion.v1_9); + registerProtocol(new Protocol1_9_1To1_9_3(), ProtocolVersion.v1_9_3, ProtocolVersion.v1_9_2); - registerProtocol(new Protocol1_10To1_9_3_4(), ProtocolVersion.v1_10, ProtocolVersion.v1_9_3); + registerProtocol(new Protocol1_9_3To1_10(), ProtocolVersion.v1_10, ProtocolVersion.v1_9_3); - registerProtocol(new Protocol1_11To1_10(), ProtocolVersion.v1_11, ProtocolVersion.v1_10); - registerProtocol(new Protocol1_11_1To1_11(), ProtocolVersion.v1_11_1, ProtocolVersion.v1_11); + registerProtocol(new Protocol1_10To1_11(), ProtocolVersion.v1_11, ProtocolVersion.v1_10); + registerProtocol(new Protocol1_11To1_11_1(), ProtocolVersion.v1_11_1, ProtocolVersion.v1_11); - registerProtocol(new Protocol1_12To1_11_1(), ProtocolVersion.v1_12, ProtocolVersion.v1_11_1); - registerProtocol(new Protocol1_12_1To1_12(), ProtocolVersion.v1_12_1, ProtocolVersion.v1_12); - registerProtocol(new Protocol1_12_2To1_12_1(), ProtocolVersion.v1_12_2, ProtocolVersion.v1_12_1); + registerProtocol(new Protocol1_11_1To1_12(), ProtocolVersion.v1_12, ProtocolVersion.v1_11_1); + registerProtocol(new Protocol1_12To1_12_1(), ProtocolVersion.v1_12_1, ProtocolVersion.v1_12); + registerProtocol(new Protocol1_12_1To1_12_2(), ProtocolVersion.v1_12_2, ProtocolVersion.v1_12_1); - registerProtocol(new Protocol1_13To1_12_2(), ProtocolVersion.v1_13, ProtocolVersion.v1_12_2); - registerProtocol(new Protocol1_13_1To1_13(), ProtocolVersion.v1_13_1, ProtocolVersion.v1_13); - registerProtocol(new Protocol1_13_2To1_13_1(), ProtocolVersion.v1_13_2, ProtocolVersion.v1_13_1); + registerProtocol(new Protocol1_12_2To1_13(), ProtocolVersion.v1_13, ProtocolVersion.v1_12_2); + registerProtocol(new Protocol1_13To1_13_1(), ProtocolVersion.v1_13_1, ProtocolVersion.v1_13); + registerProtocol(new Protocol1_13_1To1_13_2(), ProtocolVersion.v1_13_2, ProtocolVersion.v1_13_1); - registerProtocol(new Protocol1_14To1_13_2(), ProtocolVersion.v1_14, ProtocolVersion.v1_13_2); - registerProtocol(new Protocol1_14_1To1_14(), ProtocolVersion.v1_14_1, ProtocolVersion.v1_14); - registerProtocol(new Protocol1_14_2To1_14_1(), ProtocolVersion.v1_14_2, ProtocolVersion.v1_14_1); - registerProtocol(new Protocol1_14_3To1_14_2(), ProtocolVersion.v1_14_3, ProtocolVersion.v1_14_2); - registerProtocol(new Protocol1_14_4To1_14_3(), ProtocolVersion.v1_14_4, ProtocolVersion.v1_14_3); + registerProtocol(new Protocol1_13_2To1_14(), ProtocolVersion.v1_14, ProtocolVersion.v1_13_2); + registerProtocol(new Protocol1_14To1_14_1(), ProtocolVersion.v1_14_1, ProtocolVersion.v1_14); + registerProtocol(new Protocol1_14_1To1_14_2(), ProtocolVersion.v1_14_2, ProtocolVersion.v1_14_1); + registerProtocol(new Protocol1_14_2To1_14_3(), ProtocolVersion.v1_14_3, ProtocolVersion.v1_14_2); + registerProtocol(new Protocol1_14_3To1_14_4(), ProtocolVersion.v1_14_4, ProtocolVersion.v1_14_3); - registerProtocol(new Protocol1_15To1_14_4(), ProtocolVersion.v1_15, ProtocolVersion.v1_14_4); - registerProtocol(new Protocol1_15_1To1_15(), ProtocolVersion.v1_15_1, ProtocolVersion.v1_15); - registerProtocol(new Protocol1_15_2To1_15_1(), ProtocolVersion.v1_15_2, ProtocolVersion.v1_15_1); + registerProtocol(new Protocol1_14_4To1_15(), ProtocolVersion.v1_15, ProtocolVersion.v1_14_4); + registerProtocol(new Protocol1_15To1_15_1(), ProtocolVersion.v1_15_1, ProtocolVersion.v1_15); + registerProtocol(new Protocol1_15_1To1_15_2(), ProtocolVersion.v1_15_2, ProtocolVersion.v1_15_1); - registerProtocol(new Protocol1_16To1_15_2(), ProtocolVersion.v1_16, ProtocolVersion.v1_15_2); - registerProtocol(new Protocol1_16_1To1_16(), ProtocolVersion.v1_16_1, ProtocolVersion.v1_16); - registerProtocol(new Protocol1_16_2To1_16_1(), ProtocolVersion.v1_16_2, ProtocolVersion.v1_16_1); - registerProtocol(new Protocol1_16_3To1_16_2(), ProtocolVersion.v1_16_3, ProtocolVersion.v1_16_2); - registerProtocol(new Protocol1_16_4To1_16_3(), ProtocolVersion.v1_16_4, ProtocolVersion.v1_16_3); + registerProtocol(new Protocol1_15_2To1_16(), ProtocolVersion.v1_16, ProtocolVersion.v1_15_2); + registerProtocol(new Protocol1_16To1_16_1(), ProtocolVersion.v1_16_1, ProtocolVersion.v1_16); + registerProtocol(new Protocol1_16_1To1_16_2(), ProtocolVersion.v1_16_2, ProtocolVersion.v1_16_1); + registerProtocol(new Protocol1_16_2To1_16_3(), ProtocolVersion.v1_16_3, ProtocolVersion.v1_16_2); + registerProtocol(new Protocol1_16_3To1_16_4(), ProtocolVersion.v1_16_4, ProtocolVersion.v1_16_3); - registerProtocol(new Protocol1_17To1_16_4(), ProtocolVersion.v1_17, ProtocolVersion.v1_16_4); - registerProtocol(new Protocol1_17_1To1_17(), ProtocolVersion.v1_17_1, ProtocolVersion.v1_17); + registerProtocol(new Protocol1_16_4To1_17(), ProtocolVersion.v1_17, ProtocolVersion.v1_16_4); + registerProtocol(new Protocol1_17To1_17_1(), ProtocolVersion.v1_17_1, ProtocolVersion.v1_17); - registerProtocol(new Protocol1_18To1_17_1(), ProtocolVersion.v1_18, ProtocolVersion.v1_17_1); - registerProtocol(new Protocol1_18_2To1_18(), ProtocolVersion.v1_18_2, ProtocolVersion.v1_18); + registerProtocol(new Protocol1_17_1To1_18(), ProtocolVersion.v1_18, ProtocolVersion.v1_17_1); + registerProtocol(new Protocol1_18To1_18_2(), ProtocolVersion.v1_18_2, ProtocolVersion.v1_18); - registerProtocol(new Protocol1_19To1_18_2(), ProtocolVersion.v1_19, ProtocolVersion.v1_18_2); - registerProtocol(new Protocol1_19_1To1_19(), ProtocolVersion.v1_19_1, ProtocolVersion.v1_19); - registerProtocol(new Protocol1_19_3To1_19_1(), ProtocolVersion.v1_19_3, ProtocolVersion.v1_19_1); - registerProtocol(new Protocol1_19_4To1_19_3(), ProtocolVersion.v1_19_4, ProtocolVersion.v1_19_3); + registerProtocol(new Protocol1_18_2To1_19(), ProtocolVersion.v1_19, ProtocolVersion.v1_18_2); + registerProtocol(new Protocol1_19To1_19_1(), ProtocolVersion.v1_19_1, ProtocolVersion.v1_19); + registerProtocol(new Protocol1_19_1To1_19_3(), ProtocolVersion.v1_19_3, ProtocolVersion.v1_19_1); + registerProtocol(new Protocol1_19_3To1_19_4(), ProtocolVersion.v1_19_4, ProtocolVersion.v1_19_3); - registerProtocol(new Protocol1_20To1_19_4(), ProtocolVersion.v1_20, ProtocolVersion.v1_19_4); - registerProtocol(new Protocol1_20_2To1_20(), ProtocolVersion.v1_20_2, ProtocolVersion.v1_20); - registerProtocol(new Protocol1_20_3To1_20_2(), ProtocolVersion.v1_20_3, ProtocolVersion.v1_20_2); - registerProtocol(new Protocol1_20_5To1_20_3(), ProtocolVersion.v1_20_5, ProtocolVersion.v1_20_3); + registerProtocol(new Protocol1_19_4To1_20(), ProtocolVersion.v1_20, ProtocolVersion.v1_19_4); + registerProtocol(new Protocol1_20To1_20_2(), ProtocolVersion.v1_20_2, ProtocolVersion.v1_20); + registerProtocol(new Protocol1_20_2To1_20_3(), ProtocolVersion.v1_20_3, ProtocolVersion.v1_20_2); + registerProtocol(new Protocol1_20_3To1_20_5(), ProtocolVersion.v1_20_5, ProtocolVersion.v1_20_3); } @Override diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/Protocol1_11To1_10.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_10to1_11/Protocol1_10To1_11.java similarity index 91% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/Protocol1_11To1_10.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_10to1_11/Protocol1_10To1_11.java index 5aa91f933..780909b22 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/Protocol1_11To1_10.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_10to1_11/Protocol1_10To1_11.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_11to1_10; +package com.viaversion.viaversion.protocols.v1_10to1_11; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.StringTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.StringTag; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.ClientWorld; @@ -31,18 +31,18 @@ import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_9_3; import com.viaversion.viaversion.api.type.types.version.Types1_9; -import com.viaversion.viaversion.protocols.protocol1_11to1_10.data.PotionColorMapping; -import com.viaversion.viaversion.protocols.protocol1_11to1_10.metadata.MetadataRewriter1_11To1_10; -import com.viaversion.viaversion.protocols.protocol1_11to1_10.packets.InventoryPackets; -import com.viaversion.viaversion.protocols.protocol1_11to1_10.rewriter.BlockEntityRewriter; -import com.viaversion.viaversion.protocols.protocol1_11to1_10.rewriter.EntityIdRewriter; -import com.viaversion.viaversion.protocols.protocol1_11to1_10.storage.EntityTracker1_11; -import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; -import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3; +import com.viaversion.viaversion.protocols.v1_10to1_11.data.PotionColorMapping; +import com.viaversion.viaversion.protocols.v1_10to1_11.metadata.MetadataRewriter1_11To1_10; +import com.viaversion.viaversion.protocols.v1_10to1_11.rewriter.BlockEntityRewriter; +import com.viaversion.viaversion.protocols.v1_10to1_11.rewriter.EntityIdRewriter; +import com.viaversion.viaversion.protocols.v1_10to1_11.rewriter.ItemPacketRewriter1_11; +import com.viaversion.viaversion.protocols.v1_10to1_11.storage.EntityTracker1_11; +import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ClientboundPackets1_9_3; +import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ServerboundPackets1_9_3; import com.viaversion.viaversion.rewriter.SoundRewriter; import com.viaversion.viaversion.util.Pair; -public class Protocol1_11To1_10 extends AbstractProtocol { +public class Protocol1_10To1_11 extends AbstractProtocol { private static final ValueTransformer toOldByte = new ValueTransformer<>(Type.UNSIGNED_BYTE) { @Override public Short transform(PacketWrapper wrapper, Float inputValue) { @@ -51,9 +51,9 @@ public class Protocol1_11To1_10 extends AbstractProtocol { int entityID = wrapper.get(Type.VAR_INT, 0); if (Via.getConfig().isHologramPatch()) { - EntityTracker1_11 tracker = wrapper.user().getEntityTracker(Protocol1_11To1_10.class); + EntityTracker1_11 tracker = wrapper.user().getEntityTracker(Protocol1_10To1_11.class); if (tracker.isHologram(entityID)) { Double newValue = wrapper.get(Type.DOUBLE, 1); newValue -= (Via.getConfig().getHologramYOffset()); @@ -361,7 +361,7 @@ public class Protocol1_11To1_10 extends AbstractProtocol. */ -package com.viaversion.viaversion.protocols.protocol1_11to1_10.data; +package com.viaversion.viaversion.protocols.v1_10to1_11.data; import com.viaversion.viaversion.util.Pair; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/metadata/MetadataRewriter1_11To1_10.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_10to1_11/metadata/MetadataRewriter1_11To1_10.java similarity index 93% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/metadata/MetadataRewriter1_11To1_10.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_10to1_11/metadata/MetadataRewriter1_11To1_10.java index afd3f90e3..2bd401060 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/metadata/MetadataRewriter1_11To1_10.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_10to1_11/metadata/MetadataRewriter1_11To1_10.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_11to1_10.metadata; +package com.viaversion.viaversion.protocols.v1_10to1_11.metadata; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_11; @@ -25,18 +25,18 @@ import com.viaversion.viaversion.api.minecraft.metadata.Metadata; import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_9; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_11to1_10.rewriter.EntityIdRewriter; -import com.viaversion.viaversion.protocols.protocol1_11to1_10.Protocol1_11To1_10; -import com.viaversion.viaversion.protocols.protocol1_11to1_10.storage.EntityTracker1_11; -import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; +import com.viaversion.viaversion.protocols.v1_10to1_11.Protocol1_10To1_11; +import com.viaversion.viaversion.protocols.v1_10to1_11.rewriter.EntityIdRewriter; +import com.viaversion.viaversion.protocols.v1_10to1_11.storage.EntityTracker1_11; +import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ClientboundPackets1_9_3; import com.viaversion.viaversion.rewriter.EntityRewriter; import java.util.List; import java.util.Optional; import java.util.logging.Level; -public class MetadataRewriter1_11To1_10 extends EntityRewriter { +public class MetadataRewriter1_11To1_10 extends EntityRewriter { - public MetadataRewriter1_11To1_10(Protocol1_11To1_10 protocol) { + public MetadataRewriter1_11To1_10(Protocol1_10To1_11 protocol) { super(protocol); } @@ -120,7 +120,7 @@ public class MetadataRewriter1_11To1_10 extends EntityRewriter. */ -package com.viaversion.viaversion.protocols.protocol1_11to1_10.rewriter; +package com.viaversion.viaversion.protocols.v1_10to1_11.rewriter; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/rewriter/EntityIdRewriter.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_10to1_11/rewriter/EntityIdRewriter.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/rewriter/EntityIdRewriter.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_10to1_11/rewriter/EntityIdRewriter.java index 87b742137..bd82d349b 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/rewriter/EntityIdRewriter.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_10to1_11/rewriter/EntityIdRewriter.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_11to1_10.rewriter; +package com.viaversion.viaversion.protocols.v1_10to1_11.rewriter; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.StringTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.StringTag; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import com.viaversion.viaversion.api.minecraft.item.Item; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_10to1_11/rewriter/ItemPacketRewriter1_11.java similarity index 85% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/packets/InventoryPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_10to1_11/rewriter/ItemPacketRewriter1_11.java index 5f0ffa61a..c52e8821a 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/packets/InventoryPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_10to1_11/rewriter/ItemPacketRewriter1_11.java @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_11to1_10.packets; +package com.viaversion.viaversion.protocols.v1_10to1_11.rewriter; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_11to1_10.rewriter.EntityIdRewriter; -import com.viaversion.viaversion.protocols.protocol1_11to1_10.Protocol1_11To1_10; -import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; -import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3; +import com.viaversion.viaversion.protocols.v1_10to1_11.Protocol1_10To1_11; +import com.viaversion.viaversion.protocols.v1_10to1_11.rewriter.EntityIdRewriter; +import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ClientboundPackets1_9_3; +import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ServerboundPackets1_9_3; import com.viaversion.viaversion.rewriter.ItemRewriter; -public class InventoryPackets extends ItemRewriter { +public class ItemPacketRewriter1_11 extends ItemRewriter { - public InventoryPackets(Protocol1_11To1_10 protocol) { + public ItemPacketRewriter1_11(Protocol1_10To1_11 protocol) { super(protocol, Type.ITEM1_8, Type.ITEM1_8_SHORT_ARRAY); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/storage/EntityTracker1_11.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_10to1_11/storage/EntityTracker1_11.java similarity index 95% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/storage/EntityTracker1_11.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_10to1_11/storage/EntityTracker1_11.java index c68cb21a0..3080cf558 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/storage/EntityTracker1_11.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_10to1_11/storage/EntityTracker1_11.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_11to1_10.storage; +package com.viaversion.viaversion.protocols.v1_10to1_11.storage; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_11.EntityType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/Protocol1_12To1_11_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/Protocol1_11_1To1_12.java similarity index 87% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/Protocol1_12To1_11_1.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/Protocol1_11_1To1_12.java index bd2a5d1b9..81d646c61 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/Protocol1_12To1_11_1.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/Protocol1_11_1To1_12.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_12to1_11_1; +package com.viaversion.viaversion.protocols.v1_11_1to1_12; -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 com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.IntTag; +import com.viaversion.nbt.tag.StringTag; import com.google.gson.JsonElement; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; @@ -37,25 +37,26 @@ import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_9_3; import com.viaversion.viaversion.api.type.types.version.Types1_12; import com.viaversion.viaversion.data.entity.EntityTrackerBase; -import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.metadata.MetadataRewriter1_12To1_11_1; -import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.packets.InventoryPackets; -import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.providers.InventoryQuickMoveProvider; -import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.rewriter.ChatItemRewriter; -import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.rewriter.TranslateRewriter; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2; -import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; -import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8; +import com.viaversion.viaversion.protocols.v1_11_1to1_12.metadata.MetadataRewriter1_12To1_11_1; +import com.viaversion.viaversion.protocols.v1_11_1to1_12.packet.ClientboundPackets1_12; +import com.viaversion.viaversion.protocols.v1_11_1to1_12.packet.ServerboundPackets1_12; +import com.viaversion.viaversion.protocols.v1_11_1to1_12.providers.InventoryQuickMoveProvider; +import com.viaversion.viaversion.protocols.v1_11_1to1_12.rewriter.ChatItemRewriter; +import com.viaversion.viaversion.protocols.v1_11_1to1_12.rewriter.ItemPacketRewriter1_12; +import com.viaversion.viaversion.protocols.v1_11_1to1_12.rewriter.TranslateRewriter; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.Protocol1_12_2To1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ClientboundPackets1_9_3; +import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ServerboundPackets1_9_3; import com.viaversion.viaversion.rewriter.SoundRewriter; import java.util.logging.Level; -public class Protocol1_12To1_11_1 extends AbstractProtocol { +public class Protocol1_11_1To1_12 extends AbstractProtocol { private final MetadataRewriter1_12To1_11_1 metadataRewriter = new MetadataRewriter1_12To1_11_1(this); - private final InventoryPackets itemRewriter = new InventoryPackets(this); + private final ItemPacketRewriter1_12 itemRewriter = new ItemPacketRewriter1_12(this); - public Protocol1_12To1_11_1() { + public Protocol1_11_1To1_12() { super(ClientboundPackets1_9_3.class, ClientboundPackets1_12.class, ServerboundPackets1_9_3.class, ServerboundPackets1_12.class); } @@ -154,7 +155,7 @@ public class Protocol1_12To1_11_1 extends AbstractProtocol packetWrapper.write(Type.VAR_INT, 0)) - .scheduleSend(Protocol1_13To1_12_2.class); + .scheduleSend(Protocol1_12_2To1_13.class); } }); } @@ -254,7 +255,7 @@ public class Protocol1_12To1_11_1 extends AbstractProtocol. */ -package com.viaversion.viaversion.protocols.protocol1_12to1_11_1.data; +package com.viaversion.viaversion.protocols.v1_11_1to1_12.data; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import java.util.HashSet; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/metadata/MetadataRewriter1_12To1_11_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/metadata/MetadataRewriter1_12To1_11_1.java similarity index 83% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/metadata/MetadataRewriter1_12To1_11_1.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/metadata/MetadataRewriter1_12To1_11_1.java index 632d4c8e3..693443863 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/metadata/MetadataRewriter1_12To1_11_1.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/metadata/MetadataRewriter1_12To1_11_1.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_12to1_11_1.metadata; +package com.viaversion.viaversion.protocols.v1_11_1to1_12.metadata; import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_12; import com.viaversion.viaversion.api.minecraft.item.Item; -import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.Protocol1_12To1_11_1; -import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; +import com.viaversion.viaversion.protocols.v1_11_1to1_12.Protocol1_11_1To1_12; +import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ClientboundPackets1_9_3; import com.viaversion.viaversion.rewriter.EntityRewriter; -public class MetadataRewriter1_12To1_11_1 extends EntityRewriter { +public class MetadataRewriter1_12To1_11_1 extends EntityRewriter { - public MetadataRewriter1_12To1_11_1(Protocol1_12To1_11_1 protocol) { + public MetadataRewriter1_12To1_11_1(Protocol1_11_1To1_12 protocol) { super(protocol); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/ClientboundPackets1_12.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/packet/ClientboundPackets1_12.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/ClientboundPackets1_12.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/packet/ClientboundPackets1_12.java index 225930274..d0713c58e 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/ClientboundPackets1_12.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/packet/ClientboundPackets1_12.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_12to1_11_1; +package com.viaversion.viaversion.protocols.v1_11_1to1_12.packet; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/ServerboundPackets1_12.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/packet/ServerboundPackets1_12.java similarity index 96% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/ServerboundPackets1_12.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/packet/ServerboundPackets1_12.java index 702ffcd41..bc5da9a96 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/ServerboundPackets1_12.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/packet/ServerboundPackets1_12.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_12to1_11_1; +package com.viaversion.viaversion.protocols.v1_11_1to1_12.packet; import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/providers/InventoryQuickMoveProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/providers/InventoryQuickMoveProvider.java similarity index 93% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/providers/InventoryQuickMoveProvider.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/providers/InventoryQuickMoveProvider.java index c84a5a715..23a47700b 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/providers/InventoryQuickMoveProvider.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/providers/InventoryQuickMoveProvider.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_12to1_11_1.providers; +package com.viaversion.viaversion.protocols.v1_11_1to1_12.providers; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.platform.providers.Provider; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/rewriter/ChatItemRewriter.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/rewriter/ChatItemRewriter.java similarity index 94% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/rewriter/ChatItemRewriter.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/rewriter/ChatItemRewriter.java index 6dbc6c591..022bf259d 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/rewriter/ChatItemRewriter.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/rewriter/ChatItemRewriter.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_12to1_11_1.rewriter; +package com.viaversion.viaversion.protocols.v1_11_1to1_12.rewriter; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/rewriter/ItemPacketRewriter1_12.java similarity index 90% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/packets/InventoryPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/rewriter/ItemPacketRewriter1_12.java index 51520064f..6d9de592f 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/packets/InventoryPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/rewriter/ItemPacketRewriter1_12.java @@ -15,23 +15,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_12to1_11_1.packets; +package com.viaversion.viaversion.protocols.v1_11_1to1_12.rewriter; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.Protocol1_12To1_11_1; -import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ServerboundPackets1_12; -import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.providers.InventoryQuickMoveProvider; -import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; +import com.viaversion.viaversion.protocols.v1_11_1to1_12.Protocol1_11_1To1_12; +import com.viaversion.viaversion.protocols.v1_11_1to1_12.packet.ServerboundPackets1_12; +import com.viaversion.viaversion.protocols.v1_11_1to1_12.providers.InventoryQuickMoveProvider; +import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ClientboundPackets1_9_3; import com.viaversion.viaversion.rewriter.ItemRewriter; import org.checkerframework.checker.nullness.qual.Nullable; -public class InventoryPackets extends ItemRewriter { +public class ItemPacketRewriter1_12 extends ItemRewriter { - public InventoryPackets(Protocol1_12To1_11_1 protocol) { + public ItemPacketRewriter1_12(Protocol1_11_1To1_12 protocol) { super(protocol, Type.ITEM1_8, Type.ITEM1_8_SHORT_ARRAY); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/rewriter/TranslateRewriter.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/rewriter/TranslateRewriter.java similarity index 95% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/rewriter/TranslateRewriter.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/rewriter/TranslateRewriter.java index 411c04f05..f25701cc3 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/rewriter/TranslateRewriter.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/rewriter/TranslateRewriter.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_12to1_11_1.rewriter; +package com.viaversion.viaversion.protocols.v1_11_1to1_12.rewriter; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; -import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.data.AchievementTranslationMapping; -import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; +import com.viaversion.viaversion.protocols.v1_11_1to1_12.data.AchievementTranslationMapping; +import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ClientboundPackets1_9_3; import com.viaversion.viaversion.rewriter.ComponentRewriter; import com.viaversion.viaversion.util.SerializerVersion; import java.util.logging.Level; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/storage/ItemTransaction.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/storage/ItemTransaction.java similarity index 92% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/storage/ItemTransaction.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/storage/ItemTransaction.java index 7be16f5d4..5389eb3af 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/storage/ItemTransaction.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/storage/ItemTransaction.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_12to1_11_1.storage; +package com.viaversion.viaversion.protocols.v1_11_1to1_12.storage; public record ItemTransaction(short windowId, short slotId, short actionId) { } \ No newline at end of file diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11_1to1_11/Protocol1_11_1To1_11.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_11to1_11_1/Protocol1_11To1_11_1.java similarity index 68% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11_1to1_11/Protocol1_11_1To1_11.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_11to1_11_1/Protocol1_11To1_11_1.java index 9853c632a..b63b3a13f 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11_1to1_11/Protocol1_11_1To1_11.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_11to1_11_1/Protocol1_11To1_11_1.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_11_1to1_11; +package com.viaversion.viaversion.protocols.v1_11to1_11_1; import com.viaversion.viaversion.api.protocol.AbstractProtocol; -import com.viaversion.viaversion.protocols.protocol1_11_1to1_11.packets.InventoryPackets; -import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; -import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3; +import com.viaversion.viaversion.protocols.v1_11to1_11_1.rewriter.ItemPacketRewriter1_11_1; +import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ClientboundPackets1_9_3; +import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ServerboundPackets1_9_3; -public class Protocol1_11_1To1_11 extends AbstractProtocol { +public class Protocol1_11To1_11_1 extends AbstractProtocol { - private final InventoryPackets itemRewriter = new InventoryPackets(this); + private final ItemPacketRewriter1_11_1 itemRewriter = new ItemPacketRewriter1_11_1(this); - public Protocol1_11_1To1_11() { + public Protocol1_11To1_11_1() { super(ClientboundPackets1_9_3.class, ClientboundPackets1_9_3.class, ServerboundPackets1_9_3.class, ServerboundPackets1_9_3.class); } @@ -36,7 +36,7 @@ public class Protocol1_11_1To1_11 extends AbstractProtocol. */ -package com.viaversion.viaversion.protocols.protocol1_11_1to1_11.packets; +package com.viaversion.viaversion.protocols.v1_11to1_11_1.rewriter; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_11_1to1_11.Protocol1_11_1To1_11; -import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; -import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3; +import com.viaversion.viaversion.protocols.v1_11to1_11_1.Protocol1_11To1_11_1; +import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ClientboundPackets1_9_3; +import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ServerboundPackets1_9_3; import com.viaversion.viaversion.rewriter.ItemRewriter; -public class InventoryPackets extends ItemRewriter { +public class ItemPacketRewriter1_11_1 extends ItemRewriter { - public InventoryPackets(Protocol1_11_1To1_11 protocol) { + public ItemPacketRewriter1_11_1(Protocol1_11To1_11_1 protocol) { super(protocol, Type.ITEM1_8, null); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12_2to1_12_1/Protocol1_12_2To1_12_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_1to1_12_2/Protocol1_12_1To1_12_2.java similarity index 85% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12_2to1_12_1/Protocol1_12_2To1_12_1.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_1to1_12_2/Protocol1_12_1To1_12_2.java index 9d6f33d2f..5cb094eee 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12_2to1_12_1/Protocol1_12_2To1_12_1.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_1to1_12_2/Protocol1_12_1To1_12_2.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_12_2to1_12_1; +package com.viaversion.viaversion.protocols.v1_12_1to1_12_2; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1; -import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ServerboundPackets1_12_1; +import com.viaversion.viaversion.protocols.v1_12to1_12_1.packet.ClientboundPackets1_12_1; +import com.viaversion.viaversion.protocols.v1_12to1_12_1.packet.ServerboundPackets1_12_1; -public class Protocol1_12_2To1_12_1 extends AbstractProtocol { +public class Protocol1_12_1To1_12_2 extends AbstractProtocol { - public Protocol1_12_2To1_12_1() { + public Protocol1_12_1To1_12_2() { super(ClientboundPackets1_12_1.class, ClientboundPackets1_12_1.class, ServerboundPackets1_12_1.class, ServerboundPackets1_12_1.class); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/Protocol1_12_2To1_13.java similarity index 93% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/Protocol1_12_2To1_13.java index be3b91170..5c85a567a 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/Protocol1_12_2To1_13.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2; +package com.viaversion.viaversion.protocols.v1_12_2to1_13; import com.google.common.collect.Sets; import com.google.common.primitives.Ints; @@ -42,27 +42,29 @@ import com.viaversion.viaversion.data.entity.EntityTrackerBase; import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets; import com.viaversion.viaversion.protocols.base.ClientboundStatusPackets; import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets; -import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1; -import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ServerboundPackets1_12_1; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.ConnectionData; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.providers.BlockConnectionProvider; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.providers.PacketBlockConnectionProvider; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.BlockIdData; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.ComponentRewriter1_13; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.MappingData; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.RecipeData; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.StatisticData; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.StatisticMappings; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.metadata.MetadataRewriter1_13To1_12_2; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.packets.EntityPackets; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.packets.InventoryPackets; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.packets.WorldPackets; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.BlockEntityProvider; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.PaintingProvider; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.PlayerLookTargetProvider; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.BlockConnectionStorage; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.BlockStorage; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.TabCompleteTracker; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ServerboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_12to1_12_1.packet.ClientboundPackets1_12_1; +import com.viaversion.viaversion.protocols.v1_12to1_12_1.packet.ServerboundPackets1_12_1; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections.ConnectionData; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections.providers.BlockConnectionProvider; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections.providers.PacketBlockConnectionProvider; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.data.BlockIdData; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.data.ComponentRewriter1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.data.MappingData1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.data.RecipeData; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.data.StatisticData; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.data.StatisticMappings; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.metadata.MetadataRewriter1_13To1_12_2; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.providers.BlockEntityProvider; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.providers.PaintingProvider; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.providers.PlayerLookTargetProvider; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.rewriter.EntityPacketRewriter1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.rewriter.ItemPacketRewriter1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.rewriter.WorldPacketRewriter1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.storage.BlockConnectionStorage; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.storage.BlockStorage; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.storage.TabCompleteTracker; import com.viaversion.viaversion.rewriter.SoundRewriter; import com.viaversion.viaversion.util.ChatColorUtil; import com.viaversion.viaversion.util.ComponentUtil; @@ -75,14 +77,14 @@ import java.util.Map; import java.util.Set; import java.util.logging.Level; -public class Protocol1_13To1_12_2 extends AbstractProtocol { +public class Protocol1_12_2To1_13 extends AbstractProtocol { - public static final MappingData MAPPINGS = new MappingData(); + public static final MappingData1_13 MAPPINGS = new MappingData1_13(); // These are arbitrary rewrite values, it just needs an invalid color code character. private static final Map SCOREBOARD_TEAM_NAME_REWRITE = new HashMap<>(); private static final Set FORMATTING_CODES = Sets.newHashSet('k', 'l', 'm', 'n', 'o', 'r'); private final MetadataRewriter1_13To1_12_2 entityRewriter = new MetadataRewriter1_13To1_12_2(this); - private final InventoryPackets itemRewriter = new InventoryPackets(this); + private final ItemPacketRewriter1_13 itemRewriter = new ItemPacketRewriter1_13(this); private final ComponentRewriter1_13 componentRewriter = new ComponentRewriter1_13<>(this); static { @@ -110,7 +112,7 @@ public class Protocol1_13To1_12_2 extends AbstractProtocol { @@ -162,15 +164,15 @@ public class Protocol1_13To1_12_2 extends AbstractProtocol { componentRewriter.processText(wrapper.user(), wrapper.passthrough(Type.COMPONENT)); @@ -300,7 +302,7 @@ public class Protocol1_13To1_12_2 extends AbstractProtocol> 12; - wrapper.set(Type.INT, 1, WorldPackets.toNewId(IdAndData.toRawData(blockId, blockData))); + wrapper.set(Type.INT, 1, WorldPacketRewriter1_13.toNewId(IdAndData.toRawData(blockId, blockData))); } }); } @@ -394,7 +396,7 @@ public class Protocol1_13To1_12_2 extends AbstractProtocol writeDeclareRecipes(w)).send(Protocol1_13To1_12_2.class); + wrapper.create(ClientboundPackets1_13.DECLARE_RECIPES, w -> writeDeclareRecipes(w)).send(Protocol1_12_2To1_13.class); } }); } @@ -896,7 +898,7 @@ public class Protocol1_13To1_12_2 extends AbstractProtocol. */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.BlockFace; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/AbstractStempConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/AbstractStempConnectionHandler.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/AbstractStempConnectionHandler.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/AbstractStempConnectionHandler.java index 36eb46367..99ec418e1 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/AbstractStempConnectionHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/AbstractStempConnectionHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.BlockFace; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/BasicFenceConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/BasicFenceConnectionHandler.java similarity index 95% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/BasicFenceConnectionHandler.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/BasicFenceConnectionHandler.java index 547661e83..a9c524c3d 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/BasicFenceConnectionHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/BasicFenceConnectionHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/BlockData.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/BlockData.java similarity index 96% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/BlockData.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/BlockData.java index f4d8618c7..689444aea 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/BlockData.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/BlockData.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections; import com.google.common.base.Preconditions; import com.viaversion.viaversion.api.minecraft.BlockFace; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ChestConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/ChestConnectionHandler.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ChestConnectionHandler.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/ChestConnectionHandler.java index 1f3d324a8..47cf56585 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ChestConnectionHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/ChestConnectionHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.BlockFace; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ChorusPlantConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/ChorusPlantConnectionHandler.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ChorusPlantConnectionHandler.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/ChorusPlantConnectionHandler.java index a678c2ce8..310cb58ed 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ChorusPlantConnectionHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/ChorusPlantConnectionHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.BlockFace; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionData.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/ConnectionData.java similarity index 96% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionData.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/ConnectionData.java index d07797c21..8720b5d67 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionData.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/ConnectionData.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections; -import com.github.steveice10.opennbt.tag.builtin.ByteArrayTag; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.IntArrayTag; -import com.github.steveice10.opennbt.tag.builtin.ListTag; -import com.github.steveice10.opennbt.tag.builtin.NumberTag; -import com.github.steveice10.opennbt.tag.builtin.StringTag; -import com.github.steveice10.opennbt.tag.builtin.Tag; +import com.viaversion.nbt.tag.ByteArrayTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.IntArrayTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.NumberTag; +import com.viaversion.nbt.tag.StringTag; +import com.viaversion.nbt.tag.Tag; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.data.MappingDataLoader; @@ -36,11 +36,11 @@ import com.viaversion.viaversion.api.minecraft.chunks.DataPalette; import com.viaversion.viaversion.api.minecraft.chunks.PaletteType; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.providers.BlockConnectionProvider; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.providers.PacketBlockConnectionProvider; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.providers.UserBlockData; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.Protocol1_12_2To1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections.providers.BlockConnectionProvider; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections.providers.PacketBlockConnectionProvider; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections.providers.UserBlockData; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13; import com.viaversion.viaversion.util.Key; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; @@ -91,7 +91,7 @@ public final class ConnectionData { PacketWrapper blockUpdatePacket = PacketWrapper.create(ClientboundPackets1_13.BLOCK_CHANGE, null, user); blockUpdatePacket.write(Type.POSITION1_8, pos); blockUpdatePacket.write(Type.VAR_INT, newBlockState); - blockUpdatePacket.send(Protocol1_13To1_12_2.class); + blockUpdatePacket.send(Protocol1_12_2To1_13.class); } } @@ -723,7 +723,7 @@ public final class ConnectionData { wrapper.write(Type.INT, chunkX + chunkDeltaX); wrapper.write(Type.INT, chunkZ + chunkDeltaZ); wrapper.write(Type.BLOCK_CHANGE_RECORD_ARRAY, updates.toArray(EMPTY_RECORDS)); - wrapper.send(Protocol1_13To1_12_2.class); + wrapper.send(Protocol1_12_2To1_13.class); updates.clear(); } } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/ConnectionHandler.java similarity index 93% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionHandler.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/ConnectionHandler.java index 547e19e07..8c37c73a0 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/ConnectionHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.Position; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/DoorConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/DoorConnectionHandler.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/DoorConnectionHandler.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/DoorConnectionHandler.java index 4524de429..b8e8e60f0 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/DoorConnectionHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/DoorConnectionHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.BlockFace; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/FireConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/FireConnectionHandler.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/FireConnectionHandler.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/FireConnectionHandler.java index fdb3d3e7d..cf9b1bcdf 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/FireConnectionHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/FireConnectionHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.BlockFace; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/FlowerConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/FlowerConnectionHandler.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/FlowerConnectionHandler.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/FlowerConnectionHandler.java index 463d8d9cc..4879a49d4 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/FlowerConnectionHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/FlowerConnectionHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/GlassConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/GlassConnectionHandler.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/GlassConnectionHandler.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/GlassConnectionHandler.java index 1711da5ad..96384141b 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/GlassConnectionHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/GlassConnectionHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections; import com.viaversion.viaversion.api.connection.ProtocolInfo; import com.viaversion.viaversion.api.connection.UserConnection; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/MelonConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/MelonConnectionHandler.java similarity index 93% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/MelonConnectionHandler.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/MelonConnectionHandler.java index 5aeba23bd..4b8e17637 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/MelonConnectionHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/MelonConnectionHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections; public class MelonConnectionHandler extends AbstractStempConnectionHandler { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/NetherFenceConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/NetherFenceConnectionHandler.java similarity index 93% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/NetherFenceConnectionHandler.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/NetherFenceConnectionHandler.java index 75ec12a0a..ee43ec3a1 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/NetherFenceConnectionHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/NetherFenceConnectionHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections; public class NetherFenceConnectionHandler extends AbstractFenceConnectionHandler { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/PumpkinConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/PumpkinConnectionHandler.java similarity index 93% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/PumpkinConnectionHandler.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/PumpkinConnectionHandler.java index 43aebe763..abbeb6f40 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/PumpkinConnectionHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/PumpkinConnectionHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections; public class PumpkinConnectionHandler extends AbstractStempConnectionHandler { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/RedstoneConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/RedstoneConnectionHandler.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/RedstoneConnectionHandler.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/RedstoneConnectionHandler.java index 7ae2e1cef..37c846637 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/RedstoneConnectionHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/RedstoneConnectionHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.BlockFace; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/SnowyGrassConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/SnowyGrassConnectionHandler.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/SnowyGrassConnectionHandler.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/SnowyGrassConnectionHandler.java index 6fb429382..e1e8e392e 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/SnowyGrassConnectionHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/SnowyGrassConnectionHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.BlockFace; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/StairConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/StairConnectionHandler.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/StairConnectionHandler.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/StairConnectionHandler.java index 9fe69bd73..f07568347 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/StairConnectionHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/StairConnectionHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.BlockFace; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/TripwireConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/TripwireConnectionHandler.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/TripwireConnectionHandler.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/TripwireConnectionHandler.java index a0c8e37cd..f504f5799 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/TripwireConnectionHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/TripwireConnectionHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.BlockFace; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/VineConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/VineConnectionHandler.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/VineConnectionHandler.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/VineConnectionHandler.java index 76bd32bc1..b625386aa 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/VineConnectionHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/VineConnectionHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.BlockFace; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/WallConnectionHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/WallConnectionHandler.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/WallConnectionHandler.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/WallConnectionHandler.java index 30a09476e..7761f291e 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/WallConnectionHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/WallConnectionHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.BlockFace; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/WrappedBlockData.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/WrappedBlockData.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/WrappedBlockData.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/WrappedBlockData.java index 4d4de13ad..845f24688 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/WrappedBlockData.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/WrappedBlockData.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections; import com.viaversion.viaversion.util.Key; import java.util.LinkedHashMap; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/BlockConnectionProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/providers/BlockConnectionProvider.java similarity index 91% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/BlockConnectionProvider.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/providers/BlockConnectionProvider.java index 32908ba39..ca69636c0 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/BlockConnectionProvider.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/providers/BlockConnectionProvider.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.providers; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections.providers; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.Position; import com.viaversion.viaversion.api.platform.providers.Provider; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.Protocol1_12_2To1_13; import org.checkerframework.checker.nullness.qual.Nullable; public abstract class BlockConnectionProvider implements Provider { public int getBlockData(UserConnection connection, int x, int y, int z) { int oldId = getWorldBlockData(connection, x, y, z); - return Protocol1_13To1_12_2.MAPPINGS.getBlockMappings().getNewId(oldId); + return Protocol1_12_2To1_13.MAPPINGS.getBlockMappings().getNewId(oldId); } public int getWorldBlockData(UserConnection connection, int x, int y, int z) { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/PacketBlockConnectionProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/providers/PacketBlockConnectionProvider.java similarity index 93% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/PacketBlockConnectionProvider.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/providers/PacketBlockConnectionProvider.java index e9e9e3b95..7e6b8cfc0 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/PacketBlockConnectionProvider.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/providers/PacketBlockConnectionProvider.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.providers; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections.providers; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.Position; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.BlockConnectionStorage; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.storage.BlockConnectionStorage; import org.checkerframework.checker.nullness.qual.Nullable; public class PacketBlockConnectionProvider extends BlockConnectionProvider { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/UserBlockData.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/providers/UserBlockData.java similarity index 90% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/UserBlockData.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/providers/UserBlockData.java index 6ce68b0e2..ac3bf1e37 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/blockconnections/providers/UserBlockData.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/blockconnections/providers/UserBlockData.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.providers; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections.providers; @FunctionalInterface public interface UserBlockData { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/BlockIdData.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/BlockIdData.java similarity index 94% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/BlockIdData.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/BlockIdData.java index 1cee38527..9193059bc 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/BlockIdData.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/BlockIdData.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.data; import com.google.common.collect.ObjectArrays; import com.google.gson.reflect.TypeToken; @@ -38,7 +38,7 @@ public class BlockIdData { public static void init() { // Data from https://minecraft.gamepedia.com/1.13/Flattening - InputStream stream = MappingData.class.getClassLoader() + InputStream stream = MappingData1_13.class.getClassLoader() .getResourceAsStream("assets/viaversion/data/blockIds1.12to1.13.json"); try (InputStreamReader reader = new InputStreamReader(stream)) { Map map = GsonUtil.getGson().fromJson( @@ -57,7 +57,7 @@ public class BlockIdData { Via.getPlatform().getLogger().log(Level.SEVERE, "Failed to load block id mappings (1.12.2 -> 1.13)", e); } - InputStream blockS = MappingData.class.getClassLoader() + InputStream blockS = MappingData1_13.class.getClassLoader() .getResourceAsStream("assets/viaversion/data/blockNumberToString1.12.json"); try (InputStreamReader blockR = new InputStreamReader(blockS)) { Map map = GsonUtil.getGson().fromJson( diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/ComponentRewriter1_13.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/ComponentRewriter1_13.java similarity index 89% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/ComponentRewriter1_13.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/ComponentRewriter1_13.java index edb0a7879..a4a462fea 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/ComponentRewriter1_13.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/ComponentRewriter1_13.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.data; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.NumberTag; -import com.github.steveice10.opennbt.tag.builtin.ShortTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.NumberTag; +import com.viaversion.nbt.tag.ShortTag; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -29,7 +29,7 @@ import com.viaversion.viaversion.api.minecraft.item.DataItem; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.Protocol; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.Protocol1_12_2To1_13; import com.viaversion.viaversion.rewriter.ComponentRewriter; import com.viaversion.viaversion.util.ComponentUtil; import com.viaversion.viaversion.util.SerializerVersion; @@ -96,9 +96,9 @@ public class ComponentRewriter1_13 extends Comp protected void handleTranslate(JsonObject object, String translate) { super.handleTranslate(object, translate); String newTranslate; - newTranslate = Protocol1_13To1_12_2.MAPPINGS.getTranslateMapping().get(translate); + newTranslate = Protocol1_12_2To1_13.MAPPINGS.getTranslateMapping().get(translate); if (newTranslate == null) { - newTranslate = Protocol1_13To1_12_2.MAPPINGS.getMojangTranslation().get(translate); + newTranslate = Protocol1_12_2To1_13.MAPPINGS.getMojangTranslation().get(translate); } if (newTranslate != null) { object.addProperty("translate", newTranslate); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/EntityNameRewriter.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/EntityNameRewriter.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/EntityNameRewriter.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/EntityNameRewriter.java index b31a7f25a..4b36de0af 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/EntityNameRewriter.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/EntityNameRewriter.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.data; import com.viaversion.viaversion.util.Key; import java.util.HashMap; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/EntityTypeRewriter.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/EntityTypeRewriter.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/EntityTypeRewriter.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/EntityTypeRewriter.java index 34d6624af..822ff5684 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/EntityTypeRewriter.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/EntityTypeRewriter.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.data; import it.unimi.dsi.fastutil.ints.Int2IntMap; import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/MappingData.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/MappingData1_13.java similarity index 92% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/MappingData.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/MappingData1_13.java index c5a654111..3bf978dae 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/MappingData.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/MappingData1_13.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.data; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.IntArrayTag; -import com.github.steveice10.opennbt.tag.builtin.StringTag; -import com.github.steveice10.opennbt.tag.builtin.Tag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.IntArrayTag; +import com.viaversion.nbt.tag.StringTag; +import com.viaversion.nbt.tag.Tag; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import com.google.common.io.CharStreams; @@ -44,7 +44,7 @@ import java.util.HashMap; import java.util.Map; import org.checkerframework.checker.nullness.qual.Nullable; -public class MappingData extends MappingDataBase { +public class MappingData1_13 extends MappingDataBase { private final Map blockTags = new HashMap<>(); private final Map itemTags = new HashMap<>(); private final Map fluidTags = new HashMap<>(); @@ -53,7 +53,7 @@ public class MappingData extends MappingDataBase { private final Map mojangTranslation = new HashMap<>(); private final BiMap channelMappings = HashBiMap.create(); - public MappingData() { + public MappingData1_13() { super("1.12", "1.13"); } @@ -95,12 +95,12 @@ public class MappingData extends MappingDataBase { } Map translationMappingData = GsonUtil.getGson().fromJson( - new InputStreamReader(MappingData.class.getClassLoader().getResourceAsStream("assets/viaversion/data/mapping-lang-1.12-1.13.json")), + new InputStreamReader(MappingData1_13.class.getClassLoader().getResourceAsStream("assets/viaversion/data/mapping-lang-1.12-1.13.json")), new TypeToken>() { }.getType()); String[] unmappedTranslationLines; - try (Reader reader = new InputStreamReader(MappingData.class.getClassLoader() + try (Reader reader = new InputStreamReader(MappingData1_13.class.getClassLoader() .getResourceAsStream("assets/viaversion/data/en_US.properties"), StandardCharsets.UTF_8)) { unmappedTranslationLines = CharStreams.toString(reader).split("\n"); } catch (IOException e) { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/NamedSoundRewriter.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/NamedSoundRewriter.java similarity index 99% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/NamedSoundRewriter.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/NamedSoundRewriter.java index da4513361..c47152708 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/NamedSoundRewriter.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/NamedSoundRewriter.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.data; import java.util.HashMap; import java.util.Locale; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/ParticleRewriter.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/ParticleRewriter.java similarity index 95% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/ParticleRewriter.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/ParticleRewriter.java index b09f4284b..c8061cf83 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/ParticleRewriter.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/ParticleRewriter.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.data; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.minecraft.item.DataItem; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.Protocol1_12_2To1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.rewriter.WorldPacketRewriter1_13; import com.viaversion.viaversion.api.minecraft.Particle; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.packets.WorldPackets; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -139,7 +139,7 @@ public class ParticleRewriter { } // Transform to new Item - Via.getManager().getProtocolManager().getProtocol(Protocol1_13To1_12_2.class).getItemRewriter().handleItemToClient(null, item); + Via.getManager().getProtocolManager().getProtocol(Protocol1_12_2To1_13.class).getItemRewriter().handleItemToClient(null, item); particle.add(Type.ITEM1_13, item); // Item Slot The item that will be used. return particle; @@ -151,7 +151,7 @@ public class ParticleRewriter { return (particle, data) -> { int value = data[0]; int combined = (((value & 4095) << 4) | (value >> 12 & 15)); - int newId = WorldPackets.toNewId(combined); + int newId = WorldPacketRewriter1_13.toNewId(combined); particle.add(Type.VAR_INT, newId); // BlockState VarInt The ID of the block state. return particle; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/RecipeData.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/RecipeData.java similarity index 96% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/RecipeData.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/RecipeData.java index 3b5e0d048..0db5f77c7 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/RecipeData.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/RecipeData.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.data; import com.google.gson.reflect.TypeToken; import com.viaversion.viaversion.api.minecraft.item.DataItem; @@ -29,7 +29,7 @@ public class RecipeData { public static Map recipes; public static void init() { - InputStream stream = MappingData.class.getClassLoader() + InputStream stream = MappingData1_13.class.getClassLoader() .getResourceAsStream("assets/viaversion/data/itemrecipes1_12_2to1_13.json"); try (InputStreamReader reader = new InputStreamReader(stream)) { recipes = GsonUtil.getGson().fromJson( diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/SoundSource.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/SoundSource.java similarity index 95% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/SoundSource.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/SoundSource.java index 0d85c4e0c..599e6aec6 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/SoundSource.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/SoundSource.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.data; import java.util.Optional; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/SpawnEggRewriter.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/SpawnEggRewriter.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/SpawnEggRewriter.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/SpawnEggRewriter.java index b06be07b3..e5296977b 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/SpawnEggRewriter.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/SpawnEggRewriter.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.data; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/StatisticData.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/StatisticData.java similarity index 92% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/StatisticData.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/StatisticData.java index 8c076e800..4992d71cb 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/StatisticData.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/StatisticData.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.data; public record StatisticData(int categoryId, int newId, int value) { } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/StatisticMappings.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/StatisticMappings.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/StatisticMappings.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/StatisticMappings.java index 8ccc12496..476407742 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/StatisticMappings.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/data/StatisticMappings.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.data; import java.util.HashMap; import java.util.Map; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/metadata/MetadataRewriter1_13To1_12_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/metadata/MetadataRewriter1_13To1_12_2.java similarity index 85% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/metadata/MetadataRewriter1_13To1_12_2.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/metadata/MetadataRewriter1_13To1_12_2.java index a21080ef7..d5eaa12e3 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/metadata/MetadataRewriter1_13To1_12_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/metadata/MetadataRewriter1_13To1_12_2.java @@ -15,24 +15,24 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.metadata; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.metadata; import com.viaversion.viaversion.api.minecraft.Particle; import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_13; import com.viaversion.viaversion.api.minecraft.metadata.Metadata; import com.viaversion.viaversion.api.type.types.version.Types1_13; -import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.EntityTypeRewriter; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.ParticleRewriter; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.packets.WorldPackets; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.Protocol1_12_2To1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.data.EntityTypeRewriter; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.data.ParticleRewriter; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.rewriter.WorldPacketRewriter1_13; +import com.viaversion.viaversion.protocols.v1_12to1_12_1.packet.ClientboundPackets1_12_1; import com.viaversion.viaversion.rewriter.EntityRewriter; import com.viaversion.viaversion.util.ComponentUtil; -public class MetadataRewriter1_13To1_12_2 extends EntityRewriter { +public class MetadataRewriter1_13To1_12_2 extends EntityRewriter { - public MetadataRewriter1_13To1_12_2(Protocol1_13To1_12_2 protocol) { + public MetadataRewriter1_13To1_12_2(Protocol1_12_2To1_13 protocol) { super(protocol); } @@ -44,7 +44,7 @@ public class MetadataRewriter1_13To1_12_2 extends EntityRewriter> 12 & 15)); - final int newId = WorldPackets.toNewId(combined); + final int newId = WorldPacketRewriter1_13.toNewId(combined); meta.setValue(newId); } })); @@ -70,7 +70,7 @@ public class MetadataRewriter1_13To1_12_2 extends EntityRewriter { final int oldId = meta.value(); final int combined = (((oldId & 4095) << 4) | (oldId >> 12 & 15)); - final int newId = WorldPackets.toNewId(combined); + final int newId = WorldPacketRewriter1_13.toNewId(combined); meta.setValue(newId); }); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/ClientboundPackets1_13.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/packet/ClientboundPackets1_13.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/ClientboundPackets1_13.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/packet/ClientboundPackets1_13.java index 1d758d7d5..4074d0872 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/ClientboundPackets1_13.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/packet/ClientboundPackets1_13.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.packet; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/ServerboundPackets1_13.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/packet/ServerboundPackets1_13.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/ServerboundPackets1_13.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/packet/ServerboundPackets1_13.java index 46ec68770..aa4f401f9 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/ServerboundPackets1_13.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/packet/ServerboundPackets1_13.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.packet; import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/BlockEntityProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/BlockEntityProvider.java similarity index 76% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/BlockEntityProvider.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/BlockEntityProvider.java index 56efa760c..a3ce674af 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/BlockEntityProvider.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/BlockEntityProvider.java @@ -15,24 +15,24 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.providers; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.StringTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.StringTag; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.Position; import com.viaversion.viaversion.api.platform.providers.Provider; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.blockentities.BannerHandler; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.blockentities.BedHandler; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.blockentities.CommandBlockHandler; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.blockentities.FlowerPotHandler; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.blockentities.SkullHandler; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.blockentities.SpawnerHandler; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.Protocol1_12_2To1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.providers.blockentities.BannerHandler; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.providers.blockentities.BedHandler; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.providers.blockentities.CommandBlockHandler; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.providers.blockentities.FlowerPotHandler; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.providers.blockentities.SkullHandler; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.providers.blockentities.SpawnerHandler; import java.util.HashMap; import java.util.Map; @@ -83,7 +83,7 @@ public class BlockEntityProvider implements Provider { wrapper.write(Type.POSITION1_8, position); wrapper.write(Type.VAR_INT, blockId); - wrapper.send(Protocol1_13To1_12_2.class); + wrapper.send(Protocol1_12_2To1_13.class); } @FunctionalInterface diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/PaintingProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/PaintingProvider.java similarity index 96% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/PaintingProvider.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/PaintingProvider.java index e53f7ca47..9fe99acb2 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/PaintingProvider.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/PaintingProvider.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.providers; import com.viaversion.viaversion.api.platform.providers.Provider; import com.viaversion.viaversion.util.Key; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/PlayerLookTargetProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/PlayerLookTargetProvider.java similarity index 94% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/PlayerLookTargetProvider.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/PlayerLookTargetProvider.java index 553335ff4..f481e1681 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/PlayerLookTargetProvider.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/PlayerLookTargetProvider.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.providers; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.Position; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/BannerHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/blockentities/BannerHandler.java similarity index 84% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/BannerHandler.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/blockentities/BannerHandler.java index eb7580958..cd2637d86 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/BannerHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/blockentities/BannerHandler.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.blockentities; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.providers.blockentities; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.ListTag; -import com.github.steveice10.opennbt.tag.builtin.NumberTag; -import com.github.steveice10.opennbt.tag.builtin.StringTag; -import com.github.steveice10.opennbt.tag.builtin.Tag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.NumberTag; +import com.viaversion.nbt.tag.StringTag; +import com.viaversion.nbt.tag.Tag; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.Position; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.BlockEntityProvider; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.BlockStorage; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.providers.BlockEntityProvider; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.storage.BlockStorage; import com.viaversion.viaversion.util.ComponentUtil; public class BannerHandler implements BlockEntityProvider.BlockEntityHandler { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/BedHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/blockentities/BedHandler.java similarity index 82% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/BedHandler.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/blockentities/BedHandler.java index b794aaf76..ed67f83de 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/BedHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/blockentities/BedHandler.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.blockentities; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.providers.blockentities; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.NumberTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.NumberTag; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.Position; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.BlockEntityProvider; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.BlockStorage; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.providers.BlockEntityProvider; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.storage.BlockStorage; public class BedHandler implements BlockEntityProvider.BlockEntityHandler { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/CommandBlockHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/blockentities/CommandBlockHandler.java similarity index 76% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/CommandBlockHandler.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/blockentities/CommandBlockHandler.java index 252053805..e9a4dba55 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/CommandBlockHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/blockentities/CommandBlockHandler.java @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.blockentities; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.providers.blockentities; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.StringTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.StringTag; import com.google.gson.JsonElement; import com.google.gson.JsonParser; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.BlockEntityProvider; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.Protocol1_12_2To1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.providers.BlockEntityProvider; import com.viaversion.viaversion.util.ComponentUtil; public class CommandBlockHandler implements BlockEntityProvider.BlockEntityHandler { - private final Protocol1_13To1_12_2 protocol = Via.getManager().getProtocolManager().getProtocol(Protocol1_13To1_12_2.class); + private final Protocol1_12_2To1_13 protocol = Via.getManager().getProtocolManager().getProtocol(Protocol1_12_2To1_13.class); @Override public int transform(UserConnection user, CompoundTag tag) { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/FlowerPotHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/blockentities/FlowerPotHandler.java similarity index 93% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/FlowerPotHandler.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/blockentities/FlowerPotHandler.java index d0dfdf2fd..aa50cc8d8 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/FlowerPotHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/blockentities/FlowerPotHandler.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.blockentities; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.providers.blockentities; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.connection.UserConnection; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.BlockEntityProvider; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.providers.BlockEntityProvider; import com.viaversion.viaversion.util.Key; import com.viaversion.viaversion.util.Pair; import java.util.Map; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/SkullHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/blockentities/SkullHandler.java similarity index 84% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/SkullHandler.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/blockentities/SkullHandler.java index 56d0298c0..a56258ba9 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/SkullHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/blockentities/SkullHandler.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.blockentities; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.providers.blockentities; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.NumberTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.NumberTag; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.Position; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.BlockEntityProvider; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.BlockStorage; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.providers.BlockEntityProvider; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.storage.BlockStorage; public class SkullHandler implements BlockEntityProvider.BlockEntityHandler { private static final int SKULL_WALL_START = 5447; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/SpawnerHandler.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/blockentities/SpawnerHandler.java similarity index 77% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/SpawnerHandler.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/blockentities/SpawnerHandler.java index 7d3bf7511..a86c06ed1 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/providers/blockentities/SpawnerHandler.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/providers/blockentities/SpawnerHandler.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.blockentities; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.providers.blockentities; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.StringTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.StringTag; import com.viaversion.viaversion.api.connection.UserConnection; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.EntityNameRewriter; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.BlockEntityProvider; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.data.EntityNameRewriter; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.providers.BlockEntityProvider; public class SpawnerHandler implements BlockEntityProvider.BlockEntityHandler { @Override diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/rewriter/EntityPacketRewriter1_13.java similarity index 90% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/EntityPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/rewriter/EntityPacketRewriter1_13.java index 7d3bc9549..edd52690d 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/EntityPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/rewriter/EntityPacketRewriter1_13.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.packets; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.rewriter; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.minecraft.ClientWorld; @@ -24,13 +24,13 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_12; import com.viaversion.viaversion.api.type.types.version.Types1_13; -import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.metadata.MetadataRewriter1_13To1_12_2; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.Protocol1_12_2To1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.metadata.MetadataRewriter1_13To1_12_2; +import com.viaversion.viaversion.protocols.v1_12to1_12_1.packet.ClientboundPackets1_12_1; -public class EntityPackets { +public class EntityPacketRewriter1_13 { - public static void register(Protocol1_13To1_12_2 protocol) { + public static void register(Protocol1_12_2To1_13 protocol) { MetadataRewriter1_13To1_12_2 metadataRewriter = protocol.get(MetadataRewriter1_13To1_12_2.class); protocol.registerClientbound(ClientboundPackets1_12_1.SPAWN_ENTITY, new PacketHandlers() { @@ -54,12 +54,12 @@ public class EntityPackets { if (entType == null) return; // Register Type ID - wrapper.user().getEntityTracker(Protocol1_13To1_12_2.class).addEntity(entityId, entType); + wrapper.user().getEntityTracker(Protocol1_12_2To1_13.class).addEntity(entityId, entType); if (entType.is(EntityTypes1_13.EntityType.FALLING_BLOCK)) { int oldId = wrapper.get(Type.INT, 0); int combined = (((oldId & 4095) << 4) | (oldId >> 12 & 15)); - wrapper.set(Type.INT, 0, WorldPackets.toNewId(combined)); + wrapper.set(Type.INT, 0, WorldPacketRewriter1_13.toNewId(combined)); } // Fix ItemFrame hitbox @@ -128,7 +128,7 @@ public class EntityPackets { clientChunks.setEnvironment(dimensionId); }); handler(metadataRewriter.playerTrackerHandler()); - handler(Protocol1_13To1_12_2.SEND_DECLARE_COMMANDS_AND_TAGS); + handler(Protocol1_12_2To1_13.SEND_DECLARE_COMMANDS_AND_TAGS); } }); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/rewriter/ItemPacketRewriter1_13.java similarity index 94% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/rewriter/ItemPacketRewriter1_13.java index 791bf4664..b2dc4d8cf 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/rewriter/ItemPacketRewriter1_13.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.packets; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.rewriter; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.IntTag; -import com.github.steveice10.opennbt.tag.builtin.ListTag; -import com.github.steveice10.opennbt.tag.builtin.NumberTag; -import com.github.steveice10.opennbt.tag.builtin.StringTag; -import com.github.steveice10.opennbt.tag.builtin.Tag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.IntTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.NumberTag; +import com.viaversion.nbt.tag.StringTag; +import com.viaversion.nbt.tag.Tag; import com.google.common.base.Joiner; import com.google.common.primitives.Ints; import com.viaversion.viaversion.api.Via; @@ -30,14 +30,14 @@ import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.BlockIdData; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.MappingData; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.SoundSource; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.SpawnEggRewriter; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ServerboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_12to1_12_1.packet.ClientboundPackets1_12_1; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.Protocol1_12_2To1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.data.BlockIdData; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.data.MappingData1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.data.SoundSource; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.data.SpawnEggRewriter; import com.viaversion.viaversion.rewriter.ItemRewriter; import com.viaversion.viaversion.util.ComponentUtil; import com.viaversion.viaversion.util.IdAndData; @@ -48,9 +48,9 @@ import java.util.List; import java.util.Locale; import java.util.Optional; -public class InventoryPackets extends ItemRewriter { +public class ItemPacketRewriter1_13 extends ItemRewriter { - public InventoryPackets(Protocol1_13To1_12_2 protocol) { + public ItemPacketRewriter1_13(Protocol1_12_2To1_13 protocol) { super(protocol, null, null); } @@ -336,7 +336,7 @@ public class InventoryPackets extends ItemRewriter eggEntityId = SpawnEggRewriter.getEntityId(oldId); @@ -616,7 +616,7 @@ public class InventoryPackets extends ItemRewriter 20 ? newId.substring(0, 20) : newId; } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/rewriter/WorldPacketRewriter1_13.java similarity index 94% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/WorldPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/rewriter/WorldPacketRewriter1_13.java index 420963c06..f66790d2a 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/WorldPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/rewriter/WorldPacketRewriter1_13.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.packets; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.rewriter; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.StringTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.StringTag; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.BlockChangeRecord; @@ -34,17 +34,17 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_13; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_9_3; -import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.ConnectionData; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.ConnectionHandler; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.NamedSoundRewriter; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.ParticleRewriter; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.BlockEntityProvider; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.PaintingProvider; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.BlockStorage; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.Protocol1_12_2To1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections.ConnectionData; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections.ConnectionHandler; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.data.NamedSoundRewriter; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.data.ParticleRewriter; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ServerboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.providers.BlockEntityProvider; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.providers.PaintingProvider; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.storage.BlockStorage; +import com.viaversion.viaversion.protocols.v1_12to1_12_1.packet.ClientboundPackets1_12_1; import com.viaversion.viaversion.util.IdAndData; import com.viaversion.viaversion.util.Key; import it.unimi.dsi.fastutil.ints.IntOpenHashSet; @@ -52,7 +52,7 @@ import it.unimi.dsi.fastutil.ints.IntSet; import java.util.Iterator; import java.util.Optional; -public class WorldPackets { +public class WorldPacketRewriter1_13 { private static final IntSet VALID_BIOMES = new IntOpenHashSet(70, .99F); static { @@ -75,7 +75,7 @@ public class WorldPackets { } } - public static void register(Protocol1_13To1_12_2 protocol) { + public static void register(Protocol1_12_2To1_13 protocol) { // Outgoing packets protocol.registerClientbound(ClientboundPackets1_12_1.SPAWN_PAINTING, new PacketHandlers() { @Override @@ -165,7 +165,7 @@ public class WorldPackets { PacketWrapper blockChange = wrapper.create(ClientboundPackets1_13.BLOCK_CHANGE); blockChange.write(Type.POSITION1_8, pos); blockChange.write(Type.VAR_INT, 249 + (action * 24 * 2) + (param * 2)); - blockChange.send(Protocol1_13To1_12_2.class); + blockChange.send(Protocol1_12_2To1_13.class); } wrapper.set(Type.VAR_INT, 0, blockId); }); @@ -191,7 +191,7 @@ public class WorldPackets { if (Via.getConfig().isServersideBlockConnections()) { // Workaround for packet order issue - wrapper.send(Protocol1_13To1_12_2.class); + wrapper.send(Protocol1_12_2To1_13.class); wrapper.cancel(); ConnectionData.update(userConnection, position); } @@ -242,7 +242,7 @@ public class WorldPackets { } // Workaround for packet order issue - wrapper.send(Protocol1_13To1_12_2.class); + wrapper.send(Protocol1_12_2To1_13.class); wrapper.cancel(); for (BlockChangeRecord record : records) { @@ -290,7 +290,7 @@ public class WorldPackets { } // Workaround for packet order issue - wrapper.send(Protocol1_13To1_12_2.class); + wrapper.send(Protocol1_12_2To1_13.class); wrapper.cancel(); for (int i = 0; i < recordCount; i++) { @@ -453,7 +453,7 @@ public class WorldPackets { if (Via.getConfig().isServersideBlockConnections()) { ConnectionData.connectBlocks(wrapper.user(), chunk); // Workaround for packet order issue - wrapper.send(Protocol1_13To1_12_2.class); + wrapper.send(Protocol1_12_2To1_13.class); wrapper.cancel(); ConnectionData.NeighbourUpdater updater = new ConnectionData.NeighbourUpdater(wrapper.user()); for (int i = 0; i < chunk.getSections().length; i++) { @@ -566,11 +566,11 @@ public class WorldPackets { if (oldId < 0) { oldId = 0; // Some plugins use negative numbers to clear blocks, remap them to air. } - int newId = Protocol1_13To1_12_2.MAPPINGS.getBlockMappings().getNewId(oldId); + int newId = Protocol1_12_2To1_13.MAPPINGS.getBlockMappings().getNewId(oldId); if (newId != -1) { return newId; } - newId = Protocol1_13To1_12_2.MAPPINGS.getBlockMappings().getNewId(IdAndData.removeData(oldId)); // Remove data + newId = Protocol1_12_2To1_13.MAPPINGS.getBlockMappings().getNewId(IdAndData.removeData(oldId)); // Remove data if (newId != -1) { if (!Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) { Via.getPlatform().getLogger().warning("Missing block " + oldId); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockConnectionStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/storage/BlockConnectionStorage.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockConnectionStorage.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/storage/BlockConnectionStorage.java index 95c0002b5..eafdd3cca 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockConnectionStorage.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/storage/BlockConnectionStorage.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.storage; import com.google.common.collect.EvictingQueue; import com.viaversion.viaversion.api.Via; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/storage/BlockStorage.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockStorage.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/storage/BlockStorage.java index 7ee968213..c679e3b52 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/BlockStorage.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/storage/BlockStorage.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.storage; import com.viaversion.viaversion.api.connection.StorableObject; import com.viaversion.viaversion.api.minecraft.Position; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/TabCompleteTracker.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/storage/TabCompleteTracker.java similarity index 87% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/TabCompleteTracker.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/storage/TabCompleteTracker.java index 52a5ef8d0..0b962d3c8 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/storage/TabCompleteTracker.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/storage/TabCompleteTracker.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.storage; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.StorableObject; @@ -23,9 +23,9 @@ import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.Position; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ServerboundPackets1_12_1; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.PlayerLookTargetProvider; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.Protocol1_12_2To1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.providers.PlayerLookTargetProvider; +import com.viaversion.viaversion.protocols.v1_12to1_12_1.packet.ServerboundPackets1_12_1; import java.util.logging.Level; public class TabCompleteTracker implements StorableObject { @@ -41,7 +41,7 @@ public class TabCompleteTracker implements StorableObject { wrapper.write(Type.BOOLEAN, false); final Position playerLookTarget = Via.getManager().getProviders().get(PlayerLookTargetProvider.class).getPlayerLookTarget(connection); wrapper.write(Type.OPTIONAL_POSITION1_8, playerLookTarget); - wrapper.scheduleSendToServer(Protocol1_13To1_12_2.class); + wrapper.scheduleSendToServer(Protocol1_12_2To1_13.class); lastTabComplete = null; } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/task/TabCompleteThread.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/task/TabCompleteThread.java similarity index 81% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/task/TabCompleteThread.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/task/TabCompleteThread.java index 1e344a7f6..2acb822e7 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/task/TabCompleteThread.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/task/TabCompleteThread.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13to1_12_2.task; +package com.viaversion.viaversion.protocols.v1_12_2to1_13.task; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.TabCompleteTracker; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.Protocol1_12_2To1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.storage.TabCompleteTracker; public class TabCompleteThread implements Runnable { @Override public void run() { for (UserConnection info : Via.getManager().getConnectionManager().getConnections()) { if (info.getProtocolInfo() == null) continue; - if (info.getProtocolInfo().getPipeline().contains(Protocol1_13To1_12_2.class) && info.getChannel().isOpen()) { + if (info.getProtocolInfo().getPipeline().contains(Protocol1_12_2To1_13.class) && info.getChannel().isOpen()) { info.get(TabCompleteTracker.class).sendPacketToServer(info); } } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12_1to1_12/Protocol1_12_1To1_12.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12to1_12_1/Protocol1_12To1_12_1.java similarity index 73% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12_1to1_12/Protocol1_12_1To1_12.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12to1_12_1/Protocol1_12To1_12_1.java index 8b9488240..3adc131e1 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12_1to1_12/Protocol1_12_1To1_12.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12to1_12_1/Protocol1_12To1_12_1.java @@ -15,15 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_12_1to1_12; +package com.viaversion.viaversion.protocols.v1_12to1_12_1; import com.viaversion.viaversion.api.protocol.AbstractProtocol; -import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ClientboundPackets1_12; -import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ServerboundPackets1_12; +import com.viaversion.viaversion.protocols.v1_11_1to1_12.packet.ClientboundPackets1_12; +import com.viaversion.viaversion.protocols.v1_11_1to1_12.packet.ServerboundPackets1_12; +import com.viaversion.viaversion.protocols.v1_12to1_12_1.packet.ClientboundPackets1_12_1; +import com.viaversion.viaversion.protocols.v1_12to1_12_1.packet.ServerboundPackets1_12_1; -public class Protocol1_12_1To1_12 extends AbstractProtocol { +public class Protocol1_12To1_12_1 extends AbstractProtocol { - public Protocol1_12_1To1_12() { + public Protocol1_12To1_12_1() { super(ClientboundPackets1_12.class, ClientboundPackets1_12_1.class, ServerboundPackets1_12.class, ServerboundPackets1_12_1.class); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12_1to1_12/ClientboundPackets1_12_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12to1_12_1/packet/ClientboundPackets1_12_1.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12_1to1_12/ClientboundPackets1_12_1.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12to1_12_1/packet/ClientboundPackets1_12_1.java index d11b766a2..f02bb5fbd 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12_1to1_12/ClientboundPackets1_12_1.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12to1_12_1/packet/ClientboundPackets1_12_1.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_12_1to1_12; +package com.viaversion.viaversion.protocols.v1_12to1_12_1.packet; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12_1to1_12/ServerboundPackets1_12_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12to1_12_1/packet/ServerboundPackets1_12_1.java similarity index 96% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12_1to1_12/ServerboundPackets1_12_1.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_12to1_12_1/packet/ServerboundPackets1_12_1.java index 48b66d2e8..8566308a2 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12_1to1_12/ServerboundPackets1_12_1.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12to1_12_1/packet/ServerboundPackets1_12_1.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_12_1to1_12; +package com.viaversion.viaversion.protocols.v1_12to1_12_1.packet; import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/Protocol1_13_2To1_13_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_1to1_13_2/Protocol1_13_1To1_13_2.java similarity index 80% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/Protocol1_13_2To1_13_1.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_13_1to1_13_2/Protocol1_13_1To1_13_2.java index f56818a3e..77d981cd4 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/Protocol1_13_2To1_13_1.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_1to1_13_2/Protocol1_13_1To1_13_2.java @@ -15,29 +15,29 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13_2to1_13_1; +package com.viaversion.viaversion.protocols.v1_13_1to1_13_2; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_13_2to1_13_1.packets.EntityPackets; -import com.viaversion.viaversion.protocols.protocol1_13_2to1_13_1.packets.InventoryPackets; -import com.viaversion.viaversion.protocols.protocol1_13_2to1_13_1.packets.WorldPackets; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ServerboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_13_1to1_13_2.rewriter.EntityPacketRewriter1_13_2; +import com.viaversion.viaversion.protocols.v1_13_1to1_13_2.rewriter.ItemPacketRewriter1_13_2; +import com.viaversion.viaversion.protocols.v1_13_1to1_13_2.rewriter.WorldPacketRewriter1_13_2; -public class Protocol1_13_2To1_13_1 extends AbstractProtocol { +public class Protocol1_13_1To1_13_2 extends AbstractProtocol { - public Protocol1_13_2To1_13_1() { + public Protocol1_13_1To1_13_2() { super(ClientboundPackets1_13.class, ClientboundPackets1_13.class, ServerboundPackets1_13.class, ServerboundPackets1_13.class); } @Override protected void registerPackets() { - InventoryPackets.register(this); - WorldPackets.register(this); - EntityPackets.register(this); + ItemPacketRewriter1_13_2.register(this); + WorldPacketRewriter1_13_2.register(this); + EntityPacketRewriter1_13_2.register(this); registerServerbound(ServerboundPackets1_13.EDIT_BOOK, new PacketHandlers() { @Override diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_1to1_13_2/rewriter/EntityPacketRewriter1_13_2.java similarity index 91% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/EntityPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_13_1to1_13_2/rewriter/EntityPacketRewriter1_13_2.java index 8f46a03dd..a8e8a80a4 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/EntityPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_1to1_13_2/rewriter/EntityPacketRewriter1_13_2.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13_2to1_13_1.packets; +package com.viaversion.viaversion.protocols.v1_13_1to1_13_2.rewriter; import com.viaversion.viaversion.api.minecraft.metadata.Metadata; import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; @@ -23,12 +23,12 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_13; import com.viaversion.viaversion.api.type.types.version.Types1_13_2; -import com.viaversion.viaversion.protocols.protocol1_13_2to1_13_1.Protocol1_13_2To1_13_1; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_13_1to1_13_2.Protocol1_13_1To1_13_2; -public class EntityPackets { +public class EntityPacketRewriter1_13_2 { - public static void register(Protocol1_13_2To1_13_1 protocol) { + public static void register(Protocol1_13_1To1_13_2 protocol) { final PacketHandler metaTypeHandler = wrapper -> { for (Metadata metadata : wrapper.get(Types1_13_2.METADATA_LIST, 0)) { metadata.setMetaType(Types1_13_2.META_TYPES.byId(metadata.metaType().typeId())); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_1to1_13_2/rewriter/ItemPacketRewriter1_13_2.java similarity index 94% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/InventoryPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_13_1to1_13_2/rewriter/ItemPacketRewriter1_13_2.java index 24bcba0cc..efd3c00fa 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/InventoryPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_1to1_13_2/rewriter/ItemPacketRewriter1_13_2.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13_2to1_13_1.packets; +package com.viaversion.viaversion.protocols.v1_13_1to1_13_2.rewriter; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_13_2to1_13_1.Protocol1_13_2To1_13_1; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ServerboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_13_1to1_13_2.Protocol1_13_1To1_13_2; import com.viaversion.viaversion.util.Key; -public class InventoryPackets { +public class ItemPacketRewriter1_13_2 { - public static void register(Protocol1_13_2To1_13_1 protocol) { + public static void register(Protocol1_13_1To1_13_2 protocol) { protocol.registerClientbound(ClientboundPackets1_13.SET_SLOT, new PacketHandlers() { @Override public void register() { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_1to1_13_2/rewriter/WorldPacketRewriter1_13_2.java similarity index 85% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/WorldPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_13_1to1_13_2/rewriter/WorldPacketRewriter1_13_2.java index 027378357..cca2ea948 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_2to1_13_1/packets/WorldPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_1to1_13_2/rewriter/WorldPacketRewriter1_13_2.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13_2to1_13_1.packets; +package com.viaversion.viaversion.protocols.v1_13_1to1_13_2.rewriter; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_13_2to1_13_1.Protocol1_13_2To1_13_1; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_13_1to1_13_2.Protocol1_13_1To1_13_2; -public class WorldPackets { +public class WorldPacketRewriter1_13_2 { - public static void register(Protocol1_13_2To1_13_1 protocol) { + public static void register(Protocol1_13_1To1_13_2 protocol) { protocol.registerClientbound(ClientboundPackets1_13.SPAWN_PARTICLE, new PacketHandlers() { @Override public void register() { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/Protocol1_14To1_13_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/Protocol1_13_2To1_14.java similarity index 80% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/Protocol1_14To1_13_2.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/Protocol1_13_2To1_14.java index 22f92b517..e0d80632a 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/Protocol1_14To1_13_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/Protocol1_13_2To1_14.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_14to1_13_2; +package com.viaversion.viaversion.protocols.v1_13_2to1_14; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.ClientWorld; @@ -25,29 +25,31 @@ import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.misc.ParticleType; import com.viaversion.viaversion.api.type.types.version.Types1_13_2; import com.viaversion.viaversion.api.type.types.version.Types1_14; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.data.ComponentRewriter1_14; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.data.MappingData; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.metadata.MetadataRewriter1_14To1_13_2; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.packets.EntityPackets; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.packets.InventoryPackets; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.packets.PlayerPackets; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.packets.WorldPackets; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.storage.EntityTracker1_14; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ServerboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.data.ComponentRewriter1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.data.MappingData1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.metadata.MetadataRewriter1_14To1_13_2; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ClientboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.rewriter.EntityPacketRewriter1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.rewriter.ItemPacketRewriter1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.rewriter.PlayerPackets1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.rewriter.WorldPacketRewriter1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.storage.EntityTracker1_14; import com.viaversion.viaversion.rewriter.CommandRewriter; import com.viaversion.viaversion.rewriter.ComponentRewriter; import com.viaversion.viaversion.rewriter.SoundRewriter; import com.viaversion.viaversion.rewriter.StatisticsRewriter; import org.checkerframework.checker.nullness.qual.Nullable; -public class Protocol1_14To1_13_2 extends AbstractProtocol { +public class Protocol1_13_2To1_14 extends AbstractProtocol { - public static final MappingData MAPPINGS = new MappingData(); + public static final MappingData1_14 MAPPINGS = new MappingData1_14(); private final MetadataRewriter1_14To1_13_2 metadataRewriter = new MetadataRewriter1_14To1_13_2(this); - private final InventoryPackets itemRewriter = new InventoryPackets(this); + private final ItemPacketRewriter1_14 itemRewriter = new ItemPacketRewriter1_14(this); - public Protocol1_14To1_13_2() { + public Protocol1_13_2To1_14() { super(ClientboundPackets1_13.class, ClientboundPackets1_14.class, ServerboundPackets1_13.class, ServerboundPackets1_14.class); } @@ -55,9 +57,9 @@ public class Protocol1_14To1_13_2 extends AbstractProtocol(this).registerSound(ClientboundPackets1_13.SOUND); new StatisticsRewriter<>(this).register(ClientboundPackets1_13.STATISTICS); @@ -141,9 +143,9 @@ public class Protocol1_14To1_13_2 extends AbstractProtocol. */ -package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.data; +package com.viaversion.viaversion.protocols.v1_13_2to1_14.data; import com.google.gson.JsonObject; import com.viaversion.viaversion.api.protocol.Protocol; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.ComponentRewriter1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.data.ComponentRewriter1_13; public class ComponentRewriter1_14 extends ComponentRewriter1_13 { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/data/MappingData.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/data/MappingData1_14.java similarity index 87% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/data/MappingData.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/data/MappingData1_14.java index 4e6329663..1a04cd7f1 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/data/MappingData.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/data/MappingData1_14.java @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.data; +package com.viaversion.viaversion.protocols.v1_13_2to1_14.data; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.IntArrayTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.IntArrayTag; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.data.MappingDataBase; import com.viaversion.viaversion.api.data.MappingDataLoader; import it.unimi.dsi.fastutil.ints.IntOpenHashSet; import it.unimi.dsi.fastutil.ints.IntSet; -public class MappingData extends MappingDataBase { +public class MappingData1_14 extends MappingDataBase { private IntSet motionBlocking; private IntSet nonFullBlocks; - public MappingData() { + public MappingData1_14() { super("1.13.2", "1.14"); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/metadata/MetadataRewriter1_14To1_13_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/metadata/MetadataRewriter1_14To1_13_2.java similarity index 94% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/metadata/MetadataRewriter1_14To1_13_2.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/metadata/MetadataRewriter1_14To1_13_2.java index 60b082bd0..44d93ec24 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/metadata/MetadataRewriter1_14To1_13_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/metadata/MetadataRewriter1_14To1_13_2.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.metadata; +package com.viaversion.viaversion.protocols.v1_13_2to1_14.metadata; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.minecraft.VillagerData; @@ -28,15 +28,15 @@ import com.viaversion.viaversion.api.minecraft.metadata.Metadata; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_14; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.Protocol1_14To1_13_2; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.storage.EntityTracker1_14; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.Protocol1_13_2To1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ClientboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.storage.EntityTracker1_14; import com.viaversion.viaversion.rewriter.EntityRewriter; -public class MetadataRewriter1_14To1_13_2 extends EntityRewriter { +public class MetadataRewriter1_14To1_13_2 extends EntityRewriter { - public MetadataRewriter1_14To1_13_2(Protocol1_14To1_13_2 protocol) { + public MetadataRewriter1_14To1_13_2(Protocol1_13_2To1_14 protocol) { super(protocol); } @@ -116,7 +116,7 @@ public class MetadataRewriter1_14To1_13_2 extends EntityRewriter. */ -package com.viaversion.viaversion.protocols.protocol1_14to1_13_2; +package com.viaversion.viaversion.protocols.v1_13_2to1_14.packet; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/ServerboundPackets1_14.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/packet/ServerboundPackets1_14.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/ServerboundPackets1_14.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/packet/ServerboundPackets1_14.java index a019875a0..d0da1f332 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/ServerboundPackets1_14.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/packet/ServerboundPackets1_14.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_14to1_13_2; +package com.viaversion.viaversion.protocols.v1_13_2to1_14.packet; import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/rewriter/EntityPacketRewriter1_14.java similarity index 91% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/EntityPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/rewriter/EntityPacketRewriter1_14.java index 5d93883d1..8d199c964 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/EntityPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/rewriter/EntityPacketRewriter1_14.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.packets; +package com.viaversion.viaversion.protocols.v1_13_2to1_14.rewriter; import com.viaversion.viaversion.api.minecraft.ClientWorld; import com.viaversion.viaversion.api.minecraft.Position; @@ -28,17 +28,17 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_13_2; import com.viaversion.viaversion.api.type.types.version.Types1_14; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.Protocol1_14To1_13_2; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.metadata.MetadataRewriter1_14To1_13_2; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.storage.EntityTracker1_14; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.Protocol1_13_2To1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.metadata.MetadataRewriter1_14To1_13_2; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ClientboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.storage.EntityTracker1_14; import java.util.LinkedList; import java.util.List; -public class EntityPackets { +public class EntityPacketRewriter1_14 { - public static void register(Protocol1_14To1_13_2 protocol) { + public static void register(Protocol1_13_2To1_14 protocol) { MetadataRewriter1_14To1_13_2 metadataRewriter = protocol.get(MetadataRewriter1_14To1_13_2.class); protocol.registerClientbound(ClientboundPackets1_13.SPAWN_EXPERIENCE_ORB, wrapper -> { @@ -103,11 +103,11 @@ public class EntityPackets { velocity.write(Type.SHORT, wrapper.get(Type.SHORT, 0)); velocity.write(Type.SHORT, wrapper.get(Type.SHORT, 1)); velocity.write(Type.SHORT, wrapper.get(Type.SHORT, 2)); - velocity.scheduleSend(Protocol1_14To1_13_2.class); + velocity.scheduleSend(Protocol1_13_2To1_14.class); } // Register Type ID - wrapper.user().getEntityTracker(Protocol1_14To1_13_2.class).addEntity(entityId, type1_14); + wrapper.user().getEntityTracker(Protocol1_13_2To1_14.class).addEntity(entityId, type1_14); } wrapper.set(Type.VAR_INT, 1, typeId); @@ -171,7 +171,7 @@ public class EntityPackets { handler(wrapper -> { short animation = wrapper.passthrough(Type.UNSIGNED_BYTE); if (animation == 2) { //Leave bed - EntityTracker1_14 tracker = wrapper.user().getEntityTracker(Protocol1_14To1_13_2.class); + EntityTracker1_14 tracker = wrapper.user().getEntityTracker(Protocol1_13_2To1_14.class); int entityId = wrapper.get(Type.VAR_INT, 0); tracker.setSleeping(entityId, false); @@ -183,7 +183,7 @@ public class EntityPackets { } metadataList.add(new Metadata(12, Types1_14.META_TYPES.optionalPositionType, null)); metadataPacket.write(Types1_14.METADATA_LIST, metadataList); - metadataPacket.scheduleSend(Protocol1_14To1_13_2.class); + metadataPacket.scheduleSend(Protocol1_13_2To1_14.class); } }); } @@ -212,15 +212,15 @@ public class EntityPackets { wrapper.passthrough(Type.UNSIGNED_BYTE); // Max Players wrapper.passthrough(Type.STRING); // Level Type - wrapper.write(Type.VAR_INT, WorldPackets.SERVERSIDE_VIEW_DISTANCE); // Serverside view distance, added in 19w13a + wrapper.write(Type.VAR_INT, WorldPacketRewriter1_14.SERVERSIDE_VIEW_DISTANCE); // Serverside view distance, added in 19w13a }); handler(wrapper -> { // Manually send the packet - wrapper.send(Protocol1_14To1_13_2.class); + wrapper.send(Protocol1_13_2To1_14.class); wrapper.cancel(); // View distance has to be sent after the join packet - WorldPackets.sendViewDistancePacket(wrapper.user()); + WorldPacketRewriter1_14.sendViewDistancePacket(wrapper.user()); }); } }); @@ -230,7 +230,7 @@ public class EntityPackets { public void register() { map(Type.VAR_INT); handler(wrapper -> { - EntityTracker1_14 tracker = wrapper.user().getEntityTracker(Protocol1_14To1_13_2.class); + EntityTracker1_14 tracker = wrapper.user().getEntityTracker(Protocol1_13_2To1_14.class); int entityId = wrapper.get(Type.VAR_INT, 0); tracker.setSleeping(entityId, true); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/rewriter/ItemPacketRewriter1_14.java similarity index 90% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/InventoryPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/rewriter/ItemPacketRewriter1_14.java index d934b0798..daffacbde 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/InventoryPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/rewriter/ItemPacketRewriter1_14.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.packets; +package com.viaversion.viaversion.protocols.v1_13_2to1_14.rewriter; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.DoubleTag; -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 com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.DoubleTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.StringTag; +import com.viaversion.nbt.tag.Tag; import com.google.common.collect.Sets; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -32,12 +32,12 @@ import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.Protocol1_14To1_13_2; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.storage.EntityTracker1_14; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ServerboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.Protocol1_13_2To1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ClientboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.storage.EntityTracker1_14; import com.viaversion.viaversion.rewriter.ComponentRewriter; import com.viaversion.viaversion.rewriter.ItemRewriter; import com.viaversion.viaversion.rewriter.RecipeRewriter; @@ -46,7 +46,7 @@ import com.viaversion.viaversion.util.Key; import java.util.Set; import java.util.concurrent.ThreadLocalRandom; -public class InventoryPackets extends ItemRewriter { +public class ItemPacketRewriter1_14 extends ItemRewriter { private static final Set REMOVED_RECIPE_TYPES = Sets.newHashSet("crafting_special_banneraddpattern", "crafting_special_repairitem"); private static final ComponentRewriter COMPONENT_REWRITER = new ComponentRewriter<>(null, ComponentRewriter.ReadType.JSON) { @Override @@ -59,7 +59,7 @@ public class InventoryPackets extends ItemRewriter { // Selecting trade now moves the items, we need to resync the inventory PacketWrapper resyncPacket = wrapper.create(ServerboundPackets1_13.CLICK_WINDOW); - EntityTracker1_14 tracker = wrapper.user().getEntityTracker(Protocol1_14To1_13_2.class); + EntityTracker1_14 tracker = wrapper.user().getEntityTracker(Protocol1_13_2To1_14.class); resyncPacket.write(Type.UNSIGNED_BYTE, ((short) tracker.getLatestTradeWindowId())); // 0 - Window ID resyncPacket.write(Type.SHORT, ((short) -999)); // 1 - Slot resyncPacket.write(Type.BYTE, (byte) 2); // 2 - Button - End left click @@ -224,7 +224,7 @@ public class InventoryPackets extends ItemRewriter. */ -package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.packets; +package com.viaversion.viaversion.protocols.v1_13_2to1_14.rewriter; -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.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.StringTag; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.minecraft.Position; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.Protocol1_14To1_13_2; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.Protocol1_13_2To1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPackets1_14; import java.util.Collections; -public class PlayerPackets { +public class PlayerPackets1_14 { - public static void register(Protocol1_14To1_13_2 protocol) { + public static void register(Protocol1_13_2To1_14 protocol) { protocol.registerClientbound(ClientboundPackets1_13.OPEN_SIGN_EDITOR, new PacketHandlers() { @Override public void register() { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/rewriter/WorldPacketRewriter1_14.java similarity index 94% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/WorldPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/rewriter/WorldPacketRewriter1_14.java index 4182219a9..a857e85f5 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/WorldPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/rewriter/WorldPacketRewriter1_14.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.packets; +package com.viaversion.viaversion.protocols.v1_13_2to1_14.rewriter; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.LongArrayTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.LongArrayTag; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.BlockFace; @@ -33,15 +33,15 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_13; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_14; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.Protocol1_14To1_13_2; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.storage.EntityTracker1_14; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.Protocol1_13_2To1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ClientboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.storage.EntityTracker1_14; import com.viaversion.viaversion.rewriter.BlockRewriter; import com.viaversion.viaversion.util.CompactArrayUtil; import java.util.Arrays; -public class WorldPackets { +public class WorldPacketRewriter1_14 { public static final int SERVERSIDE_VIEW_DISTANCE = 64; private static final byte[] FULL_LIGHT = new byte[2048]; public static int air; @@ -52,7 +52,7 @@ public class WorldPackets { Arrays.fill(FULL_LIGHT, (byte) 0xff); } - public static void register(Protocol1_14To1_13_2 protocol) { + public static void register(Protocol1_13_2To1_14 protocol) { BlockRewriter blockRewriter = BlockRewriter.for1_14(protocol); protocol.registerClientbound(ClientboundPackets1_13.BLOCK_BREAK_ANIMATION, new PacketHandlers() { @@ -223,7 +223,7 @@ public class WorldPackets { lightPacket.write(Type.BYTE_ARRAY_PRIMITIVE, section.getLight().getBlockLight()); } - EntityTracker1_14 entityTracker = wrapper.user().getEntityTracker(Protocol1_14To1_13_2.class); + EntityTracker1_14 entityTracker = wrapper.user().getEntityTracker(Protocol1_13_2To1_14.class); int diffX = Math.abs(entityTracker.getChunkCenterX() - chunk.getX()); int diffZ = Math.abs(entityTracker.getChunkCenterZ() - chunk.getZ()); if (entityTracker.isForceSendCenterChunk() @@ -232,12 +232,12 @@ public class WorldPackets { PacketWrapper fakePosLook = wrapper.create(ClientboundPackets1_14.UPDATE_VIEW_POSITION); // Set center chunk fakePosLook.write(Type.VAR_INT, chunk.getX()); fakePosLook.write(Type.VAR_INT, chunk.getZ()); - fakePosLook.send(Protocol1_14To1_13_2.class); + fakePosLook.send(Protocol1_13_2To1_14.class); entityTracker.setChunkCenterX(chunk.getX()); entityTracker.setChunkCenterZ(chunk.getZ()); } - lightPacket.send(Protocol1_14To1_13_2.class); + lightPacket.send(Protocol1_13_2To1_14.class); // Remove light references from chunk sections for (ChunkSection section : chunk.getSections()) { @@ -285,7 +285,7 @@ public class WorldPackets { ClientWorld clientWorld = wrapper.user().get(ClientWorld.class); int dimensionId = wrapper.get(Type.INT, 0); clientWorld.setEnvironment(dimensionId); - EntityTracker1_14 entityTracker = wrapper.user().getEntityTracker(Protocol1_14To1_13_2.class); + EntityTracker1_14 entityTracker = wrapper.user().getEntityTracker(Protocol1_13_2To1_14.class); // The client may reset the center chunk if dimension is changed entityTracker.setForceSendCenterChunk(true); }); @@ -298,7 +298,7 @@ public class WorldPackets { }); handler(wrapper -> { // Manually send the packet and update the viewdistance after - wrapper.send(Protocol1_14To1_13_2.class); + wrapper.send(Protocol1_13_2To1_14.class); wrapper.cancel(); sendViewDistancePacket(wrapper.user()); }); @@ -315,8 +315,8 @@ public class WorldPackets { static void sendViewDistancePacket(UserConnection connection) { PacketWrapper setViewDistance = PacketWrapper.create(ClientboundPackets1_14.UPDATE_VIEW_DISTANCE, connection); - setViewDistance.write(Type.VAR_INT, WorldPackets.SERVERSIDE_VIEW_DISTANCE); - setViewDistance.send(Protocol1_14To1_13_2.class); + setViewDistance.write(Type.VAR_INT, WorldPacketRewriter1_14.SERVERSIDE_VIEW_DISTANCE); + setViewDistance.send(Protocol1_13_2To1_14.class); } private static long[] encodeHeightMap(int[] heightMap) { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/storage/EntityTracker1_14.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/storage/EntityTracker1_14.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/storage/EntityTracker1_14.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/storage/EntityTracker1_14.java index 9dd412b68..84d7cb1c8 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/storage/EntityTracker1_14.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/storage/EntityTracker1_14.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_14to1_13_2.storage; +package com.viaversion.viaversion.protocols.v1_13_2to1_14.storage; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_14; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/Protocol1_13_1To1_13.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13to1_13_1/Protocol1_13To1_13_1.java similarity index 87% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/Protocol1_13_1To1_13.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_13to1_13_1/Protocol1_13To1_13_1.java index 311997da7..02abb8bc1 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/Protocol1_13_1To1_13.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13to1_13_1/Protocol1_13To1_13_1.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13_1to1_13; +package com.viaversion.viaversion.protocols.v1_13to1_13_1; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.data.MappingData; @@ -30,23 +30,23 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.data.entity.EntityTrackerBase; -import com.viaversion.viaversion.protocols.protocol1_13_1to1_13.metadata.MetadataRewriter1_13_1To1_13; -import com.viaversion.viaversion.protocols.protocol1_13_1to1_13.packets.EntityPackets; -import com.viaversion.viaversion.protocols.protocol1_13_1to1_13.packets.InventoryPackets; -import com.viaversion.viaversion.protocols.protocol1_13_1to1_13.packets.WorldPackets; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ServerboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_13to1_13_1.metadata.MetadataRewriter1_13_1To1_13; +import com.viaversion.viaversion.protocols.v1_13to1_13_1.rewriter.EntityPacketRewriter1_13_1; +import com.viaversion.viaversion.protocols.v1_13to1_13_1.rewriter.ItemPacketRewriter1_13_1; +import com.viaversion.viaversion.protocols.v1_13to1_13_1.rewriter.WorldPacketRewriter1_13_1; import com.viaversion.viaversion.rewriter.StatisticsRewriter; import com.viaversion.viaversion.rewriter.TagRewriter; -public class Protocol1_13_1To1_13 extends AbstractProtocol { +public class Protocol1_13To1_13_1 extends AbstractProtocol { public static final MappingData MAPPINGS = new MappingDataBase("1.13", "1.13.2"); private final MetadataRewriter1_13_1To1_13 entityRewriter = new MetadataRewriter1_13_1To1_13(this); - private final InventoryPackets itemRewriter = new InventoryPackets(this); + private final ItemPacketRewriter1_13_1 itemRewriter = new ItemPacketRewriter1_13_1(this); private final TagRewriter tagRewriter = new TagRewriter<>(this); - public Protocol1_13_1To1_13() { + public Protocol1_13To1_13_1() { super(ClientboundPackets1_13.class, ClientboundPackets1_13.class, ServerboundPackets1_13.class, ServerboundPackets1_13.class); } @@ -54,8 +54,8 @@ public class Protocol1_13_1To1_13 extends AbstractProtocol. */ -package com.viaversion.viaversion.protocols.protocol1_13_1to1_13.metadata; +package com.viaversion.viaversion.protocols.v1_13to1_13_1.metadata; import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_13; import com.viaversion.viaversion.api.type.types.version.Types1_13; -import com.viaversion.viaversion.protocols.protocol1_13_1to1_13.Protocol1_13_1To1_13; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_13to1_13_1.Protocol1_13To1_13_1; import com.viaversion.viaversion.rewriter.EntityRewriter; -public class MetadataRewriter1_13_1To1_13 extends EntityRewriter { +public class MetadataRewriter1_13_1To1_13 extends EntityRewriter { - public MetadataRewriter1_13_1To1_13(Protocol1_13_1To1_13 protocol) { + public MetadataRewriter1_13_1To1_13(Protocol1_13To1_13_1 protocol) { super(protocol); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13to1_13_1/rewriter/EntityPacketRewriter1_13_1.java similarity index 90% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/EntityPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_13to1_13_1/rewriter/EntityPacketRewriter1_13_1.java index 2a6051ec0..ab778db64 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/EntityPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13to1_13_1/rewriter/EntityPacketRewriter1_13_1.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13_1to1_13.packets; +package com.viaversion.viaversion.protocols.v1_13to1_13_1.rewriter; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_13; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_13; -import com.viaversion.viaversion.protocols.protocol1_13_1to1_13.Protocol1_13_1To1_13; -import com.viaversion.viaversion.protocols.protocol1_13_1to1_13.metadata.MetadataRewriter1_13_1To1_13; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_13to1_13_1.Protocol1_13To1_13_1; +import com.viaversion.viaversion.protocols.v1_13to1_13_1.metadata.MetadataRewriter1_13_1To1_13; -public class EntityPackets { +public class EntityPacketRewriter1_13_1 { - public static void register(Protocol1_13_1To1_13 protocol) { + public static void register(Protocol1_13To1_13_1 protocol) { MetadataRewriter1_13_1To1_13 metadataRewriter = protocol.get(MetadataRewriter1_13_1To1_13.class); protocol.registerClientbound(ClientboundPackets1_13.SPAWN_ENTITY, new PacketHandlers() { @@ -55,7 +55,7 @@ public class EntityPackets { wrapper.set(Type.INT, 0, protocol.getMappingData().getNewBlockStateId(data)); } // Register Type ID - wrapper.user().getEntityTracker(Protocol1_13_1To1_13.class).addEntity(entityId, entType); + wrapper.user().getEntityTracker(Protocol1_13To1_13_1.class).addEntity(entityId, entType); } }); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13to1_13_1/rewriter/ItemPacketRewriter1_13_1.java similarity index 90% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/InventoryPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_13to1_13_1/rewriter/ItemPacketRewriter1_13_1.java index 981d43504..05c704bda 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/InventoryPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13to1_13_1/rewriter/ItemPacketRewriter1_13_1.java @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13_1to1_13.packets; +package com.viaversion.viaversion.protocols.v1_13to1_13_1.rewriter; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_13_1to1_13.Protocol1_13_1To1_13; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ServerboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_13to1_13_1.Protocol1_13To1_13_1; import com.viaversion.viaversion.rewriter.ItemRewriter; import com.viaversion.viaversion.rewriter.RecipeRewriter; import com.viaversion.viaversion.util.Key; -public class InventoryPackets extends ItemRewriter { +public class ItemPacketRewriter1_13_1 extends ItemRewriter { - public InventoryPackets(Protocol1_13_1To1_13 protocol) { + public ItemPacketRewriter1_13_1(Protocol1_13To1_13_1 protocol) { super(protocol, Type.ITEM1_13, Type.ITEM1_13_SHORT_ARRAY); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13to1_13_1/rewriter/WorldPacketRewriter1_13_1.java similarity index 94% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/WorldPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_13to1_13_1/rewriter/WorldPacketRewriter1_13_1.java index 947134a6c..1f341cc2a 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/packets/WorldPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13to1_13_1/rewriter/WorldPacketRewriter1_13_1.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_13_1to1_13.packets; +package com.viaversion.viaversion.protocols.v1_13to1_13_1.rewriter; import com.viaversion.viaversion.api.minecraft.ClientWorld; import com.viaversion.viaversion.api.minecraft.chunks.Chunk; @@ -25,13 +25,13 @@ import com.viaversion.viaversion.api.minecraft.chunks.PaletteType; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_13; -import com.viaversion.viaversion.protocols.protocol1_13_1to1_13.Protocol1_13_1To1_13; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.v1_13to1_13_1.Protocol1_13To1_13_1; import com.viaversion.viaversion.rewriter.BlockRewriter; -public class WorldPackets { +public class WorldPacketRewriter1_13_1 { - public static void register(Protocol1_13_1To1_13 protocol) { + public static void register(Protocol1_13To1_13_1 protocol) { BlockRewriter blockRewriter = BlockRewriter.legacy(protocol); protocol.registerClientbound(ClientboundPackets1_13.CHUNK_DATA, wrapper -> { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_2to1_14_1/Protocol1_14_2To1_14_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_14_1to1_14_2/Protocol1_14_1To1_14_2.java similarity index 79% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_2to1_14_1/Protocol1_14_2To1_14_1.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_14_1to1_14_2/Protocol1_14_1To1_14_2.java index 31612e156..5e52d14ea 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_2to1_14_1/Protocol1_14_2To1_14_1.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_14_1to1_14_2/Protocol1_14_1To1_14_2.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_14_2to1_14_1; +package com.viaversion.viaversion.protocols.v1_14_1to1_14_2; import com.viaversion.viaversion.api.protocol.AbstractProtocol; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ClientboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPackets1_14; -public class Protocol1_14_2To1_14_1 extends AbstractProtocol { +public class Protocol1_14_1To1_14_2 extends AbstractProtocol { - public Protocol1_14_2To1_14_1() { + public Protocol1_14_1To1_14_2() { super(ClientboundPackets1_14.class, ClientboundPackets1_14.class, ServerboundPackets1_14.class, ServerboundPackets1_14.class); } } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_3to1_14_2/Protocol1_14_3To1_14_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_14_2to1_14_3/Protocol1_14_2To1_14_3.java similarity index 88% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_3to1_14_2/Protocol1_14_3To1_14_2.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_14_2to1_14_3/Protocol1_14_2To1_14_3.java index 00a8f14ba..09f6d322d 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_3to1_14_2/Protocol1_14_3To1_14_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_14_2to1_14_3/Protocol1_14_2To1_14_3.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_14_3to1_14_2; +package com.viaversion.viaversion.protocols.v1_14_2to1_14_3; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ClientboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPackets1_14; -public class Protocol1_14_3To1_14_2 extends AbstractProtocol { +public class Protocol1_14_2To1_14_3 extends AbstractProtocol { - public Protocol1_14_3To1_14_2() { + public Protocol1_14_2To1_14_3() { super(ClientboundPackets1_14.class, ClientboundPackets1_14.class, null, null); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_4to1_14_3/Protocol1_14_4To1_14_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_14_3to1_14_4/Protocol1_14_3To1_14_4.java similarity index 84% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_4to1_14_3/Protocol1_14_4To1_14_3.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_14_3to1_14_4/Protocol1_14_3To1_14_4.java index d7dc56a4a..caaef8f2a 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_4to1_14_3/Protocol1_14_4To1_14_3.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_14_3to1_14_4/Protocol1_14_3To1_14_4.java @@ -15,16 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_14_4to1_14_3; +package com.viaversion.viaversion.protocols.v1_14_3to1_14_4; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ClientboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_14_3to1_14_4.packet.ClientboundPackets1_14_4; -public class Protocol1_14_4To1_14_3 extends AbstractProtocol { +public class Protocol1_14_3To1_14_4 extends AbstractProtocol { - public Protocol1_14_4To1_14_3() { + public Protocol1_14_3To1_14_4() { super(ClientboundPackets1_14.class, ClientboundPackets1_14_4.class, null, null); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_4to1_14_3/ClientboundPackets1_14_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_14_3to1_14_4/packet/ClientboundPackets1_14_4.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_4to1_14_3/ClientboundPackets1_14_4.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_14_3to1_14_4/packet/ClientboundPackets1_14_4.java index 02d36d936..192b49c13 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_4to1_14_3/ClientboundPackets1_14_4.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_14_3to1_14_4/packet/ClientboundPackets1_14_4.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_14_4to1_14_3; +package com.viaversion.viaversion.protocols.v1_14_3to1_14_4.packet; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/Protocol1_15To1_14_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_14_4to1_15/Protocol1_14_4To1_15.java similarity index 78% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/Protocol1_15To1_14_4.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_14_4to1_15/Protocol1_14_4To1_15.java index 54bd5d57b..fdf835912 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/Protocol1_15To1_14_4.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_14_4to1_15/Protocol1_14_4To1_15.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_15to1_14_4; +package com.viaversion.viaversion.protocols.v1_14_4to1_15; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.data.MappingData; @@ -25,24 +25,25 @@ import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_15; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.data.entity.EntityTrackerBase; -import com.viaversion.viaversion.protocols.protocol1_14_4to1_14_3.ClientboundPackets1_14_4; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; -import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.metadata.MetadataRewriter1_15To1_14_4; -import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.packets.EntityPackets; -import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.packets.InventoryPackets; -import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.packets.WorldPackets; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_14_3to1_14_4.packet.ClientboundPackets1_14_4; +import com.viaversion.viaversion.protocols.v1_14_4to1_15.metadata.MetadataRewriter1_15To1_14_4; +import com.viaversion.viaversion.protocols.v1_14_4to1_15.packet.ClientboundPackets1_15; +import com.viaversion.viaversion.protocols.v1_14_4to1_15.rewriter.EntityPacketRewriter1_15; +import com.viaversion.viaversion.protocols.v1_14_4to1_15.rewriter.ItemPacketRewriter1_15; +import com.viaversion.viaversion.protocols.v1_14_4to1_15.rewriter.WorldPacketRewriter1_15; import com.viaversion.viaversion.rewriter.SoundRewriter; import com.viaversion.viaversion.rewriter.StatisticsRewriter; import com.viaversion.viaversion.rewriter.TagRewriter; -public class Protocol1_15To1_14_4 extends AbstractProtocol { +public class Protocol1_14_4To1_15 extends AbstractProtocol { public static final MappingData MAPPINGS = new MappingDataBase("1.14", "1.15"); private final MetadataRewriter1_15To1_14_4 metadataRewriter = new MetadataRewriter1_15To1_14_4(this); - private final InventoryPackets itemRewriter = new InventoryPackets(this); + private final ItemPacketRewriter1_15 itemRewriter = new ItemPacketRewriter1_15(this); private final TagRewriter tagRewriter = new TagRewriter<>(this); - public Protocol1_15To1_14_4() { + public Protocol1_14_4To1_15() { super(ClientboundPackets1_14_4.class, ClientboundPackets1_15.class, ServerboundPackets1_14.class, ServerboundPackets1_14.class); } @@ -50,8 +51,8 @@ public class Protocol1_15To1_14_4 extends AbstractProtocol soundRewriter = new SoundRewriter<>(this); soundRewriter.registerSound(ClientboundPackets1_14_4.ENTITY_SOUND); // Entity Sound Effect (added somewhere in 1.14) @@ -94,7 +95,7 @@ public class Protocol1_15To1_14_4 extends AbstractProtocol. */ -package com.viaversion.viaversion.protocols.protocol1_15to1_14_4.metadata; +package com.viaversion.viaversion.protocols.v1_14_4to1_15.metadata; import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_15; import com.viaversion.viaversion.api.type.types.version.Types1_14; -import com.viaversion.viaversion.protocols.protocol1_14_4to1_14_3.ClientboundPackets1_14_4; -import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.Protocol1_15To1_14_4; -import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.packets.EntityPackets; +import com.viaversion.viaversion.protocols.v1_14_3to1_14_4.packet.ClientboundPackets1_14_4; +import com.viaversion.viaversion.protocols.v1_14_4to1_15.Protocol1_14_4To1_15; +import com.viaversion.viaversion.protocols.v1_14_4to1_15.rewriter.EntityPacketRewriter1_15; import com.viaversion.viaversion.rewriter.EntityRewriter; -public class MetadataRewriter1_15To1_14_4 extends EntityRewriter { +public class MetadataRewriter1_15To1_14_4 extends EntityRewriter { - public MetadataRewriter1_15To1_14_4(Protocol1_15To1_14_4 protocol) { + public MetadataRewriter1_15To1_14_4(Protocol1_14_4To1_15 protocol) { super(protocol); } @@ -45,7 +45,7 @@ public class MetadataRewriter1_15To1_14_4 extends EntityRewriter. */ -package com.viaversion.viaversion.protocols.protocol1_15to1_14_4; +package com.viaversion.viaversion.protocols.v1_14_4to1_15.packet; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_14_4to1_15/rewriter/EntityPacketRewriter1_15.java similarity index 87% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_14_4to1_15/rewriter/EntityPacketRewriter1_15.java index 51fef6ee2..f3ae7a00a 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_14_4to1_15/rewriter/EntityPacketRewriter1_15.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_15to1_14_4.packets; +package com.viaversion.viaversion.protocols.v1_14_4to1_15.rewriter; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_15; @@ -24,16 +24,16 @@ import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_14; -import com.viaversion.viaversion.protocols.protocol1_14_4to1_14_3.ClientboundPackets1_14_4; -import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; -import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.Protocol1_15To1_14_4; -import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.metadata.MetadataRewriter1_15To1_14_4; +import com.viaversion.viaversion.protocols.v1_14_3to1_14_4.packet.ClientboundPackets1_14_4; +import com.viaversion.viaversion.protocols.v1_14_4to1_15.Protocol1_14_4To1_15; +import com.viaversion.viaversion.protocols.v1_14_4to1_15.metadata.MetadataRewriter1_15To1_14_4; +import com.viaversion.viaversion.protocols.v1_14_4to1_15.packet.ClientboundPackets1_15; import com.viaversion.viaversion.rewriter.EntityRewriter; import java.util.List; -public final class EntityPackets { +public final class EntityPacketRewriter1_15 { - public static void register(Protocol1_15To1_14_4 protocol) { + public static void register(Protocol1_14_4To1_15 protocol) { MetadataRewriter1_15To1_14_4 metadataRewriter = protocol.get(MetadataRewriter1_15To1_14_4.class); metadataRewriter.registerTrackerWithData(ClientboundPackets1_14_4.SPAWN_ENTITY, EntityTypes1_15.FALLING_BLOCK); @@ -72,7 +72,7 @@ public final class EntityPackets { handler(wrapper -> { int entityId = wrapper.get(Type.VAR_INT, 0); - wrapper.user().getEntityTracker(Protocol1_15To1_14_4.class).addEntity(entityId, EntityTypes1_15.PLAYER); + wrapper.user().getEntityTracker(Protocol1_14_4To1_15.class).addEntity(entityId, EntityTypes1_15.PLAYER); sendMetadataPacket(wrapper, entityId, metadataRewriter); }); @@ -117,7 +117,7 @@ public final class EntityPackets { } // Send the spawn packet manually - wrapper.send(Protocol1_15To1_14_4.class); + wrapper.send(Protocol1_14_4To1_15.class); wrapper.cancel(); // Handle meta @@ -126,7 +126,7 @@ public final class EntityPackets { PacketWrapper metadataPacket = PacketWrapper.create(ClientboundPackets1_15.ENTITY_METADATA, wrapper.user()); metadataPacket.write(Type.VAR_INT, entityId); metadataPacket.write(Types1_14.METADATA_LIST, metadata); - metadataPacket.send(Protocol1_15To1_14_4.class); + metadataPacket.send(Protocol1_14_4To1_15.class); } public static int getNewEntityId(int oldId) { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_14_4to1_15/rewriter/ItemPacketRewriter1_15.java similarity index 77% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/InventoryPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_14_4to1_15/rewriter/ItemPacketRewriter1_15.java index 93d5a0f5c..1eefb0cad 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/InventoryPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_14_4to1_15/rewriter/ItemPacketRewriter1_15.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_15to1_14_4.packets; +package com.viaversion.viaversion.protocols.v1_14_4to1_15.rewriter; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_14_4to1_14_3.ClientboundPackets1_14_4; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; -import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.Protocol1_15To1_14_4; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_14_3to1_14_4.packet.ClientboundPackets1_14_4; +import com.viaversion.viaversion.protocols.v1_14_4to1_15.Protocol1_14_4To1_15; import com.viaversion.viaversion.rewriter.ItemRewriter; import com.viaversion.viaversion.rewriter.RecipeRewriter; -public class InventoryPackets extends ItemRewriter { +public class ItemPacketRewriter1_15 extends ItemRewriter { - public InventoryPackets(Protocol1_15To1_14_4 protocol) { + public ItemPacketRewriter1_15(Protocol1_14_4To1_15 protocol) { super(protocol, Type.ITEM1_13_2, Type.ITEM1_13_2_SHORT_ARRAY); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_14_4to1_15/rewriter/WorldPacketRewriter1_15.java similarity index 93% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/WorldPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_14_4to1_15/rewriter/WorldPacketRewriter1_15.java index 9847a1b0d..fcde03c86 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/WorldPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_14_4to1_15/rewriter/WorldPacketRewriter1_15.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_15to1_14_4.packets; +package com.viaversion.viaversion.protocols.v1_14_4to1_15.rewriter; import com.viaversion.viaversion.api.minecraft.chunks.Chunk; import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection; @@ -25,13 +25,13 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_14; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_15; -import com.viaversion.viaversion.protocols.protocol1_14_4to1_14_3.ClientboundPackets1_14_4; -import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.Protocol1_15To1_14_4; +import com.viaversion.viaversion.protocols.v1_14_3to1_14_4.packet.ClientboundPackets1_14_4; +import com.viaversion.viaversion.protocols.v1_14_4to1_15.Protocol1_14_4To1_15; import com.viaversion.viaversion.rewriter.BlockRewriter; -public final class WorldPackets { +public final class WorldPacketRewriter1_15 { - public static void register(Protocol1_15To1_14_4 protocol) { + public static void register(Protocol1_14_4To1_15 protocol) { BlockRewriter blockRewriter = BlockRewriter.for1_14(protocol); blockRewriter.registerBlockAction(ClientboundPackets1_14_4.BLOCK_ACTION); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/Protocol1_14_1To1_14.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_14to1_14_1/Protocol1_14To1_14_1.java similarity index 77% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/Protocol1_14_1To1_14.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_14to1_14_1/Protocol1_14To1_14_1.java index 5b4645853..13849a160 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/Protocol1_14_1To1_14.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_14to1_14_1/Protocol1_14To1_14_1.java @@ -15,22 +15,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_14_1to1_14; +package com.viaversion.viaversion.protocols.v1_14to1_14_1; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_14; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.data.entity.EntityTrackerBase; -import com.viaversion.viaversion.protocols.protocol1_14_1to1_14.metadata.MetadataRewriter1_14_1To1_14; -import com.viaversion.viaversion.protocols.protocol1_14_1to1_14.packets.EntityPackets; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ClientboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_14to1_14_1.metadata.MetadataRewriter1_14_1To1_14; +import com.viaversion.viaversion.protocols.v1_14to1_14_1.rewriter.EntityPacketRewriter1_14_1; -public class Protocol1_14_1To1_14 extends AbstractProtocol { +public class Protocol1_14To1_14_1 extends AbstractProtocol { private final MetadataRewriter1_14_1To1_14 metadataRewriter = new MetadataRewriter1_14_1To1_14(this); - public Protocol1_14_1To1_14() { + public Protocol1_14To1_14_1() { super(ClientboundPackets1_14.class, ClientboundPackets1_14.class, ServerboundPackets1_14.class, ServerboundPackets1_14.class); } @@ -38,7 +38,7 @@ public class Protocol1_14_1To1_14 extends AbstractProtocol. */ -package com.viaversion.viaversion.protocols.protocol1_14_1to1_14.metadata; +package com.viaversion.viaversion.protocols.v1_14to1_14_1.metadata; import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_14; -import com.viaversion.viaversion.protocols.protocol1_14_1to1_14.Protocol1_14_1To1_14; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ClientboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_14to1_14_1.Protocol1_14To1_14_1; import com.viaversion.viaversion.rewriter.EntityRewriter; -public class MetadataRewriter1_14_1To1_14 extends EntityRewriter { +public class MetadataRewriter1_14_1To1_14 extends EntityRewriter { - public MetadataRewriter1_14_1To1_14(Protocol1_14_1To1_14 protocol) { + public MetadataRewriter1_14_1To1_14(Protocol1_14To1_14_1 protocol) { super(protocol); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_14to1_14_1/rewriter/EntityPacketRewriter1_14_1.java similarity index 87% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/packets/EntityPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_14to1_14_1/rewriter/EntityPacketRewriter1_14_1.java index 480d9315b..95b63e7bc 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14_1to1_14/packets/EntityPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_14to1_14_1/rewriter/EntityPacketRewriter1_14_1.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_14_1to1_14.packets; +package com.viaversion.viaversion.protocols.v1_14to1_14_1.rewriter; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_14; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_14; -import com.viaversion.viaversion.protocols.protocol1_14_1to1_14.Protocol1_14_1To1_14; -import com.viaversion.viaversion.protocols.protocol1_14_1to1_14.metadata.MetadataRewriter1_14_1To1_14; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ClientboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_14to1_14_1.Protocol1_14To1_14_1; +import com.viaversion.viaversion.protocols.v1_14to1_14_1.metadata.MetadataRewriter1_14_1To1_14; -public class EntityPackets { +public class EntityPacketRewriter1_14_1 { - public static void register(Protocol1_14_1To1_14 protocol) { + public static void register(Protocol1_14To1_14_1 protocol) { MetadataRewriter1_14_1To1_14 metadataRewriter = protocol.get(MetadataRewriter1_14_1To1_14.class); protocol.registerClientbound(ClientboundPackets1_14.SPAWN_MOB, new PacketHandlers() { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15_2to1_15_1/Protocol1_15_2To1_15_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_1to1_15_2/Protocol1_15_1To1_15_2.java similarity index 79% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15_2to1_15_1/Protocol1_15_2To1_15_1.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_15_1to1_15_2/Protocol1_15_1To1_15_2.java index 062e7a96a..4f003f969 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15_2to1_15_1/Protocol1_15_2To1_15_1.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_1to1_15_2/Protocol1_15_1To1_15_2.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_15_2to1_15_1; +package com.viaversion.viaversion.protocols.v1_15_1to1_15_2; import com.viaversion.viaversion.api.protocol.AbstractProtocol; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; -import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_14_4to1_15.packet.ClientboundPackets1_15; -public class Protocol1_15_2To1_15_1 extends AbstractProtocol { +public class Protocol1_15_1To1_15_2 extends AbstractProtocol { - public Protocol1_15_2To1_15_1() { + public Protocol1_15_1To1_15_2() { super(ClientboundPackets1_15.class, ClientboundPackets1_15.class, ServerboundPackets1_14.class, ServerboundPackets1_14.class); } } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/Protocol1_15_2To1_16.java similarity index 91% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/Protocol1_15_2To1_16.java index 196985c7a..1e15d75cb 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/Protocol1_15_2To1_16.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_16to1_15_2; +package com.viaversion.viaversion.protocols.v1_15_2to1_16; import com.google.common.base.Joiner; import com.google.gson.JsonArray; @@ -37,15 +37,17 @@ import com.viaversion.viaversion.api.type.types.version.Types1_16; import com.viaversion.viaversion.data.entity.EntityTrackerBase; import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets; import com.viaversion.viaversion.protocols.base.ClientboundStatusPackets; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; -import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.data.TranslationMappings; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.metadata.MetadataRewriter1_16To1_15_2; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.packets.EntityPackets; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.packets.InventoryPackets; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.packets.WorldPackets; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.provider.PlayerAbilitiesProvider; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.storage.InventoryTracker1_16; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_14_4to1_15.packet.ClientboundPackets1_15; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.data.TranslationMappings; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.metadata.MetadataRewriter1_16To1_15_2; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.packet.ClientboundPackets1_16; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.packet.ServerboundPackets1_16; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.provider.PlayerAbilitiesProvider; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.rewriter.EntityPacketRewriter1_16; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.rewriter.ItemPacketRewriter1_16; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.rewriter.WorldPacketRewriter1_16; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.storage.InventoryTracker1_16; import com.viaversion.viaversion.rewriter.SoundRewriter; import com.viaversion.viaversion.rewriter.StatisticsRewriter; import com.viaversion.viaversion.rewriter.TagRewriter; @@ -56,16 +58,16 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -public class Protocol1_16To1_15_2 extends AbstractProtocol { +public class Protocol1_15_2To1_16 extends AbstractProtocol { private static final UUID ZERO_UUID = new UUID(0, 0); public static final MappingData MAPPINGS = new MappingDataBase("1.15", "1.16"); private final MetadataRewriter1_16To1_15_2 metadataRewriter = new MetadataRewriter1_16To1_15_2(this); - private final InventoryPackets itemRewriter = new InventoryPackets(this); + private final ItemPacketRewriter1_16 itemRewriter = new ItemPacketRewriter1_16(this); private final TranslationMappings componentRewriter = new TranslationMappings(this); private final TagRewriter tagRewriter = new TagRewriter<>(this); - public Protocol1_16To1_15_2() { + public Protocol1_15_2To1_16() { super(ClientboundPackets1_15.class, ClientboundPackets1_16.class, ServerboundPackets1_14.class, ServerboundPackets1_16.class); } @@ -73,8 +75,8 @@ public class Protocol1_16To1_15_2 extends AbstractProtocol. */ -package com.viaversion.viaversion.protocols.protocol1_16to1_15_2.data; +package com.viaversion.viaversion.protocols.v1_15_2to1_16.data; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/data/TranslationMappings.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/data/TranslationMappings.java similarity index 94% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/data/TranslationMappings.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/data/TranslationMappings.java index 5247dc3c5..dd688cab8 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/data/TranslationMappings.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/data/TranslationMappings.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_16to1_15_2.data; +package com.viaversion.viaversion.protocols.v1_15_2to1_16.data; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; import com.viaversion.viaversion.api.connection.UserConnection; -import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.Protocol1_16To1_15_2; +import com.viaversion.viaversion.protocols.v1_14_4to1_15.packet.ClientboundPackets1_15; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.Protocol1_15_2To1_16; import com.viaversion.viaversion.rewriter.ComponentRewriter; import java.util.HashMap; import java.util.Map; @@ -30,7 +30,7 @@ import java.util.Map; public class TranslationMappings extends ComponentRewriter { private final Map mappings = new HashMap<>(); - public TranslationMappings(Protocol1_16To1_15_2 protocol) { + public TranslationMappings(Protocol1_15_2To1_16 protocol) { super(protocol, ReadType.JSON); mappings.put("attribute.name.generic.armorToughness", "attribute.name.generic.armor_toughness"); mappings.put("attribute.name.generic.attackDamage", "attribute.name.generic.attack_damage"); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/metadata/MetadataRewriter1_16To1_15_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/metadata/MetadataRewriter1_16To1_15_2.java similarity index 87% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/metadata/MetadataRewriter1_16To1_15_2.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/metadata/MetadataRewriter1_16To1_15_2.java index 2523e76af..1fa0d194f 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/metadata/MetadataRewriter1_16To1_15_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/metadata/MetadataRewriter1_16To1_15_2.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_16to1_15_2.metadata; +package com.viaversion.viaversion.protocols.v1_15_2to1_16.metadata; import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_16; import com.viaversion.viaversion.api.minecraft.metadata.Metadata; import com.viaversion.viaversion.api.type.types.version.Types1_16; -import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.Protocol1_16To1_15_2; +import com.viaversion.viaversion.protocols.v1_14_4to1_15.packet.ClientboundPackets1_15; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.Protocol1_15_2To1_16; import com.viaversion.viaversion.rewriter.EntityRewriter; -public class MetadataRewriter1_16To1_15_2 extends EntityRewriter { +public class MetadataRewriter1_16To1_15_2 extends EntityRewriter { - public MetadataRewriter1_16To1_15_2(Protocol1_16To1_15_2 protocol) { + public MetadataRewriter1_16To1_15_2(Protocol1_15_2To1_16 protocol) { super(protocol); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/ClientboundPackets1_16.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/packet/ClientboundPackets1_16.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/ClientboundPackets1_16.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/packet/ClientboundPackets1_16.java index c29b370f2..62658cf0c 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/ClientboundPackets1_16.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/packet/ClientboundPackets1_16.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_16to1_15_2; +package com.viaversion.viaversion.protocols.v1_15_2to1_16.packet; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/ServerboundPackets1_16.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/packet/ServerboundPackets1_16.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/ServerboundPackets1_16.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/packet/ServerboundPackets1_16.java index 28bf40dae..64469f2e1 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/ServerboundPackets1_16.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/packet/ServerboundPackets1_16.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_16to1_15_2; +package com.viaversion.viaversion.protocols.v1_15_2to1_16.packet; import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/provider/PlayerAbilitiesProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/provider/PlayerAbilitiesProvider.java similarity index 93% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/provider/PlayerAbilitiesProvider.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/provider/PlayerAbilitiesProvider.java index 0fb08c0dc..1ee1dd190 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/provider/PlayerAbilitiesProvider.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/provider/PlayerAbilitiesProvider.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_16to1_15_2.provider; +package com.viaversion.viaversion.protocols.v1_15_2to1_16.provider; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.platform.providers.Provider; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/rewriter/EntityPacketRewriter1_16.java similarity index 90% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/EntityPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/rewriter/EntityPacketRewriter1_16.java index 6bd834699..ccd77d202 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/EntityPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/rewriter/EntityPacketRewriter1_16.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_16to1_15_2.packets; +package com.viaversion.viaversion.protocols.v1_15_2to1_16.rewriter; -import com.github.steveice10.opennbt.tag.builtin.ByteTag; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.FloatTag; -import com.github.steveice10.opennbt.tag.builtin.IntTag; -import com.github.steveice10.opennbt.tag.builtin.ListTag; -import com.github.steveice10.opennbt.tag.builtin.LongTag; -import com.github.steveice10.opennbt.tag.builtin.StringTag; +import com.viaversion.nbt.tag.ByteTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.FloatTag; +import com.viaversion.nbt.tag.IntTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.LongTag; +import com.viaversion.nbt.tag.StringTag; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.minecraft.WorldIdentifiers; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_16; @@ -32,18 +32,18 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_14; import com.viaversion.viaversion.api.type.types.version.Types1_16; -import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ClientboundPackets1_16; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.Protocol1_16To1_15_2; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ServerboundPackets1_16; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.data.AttributeMappings; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.metadata.MetadataRewriter1_16To1_15_2; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.storage.InventoryTracker1_16; +import com.viaversion.viaversion.protocols.v1_14_4to1_15.packet.ClientboundPackets1_15; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.Protocol1_15_2To1_16; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.data.AttributeMappings; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.metadata.MetadataRewriter1_16To1_15_2; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.packet.ClientboundPackets1_16; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.packet.ServerboundPackets1_16; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.storage.InventoryTracker1_16; import com.viaversion.viaversion.util.Key; import java.util.Arrays; import java.util.UUID; -public class EntityPackets { +public class EntityPacketRewriter1_16 { private static final PacketHandler DIMENSION_HANDLER = wrapper -> { WorldIdentifiers map = Via.getConfig().get1_16WorldNamesMap(); @@ -156,7 +156,7 @@ public class EntityPackets { return tag; } - public static void register(Protocol1_16To1_15_2 protocol) { + public static void register(Protocol1_15_2To1_16 protocol) { MetadataRewriter1_16To1_15_2 metadataRewriter = protocol.get(MetadataRewriter1_16To1_15_2.class); // Spawn lightning -> Spawn entity @@ -169,7 +169,7 @@ public class EntityPackets { return; } - wrapper.user().getEntityTracker(Protocol1_16To1_15_2.class).addEntity(entityId, EntityTypes1_16.LIGHTNING_BOLT); + wrapper.user().getEntityTracker(Protocol1_15_2To1_16.class).addEntity(entityId, EntityTypes1_16.LIGHTNING_BOLT); wrapper.write(Type.UUID, UUID.randomUUID()); // uuid wrapper.write(Type.VAR_INT, EntityTypes1_16.LIGHTNING_BOLT.getId()); // entity type @@ -222,7 +222,7 @@ public class EntityPackets { map(Type.LONG); // Seed map(Type.UNSIGNED_BYTE); // Max players handler(wrapper -> { - wrapper.user().getEntityTracker(Protocol1_16To1_15_2.class).addEntity(wrapper.get(Type.INT, 0), EntityTypes1_16.PLAYER); + wrapper.user().getEntityTracker(Protocol1_15_2To1_16.class).addEntity(wrapper.get(Type.INT, 0), EntityTypes1_16.PLAYER); final String type = wrapper.read(Type.STRING);// level type wrapper.passthrough(Type.VAR_INT); // View distance diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/rewriter/ItemPacketRewriter1_16.java similarity index 89% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/InventoryPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/rewriter/ItemPacketRewriter1_16.java index 817c039a2..d14326c25 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/InventoryPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/rewriter/ItemPacketRewriter1_16.java @@ -15,34 +15,34 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_16to1_15_2.packets; +package com.viaversion.viaversion.protocols.v1_15_2to1_16.rewriter; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.IntArrayTag; -import com.github.steveice10.opennbt.tag.builtin.ListTag; -import com.github.steveice10.opennbt.tag.builtin.NumberTag; -import com.github.steveice10.opennbt.tag.builtin.StringTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.IntArrayTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.NumberTag; +import com.viaversion.nbt.tag.StringTag; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ClientboundPackets1_16; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.Protocol1_16To1_15_2; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ServerboundPackets1_16; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.data.AttributeMappings; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.storage.InventoryTracker1_16; +import com.viaversion.viaversion.protocols.v1_14_4to1_15.packet.ClientboundPackets1_15; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.Protocol1_15_2To1_16; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.data.AttributeMappings; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.packet.ClientboundPackets1_16; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.packet.ServerboundPackets1_16; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.storage.InventoryTracker1_16; import com.viaversion.viaversion.rewriter.ItemRewriter; import com.viaversion.viaversion.rewriter.RecipeRewriter; import com.viaversion.viaversion.util.Key; import com.viaversion.viaversion.util.UUIDUtil; import java.util.UUID; -public class InventoryPackets extends ItemRewriter { +public class ItemPacketRewriter1_16 extends ItemRewriter { - public InventoryPackets(Protocol1_16To1_15_2 protocol) { + public ItemPacketRewriter1_16(Protocol1_15_2To1_16 protocol) { super(protocol, Type.ITEM1_13_2, Type.ITEM1_13_2_SHORT_ARRAY); } @@ -54,7 +54,7 @@ public class InventoryPackets extends ItemRewriter. */ -package com.viaversion.viaversion.protocols.protocol1_16to1_15_2.packets; +package com.viaversion.viaversion.protocols.v1_15_2to1_16.rewriter; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.IntArrayTag; -import com.github.steveice10.opennbt.tag.builtin.LongArrayTag; -import com.github.steveice10.opennbt.tag.builtin.StringTag; -import com.github.steveice10.opennbt.tag.builtin.Tag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.IntArrayTag; +import com.viaversion.nbt.tag.LongArrayTag; +import com.viaversion.nbt.tag.StringTag; +import com.viaversion.nbt.tag.Tag; import com.google.gson.JsonElement; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.chunks.Chunk; @@ -32,8 +32,8 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_15; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_16; -import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.Protocol1_16To1_15_2; +import com.viaversion.viaversion.protocols.v1_14_4to1_15.packet.ClientboundPackets1_15; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.Protocol1_15_2To1_16; import com.viaversion.viaversion.rewriter.BlockRewriter; import com.viaversion.viaversion.util.CompactArrayUtil; import com.viaversion.viaversion.util.Key; @@ -41,9 +41,9 @@ import com.viaversion.viaversion.util.UUIDUtil; import java.util.Map; import java.util.UUID; -public class WorldPackets { +public class WorldPacketRewriter1_16 { - public static void register(Protocol1_16To1_15_2 protocol) { + public static void register(Protocol1_15_2To1_16 protocol) { BlockRewriter blockRewriter = BlockRewriter.for1_14(protocol); blockRewriter.registerBlockAction(ClientboundPackets1_15.BLOCK_ACTION); @@ -103,7 +103,7 @@ public class WorldPackets { blockRewriter.registerEffect(ClientboundPackets1_15.EFFECT, 1010, 2001); } - private static void handleBlockEntity(Protocol1_16To1_15_2 protocol, UserConnection connection, CompoundTag compoundTag) { + private static void handleBlockEntity(Protocol1_15_2To1_16 protocol, UserConnection connection, CompoundTag compoundTag) { StringTag idTag = compoundTag.getStringTag("id"); if (idTag == null) return; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/storage/InventoryTracker1_16.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/storage/InventoryTracker1_16.java similarity index 93% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/storage/InventoryTracker1_16.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/storage/InventoryTracker1_16.java index 7a6a7e7cd..77851eae2 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/storage/InventoryTracker1_16.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/storage/InventoryTracker1_16.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_16to1_15_2.storage; +package com.viaversion.viaversion.protocols.v1_15_2to1_16.storage; import com.viaversion.viaversion.api.connection.StorableObject; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15_1to1_15/Protocol1_15_1To1_15.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15to1_15_1/Protocol1_15To1_15_1.java similarity index 79% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15_1to1_15/Protocol1_15_1To1_15.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_15to1_15_1/Protocol1_15To1_15_1.java index 2498b3574..5a8e2c36b 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15_1to1_15/Protocol1_15_1To1_15.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15to1_15_1/Protocol1_15To1_15_1.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_15_1to1_15; +package com.viaversion.viaversion.protocols.v1_15to1_15_1; import com.viaversion.viaversion.api.protocol.AbstractProtocol; -import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; -import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; +import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPackets1_14; +import com.viaversion.viaversion.protocols.v1_14_4to1_15.packet.ClientboundPackets1_15; -public class Protocol1_15_1To1_15 extends AbstractProtocol { +public class Protocol1_15To1_15_1 extends AbstractProtocol { - public Protocol1_15_1To1_15() { + public Protocol1_15To1_15_1() { super(ClientboundPackets1_15.class, ClientboundPackets1_15.class, ServerboundPackets1_14.class, ServerboundPackets1_14.class); } } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/Protocol1_16_2To1_16_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/Protocol1_16_1To1_16_2.java similarity index 80% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/Protocol1_16_2To1_16_1.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/Protocol1_16_1To1_16_2.java index 8625fe6d3..3a2430eac 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/Protocol1_16_2To1_16_1.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/Protocol1_16_1To1_16_2.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1; +package com.viaversion.viaversion.protocols.v1_16_1to1_16_2; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.RegistryType; @@ -23,25 +23,27 @@ import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_16_2; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.data.entity.EntityTrackerBase; -import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.data.MappingData; -import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.metadata.MetadataRewriter1_16_2To1_16_1; -import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.packets.EntityPackets; -import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.packets.InventoryPackets; -import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.packets.WorldPackets; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ClientboundPackets1_16; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ServerboundPackets1_16; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.packet.ClientboundPackets1_16; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.packet.ServerboundPackets1_16; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.data.MappingData1_16_2; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.metadata.MetadataRewriter1_16_2To1_16_1; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ClientboundPackets1_16_2; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ServerboundPackets1_16_2; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.rewriter.EntityPacketRewriter1_16_2; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.rewriter.ItemPacketRewriter1_16_2; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.rewriter.WorldPacketRewriter1_16_2; import com.viaversion.viaversion.rewriter.SoundRewriter; import com.viaversion.viaversion.rewriter.StatisticsRewriter; import com.viaversion.viaversion.rewriter.TagRewriter; -public class Protocol1_16_2To1_16_1 extends AbstractProtocol { +public class Protocol1_16_1To1_16_2 extends AbstractProtocol { - public static final MappingData MAPPINGS = new MappingData(); + public static final MappingData1_16_2 MAPPINGS = new MappingData1_16_2(); private final MetadataRewriter1_16_2To1_16_1 metadataRewriter = new MetadataRewriter1_16_2To1_16_1(this); - private final InventoryPackets itemRewriter = new InventoryPackets(this); + private final ItemPacketRewriter1_16_2 itemRewriter = new ItemPacketRewriter1_16_2(this); private final TagRewriter tagRewriter = new TagRewriter<>(this); - public Protocol1_16_2To1_16_1() { + public Protocol1_16_1To1_16_2() { super(ClientboundPackets1_16.class, ClientboundPackets1_16_2.class, ServerboundPackets1_16.class, ServerboundPackets1_16_2.class); } @@ -49,8 +51,8 @@ public class Protocol1_16_2To1_16_1 extends AbstractProtocol. */ -package com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.data; +package com.viaversion.viaversion.protocols.v1_16_1to1_16_2.data; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.ListTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.ListTag; import com.viaversion.viaversion.api.data.MappingDataBase; import com.viaversion.viaversion.api.data.MappingDataLoader; import com.viaversion.viaversion.util.TagUtil; import java.util.HashMap; import java.util.Map; -public class MappingData extends MappingDataBase { +public class MappingData1_16_2 extends MappingDataBase { private final Map dimensionDataMap = new HashMap<>(); private CompoundTag dimensionRegistry; - public MappingData() { + public MappingData1_16_2() { super("1.16", "1.16.2"); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/metadata/MetadataRewriter1_16_2To1_16_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/metadata/MetadataRewriter1_16_2To1_16_1.java similarity index 85% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/metadata/MetadataRewriter1_16_2To1_16_1.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/metadata/MetadataRewriter1_16_2To1_16_1.java index f383fb807..7131ff15e 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/metadata/MetadataRewriter1_16_2To1_16_1.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/metadata/MetadataRewriter1_16_2To1_16_1.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.metadata; +package com.viaversion.viaversion.protocols.v1_16_1to1_16_2.metadata; import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_16_2; import com.viaversion.viaversion.api.type.types.version.Types1_16; -import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.Protocol1_16_2To1_16_1; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ClientboundPackets1_16; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.packet.ClientboundPackets1_16; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.Protocol1_16_1To1_16_2; import com.viaversion.viaversion.rewriter.EntityRewriter; -public class MetadataRewriter1_16_2To1_16_1 extends EntityRewriter { +public class MetadataRewriter1_16_2To1_16_1 extends EntityRewriter { - public MetadataRewriter1_16_2To1_16_1(Protocol1_16_2To1_16_1 protocol) { + public MetadataRewriter1_16_2To1_16_1(Protocol1_16_1To1_16_2 protocol) { super(protocol); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/ClientboundPackets1_16_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/packet/ClientboundPackets1_16_2.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/ClientboundPackets1_16_2.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/packet/ClientboundPackets1_16_2.java index a9b052d15..c27cdcfcb 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/ClientboundPackets1_16_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/packet/ClientboundPackets1_16_2.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1; +package com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/ServerboundPackets1_16_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/packet/ServerboundPackets1_16_2.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/ServerboundPackets1_16_2.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/packet/ServerboundPackets1_16_2.java index 8c304e4d4..97577d04e 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/ServerboundPackets1_16_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/packet/ServerboundPackets1_16_2.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1; +package com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet; import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/rewriter/EntityPacketRewriter1_16_2.java similarity index 87% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/EntityPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/rewriter/EntityPacketRewriter1_16_2.java index c2a650542..3c4786c09 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/EntityPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/rewriter/EntityPacketRewriter1_16_2.java @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.packets; +package com.viaversion.viaversion.protocols.v1_16_1to1_16_2.rewriter; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_16_2; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_16; -import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.Protocol1_16_2To1_16_1; -import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.metadata.MetadataRewriter1_16_2To1_16_1; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ClientboundPackets1_16; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.packet.ClientboundPackets1_16; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.Protocol1_16_1To1_16_2; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.metadata.MetadataRewriter1_16_2To1_16_1; -public class EntityPackets { +public class EntityPacketRewriter1_16_2 { - public static void register(Protocol1_16_2To1_16_1 protocol) { + public static void register(Protocol1_16_1To1_16_2 protocol) { MetadataRewriter1_16_2To1_16_1 metadataRewriter = protocol.get(MetadataRewriter1_16_2To1_16_1.class); metadataRewriter.registerTrackerWithData(ClientboundPackets1_16.SPAWN_ENTITY, EntityTypes1_16_2.FALLING_BLOCK); metadataRewriter.registerTracker(ClientboundPackets1_16.SPAWN_MOB); @@ -72,7 +72,7 @@ public class EntityPackets { } public static CompoundTag getDimensionData(String dimensionType) { - CompoundTag tag = Protocol1_16_2To1_16_1.MAPPINGS.getDimensionDataMap().get(dimensionType); + CompoundTag tag = Protocol1_16_1To1_16_2.MAPPINGS.getDimensionDataMap().get(dimensionType); if (tag == null) { Via.getPlatform().getLogger().severe("Could not get dimension data of " + dimensionType); throw new NullPointerException("Dimension data for " + dimensionType + " is null!"); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/rewriter/ItemPacketRewriter1_16_2.java similarity index 83% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/InventoryPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/rewriter/ItemPacketRewriter1_16_2.java index 9c2d174eb..6f9fd1695 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/InventoryPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/rewriter/ItemPacketRewriter1_16_2.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.packets; +package com.viaversion.viaversion.protocols.v1_16_1to1_16_2.rewriter; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.Protocol1_16_2To1_16_1; -import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ServerboundPackets1_16_2; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ClientboundPackets1_16; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.packet.ClientboundPackets1_16; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.Protocol1_16_1To1_16_2; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ServerboundPackets1_16_2; import com.viaversion.viaversion.rewriter.ItemRewriter; import com.viaversion.viaversion.rewriter.RecipeRewriter; -public class InventoryPackets extends ItemRewriter { +public class ItemPacketRewriter1_16_2 extends ItemRewriter { - public InventoryPackets(Protocol1_16_2To1_16_1 protocol) { + public ItemPacketRewriter1_16_2(Protocol1_16_1To1_16_2 protocol) { super(protocol, Type.ITEM1_13_2, Type.ITEM1_13_2_SHORT_ARRAY); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/rewriter/WorldPacketRewriter1_16_2.java similarity index 90% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/WorldPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/rewriter/WorldPacketRewriter1_16_2.java index 73d39de29..423ec6ec9 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/WorldPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/rewriter/WorldPacketRewriter1_16_2.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.packets; +package com.viaversion.viaversion.protocols.v1_16_1to1_16_2.rewriter; import com.viaversion.viaversion.api.minecraft.BlockChangeRecord; import com.viaversion.viaversion.api.minecraft.BlockChangeRecord1_16_2; @@ -27,18 +27,18 @@ import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_16; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_16_2; -import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2; -import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.Protocol1_16_2To1_16_1; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ClientboundPackets1_16; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.packet.ClientboundPackets1_16; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.Protocol1_16_1To1_16_2; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ClientboundPackets1_16_2; import com.viaversion.viaversion.rewriter.BlockRewriter; import java.util.ArrayList; import java.util.List; -public class WorldPackets { +public class WorldPacketRewriter1_16_2 { private static final BlockChangeRecord[] EMPTY_RECORDS = new BlockChangeRecord[0]; - public static void register(Protocol1_16_2To1_16_1 protocol) { + public static void register(Protocol1_16_1To1_16_2 protocol) { BlockRewriter blockRewriter = BlockRewriter.for1_14(protocol); blockRewriter.registerBlockAction(ClientboundPackets1_16.BLOCK_ACTION); @@ -96,7 +96,7 @@ public class WorldPackets { newPacket.write(Type.LONG, chunkPosition | (chunkY & 0xFFFFFL)); newPacket.write(Type.BOOLEAN, false); // Ignore light updates newPacket.write(Type.VAR_LONG_BLOCK_CHANGE_RECORD_ARRAY, sectionRecord.toArray(EMPTY_RECORDS)); - newPacket.send(Protocol1_16_2To1_16_1.class); + newPacket.send(Protocol1_16_1To1_16_2.class); } }); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_3to1_16_2/Protocol1_16_3To1_16_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_2to1_16_3/Protocol1_16_2To1_16_3.java similarity index 75% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_3to1_16_2/Protocol1_16_3To1_16_2.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_16_2to1_16_3/Protocol1_16_2To1_16_3.java index 2a9be3efb..aa4db8fc1 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_3to1_16_2/Protocol1_16_3To1_16_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_2to1_16_3/Protocol1_16_2To1_16_3.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_16_3to1_16_2; +package com.viaversion.viaversion.protocols.v1_16_2to1_16_3; import com.viaversion.viaversion.api.protocol.AbstractProtocol; -import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2; -import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ServerboundPackets1_16_2; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ClientboundPackets1_16_2; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ServerboundPackets1_16_2; -public class Protocol1_16_3To1_16_2 extends AbstractProtocol { +public class Protocol1_16_2To1_16_3 extends AbstractProtocol { - public Protocol1_16_3To1_16_2() { + public Protocol1_16_2To1_16_3() { super(ClientboundPackets1_16_2.class, ClientboundPackets1_16_2.class, ServerboundPackets1_16_2.class, ServerboundPackets1_16_2.class); } } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_4to1_16_3/Protocol1_16_4To1_16_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_3to1_16_4/Protocol1_16_3To1_16_4.java similarity index 83% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_4to1_16_3/Protocol1_16_4To1_16_3.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_16_3to1_16_4/Protocol1_16_3To1_16_4.java index 173579cf4..3d2f4a977 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_4to1_16_3/Protocol1_16_4To1_16_3.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_3to1_16_4/Protocol1_16_3To1_16_4.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_16_4to1_16_3; +package com.viaversion.viaversion.protocols.v1_16_3to1_16_4; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2; -import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ServerboundPackets1_16_2; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ClientboundPackets1_16_2; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ServerboundPackets1_16_2; -public class Protocol1_16_4To1_16_3 extends AbstractProtocol { +public class Protocol1_16_3To1_16_4 extends AbstractProtocol { - public Protocol1_16_4To1_16_3() { + public Protocol1_16_3To1_16_4() { super(ClientboundPackets1_16_2.class, ClientboundPackets1_16_2.class, ServerboundPackets1_16_2.class, ServerboundPackets1_16_2.class); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/Protocol1_16_4To1_17.java similarity index 89% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/Protocol1_16_4To1_17.java index e42598036..f15828dc2 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/Protocol1_16_4To1_17.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_17to1_16_4; +package com.viaversion.viaversion.protocols.v1_16_4to1_17; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; @@ -30,26 +30,28 @@ import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.misc.ParticleType; import com.viaversion.viaversion.api.type.types.version.Types1_17; import com.viaversion.viaversion.data.entity.EntityTrackerBase; -import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2; -import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ServerboundPackets1_16_2; -import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.packets.EntityPackets; -import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.packets.InventoryPackets; -import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.packets.WorldPackets; -import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.storage.InventoryAcknowledgements; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ClientboundPackets1_16_2; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ServerboundPackets1_16_2; +import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ClientboundPackets1_17; +import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ServerboundPackets1_17; +import com.viaversion.viaversion.protocols.v1_16_4to1_17.rewriter.EntityPacketRewriter1_17; +import com.viaversion.viaversion.protocols.v1_16_4to1_17.rewriter.ItemPacketRewriter1_17; +import com.viaversion.viaversion.protocols.v1_16_4to1_17.rewriter.WorldPacketRewriter1_17; +import com.viaversion.viaversion.protocols.v1_16_4to1_17.storage.InventoryAcknowledgements; import com.viaversion.viaversion.rewriter.SoundRewriter; import com.viaversion.viaversion.rewriter.StatisticsRewriter; import com.viaversion.viaversion.rewriter.TagRewriter; -public final class Protocol1_17To1_16_4 extends AbstractProtocol { +public final class Protocol1_16_4To1_17 extends AbstractProtocol { public static final MappingData MAPPINGS = new MappingDataBase("1.16.2", "1.17"); private static final String[] NEW_GAME_EVENT_TAGS = {"minecraft:ignore_vibrations_sneaking", "minecraft:vibrations"}; private static final int[] EMPTY_ARRAY = new int[0]; - private final EntityPackets entityRewriter = new EntityPackets(this); - private final InventoryPackets itemRewriter = new InventoryPackets(this); + private final EntityPacketRewriter1_17 entityRewriter = new EntityPacketRewriter1_17(this); + private final ItemPacketRewriter1_17 itemRewriter = new ItemPacketRewriter1_17(this); private final TagRewriter tagRewriter = new TagRewriter<>(this); - public Protocol1_17To1_16_4() { + public Protocol1_16_4To1_17() { super(ClientboundPackets1_16_2.class, ClientboundPackets1_17.class, ServerboundPackets1_16_2.class, ServerboundPackets1_17.class); } @@ -58,7 +60,7 @@ public final class Protocol1_17To1_16_4 extends AbstractProtocol { // Tags are now generically written with resource location - 5 different Vanilla types @@ -209,12 +211,12 @@ public final class Protocol1_17To1_16_4 extends AbstractProtocol. */ -package com.viaversion.viaversion.protocols.protocol1_17to1_16_4; +package com.viaversion.viaversion.protocols.v1_16_4to1_17.packet; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/ServerboundPackets1_17.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/packet/ServerboundPackets1_17.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/ServerboundPackets1_17.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/packet/ServerboundPackets1_17.java index 3df2bfdaa..7053ab474 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/ServerboundPackets1_17.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/packet/ServerboundPackets1_17.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_17to1_16_4; +package com.viaversion.viaversion.protocols.v1_16_4to1_17.packet; import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/rewriter/EntityPacketRewriter1_17.java similarity index 90% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/EntityPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/rewriter/EntityPacketRewriter1_17.java index ab6a7881a..937164069 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/EntityPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/rewriter/EntityPacketRewriter1_17.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_17to1_16_4.packets; +package com.viaversion.viaversion.protocols.v1_16_4to1_17.rewriter; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.IntTag; -import com.github.steveice10.opennbt.tag.builtin.ListTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.IntTag; +import com.viaversion.nbt.tag.ListTag; import com.viaversion.viaversion.api.data.entity.EntityTracker; import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_17; @@ -29,15 +29,15 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_16; import com.viaversion.viaversion.api.type.types.version.Types1_17; -import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2; -import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ClientboundPackets1_17; -import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.Protocol1_17To1_16_4; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ClientboundPackets1_16_2; +import com.viaversion.viaversion.protocols.v1_16_4to1_17.Protocol1_16_4To1_17; +import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ClientboundPackets1_17; import com.viaversion.viaversion.rewriter.EntityRewriter; import com.viaversion.viaversion.util.TagUtil; -public final class EntityPackets extends EntityRewriter { +public final class EntityPacketRewriter1_17 extends EntityRewriter { - public EntityPackets(Protocol1_17To1_16_4 protocol) { + public EntityPacketRewriter1_17(Protocol1_16_4To1_17 protocol) { super(protocol); } @@ -52,14 +52,14 @@ public final class EntityPackets extends EntityRewriter. */ -package com.viaversion.viaversion.protocols.protocol1_17to1_16_4.packets; +package com.viaversion.viaversion.protocols.v1_16_4to1_17.rewriter; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.IntTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.IntTag; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2; -import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ServerboundPackets1_16_2; -import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ClientboundPackets1_17; -import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.Protocol1_17To1_16_4; -import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ServerboundPackets1_17; -import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.storage.InventoryAcknowledgements; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ClientboundPackets1_16_2; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ServerboundPackets1_16_2; +import com.viaversion.viaversion.protocols.v1_16_4to1_17.Protocol1_16_4To1_17; +import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ClientboundPackets1_17; +import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ServerboundPackets1_17; +import com.viaversion.viaversion.protocols.v1_16_4to1_17.storage.InventoryAcknowledgements; import com.viaversion.viaversion.rewriter.ItemRewriter; import com.viaversion.viaversion.rewriter.RecipeRewriter; -public final class InventoryPackets extends ItemRewriter { +public final class ItemPacketRewriter1_17 extends ItemRewriter { - public InventoryPackets(Protocol1_17To1_16_4 protocol) { + public ItemPacketRewriter1_17(Protocol1_16_4To1_17 protocol) { super(protocol, Type.ITEM1_13_2, Type.ITEM1_13_2_SHORT_ARRAY); } @@ -101,7 +101,7 @@ public final class InventoryPackets extends ItemRewriter. */ -package com.viaversion.viaversion.protocols.protocol1_17to1_16_4.packets; +package com.viaversion.viaversion.protocols.v1_16_4to1_17.rewriter; import com.viaversion.viaversion.api.minecraft.BlockChangeRecord; import com.viaversion.viaversion.api.minecraft.BlockChangeRecord1_16_2; @@ -29,17 +29,17 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_16_2; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_17; -import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2; -import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ClientboundPackets1_17; -import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.Protocol1_17To1_16_4; +import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ClientboundPackets1_16_2; +import com.viaversion.viaversion.protocols.v1_16_4to1_17.Protocol1_16_4To1_17; +import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ClientboundPackets1_17; import com.viaversion.viaversion.rewriter.BlockRewriter; import java.util.ArrayList; import java.util.BitSet; import java.util.List; -public final class WorldPackets { +public final class WorldPacketRewriter1_17 { - public static void register(Protocol1_17To1_16_4 protocol) { + public static void register(Protocol1_16_4To1_17 protocol) { BlockRewriter blockRewriter = BlockRewriter.for1_14(protocol); blockRewriter.registerBlockAction(ClientboundPackets1_16_2.BLOCK_ACTION); @@ -162,14 +162,14 @@ public final class WorldPackets { for (int x = 0; x < 16; x++) { for (int y = 0; y < 16; y++) { for (int z = 0; z < 16; z++) { - int blockStateId = Protocol1_17To1_16_4.MAPPINGS.getNewBlockStateId(palette.idAt(x, y, z)); + int blockStateId = Protocol1_16_4To1_17.MAPPINGS.getNewBlockStateId(palette.idAt(x, y, z)); blockChangeRecords[j++] = new BlockChangeRecord1_16_2(x, y, z, blockStateId); } } } blockChangePacket.write(Type.VAR_LONG_BLOCK_CHANGE_RECORD_ARRAY, blockChangeRecords); - blockChangePacket.send(Protocol1_17To1_16_4.class); + blockChangePacket.send(Protocol1_16_4To1_17.class); } } } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/storage/InventoryAcknowledgements.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/storage/InventoryAcknowledgements.java similarity index 94% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/storage/InventoryAcknowledgements.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/storage/InventoryAcknowledgements.java index be7cb24fa..b07d4dee7 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/storage/InventoryAcknowledgements.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/storage/InventoryAcknowledgements.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_17to1_16_4.storage; +package com.viaversion.viaversion.protocols.v1_16_4to1_17.storage; import com.viaversion.viaversion.api.connection.StorableObject; import it.unimi.dsi.fastutil.ints.IntArrayList; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_1to1_16/Protocol1_16_1To1_16.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16to1_16_1/Protocol1_16To1_16_1.java similarity index 79% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_1to1_16/Protocol1_16_1To1_16.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_16to1_16_1/Protocol1_16To1_16_1.java index a50dbd373..9e6a5e09e 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_1to1_16/Protocol1_16_1To1_16.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16to1_16_1/Protocol1_16To1_16_1.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_16_1to1_16; +package com.viaversion.viaversion.protocols.v1_16to1_16_1; import com.viaversion.viaversion.api.protocol.AbstractProtocol; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ClientboundPackets1_16; -import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ServerboundPackets1_16; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.packet.ClientboundPackets1_16; +import com.viaversion.viaversion.protocols.v1_15_2to1_16.packet.ServerboundPackets1_16; -public class Protocol1_16_1To1_16 extends AbstractProtocol { +public class Protocol1_16To1_16_1 extends AbstractProtocol { - public Protocol1_16_1To1_16() { + public Protocol1_16To1_16_1() { super(ClientboundPackets1_16.class, ClientboundPackets1_16.class, ServerboundPackets1_16.class, ServerboundPackets1_16.class); } } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/Protocol1_18To1_17_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/Protocol1_17_1To1_18.java similarity index 82% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/Protocol1_18To1_17_1.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/Protocol1_17_1To1_18.java index d21ea4932..d8da6f408 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/Protocol1_18To1_17_1.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/Protocol1_17_1To1_18.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_18to1_17_1; +package com.viaversion.viaversion.protocols.v1_17_1to1_18; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.data.MappingData; @@ -28,24 +28,25 @@ import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.misc.ParticleType; import com.viaversion.viaversion.api.type.types.version.Types1_18; import com.viaversion.viaversion.data.entity.EntityTrackerBase; -import com.viaversion.viaversion.protocols.protocol1_17_1to1_17.ClientboundPackets1_17_1; -import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ServerboundPackets1_17; -import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.packets.EntityPackets; -import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.packets.InventoryPackets; -import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.packets.WorldPackets; -import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.storage.ChunkLightStorage; +import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ServerboundPackets1_17; +import com.viaversion.viaversion.protocols.v1_17_1to1_18.packet.ClientboundPackets1_18; +import com.viaversion.viaversion.protocols.v1_17_1to1_18.rewriter.EntityPacketRewriter1_18; +import com.viaversion.viaversion.protocols.v1_17_1to1_18.rewriter.ItemPacketRewriter1_18; +import com.viaversion.viaversion.protocols.v1_17_1to1_18.rewriter.WorldPacketRewriter1_18; +import com.viaversion.viaversion.protocols.v1_17_1to1_18.storage.ChunkLightStorage; +import com.viaversion.viaversion.protocols.v1_17to1_17_1.packet.ClientboundPackets1_17_1; import com.viaversion.viaversion.rewriter.SoundRewriter; import com.viaversion.viaversion.rewriter.StatisticsRewriter; import com.viaversion.viaversion.rewriter.TagRewriter; -public final class Protocol1_18To1_17_1 extends AbstractProtocol { +public final class Protocol1_17_1To1_18 extends AbstractProtocol { public static final MappingData MAPPINGS = new MappingDataBase("1.17", "1.18"); - private final EntityPackets entityRewriter = new EntityPackets(this); - private final InventoryPackets itemRewriter = new InventoryPackets(this); + private final EntityPacketRewriter1_18 entityRewriter = new EntityPacketRewriter1_18(this); + private final ItemPacketRewriter1_18 itemRewriter = new ItemPacketRewriter1_18(this); private final TagRewriter tagRewriter = new TagRewriter<>(this); - public Protocol1_18To1_17_1() { + public Protocol1_17_1To1_18() { super(ClientboundPackets1_17_1.class, ClientboundPackets1_18.class, ServerboundPackets1_17.class, ServerboundPackets1_17.class); } @@ -53,7 +54,7 @@ public final class Protocol1_18To1_17_1 extends AbstractProtocol soundRewriter = new SoundRewriter<>(this); soundRewriter.registerSound(ClientboundPackets1_17_1.SOUND); @@ -109,12 +110,12 @@ public final class Protocol1_18To1_17_1 extends AbstractProtocol. */ -package com.viaversion.viaversion.protocols.protocol1_18to1_17_1.data; +package com.viaversion.viaversion.protocols.v1_17_1to1_18.data; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/data/BlockEntityIds.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/data/BlockEntityIds.java similarity index 96% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/data/BlockEntityIds.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/data/BlockEntityIds.java index 6baf11257..72e821196 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/data/BlockEntityIds.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/data/BlockEntityIds.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_18to1_17_1.data; +package com.viaversion.viaversion.protocols.v1_17_1to1_18.data; import com.viaversion.viaversion.api.Via; import java.util.Arrays; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/ClientboundPackets1_18.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/packet/ClientboundPackets1_18.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/ClientboundPackets1_18.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/packet/ClientboundPackets1_18.java index a904bcd95..7a4f58d76 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/ClientboundPackets1_18.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/packet/ClientboundPackets1_18.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_18to1_17_1; +package com.viaversion.viaversion.protocols.v1_17_1to1_18.packet; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/rewriter/EntityPacketRewriter1_18.java similarity index 89% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/EntityPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/rewriter/EntityPacketRewriter1_18.java index bf4db0f11..00c705bb0 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/EntityPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/rewriter/EntityPacketRewriter1_18.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_18to1_17_1.packets; +package com.viaversion.viaversion.protocols.v1_17_1to1_18.rewriter; import com.viaversion.viaversion.api.data.entity.EntityTracker; import com.viaversion.viaversion.api.minecraft.Particle; @@ -25,14 +25,14 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_17; import com.viaversion.viaversion.api.type.types.version.Types1_18; -import com.viaversion.viaversion.protocols.protocol1_17_1to1_17.ClientboundPackets1_17_1; -import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.Protocol1_18To1_17_1; -import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.storage.ChunkLightStorage; +import com.viaversion.viaversion.protocols.v1_17_1to1_18.Protocol1_17_1To1_18; +import com.viaversion.viaversion.protocols.v1_17_1to1_18.storage.ChunkLightStorage; +import com.viaversion.viaversion.protocols.v1_17to1_17_1.packet.ClientboundPackets1_17_1; import com.viaversion.viaversion.rewriter.EntityRewriter; -public final class EntityPackets extends EntityRewriter { +public final class EntityPacketRewriter1_18 extends EntityRewriter { - public EntityPackets(final Protocol1_18To1_17_1 protocol) { + public EntityPacketRewriter1_18(final Protocol1_17_1To1_18 protocol) { super(protocol); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/rewriter/ItemPacketRewriter1_18.java similarity index 90% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/InventoryPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/rewriter/ItemPacketRewriter1_18.java index db38aa702..1ea5a67ad 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/InventoryPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/rewriter/ItemPacketRewriter1_18.java @@ -15,20 +15,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_18to1_17_1.packets; +package com.viaversion.viaversion.protocols.v1_17_1to1_18.rewriter; import com.viaversion.viaversion.api.data.ParticleMappings; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_17_1to1_17.ClientboundPackets1_17_1; -import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ServerboundPackets1_17; -import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.Protocol1_18To1_17_1; +import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ServerboundPackets1_17; +import com.viaversion.viaversion.protocols.v1_17_1to1_18.Protocol1_17_1To1_18; +import com.viaversion.viaversion.protocols.v1_17to1_17_1.packet.ClientboundPackets1_17_1; import com.viaversion.viaversion.rewriter.ItemRewriter; import com.viaversion.viaversion.rewriter.RecipeRewriter; -public final class InventoryPackets extends ItemRewriter { +public final class ItemPacketRewriter1_18 extends ItemRewriter { - public InventoryPackets(Protocol1_18To1_17_1 protocol) { + public ItemPacketRewriter1_18(Protocol1_17_1To1_18 protocol) { super(protocol, Type.ITEM1_13_2, Type.ITEM1_13_2_ARRAY); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/rewriter/WorldPacketRewriter1_18.java similarity index 93% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/WorldPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/rewriter/WorldPacketRewriter1_18.java index 434d631b0..aec6ce848 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/WorldPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/rewriter/WorldPacketRewriter1_18.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_18to1_17_1.packets; +package com.viaversion.viaversion.protocols.v1_17_1to1_18.rewriter; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.NumberTag; -import com.github.steveice10.opennbt.tag.builtin.StringTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.NumberTag; +import com.viaversion.nbt.tag.StringTag; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.data.entity.EntityTracker; import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity; @@ -34,20 +34,20 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_17; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_18; -import com.viaversion.viaversion.protocols.protocol1_17_1to1_17.ClientboundPackets1_17_1; -import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.data.BlockEntityIds; -import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.Protocol1_18To1_17_1; -import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.data.BlockEntities; -import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.storage.ChunkLightStorage; +import com.viaversion.viaversion.protocols.v1_17_1to1_18.Protocol1_17_1To1_18; +import com.viaversion.viaversion.protocols.v1_17_1to1_18.data.BlockEntityIds; +import com.viaversion.viaversion.protocols.v1_17_1to1_18.data.BlockEntities; +import com.viaversion.viaversion.protocols.v1_17_1to1_18.storage.ChunkLightStorage; +import com.viaversion.viaversion.protocols.v1_17to1_17_1.packet.ClientboundPackets1_17_1; import com.viaversion.viaversion.util.Key; import com.viaversion.viaversion.util.MathUtil; import java.util.ArrayList; import java.util.BitSet; import java.util.List; -public final class WorldPackets { +public final class WorldPacketRewriter1_18 { - public static void register(final Protocol1_18To1_17_1 protocol) { + public static void register(final Protocol1_17_1To1_18 protocol) { protocol.registerClientbound(ClientboundPackets1_17_1.BLOCK_ENTITY_DATA, new PacketHandlers() { @Override public void register() { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/storage/ChunkLightStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/storage/ChunkLightStorage.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/storage/ChunkLightStorage.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/storage/ChunkLightStorage.java index fb20030c2..4681e67bb 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/storage/ChunkLightStorage.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/storage/ChunkLightStorage.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_18to1_17_1.storage; +package com.viaversion.viaversion.protocols.v1_17_1to1_18.storage; import com.viaversion.viaversion.api.connection.StorableObject; import java.util.HashMap; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17_1to1_17/Protocol1_17_1To1_17.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_17to1_17_1/Protocol1_17To1_17_1.java similarity index 90% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17_1to1_17/Protocol1_17_1To1_17.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_17to1_17_1/Protocol1_17To1_17_1.java index 27f8b69f2..5b2908b85 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17_1to1_17/Protocol1_17_1To1_17.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_17to1_17_1/Protocol1_17To1_17_1.java @@ -15,26 +15,27 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_17_1to1_17; +package com.viaversion.viaversion.protocols.v1_17to1_17_1; -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.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.StringTag; import com.viaversion.viaversion.api.minecraft.item.DataItem; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.StringType; -import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ClientboundPackets1_17; -import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ServerboundPackets1_17; +import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ClientboundPackets1_17; +import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ServerboundPackets1_17; +import com.viaversion.viaversion.protocols.v1_17to1_17_1.packet.ClientboundPackets1_17_1; -public final class Protocol1_17_1To1_17 extends AbstractProtocol { +public final class Protocol1_17To1_17_1 extends AbstractProtocol { private static final StringType PAGE_STRING_TYPE = new StringType(8192); private static final StringType TITLE_STRING_TYPE = new StringType(128); - public Protocol1_17_1To1_17() { + public Protocol1_17To1_17_1() { super(ClientboundPackets1_17.class, ClientboundPackets1_17_1.class, ServerboundPackets1_17.class, ServerboundPackets1_17.class); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17_1to1_17/ClientboundPackets1_17_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_17to1_17_1/packet/ClientboundPackets1_17_1.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17_1to1_17/ClientboundPackets1_17_1.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_17to1_17_1/packet/ClientboundPackets1_17_1.java index f14126ccc..6bc4c08d4 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17_1to1_17/ClientboundPackets1_17_1.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_17to1_17_1/packet/ClientboundPackets1_17_1.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_17_1to1_17; +package com.viaversion.viaversion.protocols.v1_17to1_17_1.packet; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/Protocol1_19To1_18_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/Protocol1_18_2To1_19.java similarity index 89% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/Protocol1_19To1_18_2.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/Protocol1_18_2To1_19.java index 35c502df2..cbcddc49b 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/Protocol1_19To1_18_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/Protocol1_18_2To1_19.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19to1_18_2; +package com.viaversion.viaversion.protocols.v1_18_2to1_19; import com.google.gson.JsonElement; import com.viaversion.viaversion.api.Via; @@ -32,16 +32,18 @@ import com.viaversion.viaversion.api.type.types.version.Types1_19; import com.viaversion.viaversion.data.entity.EntityTrackerBase; import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets; import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets; -import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ServerboundPackets1_17; -import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.ClientboundPackets1_18; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.data.MappingData; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.packets.EntityPackets; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.packets.InventoryPackets; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.packets.WorldPackets; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.provider.AckSequenceProvider; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.storage.DimensionRegistryStorage; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.storage.NonceStorage; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.storage.SequenceStorage; +import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ServerboundPackets1_17; +import com.viaversion.viaversion.protocols.v1_17_1to1_18.packet.ClientboundPackets1_18; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.data.MappingData1_19; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.packet.ClientboundPackets1_19; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.packet.ServerboundPackets1_19; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.provider.AckSequenceProvider; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.rewriter.EntityPacketRewriter1_19; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.rewriter.ItemPacketRewriter1_19; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.rewriter.WorldPacketRewriter1_19; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.storage.DimensionRegistryStorage; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.storage.NonceStorage; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.storage.SequenceStorage; import com.viaversion.viaversion.rewriter.CommandRewriter; import com.viaversion.viaversion.rewriter.SoundRewriter; import com.viaversion.viaversion.rewriter.StatisticsRewriter; @@ -50,14 +52,14 @@ import com.viaversion.viaversion.util.CipherUtil; import com.viaversion.viaversion.util.ComponentUtil; import java.util.concurrent.ThreadLocalRandom; -public final class Protocol1_19To1_18_2 extends AbstractProtocol { +public final class Protocol1_18_2To1_19 extends AbstractProtocol { - public static final MappingData MAPPINGS = new MappingData(); - private final EntityPackets entityRewriter = new EntityPackets(this); - private final InventoryPackets itemRewriter = new InventoryPackets(this); + public static final MappingData1_19 MAPPINGS = new MappingData1_19(); + private final EntityPacketRewriter1_19 entityRewriter = new EntityPacketRewriter1_19(this); + private final ItemPacketRewriter1_19 itemRewriter = new ItemPacketRewriter1_19(this); private final TagRewriter tagRewriter = new TagRewriter<>(this); - public Protocol1_19To1_18_2() { + public Protocol1_18_2To1_19() { super(ClientboundPackets1_18.class, ClientboundPackets1_19.class, ServerboundPackets1_17.class, ServerboundPackets1_19.class); } @@ -79,7 +81,7 @@ public final class Protocol1_19To1_18_2 extends AbstractProtocol. */ -package com.viaversion.viaversion.protocols.protocol1_19to1_18_2.data; +package com.viaversion.viaversion.protocols.v1_18_2to1_19.data; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.ListTag; -import com.github.steveice10.opennbt.tag.builtin.NumberTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.NumberTag; import com.viaversion.viaversion.api.data.MappingDataBase; import com.viaversion.viaversion.api.data.MappingDataLoader; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import org.checkerframework.checker.nullness.qual.Nullable; -public final class MappingData extends MappingDataBase { +public final class MappingData1_19 extends MappingDataBase { private final Int2ObjectMap defaultChatTypes = new Int2ObjectOpenHashMap<>(); private CompoundTag chatRegistry; - public MappingData() { + public MappingData1_19() { super("1.18", "1.19"); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/ClientboundPackets1_19.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/packet/ClientboundPackets1_19.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/ClientboundPackets1_19.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/packet/ClientboundPackets1_19.java index 5b17f3148..32d30db5e 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/ClientboundPackets1_19.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/packet/ClientboundPackets1_19.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19to1_18_2; +package com.viaversion.viaversion.protocols.v1_18_2to1_19.packet; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/ServerboundPackets1_19.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/packet/ServerboundPackets1_19.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/ServerboundPackets1_19.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/packet/ServerboundPackets1_19.java index ba6b4af43..73c6de7a5 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/ServerboundPackets1_19.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/packet/ServerboundPackets1_19.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19to1_18_2; +package com.viaversion.viaversion.protocols.v1_18_2to1_19.packet; import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/provider/AckSequenceProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/provider/AckSequenceProvider.java similarity index 83% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/provider/AckSequenceProvider.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/provider/AckSequenceProvider.java index 11ac77133..bbec6a8e6 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/provider/AckSequenceProvider.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/provider/AckSequenceProvider.java @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19to1_18_2.provider; +package com.viaversion.viaversion.protocols.v1_18_2to1_19.provider; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.platform.providers.Provider; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.ClientboundPackets1_19; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.Protocol1_19To1_18_2; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.Protocol1_18_2To1_19; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.packet.ClientboundPackets1_19; public class AckSequenceProvider implements Provider { public void handleSequence(final UserConnection connection, final int sequence) { final PacketWrapper ackPacket = PacketWrapper.create(ClientboundPackets1_19.BLOCK_CHANGED_ACK, connection); ackPacket.write(Type.VAR_INT, sequence); - ackPacket.send(Protocol1_19To1_18_2.class); + ackPacket.send(Protocol1_18_2To1_19.class); } } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/rewriter/EntityPacketRewriter1_19.java similarity index 94% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/EntityPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/rewriter/EntityPacketRewriter1_19.java index fd9da1b84..676335e14 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/EntityPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/rewriter/EntityPacketRewriter1_19.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19to1_18_2.packets; +package com.viaversion.viaversion.protocols.v1_18_2to1_19.rewriter; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.IntTag; -import com.github.steveice10.opennbt.tag.builtin.ListTag; -import com.github.steveice10.opennbt.tag.builtin.NumberTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.IntTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.NumberTag; import com.google.common.collect.Maps; import com.google.gson.JsonElement; import com.viaversion.viaversion.api.Via; @@ -37,10 +37,10 @@ import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_18; import com.viaversion.viaversion.api.type.types.version.Types1_19; import com.viaversion.viaversion.data.entity.DimensionDataImpl; -import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.ClientboundPackets1_18; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.ClientboundPackets1_19; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.Protocol1_19To1_18_2; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.storage.DimensionRegistryStorage; +import com.viaversion.viaversion.protocols.v1_17_1to1_18.packet.ClientboundPackets1_18; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.Protocol1_18_2To1_19; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.packet.ClientboundPackets1_19; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.storage.DimensionRegistryStorage; import com.viaversion.viaversion.rewriter.EntityRewriter; import com.viaversion.viaversion.util.Key; import com.viaversion.viaversion.util.Pair; @@ -51,9 +51,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public final class EntityPackets extends EntityRewriter { +public final class EntityPacketRewriter1_19 extends EntityRewriter { - public EntityPackets(final Protocol1_19To1_18_2 protocol) { + public EntityPacketRewriter1_19(final Protocol1_18_2To1_19 protocol) { super(protocol); } @@ -112,7 +112,7 @@ public final class EntityPackets extends EntityRewriter metadata = new ArrayList<>(); metadata.add(new Metadata(8, Types1_19.META_TYPES.paintingVariantType, protocol.getMappingData().getPaintingMappings().getNewIdOrDefault(motive, 0))); metaPacket.write(Types1_19.METADATA_LIST, metadata); - metaPacket.send(Protocol1_19To1_18_2.class); + metaPacket.send(Protocol1_18_2To1_19.class); }); } }); @@ -213,7 +213,7 @@ public final class EntityPackets extends EntityRewriter. */ -package com.viaversion.viaversion.protocols.protocol1_19to1_18_2.packets; +package com.viaversion.viaversion.protocols.v1_18_2to1_19.rewriter; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.data.ParticleMappings; import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.ClientboundPackets1_18; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.Protocol1_19To1_18_2; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.ServerboundPackets1_19; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.provider.AckSequenceProvider; +import com.viaversion.viaversion.protocols.v1_17_1to1_18.packet.ClientboundPackets1_18; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.Protocol1_18_2To1_19; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.packet.ServerboundPackets1_19; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.provider.AckSequenceProvider; import com.viaversion.viaversion.rewriter.ItemRewriter; import com.viaversion.viaversion.rewriter.RecipeRewriter; import com.viaversion.viaversion.util.Key; -public final class InventoryPackets extends ItemRewriter { +public final class ItemPacketRewriter1_19 extends ItemRewriter { - public InventoryPackets(Protocol1_19To1_18_2 protocol) { + public ItemPacketRewriter1_19(Protocol1_18_2To1_19 protocol) { super(protocol, Type.ITEM1_13_2, Type.ITEM1_13_2_ARRAY); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/rewriter/WorldPacketRewriter1_19.java similarity index 90% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/WorldPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/rewriter/WorldPacketRewriter1_19.java index 5218d3bc1..86bb55a3b 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/WorldPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/rewriter/WorldPacketRewriter1_19.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19to1_18_2.packets; +package com.viaversion.viaversion.protocols.v1_18_2to1_19.rewriter; import com.google.common.base.Preconditions; import com.viaversion.viaversion.api.data.entity.EntityTracker; @@ -25,15 +25,15 @@ import com.viaversion.viaversion.api.minecraft.chunks.DataPalette; import com.viaversion.viaversion.api.minecraft.chunks.PaletteType; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_18; -import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.ClientboundPackets1_18; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.Protocol1_19To1_18_2; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.ServerboundPackets1_19; +import com.viaversion.viaversion.protocols.v1_17_1to1_18.packet.ClientboundPackets1_18; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.Protocol1_18_2To1_19; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.packet.ServerboundPackets1_19; import com.viaversion.viaversion.rewriter.BlockRewriter; import com.viaversion.viaversion.util.MathUtil; -public final class WorldPackets { +public final class WorldPacketRewriter1_19 { - public static void register(final Protocol1_19To1_18_2 protocol) { + public static void register(final Protocol1_18_2To1_19 protocol) { final BlockRewriter blockRewriter = BlockRewriter.for1_14(protocol); blockRewriter.registerBlockAction(ClientboundPackets1_18.BLOCK_ACTION); blockRewriter.registerBlockChange(ClientboundPackets1_18.BLOCK_CHANGE); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/storage/DimensionRegistryStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/storage/DimensionRegistryStorage.java similarity index 91% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/storage/DimensionRegistryStorage.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/storage/DimensionRegistryStorage.java index 30c9a856e..2f48773e2 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/storage/DimensionRegistryStorage.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/storage/DimensionRegistryStorage.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19to1_18_2.storage; +package com.viaversion.viaversion.protocols.v1_18_2to1_19.storage; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.connection.StorableObject; import java.util.Map; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/storage/NonceStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/storage/NonceStorage.java similarity index 92% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/storage/NonceStorage.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/storage/NonceStorage.java index 4ed44b754..3f759db2b 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/storage/NonceStorage.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/storage/NonceStorage.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19to1_18_2.storage; +package com.viaversion.viaversion.protocols.v1_18_2to1_19.storage; import com.viaversion.viaversion.api.connection.StorableObject; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/storage/SequenceStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/storage/SequenceStorage.java similarity index 94% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/storage/SequenceStorage.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/storage/SequenceStorage.java index 777d4a790..720cf5435 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/storage/SequenceStorage.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/storage/SequenceStorage.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19to1_18_2.storage; +package com.viaversion.viaversion.protocols.v1_18_2to1_19.storage; import com.viaversion.viaversion.api.connection.StorableObject; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18_2to1_18/Protocol1_18_2To1_18.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_18to1_18_2/Protocol1_18To1_18_2.java similarity index 87% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18_2to1_18/Protocol1_18_2To1_18.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_18to1_18_2/Protocol1_18To1_18_2.java index 7bd20ab8c..cfb37b012 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18_2to1_18/Protocol1_18_2To1_18.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_18to1_18_2/Protocol1_18To1_18_2.java @@ -15,24 +15,24 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_18_2to1_18; +package com.viaversion.viaversion.protocols.v1_18to1_18_2; -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 com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.StringTag; +import com.viaversion.nbt.tag.Tag; import com.viaversion.viaversion.api.minecraft.RegistryType; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ServerboundPackets1_17; -import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.ClientboundPackets1_18; +import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ServerboundPackets1_17; +import com.viaversion.viaversion.protocols.v1_17_1to1_18.packet.ClientboundPackets1_18; import com.viaversion.viaversion.rewriter.TagRewriter; import com.viaversion.viaversion.util.TagUtil; -public final class Protocol1_18_2To1_18 extends AbstractProtocol { +public final class Protocol1_18To1_18_2 extends AbstractProtocol { - public Protocol1_18_2To1_18() { + public Protocol1_18To1_18_2() { super(ClientboundPackets1_18.class, ClientboundPackets1_18.class, ServerboundPackets1_17.class, ServerboundPackets1_17.class); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/Protocol1_19_3To1_19_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_1to1_19_3/Protocol1_19_1To1_19_3.java similarity index 94% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/Protocol1_19_3To1_19_1.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_19_1to1_19_3/Protocol1_19_1To1_19_3.java index 4a72f8f1f..779bdd820 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/Protocol1_19_3To1_19_1.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_1to1_19_3/Protocol1_19_1To1_19_3.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1; +package com.viaversion.viaversion.protocols.v1_19_1to1_19_3; import com.google.common.primitives.Longs; import com.google.gson.JsonElement; @@ -44,12 +44,14 @@ import com.viaversion.viaversion.api.type.types.version.Types1_19_3; import com.viaversion.viaversion.data.entity.EntityTrackerBase; import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets; import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets; -import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.ClientboundPackets1_19_1; -import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.ServerboundPackets1_19_1; -import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.packets.EntityPackets; -import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.packets.InventoryPackets; -import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.storage.NonceStorage; -import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.storage.ReceivedMessagesStorage; +import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.packet.ClientboundPackets1_19_3; +import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.packet.ServerboundPackets1_19_3; +import com.viaversion.viaversion.protocols.v1_19to1_19_1.packet.ClientboundPackets1_19_1; +import com.viaversion.viaversion.protocols.v1_19to1_19_1.packet.ServerboundPackets1_19_1; +import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.rewriter.EntityPacketRewriter1_19_3; +import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.rewriter.ItemPacketRewriter1_19_3; +import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.storage.NonceStorage; +import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.storage.ReceivedMessagesStorage; import com.viaversion.viaversion.rewriter.CommandRewriter; import com.viaversion.viaversion.rewriter.StatisticsRewriter; import com.viaversion.viaversion.rewriter.TagRewriter; @@ -60,16 +62,16 @@ import java.util.List; import java.util.UUID; import java.util.concurrent.ThreadLocalRandom; -public final class Protocol1_19_3To1_19_1 extends AbstractProtocol { +public final class Protocol1_19_1To1_19_3 extends AbstractProtocol { public static final MappingData MAPPINGS = new MappingDataBase("1.19", "1.19.3"); private static final UUID ZERO_UUID = new UUID(0, 0); private static final byte[] EMPTY_BYTES = new byte[0]; - private final EntityPackets entityRewriter = new EntityPackets(this); - private final InventoryPackets itemRewriter = new InventoryPackets(this); + private final EntityPacketRewriter1_19_3 entityRewriter = new EntityPacketRewriter1_19_3(this); + private final ItemPacketRewriter1_19_3 itemRewriter = new ItemPacketRewriter1_19_3(this); private final TagRewriter tagRewriter = new TagRewriter<>(this); - public Protocol1_19_3To1_19_1() { + public Protocol1_19_1To1_19_3() { super(ClientboundPackets1_19_1.class, ClientboundPackets1_19_3.class, ServerboundPackets1_19_1.class, ServerboundPackets1_19_3.class); } @@ -158,7 +160,7 @@ public final class Protocol1_19_3To1_19_1 extends AbstractProtocol. */ -package com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1; +package com.viaversion.viaversion.protocols.v1_19_1to1_19_3.packet; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/ServerboundPackets1_19_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_1to1_19_3/packet/ServerboundPackets1_19_3.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/ServerboundPackets1_19_3.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_19_1to1_19_3/packet/ServerboundPackets1_19_3.java index e53dad658..cbadc4b64 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/ServerboundPackets1_19_3.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_1to1_19_3/packet/ServerboundPackets1_19_3.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1; +package com.viaversion.viaversion.protocols.v1_19_1to1_19_3.packet; import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_1to1_19_3/rewriter/EntityPacketRewriter1_19_3.java similarity index 93% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/packets/EntityPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_19_1to1_19_3/rewriter/EntityPacketRewriter1_19_3.java index e5756893f..317bf88e5 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/packets/EntityPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_1to1_19_3/rewriter/EntityPacketRewriter1_19_3.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.packets; +package com.viaversion.viaversion.protocols.v1_19_1to1_19_3.rewriter; import com.google.gson.JsonElement; import com.viaversion.viaversion.api.minecraft.entities.EntityType; @@ -25,16 +25,16 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_19; import com.viaversion.viaversion.api.type.types.version.Types1_19_3; -import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.ClientboundPackets1_19_1; -import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.ClientboundPackets1_19_3; -import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.Protocol1_19_3To1_19_1; +import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.Protocol1_19_1To1_19_3; +import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.packet.ClientboundPackets1_19_3; +import com.viaversion.viaversion.protocols.v1_19to1_19_1.packet.ClientboundPackets1_19_1; import com.viaversion.viaversion.rewriter.EntityRewriter; import java.util.BitSet; import java.util.UUID; -public final class EntityPackets extends EntityRewriter { +public final class EntityPacketRewriter1_19_3 extends EntityRewriter { - public EntityPackets(final Protocol1_19_3To1_19_1 protocol) { + public EntityPacketRewriter1_19_3(final Protocol1_19_1To1_19_3 protocol) { super(protocol); } @@ -66,7 +66,7 @@ public final class EntityPackets extends EntityRewriter. */ -package com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.packets; +package com.viaversion.viaversion.protocols.v1_19_1to1_19_3.rewriter; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_18; -import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.ClientboundPackets1_19_1; -import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.Protocol1_19_3To1_19_1; -import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.ServerboundPackets1_19_3; +import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.Protocol1_19_1To1_19_3; +import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.packet.ServerboundPackets1_19_3; +import com.viaversion.viaversion.protocols.v1_19to1_19_1.packet.ClientboundPackets1_19_1; import com.viaversion.viaversion.rewriter.BlockRewriter; import com.viaversion.viaversion.rewriter.ItemRewriter; import com.viaversion.viaversion.rewriter.RecipeRewriter; import com.viaversion.viaversion.util.Key; -public final class InventoryPackets extends ItemRewriter { +public final class ItemPacketRewriter1_19_3 extends ItemRewriter { private static final int MISC_CRAFTING_BOOK_CATEGORY = 0; - public InventoryPackets(final Protocol1_19_3To1_19_1 protocol) { + public ItemPacketRewriter1_19_3(final Protocol1_19_1To1_19_3 protocol) { super(protocol, Type.ITEM1_13_2, Type.ITEM1_13_2_ARRAY); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/rewriter/RecipeRewriter1_19_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_1to1_19_3/rewriter/RecipeRewriter1_19_3.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/rewriter/RecipeRewriter1_19_3.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_19_1to1_19_3/rewriter/RecipeRewriter1_19_3.java index 741c841ba..b34053ee5 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/rewriter/RecipeRewriter1_19_3.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_1to1_19_3/rewriter/RecipeRewriter1_19_3.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.rewriter; +package com.viaversion.viaversion.protocols.v1_19_1to1_19_3.rewriter; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.Protocol; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/storage/NonceStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_1to1_19_3/storage/NonceStorage.java similarity index 92% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/storage/NonceStorage.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_19_1to1_19_3/storage/NonceStorage.java index 59ddc85ba..77abb7f12 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/storage/NonceStorage.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_1to1_19_3/storage/NonceStorage.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.storage; +package com.viaversion.viaversion.protocols.v1_19_1to1_19_3.storage; import com.viaversion.viaversion.api.connection.StorableObject; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/storage/ReceivedMessagesStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_1to1_19_3/storage/ReceivedMessagesStorage.java similarity index 96% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/storage/ReceivedMessagesStorage.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_19_1to1_19_3/storage/ReceivedMessagesStorage.java index 3ad6d14d4..bf7cf4290 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/storage/ReceivedMessagesStorage.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_1to1_19_3/storage/ReceivedMessagesStorage.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.storage; +package com.viaversion.viaversion.protocols.v1_19_1to1_19_3.storage; import com.viaversion.viaversion.api.connection.StorableObject; import com.viaversion.viaversion.api.minecraft.PlayerMessageSignature; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/Protocol1_19_4To1_19_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/Protocol1_19_3To1_19_4.java similarity index 79% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/Protocol1_19_4To1_19_3.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/Protocol1_19_3To1_19_4.java index ccddaa697..4ee53fb05 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/Protocol1_19_4To1_19_3.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/Protocol1_19_3To1_19_4.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3; +package com.viaversion.viaversion.protocols.v1_19_3to1_19_4; import com.google.gson.JsonElement; import com.viaversion.viaversion.api.connection.UserConnection; @@ -26,12 +26,14 @@ import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.misc.ParticleType; import com.viaversion.viaversion.api.type.types.version.Types1_19_4; import com.viaversion.viaversion.data.entity.EntityTrackerBase; -import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.ClientboundPackets1_19_3; -import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.ServerboundPackets1_19_3; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.data.MappingData; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.packets.EntityPackets; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.packets.InventoryPackets; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.storage.PlayerVehicleTracker; +import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.packet.ClientboundPackets1_19_3; +import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.packet.ServerboundPackets1_19_3; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.data.MappingData1_19_4; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ClientboundPackets1_19_4; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ServerboundPackets1_19_4; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.rewriter.EntityPacketRewriter1_19_4; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.rewriter.ItemPacketRewriter1_19_4; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.storage.PlayerVehicleTracker; import com.viaversion.viaversion.rewriter.CommandRewriter; import com.viaversion.viaversion.rewriter.SoundRewriter; import com.viaversion.viaversion.rewriter.StatisticsRewriter; @@ -40,14 +42,14 @@ import com.viaversion.viaversion.util.ComponentUtil; import java.nio.charset.StandardCharsets; import java.util.Base64; -public final class Protocol1_19_4To1_19_3 extends AbstractProtocol { +public final class Protocol1_19_3To1_19_4 extends AbstractProtocol { - public static final MappingData MAPPINGS = new MappingData(); - private final EntityPackets entityRewriter = new EntityPackets(this); - private final InventoryPackets itemRewriter = new InventoryPackets(this); + public static final MappingData1_19_4 MAPPINGS = new MappingData1_19_4(); + private final EntityPacketRewriter1_19_4 entityRewriter = new EntityPacketRewriter1_19_4(this); + private final ItemPacketRewriter1_19_4 itemRewriter = new ItemPacketRewriter1_19_4(this); private final TagRewriter tagRewriter = new TagRewriter<>(this); - public Protocol1_19_4To1_19_3() { + public Protocol1_19_3To1_19_4() { super(ClientboundPackets1_19_3.class, ClientboundPackets1_19_4.class, ServerboundPackets1_19_3.class, ServerboundPackets1_19_4.class); } @@ -116,17 +118,17 @@ public final class Protocol1_19_4To1_19_3 extends AbstractProtocol. */ -package com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.data; +package com.viaversion.viaversion.protocols.v1_19_3to1_19_4.data; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.data.MappingDataBase; import com.viaversion.viaversion.api.data.MappingDataLoader; -public final class MappingData extends MappingDataBase { +public final class MappingData1_19_4 extends MappingDataBase { private CompoundTag damageTypesRegistry; - public MappingData() { + public MappingData1_19_4() { super("1.19.3", "1.19.4"); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/ClientboundPackets1_19_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/packet/ClientboundPackets1_19_4.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/ClientboundPackets1_19_4.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/packet/ClientboundPackets1_19_4.java index c04b79b12..a486695ef 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/ClientboundPackets1_19_4.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/packet/ClientboundPackets1_19_4.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3; +package com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/ServerboundPackets1_19_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/packet/ServerboundPackets1_19_4.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/ServerboundPackets1_19_4.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/packet/ServerboundPackets1_19_4.java index 3c0d56d2e..6d10c716e 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/ServerboundPackets1_19_4.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/packet/ServerboundPackets1_19_4.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3; +package com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet; import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/rewriter/CommandRewriter1_19_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/rewriter/CommandRewriter1_19_4.java similarity index 94% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/rewriter/CommandRewriter1_19_4.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/rewriter/CommandRewriter1_19_4.java index 5535a5f79..339e6a2b8 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/rewriter/CommandRewriter1_19_4.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/rewriter/CommandRewriter1_19_4.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.rewriter; +package com.viaversion.viaversion.protocols.v1_19_3to1_19_4.rewriter; import com.viaversion.viaversion.api.protocol.Protocol; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/rewriter/EntityPacketRewriter1_19_4.java similarity index 89% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/packets/EntityPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/rewriter/EntityPacketRewriter1_19_4.java index 46ad9920a..7acd22bce 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/packets/EntityPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/rewriter/EntityPacketRewriter1_19_4.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.packets; +package com.viaversion.viaversion.protocols.v1_19_3to1_19_4.rewriter; -import com.github.steveice10.opennbt.tag.builtin.ByteTag; -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.viaversion.nbt.tag.ByteTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.StringTag; import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_19_4; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; @@ -28,16 +28,16 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_19_3; import com.viaversion.viaversion.api.type.types.version.Types1_19_4; -import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.ClientboundPackets1_19_3; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ClientboundPackets1_19_4; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.Protocol1_19_4To1_19_3; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.storage.PlayerVehicleTracker; +import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.packet.ClientboundPackets1_19_3; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.Protocol1_19_3To1_19_4; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ClientboundPackets1_19_4; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.storage.PlayerVehicleTracker; import com.viaversion.viaversion.rewriter.EntityRewriter; import com.viaversion.viaversion.util.TagUtil; -public final class EntityPackets extends EntityRewriter { +public final class EntityPacketRewriter1_19_4 extends EntityRewriter { - public EntityPackets(final Protocol1_19_4To1_19_3 protocol) { + public EntityPacketRewriter1_19_4(final Protocol1_19_3To1_19_4 protocol) { super(protocol); } @@ -89,15 +89,15 @@ public final class EntityPackets extends EntityRewriter { final PlayerVehicleTracker playerVehicleTracker = wrapper.user().get(PlayerVehicleTracker.class); - final int clientEntityId = wrapper.user().getEntityTracker(Protocol1_19_4To1_19_3.class).clientEntityId(); + final int clientEntityId = wrapper.user().getEntityTracker(Protocol1_19_3To1_19_4.class).clientEntityId(); final int vehicleId = wrapper.get(Type.VAR_INT, 0); if (playerVehicleTracker.getVehicleId() == vehicleId) { @@ -136,7 +136,7 @@ public final class EntityPackets extends EntityRewriter { final int entityId = wrapper.read(Type.VAR_INT); // entity id - final int clientEntityId = wrapper.user().getEntityTracker(Protocol1_19_4To1_19_3.class).clientEntityId(); + final int clientEntityId = wrapper.user().getEntityTracker(Protocol1_19_3To1_19_4.class).clientEntityId(); if (entityId != clientEntityId) { wrapper.write(Type.VAR_INT, entityId); // entity id return; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/rewriter/ItemPacketRewriter1_19_4.java similarity index 87% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/packets/InventoryPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/rewriter/ItemPacketRewriter1_19_4.java index 5ff7ad369..8e22b985c 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/packets/InventoryPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/rewriter/ItemPacketRewriter1_19_4.java @@ -15,22 +15,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.packets; +package com.viaversion.viaversion.protocols.v1_19_3to1_19_4.rewriter; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_18; -import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.ClientboundPackets1_19_3; -import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.rewriter.RecipeRewriter1_19_3; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.Protocol1_19_4To1_19_3; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ServerboundPackets1_19_4; +import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.packet.ClientboundPackets1_19_3; +import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.rewriter.RecipeRewriter1_19_3; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.Protocol1_19_3To1_19_4; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ServerboundPackets1_19_4; import com.viaversion.viaversion.rewriter.BlockRewriter; import com.viaversion.viaversion.rewriter.ItemRewriter; -public final class InventoryPackets extends ItemRewriter { +public final class ItemPacketRewriter1_19_4 extends ItemRewriter { - public InventoryPackets(final Protocol1_19_4To1_19_3 protocol) { + public ItemPacketRewriter1_19_4(final Protocol1_19_3To1_19_4 protocol) { super(protocol, Type.ITEM1_13_2, Type.ITEM1_13_2_ARRAY); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/rewriter/RecipeRewriter1_19_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/rewriter/RecipeRewriter1_19_4.java similarity index 89% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/rewriter/RecipeRewriter1_19_4.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/rewriter/RecipeRewriter1_19_4.java index 000e27551..0d04b6f04 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/rewriter/RecipeRewriter1_19_4.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/rewriter/RecipeRewriter1_19_4.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.rewriter; +package com.viaversion.viaversion.protocols.v1_19_3to1_19_4.rewriter; import com.viaversion.viaversion.api.protocol.Protocol; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.rewriter.RecipeRewriter1_19_3; +import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.rewriter.RecipeRewriter1_19_3; public class RecipeRewriter1_19_4 extends RecipeRewriter1_19_3 { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/storage/PlayerVehicleTracker.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/storage/PlayerVehicleTracker.java similarity index 93% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/storage/PlayerVehicleTracker.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/storage/PlayerVehicleTracker.java index fd84a9778..6862f219b 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/storage/PlayerVehicleTracker.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/storage/PlayerVehicleTracker.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.storage; +package com.viaversion.viaversion.protocols.v1_19_3to1_19_4.storage; import com.viaversion.viaversion.api.connection.StorableObject; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20to1_19_4/Protocol1_20To1_19_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_4to1_20/Protocol1_19_4To1_20.java similarity index 83% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20to1_19_4/Protocol1_20To1_19_4.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_19_4to1_20/Protocol1_19_4To1_20.java index d924ef035..70edf9755 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20to1_19_4/Protocol1_20To1_19_4.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_4to1_20/Protocol1_19_4To1_20.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20to1_19_4; +package com.viaversion.viaversion.protocols.v1_19_4to1_20; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.data.MappingData; @@ -26,22 +26,22 @@ import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.misc.ParticleType; import com.viaversion.viaversion.api.type.types.version.Types1_20; import com.viaversion.viaversion.data.entity.EntityTrackerBase; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ClientboundPackets1_19_4; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ServerboundPackets1_19_4; -import com.viaversion.viaversion.protocols.protocol1_20to1_19_4.packets.EntityPackets; -import com.viaversion.viaversion.protocols.protocol1_20to1_19_4.packets.InventoryPackets; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ClientboundPackets1_19_4; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ServerboundPackets1_19_4; +import com.viaversion.viaversion.protocols.v1_19_4to1_20.rewriter.EntityPacketRewriter1_20; +import com.viaversion.viaversion.protocols.v1_19_4to1_20.rewriter.ItemPacketRewriter1_20; import com.viaversion.viaversion.rewriter.SoundRewriter; import com.viaversion.viaversion.rewriter.StatisticsRewriter; import com.viaversion.viaversion.rewriter.TagRewriter; -public final class Protocol1_20To1_19_4 extends AbstractProtocol { +public final class Protocol1_19_4To1_20 extends AbstractProtocol { public static final MappingData MAPPINGS = new MappingDataBase("1.19.4", "1.20"); - private final EntityPackets entityRewriter = new EntityPackets(this); - private final InventoryPackets itemRewriter = new InventoryPackets(this); + private final EntityPacketRewriter1_20 entityRewriter = new EntityPacketRewriter1_20(this); + private final ItemPacketRewriter1_20 itemRewriter = new ItemPacketRewriter1_20(this); private final TagRewriter tagRewriter = new TagRewriter<>(this); - public Protocol1_20To1_19_4() { + public Protocol1_19_4To1_20() { super(ClientboundPackets1_19_4.class, ClientboundPackets1_19_4.class, ServerboundPackets1_19_4.class, ServerboundPackets1_19_4.class); } @@ -94,12 +94,12 @@ public final class Protocol1_20To1_19_4 extends AbstractProtocol. */ -package com.viaversion.viaversion.protocols.protocol1_20to1_19_4.packets; +package com.viaversion.viaversion.protocols.v1_19_4to1_20.rewriter; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.FloatTag; -import com.github.steveice10.opennbt.tag.builtin.IntTag; -import com.github.steveice10.opennbt.tag.builtin.ListTag; -import com.github.steveice10.opennbt.tag.builtin.StringTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.FloatTag; +import com.viaversion.nbt.tag.IntTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.StringTag; import com.viaversion.viaversion.api.minecraft.Quaternion; import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_19_4; @@ -30,16 +30,16 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_19_4; import com.viaversion.viaversion.api.type.types.version.Types1_20; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ClientboundPackets1_19_4; -import com.viaversion.viaversion.protocols.protocol1_20to1_19_4.Protocol1_20To1_19_4; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ClientboundPackets1_19_4; +import com.viaversion.viaversion.protocols.v1_19_4to1_20.Protocol1_19_4To1_20; import com.viaversion.viaversion.rewriter.EntityRewriter; import com.viaversion.viaversion.util.TagUtil; -public final class EntityPackets extends EntityRewriter { +public final class EntityPacketRewriter1_20 extends EntityRewriter { private static final Quaternion Y_FLIPPED_ROTATION = new Quaternion(0, 1, 0, 0); - public EntityPackets(final Protocol1_20To1_19_4 protocol) { + public EntityPacketRewriter1_20(final Protocol1_19_4To1_20 protocol) { super(protocol); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20to1_19_4/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_4to1_20/rewriter/ItemPacketRewriter1_20.java similarity index 90% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20to1_19_4/packets/InventoryPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_19_4to1_20/rewriter/ItemPacketRewriter1_20.java index 4ab2f7ceb..888d015b2 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20to1_19_4/packets/InventoryPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_4to1_20/rewriter/ItemPacketRewriter1_20.java @@ -15,30 +15,30 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20to1_19_4.packets; +package com.viaversion.viaversion.protocols.v1_19_4to1_20.rewriter; -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 com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.StringTag; +import com.viaversion.nbt.tag.Tag; import com.viaversion.viaversion.api.minecraft.BlockChangeRecord; import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_18; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ClientboundPackets1_19_4; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ServerboundPackets1_19_4; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.rewriter.RecipeRewriter1_19_4; -import com.viaversion.viaversion.protocols.protocol1_20to1_19_4.Protocol1_20To1_19_4; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ClientboundPackets1_19_4; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ServerboundPackets1_19_4; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.rewriter.RecipeRewriter1_19_4; +import com.viaversion.viaversion.protocols.v1_19_4to1_20.Protocol1_19_4To1_20; import com.viaversion.viaversion.rewriter.BlockRewriter; import com.viaversion.viaversion.rewriter.ItemRewriter; import com.viaversion.viaversion.rewriter.RecipeRewriter; import com.viaversion.viaversion.util.ComponentUtil; import com.viaversion.viaversion.util.Key; -public final class InventoryPackets extends ItemRewriter { +public final class ItemPacketRewriter1_20 extends ItemRewriter { - public InventoryPackets(final Protocol1_20To1_19_4 protocol) { + public ItemPacketRewriter1_20(final Protocol1_19_4To1_20 protocol) { super(protocol, Type.ITEM1_13_2, Type.ITEM1_13_2_ARRAY); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/Protocol1_19_1To1_19.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19to1_19_1/Protocol1_19To1_19_1.java similarity index 95% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/Protocol1_19_1To1_19.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_19to1_19_1/Protocol1_19To1_19_1.java index f2382ef3f..ac97dee81 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/Protocol1_19_1To1_19.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19to1_19_1/Protocol1_19To1_19_1.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19_1to1_19; +package com.viaversion.viaversion.protocols.v1_19to1_19_1; -import com.github.steveice10.opennbt.tag.builtin.ByteTag; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.ListTag; -import com.github.steveice10.opennbt.tag.builtin.NumberTag; -import com.github.steveice10.opennbt.tag.builtin.StringTag; +import com.viaversion.nbt.tag.ByteTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.NumberTag; +import com.viaversion.nbt.tag.StringTag; import com.google.common.base.Preconditions; import com.google.gson.JsonElement; import com.viaversion.viaversion.api.Via; @@ -37,12 +37,14 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets; import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets; -import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.data.ChatDecorationResult; -import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.data.ChatRegistry; -import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.storage.ChatTypeStorage; -import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.storage.NonceStorage; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.ClientboundPackets1_19; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.ServerboundPackets1_19; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.packet.ClientboundPackets1_19; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.packet.ServerboundPackets1_19; +import com.viaversion.viaversion.protocols.v1_19to1_19_1.data.ChatDecorationResult; +import com.viaversion.viaversion.protocols.v1_19to1_19_1.data.ChatRegistry; +import com.viaversion.viaversion.protocols.v1_19to1_19_1.packet.ClientboundPackets1_19_1; +import com.viaversion.viaversion.protocols.v1_19to1_19_1.packet.ServerboundPackets1_19_1; +import com.viaversion.viaversion.protocols.v1_19to1_19_1.storage.ChatTypeStorage; +import com.viaversion.viaversion.protocols.v1_19to1_19_1.storage.NonceStorage; import com.viaversion.viaversion.util.CipherUtil; import com.viaversion.viaversion.util.Pair; import com.viaversion.viaversion.util.TagUtil; @@ -58,9 +60,9 @@ import net.lenni0451.mcstructs.text.Style; import net.lenni0451.mcstructs.text.components.TranslationComponent; import org.checkerframework.checker.nullness.qual.Nullable; -public final class Protocol1_19_1To1_19 extends AbstractProtocol { +public final class Protocol1_19To1_19_1 extends AbstractProtocol { - public Protocol1_19_1To1_19() { + public Protocol1_19To1_19_1() { super(ClientboundPackets1_19.class, ClientboundPackets1_19_1.class, ServerboundPackets1_19.class, ServerboundPackets1_19_1.class); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/data/ChatDecorationResult.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19to1_19_1/data/ChatDecorationResult.java similarity index 92% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/data/ChatDecorationResult.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_19to1_19_1/data/ChatDecorationResult.java index 109894898..9784bd979 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/data/ChatDecorationResult.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19to1_19_1/data/ChatDecorationResult.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19_1to1_19.data; +package com.viaversion.viaversion.protocols.v1_19to1_19_1.data; import com.google.gson.JsonElement; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/data/ChatRegistry.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19to1_19_1/data/ChatRegistry.java similarity index 89% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/data/ChatRegistry.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_19to1_19_1/data/ChatRegistry.java index 5b5135f97..ebfd592e9 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/data/ChatRegistry.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19to1_19_1/data/ChatRegistry.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19_1to1_19.data; +package com.viaversion.viaversion.protocols.v1_19to1_19_1.data; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.data.MappingDataLoader; public class ChatRegistry { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/ClientboundPackets1_19_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19to1_19_1/packet/ClientboundPackets1_19_1.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/ClientboundPackets1_19_1.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_19to1_19_1/packet/ClientboundPackets1_19_1.java index 32b0d044b..294814fe9 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/ClientboundPackets1_19_1.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19to1_19_1/packet/ClientboundPackets1_19_1.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19_1to1_19; +package com.viaversion.viaversion.protocols.v1_19to1_19_1.packet; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/ServerboundPackets1_19_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19to1_19_1/packet/ServerboundPackets1_19_1.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/ServerboundPackets1_19_1.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_19to1_19_1/packet/ServerboundPackets1_19_1.java index 30e819658..5ffc29e01 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/ServerboundPackets1_19_1.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19to1_19_1/packet/ServerboundPackets1_19_1.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19_1to1_19; +package com.viaversion.viaversion.protocols.v1_19to1_19_1.packet; import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/storage/ChatTypeStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19to1_19_1/storage/ChatTypeStorage.java similarity index 84% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/storage/ChatTypeStorage.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_19to1_19_1/storage/ChatTypeStorage.java index 611053396..b83c38a16 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/storage/ChatTypeStorage.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19to1_19_1/storage/ChatTypeStorage.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19_1to1_19.storage; +package com.viaversion.viaversion.protocols.v1_19to1_19_1.storage; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.connection.StorableObject; -import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.Protocol1_19To1_18_2; +import com.viaversion.viaversion.protocols.v1_18_2to1_19.Protocol1_18_2To1_19; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import org.checkerframework.checker.nullness.qual.Nullable; @@ -29,7 +29,7 @@ public final class ChatTypeStorage implements StorableObject { private final Int2ObjectMap chatTypes = new Int2ObjectOpenHashMap<>(); public @Nullable CompoundTag chatType(final int id) { - return chatTypes.isEmpty() ? Protocol1_19To1_18_2.MAPPINGS.chatType(id) : chatTypes.get(id); + return chatTypes.isEmpty() ? Protocol1_18_2To1_19.MAPPINGS.chatType(id) : chatTypes.get(id); } public void addChatType(final int id, final CompoundTag chatType) { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/storage/NonceStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19to1_19_1/storage/NonceStorage.java similarity index 93% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/storage/NonceStorage.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_19to1_19_1/storage/NonceStorage.java index 458fb2e7c..3ba9c27b5 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/storage/NonceStorage.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19to1_19_1/storage/NonceStorage.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_19_1to1_19.storage; +package com.viaversion.viaversion.protocols.v1_19to1_19_1.storage; import com.viaversion.viaversion.api.connection.StorableObject; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/Protocol1_20_3To1_20_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/Protocol1_20_2To1_20_3.java similarity index 91% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/Protocol1_20_3To1_20_2.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/Protocol1_20_2To1_20_3.java index e9647a64e..00b30fb1b 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/Protocol1_20_3To1_20_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/Protocol1_20_2To1_20_3.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2; +package com.viaversion.viaversion.protocols.v1_20_2to1_20_3; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.data.MappingData; @@ -32,20 +32,20 @@ import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.misc.ParticleType; import com.viaversion.viaversion.api.type.types.version.Types1_20_3; import com.viaversion.viaversion.data.entity.EntityTrackerBase; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.rewriter.CommandRewriter1_19_4; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ClientboundConfigurationPackets1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ClientboundPacket1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ClientboundPackets1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ServerboundConfigurationPackets1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ServerboundPacket1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ServerboundPackets1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ClientboundConfigurationPackets1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ClientboundPacket1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ClientboundPackets1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ServerboundPacket1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ServerboundPackets1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.rewriter.BlockItemPacketRewriter1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.rewriter.EntityPacketRewriter1_20_3; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.rewriter.CommandRewriter1_19_4; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ClientboundConfigurationPackets1_20_2; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ClientboundPacket1_20_2; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ClientboundPackets1_20_2; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ServerboundConfigurationPackets1_20_2; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ServerboundPacket1_20_2; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ServerboundPackets1_20_2; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ClientboundConfigurationPackets1_20_3; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ClientboundPacket1_20_3; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ClientboundPackets1_20_3; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ServerboundPacket1_20_3; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ServerboundPackets1_20_3; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.rewriter.BlockItemPacketRewriter1_20_3; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.rewriter.EntityPacketRewriter1_20_3; import com.viaversion.viaversion.rewriter.SoundRewriter; import com.viaversion.viaversion.rewriter.StatisticsRewriter; import com.viaversion.viaversion.rewriter.TagRewriter; @@ -56,14 +56,14 @@ import java.util.UUID; import static com.viaversion.viaversion.util.ProtocolUtil.packetTypeMap; -public final class Protocol1_20_3To1_20_2 extends AbstractProtocol { +public final class Protocol1_20_2To1_20_3 extends AbstractProtocol { public static final MappingData MAPPINGS = new MappingDataBase("1.20.2", "1.20.3"); private final BlockItemPacketRewriter1_20_3 itemRewriter = new BlockItemPacketRewriter1_20_3(this); private final EntityPacketRewriter1_20_3 entityRewriter = new EntityPacketRewriter1_20_3(this); private final TagRewriter tagRewriter = new TagRewriter<>(this); - public Protocol1_20_3To1_20_2() { + public Protocol1_20_2To1_20_3() { super(ClientboundPacket1_20_2.class, ClientboundPacket1_20_3.class, ServerboundPacket1_20_2.class, ServerboundPacket1_20_3.class); } @@ -322,7 +322,7 @@ public final class Protocol1_20_3To1_20_2 extends AbstractProtocol. */ -package com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet; +package com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet; import com.viaversion.viaversion.api.protocol.packet.State; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/packet/ClientboundPacket1_20_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/packet/ClientboundPacket1_20_3.java similarity index 92% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/packet/ClientboundPacket1_20_3.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/packet/ClientboundPacket1_20_3.java index dfe20c279..83f7e404b 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/packet/ClientboundPacket1_20_3.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/packet/ClientboundPacket1_20_3.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet; +package com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/packet/ClientboundPackets1_20_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/packet/ClientboundPackets1_20_3.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/packet/ClientboundPackets1_20_3.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/packet/ClientboundPackets1_20_3.java index ea4553407..37bb22b0a 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/packet/ClientboundPackets1_20_3.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/packet/ClientboundPackets1_20_3.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet; +package com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet; public enum ClientboundPackets1_20_3 implements ClientboundPacket1_20_3 { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/packet/ServerboundPacket1_20_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/packet/ServerboundPacket1_20_3.java similarity index 92% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/packet/ServerboundPacket1_20_3.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/packet/ServerboundPacket1_20_3.java index 45b1176d8..27165c40a 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/packet/ServerboundPacket1_20_3.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/packet/ServerboundPacket1_20_3.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet; +package com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet; import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/packet/ServerboundPackets1_20_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/packet/ServerboundPackets1_20_3.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/packet/ServerboundPackets1_20_3.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/packet/ServerboundPackets1_20_3.java index ee93766d6..744c76aff 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/packet/ServerboundPackets1_20_3.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/packet/ServerboundPackets1_20_3.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet; +package com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet; public enum ServerboundPackets1_20_3 implements ServerboundPacket1_20_3 { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/rewriter/BlockItemPacketRewriter1_20_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/rewriter/BlockItemPacketRewriter1_20_3.java similarity index 89% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/rewriter/BlockItemPacketRewriter1_20_3.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/rewriter/BlockItemPacketRewriter1_20_3.java index b7f69eb3f..137ea0c0d 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/rewriter/BlockItemPacketRewriter1_20_3.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/rewriter/BlockItemPacketRewriter1_20_3.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.rewriter; +package com.viaversion.viaversion.protocols.v1_20_2to1_20_3.rewriter; -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 com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.StringTag; +import com.viaversion.nbt.tag.Tag; import com.google.gson.JsonElement; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; @@ -32,12 +32,12 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_20_2; import com.viaversion.viaversion.api.type.types.version.Types1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ClientboundPacket1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ClientboundPackets1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.rewriter.RecipeRewriter1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.Protocol1_20_3To1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ServerboundPacket1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ServerboundPackets1_20_3; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ClientboundPacket1_20_2; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ClientboundPackets1_20_2; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.rewriter.RecipeRewriter1_20_2; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.Protocol1_20_2To1_20_3; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ServerboundPacket1_20_3; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ServerboundPackets1_20_3; import com.viaversion.viaversion.rewriter.BlockRewriter; import com.viaversion.viaversion.rewriter.ItemRewriter; import com.viaversion.viaversion.util.ComponentUtil; @@ -45,9 +45,9 @@ import com.viaversion.viaversion.util.Key; import com.viaversion.viaversion.util.SerializerVersion; import org.checkerframework.checker.nullness.qual.Nullable; -public final class BlockItemPacketRewriter1_20_3 extends ItemRewriter { +public final class BlockItemPacketRewriter1_20_3 extends ItemRewriter { - public BlockItemPacketRewriter1_20_3(final Protocol1_20_3To1_20_2 protocol) { + public BlockItemPacketRewriter1_20_3(final Protocol1_20_2To1_20_3 protocol) { super(protocol, Type.ITEM1_20_2, Type.ITEM1_20_2_ARRAY); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/rewriter/EntityPacketRewriter1_20_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/rewriter/EntityPacketRewriter1_20_3.java similarity index 88% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/rewriter/EntityPacketRewriter1_20_3.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/rewriter/EntityPacketRewriter1_20_3.java index 407a43f01..6f5f22de3 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/rewriter/EntityPacketRewriter1_20_3.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/rewriter/EntityPacketRewriter1_20_3.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.rewriter; +package com.viaversion.viaversion.protocols.v1_20_2to1_20_3.rewriter; import com.viaversion.viaversion.api.data.ParticleMappings; import com.viaversion.viaversion.api.minecraft.Particle; @@ -27,18 +27,18 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_20_2; import com.viaversion.viaversion.api.type.types.version.Types1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ClientboundConfigurationPackets1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ClientboundPacket1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ClientboundPackets1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.Protocol1_20_3To1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ClientboundPackets1_20_3; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ClientboundConfigurationPackets1_20_2; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ClientboundPacket1_20_2; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ClientboundPackets1_20_2; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.Protocol1_20_2To1_20_3; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ClientboundPackets1_20_3; import com.viaversion.viaversion.rewriter.EntityRewriter; import com.viaversion.viaversion.util.ComponentUtil; import com.viaversion.viaversion.util.Key; -public final class EntityPacketRewriter1_20_3 extends EntityRewriter { +public final class EntityPacketRewriter1_20_3 extends EntityRewriter { - public EntityPacketRewriter1_20_3(final Protocol1_20_3To1_20_2 protocol) { + public EntityPacketRewriter1_20_3(final Protocol1_20_2To1_20_3 protocol) { super(protocol); } @@ -91,14 +91,14 @@ public final class EntityPacketRewriter1_20_3 extends EntityRewriter. */ -package com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.rewriter; +package com.viaversion.viaversion.protocols.v1_20_2to1_20_3.rewriter; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.Protocol; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.rewriter.RecipeRewriter1_19_4; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.rewriter.RecipeRewriter1_19_4; public class RecipeRewriter1_20_3 extends RecipeRewriter1_19_4 { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/Protocol1_20_5To1_20_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/Protocol1_20_3To1_20_5.java similarity index 88% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/Protocol1_20_5To1_20_3.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/Protocol1_20_3To1_20_5.java index bd39ce14d..bd58dc432 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/Protocol1_20_5To1_20_3.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/Protocol1_20_3To1_20_5.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.ProfileKey; @@ -33,24 +33,24 @@ import com.viaversion.viaversion.api.type.types.version.Types1_20_5; import com.viaversion.viaversion.data.entity.EntityTrackerBase; import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets; import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.rewriter.CommandRewriter1_19_4; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ServerboundConfigurationPackets1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ClientboundConfigurationPackets1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ClientboundPacket1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ClientboundPackets1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ServerboundPacket1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ServerboundPackets1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.MappingData; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ClientboundConfigurationPackets1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ClientboundPacket1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ClientboundPackets1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ServerboundConfigurationPackets1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ServerboundPacket1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ServerboundPackets1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.rewriter.BlockItemPacketRewriter1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.rewriter.ComponentRewriter1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.rewriter.EntityPacketRewriter1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.storage.AcknowledgedMessagesStorage; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.rewriter.CommandRewriter1_19_4; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ServerboundConfigurationPackets1_20_2; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ClientboundConfigurationPackets1_20_3; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ClientboundPacket1_20_3; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ClientboundPackets1_20_3; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ServerboundPacket1_20_3; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ServerboundPackets1_20_3; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.MappingData1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ClientboundConfigurationPackets1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ClientboundPacket1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ClientboundPackets1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ServerboundConfigurationPackets1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ServerboundPacket1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ServerboundPackets1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.rewriter.BlockItemPacketRewriter1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.rewriter.ComponentRewriter1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.rewriter.EntityPacketRewriter1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.storage.AcknowledgedMessagesStorage; import com.viaversion.viaversion.rewriter.ComponentRewriter; import com.viaversion.viaversion.rewriter.SoundRewriter; import com.viaversion.viaversion.rewriter.StatisticsRewriter; @@ -59,9 +59,9 @@ import java.util.UUID; import static com.viaversion.viaversion.util.ProtocolUtil.packetTypeMap; -public final class Protocol1_20_5To1_20_3 extends AbstractProtocol { +public final class Protocol1_20_3To1_20_5 extends AbstractProtocol { - public static final MappingData MAPPINGS = new MappingData(); + public static final MappingData1_20_5 MAPPINGS = new MappingData1_20_5(); // Mojang will remove this in the next release, so if we were to set this to false, // people would miss the changes and not fix their plugins before forcefully running into the errors then public static boolean strictErrorHandling = System.getProperty("viaversion.strict-error-handling1_20_5", "true").equalsIgnoreCase("true"); @@ -70,7 +70,7 @@ public final class Protocol1_20_5To1_20_3 extends AbstractProtocol tagRewriter = new TagRewriter<>(this); private final ComponentRewriter1_20_5 componentRewriter = new ComponentRewriter1_20_5<>(this, Types1_20_5.STRUCTURED_DATA); - public Protocol1_20_5To1_20_3() { + public Protocol1_20_3To1_20_5() { super(ClientboundPacket1_20_3.class, ClientboundPacket1_20_5.class, ServerboundPacket1_20_3.class, ServerboundPacket1_20_5.class); } @@ -127,7 +127,7 @@ public final class Protocol1_20_5To1_20_3 extends AbstractProtocol 64) { final PacketWrapper chatAck = wrapper.create(ServerboundPackets1_20_3.CHAT_ACK); chatAck.write(Type.VAR_INT, storage.offset()); - chatAck.sendToServer(Protocol1_20_5To1_20_3.class); + chatAck.sendToServer(Protocol1_20_3To1_20_5.class); storage.clearOffset(); } @@ -289,7 +289,7 @@ public final class Protocol1_20_5To1_20_3 extends AbstractProtocol. */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data; import com.viaversion.viaversion.util.KeyMappings; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/Attributes1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/Attributes1_20_5.java similarity index 96% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/Attributes1_20_5.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/Attributes1_20_5.java index 7751ed6a5..1c2def0b9 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/Attributes1_20_5.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/Attributes1_20_5.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data; import com.viaversion.viaversion.util.Key; import com.viaversion.viaversion.util.KeyMappings; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/BannerPatterns1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/BannerPatterns1_20_5.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/BannerPatterns1_20_5.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/BannerPatterns1_20_5.java index c19e6a98f..a1271b549 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/BannerPatterns1_20_5.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/BannerPatterns1_20_5.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data; import com.viaversion.viaversion.util.KeyMappings; import java.util.HashMap; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/DamageTypes1_20_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/DamageTypes1_20_3.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/DamageTypes1_20_3.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/DamageTypes1_20_3.java index 7b7dfeb99..bb6b9e3bd 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/DamageTypes1_20_3.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/DamageTypes1_20_3.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import it.unimi.dsi.fastutil.objects.Object2ObjectMap; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectSet; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/DyeColors.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/DyeColors.java similarity index 95% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/DyeColors.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/DyeColors.java index 3a7835b9f..7fcd3e4b3 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/DyeColors.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/DyeColors.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data; public final class DyeColors { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/Enchantments1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/Enchantments1_20_5.java similarity index 96% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/Enchantments1_20_5.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/Enchantments1_20_5.java index 078e55ae9..1ad1892b0 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/Enchantments1_20_5.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/Enchantments1_20_5.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data; import com.viaversion.viaversion.util.KeyMappings; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/EquipmentSlots1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/EquipmentSlots1_20_5.java similarity index 95% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/EquipmentSlots1_20_5.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/EquipmentSlots1_20_5.java index add88ce27..ad60d5661 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/EquipmentSlots1_20_5.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/EquipmentSlots1_20_5.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data; import com.viaversion.viaversion.util.KeyMappings; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/Instruments1_20_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/Instruments1_20_3.java similarity index 95% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/Instruments1_20_3.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/Instruments1_20_3.java index 87d793f4e..1f2b4f9a8 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/Instruments1_20_3.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/Instruments1_20_3.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data; import com.viaversion.viaversion.util.KeyMappings; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/MapDecorations1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/MapDecorations1_20_5.java similarity index 96% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/MapDecorations1_20_5.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/MapDecorations1_20_5.java index 08f07bd97..b90124dd1 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/MapDecorations1_20_5.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/MapDecorations1_20_5.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data; import com.viaversion.viaversion.util.KeyMappings; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/MappingData.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/MappingData1_20_5.java similarity index 87% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/MappingData.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/MappingData1_20_5.java index e34175cbf..bc7ca61fa 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/MappingData.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/MappingData1_20_5.java @@ -15,21 +15,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.StringTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.StringTag; import com.viaversion.viaversion.api.data.MappingDataBase; import com.viaversion.viaversion.api.data.MappingDataLoader; import com.viaversion.viaversion.util.KeyMappings; import org.checkerframework.checker.nullness.qual.Nullable; -public class MappingData extends MappingDataBase { +public class MappingData1_20_5 extends MappingDataBase { private KeyMappings blocks; private KeyMappings sounds; - public MappingData() { + public MappingData1_20_5() { super("1.20.3", "1.20.5"); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/PotionEffects1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/PotionEffects1_20_5.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/PotionEffects1_20_5.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/PotionEffects1_20_5.java index e9f59ef20..a347f317a 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/PotionEffects1_20_5.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/PotionEffects1_20_5.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data; import com.viaversion.viaversion.util.Key; import it.unimi.dsi.fastutil.objects.Object2IntMap; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/Potions1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/Potions1_20_5.java similarity index 96% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/Potions1_20_5.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/Potions1_20_5.java index 7e2d665d8..28d7875ca 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/Potions1_20_5.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/Potions1_20_5.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data; import com.viaversion.viaversion.util.KeyMappings; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/TrimMaterials1_20_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/TrimMaterials1_20_3.java similarity index 95% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/TrimMaterials1_20_3.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/TrimMaterials1_20_3.java index 40f215a4c..b59c167bf 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/TrimMaterials1_20_3.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/TrimMaterials1_20_3.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data; import com.viaversion.viaversion.util.KeyMappings; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/TrimPatterns1_20_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/TrimPatterns1_20_3.java similarity index 95% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/TrimPatterns1_20_3.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/TrimPatterns1_20_3.java index db77f49c1..944b56619 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/TrimPatterns1_20_3.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/data/TrimPatterns1_20_3.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data; import com.viaversion.viaversion.util.KeyMappings; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ClientboundConfigurationPackets1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/packet/ClientboundConfigurationPackets1_20_5.java similarity index 95% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ClientboundConfigurationPackets1_20_5.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/packet/ClientboundConfigurationPackets1_20_5.java index a38f46a6c..79830461c 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ClientboundConfigurationPackets1_20_5.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/packet/ClientboundConfigurationPackets1_20_5.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet; import com.viaversion.viaversion.api.protocol.packet.State; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ClientboundPacket1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/packet/ClientboundPacket1_20_5.java similarity index 92% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ClientboundPacket1_20_5.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/packet/ClientboundPacket1_20_5.java index 9131cdcaf..ae16ddf73 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ClientboundPacket1_20_5.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/packet/ClientboundPacket1_20_5.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ClientboundPackets1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/packet/ClientboundPackets1_20_5.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ClientboundPackets1_20_5.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/packet/ClientboundPackets1_20_5.java index f53873c2e..df5618f97 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ClientboundPackets1_20_5.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/packet/ClientboundPackets1_20_5.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet; public enum ClientboundPackets1_20_5 implements ClientboundPacket1_20_5 { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ServerboundConfigurationPackets1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/packet/ServerboundConfigurationPackets1_20_5.java similarity index 94% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ServerboundConfigurationPackets1_20_5.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/packet/ServerboundConfigurationPackets1_20_5.java index 3ca564b8b..e418cf61d 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ServerboundConfigurationPackets1_20_5.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/packet/ServerboundConfigurationPackets1_20_5.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet; import com.viaversion.viaversion.api.protocol.packet.State; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ServerboundPacket1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/packet/ServerboundPacket1_20_5.java similarity index 92% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ServerboundPacket1_20_5.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/packet/ServerboundPacket1_20_5.java index 7937e5400..8c17565ff 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ServerboundPacket1_20_5.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/packet/ServerboundPacket1_20_5.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet; import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ServerboundPackets1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/packet/ServerboundPackets1_20_5.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ServerboundPackets1_20_5.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/packet/ServerboundPackets1_20_5.java index de6377fbc..cba5fd3fc 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/packet/ServerboundPackets1_20_5.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/packet/ServerboundPackets1_20_5.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet; public enum ServerboundPackets1_20_5 implements ServerboundPacket1_20_5 { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java similarity index 96% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java index 3843c8a36..56b8f1b05 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.rewriter; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.rewriter; -import com.github.steveice10.opennbt.stringified.SNBT; -import com.github.steveice10.opennbt.tag.builtin.ByteTag; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.IntArrayTag; -import com.github.steveice10.opennbt.tag.builtin.IntTag; -import com.github.steveice10.opennbt.tag.builtin.ListTag; -import com.github.steveice10.opennbt.tag.builtin.NumberTag; -import com.github.steveice10.opennbt.tag.builtin.StringTag; -import com.github.steveice10.opennbt.tag.builtin.Tag; +import com.viaversion.nbt.stringified.SNBT; +import com.viaversion.nbt.tag.ByteTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.IntArrayTag; +import com.viaversion.nbt.tag.IntTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.NumberTag; +import com.viaversion.nbt.tag.StringTag; +import com.viaversion.nbt.tag.Tag; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.data.ParticleMappings; @@ -79,24 +79,24 @@ import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_20_2; import com.viaversion.viaversion.api.type.types.version.Types1_20_3; import com.viaversion.viaversion.api.type.types.version.Types1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ClientboundPacket1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ClientboundPackets1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.rewriter.RecipeRewriter1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.Protocol1_20_5To1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Attributes1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.BannerPatterns1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.DyeColors; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Enchantments1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.EquipmentSlots1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Instruments1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.MapDecorations1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.PotionEffects1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Potions1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.TrimMaterials1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.TrimPatterns1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ServerboundPacket1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ServerboundPackets1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.storage.BannerPatternStorage; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ClientboundPacket1_20_3; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ClientboundPackets1_20_3; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.rewriter.RecipeRewriter1_20_3; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.Protocol1_20_3To1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.Attributes1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.BannerPatterns1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.DyeColors; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.Enchantments1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.EquipmentSlots1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.Instruments1_20_3; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.MapDecorations1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.PotionEffects1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.Potions1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.TrimMaterials1_20_3; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.TrimPatterns1_20_3; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ServerboundPacket1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ServerboundPackets1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.storage.BannerPatternStorage; import com.viaversion.viaversion.rewriter.BlockRewriter; import com.viaversion.viaversion.rewriter.ItemRewriter; import com.viaversion.viaversion.util.ComponentUtil; @@ -120,7 +120,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import static com.viaversion.viaversion.util.MathUtil.clamp; // 1.20.3 nbt -> 1.20.5 data component conversion -public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter { +public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter { public static final String[] MOB_TAGS = {"NoAI", "Silent", "NoGravity", "Glowing", "Invulnerable", "Health", "Age", "Variant", "HuntingCooldown", "BucketVariantTag"}; public static final String[] ATTRIBUTE_OPERATIONS = {"add_value", "add_multiplied_base", "add_multiplied_total"}; @@ -128,7 +128,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter overrideArmorMaterials = new Int2ObjectOpenHashMap<>(); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/ComponentRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/ComponentRewriter1_20_5.java similarity index 95% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/ComponentRewriter1_20_5.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/ComponentRewriter1_20_5.java index 8b9a6dd94..565749fce 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/ComponentRewriter1_20_5.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/ComponentRewriter1_20_5.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.rewriter; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.rewriter; -import com.github.steveice10.opennbt.tag.builtin.ByteTag; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.FloatTag; -import com.github.steveice10.opennbt.tag.builtin.IntArrayTag; -import com.github.steveice10.opennbt.tag.builtin.IntTag; -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 com.viaversion.nbt.tag.ByteTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.FloatTag; +import com.viaversion.nbt.tag.IntArrayTag; +import com.viaversion.nbt.tag.IntTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.StringTag; +import com.viaversion.nbt.tag.Tag; import com.google.common.base.Preconditions; import com.google.common.primitives.UnsignedBytes; import com.viaversion.viaversion.api.Via; @@ -73,18 +73,18 @@ import com.viaversion.viaversion.api.minecraft.item.data.WrittenBook; import com.viaversion.viaversion.api.protocol.Protocol; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; import com.viaversion.viaversion.api.type.types.item.StructuredDataType; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.Protocol1_20_5To1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.ArmorMaterials1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Attributes1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.BannerPatterns1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.DyeColors; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Enchantments1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.EquipmentSlots1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Instruments1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.PotionEffects1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Potions1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.TrimMaterials1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.TrimPatterns1_20_3; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.Protocol1_20_3To1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.ArmorMaterials1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.Attributes1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.BannerPatterns1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.DyeColors; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.Enchantments1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.EquipmentSlots1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.Instruments1_20_3; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.PotionEffects1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.Potions1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.TrimMaterials1_20_3; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.TrimPatterns1_20_3; import com.viaversion.viaversion.rewriter.ComponentRewriter; import com.viaversion.viaversion.util.ComponentUtil; import com.viaversion.viaversion.util.Either; @@ -204,13 +204,13 @@ public class ComponentRewriter1_20_5 extends Co return; } - int itemId = Protocol1_20_5To1_20_3.MAPPINGS.getFullItemMappings().id(idTag.getValue()); + int itemId = Protocol1_20_3To1_20_5.MAPPINGS.getFullItemMappings().id(idTag.getValue()); if (itemId == -1) { // Default to stone (anything that is not air) itemId = 1; } - final StringTag tag = contentsTag.remove("tag"); + final StringTag tag = (StringTag) contentsTag.remove("tag"); final CompoundTag tagTag; try { tagTag = tag != null ? (CompoundTag) SerializerVersion.V1_20_3.toTag(tag.getValue()) : null; @@ -234,7 +234,7 @@ public class ComponentRewriter1_20_5 extends Co } if (structuredItem.identifier() != 0) { - final String itemName = Protocol1_20_5To1_20_3.MAPPINGS.getFullItemMappings().mappedIdentifier(structuredItem.identifier()); + final String itemName = Protocol1_20_3To1_20_5.MAPPINGS.getFullItemMappings().mappedIdentifier(structuredItem.identifier()); if (itemName != null) { contentsTag.putString("id", itemName); } @@ -673,7 +673,7 @@ public class ComponentRewriter1_20_5 extends Co } else { final ArmorTrimMaterial armorTrimMaterial = material.value(); final CompoundTag materialTag = new CompoundTag(); - final String ingredient = Protocol1_20_5To1_20_3.MAPPINGS.getFullItemMappings().identifier(armorTrimMaterial.itemId()); + final String ingredient = Protocol1_20_3To1_20_5.MAPPINGS.getFullItemMappings().identifier(armorTrimMaterial.itemId()); if (ingredient == null) { throw new IllegalArgumentException("Unknown item: " + armorTrimMaterial.itemId()); } @@ -700,7 +700,7 @@ public class ComponentRewriter1_20_5 extends Co } else { final ArmorTrimPattern armorTrimPattern = pattern.value(); final CompoundTag patternTag = new CompoundTag(); - final String templateItem = Protocol1_20_5To1_20_3.MAPPINGS.getFullItemMappings().identifier(armorTrimPattern.itemId()); + final String templateItem = Protocol1_20_3To1_20_5.MAPPINGS.getFullItemMappings().identifier(armorTrimPattern.itemId()); if (templateItem == null) { throw new IllegalArgumentException("Unknown item: " + armorTrimPattern.itemId()); } @@ -745,7 +745,7 @@ public class ComponentRewriter1_20_5 extends Co final CompoundTag tag = new CompoundTag(); final Holder sound = instrument.soundEvent(); if (sound.hasId()) { - tag.putString("sound_event", Protocol1_20_5To1_20_3.MAPPINGS.soundName(sound.id())); + tag.putString("sound_event", Protocol1_20_3To1_20_5.MAPPINGS.soundName(sound.id())); } else { final SoundEvent soundEvent = sound.value(); final CompoundTag soundEventTag = new CompoundTag(); @@ -849,7 +849,7 @@ public class ComponentRewriter1_20_5 extends Co protected ListTag convertPotDecorations(final PotDecorations value) { final ListTag tag = new ListTag<>(StringTag.class); for (final int decoration : value.itemIds()) { - final String item = Protocol1_20_5To1_20_3.MAPPINGS.getFullItemMappings().identifier(decoration); + final String item = Protocol1_20_3To1_20_5.MAPPINGS.getFullItemMappings().identifier(decoration); if (item == null) { throw new IllegalArgumentException("Unknown item: " + decoration); } @@ -957,7 +957,7 @@ public class ComponentRewriter1_20_5 extends Co } protected void convertItem(final CompoundTag tag, final Item item) { - final String name = Protocol1_20_5To1_20_3.MAPPINGS.getFullItemMappings().identifier(item.identifier()); + final String name = Protocol1_20_3To1_20_5.MAPPINGS.getFullItemMappings().identifier(item.identifier()); if (name == null) { throw new IllegalArgumentException("Unknown item: " + item.identifier()); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/EntityPacketRewriter1_20_5.java similarity index 93% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/EntityPacketRewriter1_20_5.java index 45b9df15d..92abc5754 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/EntityPacketRewriter1_20_5.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.rewriter; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.rewriter; -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 com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.StringTag; +import com.viaversion.nbt.tag.Tag; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.data.entity.DimensionData; @@ -35,16 +35,16 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_20_3; import com.viaversion.viaversion.api.type.types.version.Types1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ClientboundConfigurationPackets1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ClientboundPacket1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ClientboundPackets1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.Protocol1_20_5To1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Attributes1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.BannerPatterns1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.DamageTypes1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ClientboundConfigurationPackets1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ClientboundPackets1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.storage.AcknowledgedMessagesStorage; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ClientboundConfigurationPackets1_20_3; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ClientboundPacket1_20_3; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ClientboundPackets1_20_3; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.Protocol1_20_3To1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.Attributes1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.BannerPatterns1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.DamageTypes1_20_3; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ClientboundConfigurationPackets1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ClientboundPackets1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.storage.AcknowledgedMessagesStorage; import com.viaversion.viaversion.rewriter.EntityRewriter; import com.viaversion.viaversion.util.Key; import com.viaversion.viaversion.util.TagUtil; @@ -57,13 +57,13 @@ import java.util.UUID; import java.util.stream.Collectors; import org.checkerframework.checker.nullness.qual.Nullable; -public final class EntityPacketRewriter1_20_5 extends EntityRewriter { +public final class EntityPacketRewriter1_20_5 extends EntityRewriter { private static final UUID CREATIVE_BLOCK_INTERACTION_RANGE = UUID.fromString("736565d2-e1a7-403d-a3f8-1aeb3e302542"); private static final UUID CREATIVE_ENTITY_INTERACTION_RANGE = UUID.fromString("98491ef6-97b1-4584-ae82-71a8cc85cf73"); private static final int CREATIVE_MODE_ID = 1; - public EntityPacketRewriter1_20_5(final Protocol1_20_5To1_20_3 protocol) { + public EntityPacketRewriter1_20_5(final Protocol1_20_3To1_20_5 protocol) { super(protocol); } @@ -76,7 +76,7 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter { final PacketWrapper knownPacksPacket = wrapper.create(ClientboundConfigurationPackets1_20_5.SELECT_KNOWN_PACKS); knownPacksPacket.write(Type.VAR_INT, 0); // No known packs, everything is sent here - knownPacksPacket.send(Protocol1_20_5To1_20_3.class); + knownPacksPacket.send(Protocol1_20_3To1_20_5.class); final CompoundTag registryData = wrapper.read(Type.COMPOUND_TAG); cacheDimensionData(wrapper.user(), registryData); @@ -174,7 +174,7 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter(StringTag.class)); wolfVariantsPacket.write(Type.REGISTRY_ENTRY_ARRAY, new RegistryEntry[]{new RegistryEntry("minecraft:pale", paleWolf)}); - wolfVariantsPacket.send(Protocol1_20_5To1_20_3.class); + wolfVariantsPacket.send(Protocol1_20_3To1_20_5.class); final PacketWrapper bannerPatternsPacket = wrapper.create(ClientboundConfigurationPackets1_20_5.REGISTRY_DATA); bannerPatternsPacket.write(Type.STRING, "minecraft:banner_pattern"); @@ -203,7 +203,7 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter. */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.rewriter; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.rewriter; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.FloatTag; -import com.github.steveice10.opennbt.tag.builtin.IntArrayTag; -import com.github.steveice10.opennbt.tag.builtin.IntTag; -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 com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.FloatTag; +import com.viaversion.nbt.tag.IntArrayTag; +import com.viaversion.nbt.tag.IntTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.StringTag; +import com.viaversion.nbt.tag.Tag; import com.google.common.base.Preconditions; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.GameProfile; @@ -51,17 +51,17 @@ import com.viaversion.viaversion.api.minecraft.item.data.PotionEffectData; import com.viaversion.viaversion.api.minecraft.item.data.StatePropertyMatcher; import com.viaversion.viaversion.api.minecraft.item.data.SuspiciousStewEffect; import com.viaversion.viaversion.api.minecraft.item.data.ToolRule; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.Protocol1_20_5To1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Attributes1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.BannerPatterns1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Enchantments1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.EquipmentSlots1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Instruments1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.MapDecorations1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.PotionEffects1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Potions1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.TrimMaterials1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.storage.BannerPatternStorage; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.Protocol1_20_3To1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.Attributes1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.BannerPatterns1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.Enchantments1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.EquipmentSlots1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.Instruments1_20_3; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.MapDecorations1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.PotionEffects1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.Potions1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.TrimMaterials1_20_3; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.storage.BannerPatternStorage; import com.viaversion.viaversion.util.ComponentUtil; import com.viaversion.viaversion.util.UUIDUtil; import it.unimi.dsi.fastutil.ints.Int2IntMap; @@ -653,12 +653,12 @@ public final class StructuredDataConverter { } private int unmappedItemId(final int id) { - return Protocol1_20_5To1_20_3.MAPPINGS.getOldItemId(id); + return Protocol1_20_3To1_20_5.MAPPINGS.getOldItemId(id); } private String toMappedItemName(final int id) { final int mappedId = unmappedItemId(id); - return mappedId != -1 ? Protocol1_20_5To1_20_3.MAPPINGS.getFullItemMappings().identifier(mappedId) : ""; + return mappedId != -1 ? Protocol1_20_3To1_20_5.MAPPINGS.getFullItemMappings().identifier(mappedId) : ""; } private static CompoundTag getBlockEntityTag(final CompoundTag tag) { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/storage/AcknowledgedMessagesStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/storage/AcknowledgedMessagesStorage.java similarity index 91% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/storage/AcknowledgedMessagesStorage.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/storage/AcknowledgedMessagesStorage.java index 33333759c..84bae263c 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/storage/AcknowledgedMessagesStorage.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/storage/AcknowledgedMessagesStorage.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.storage; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.storage; import com.viaversion.viaversion.api.connection.StorableObject; import com.viaversion.viaversion.api.minecraft.ProfileKey; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ServerboundPackets1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.Protocol1_20_5To1_20_3; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ServerboundPackets1_20_3; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.Protocol1_20_3To1_20_5; import java.util.Arrays; import java.util.BitSet; import java.util.UUID; @@ -90,7 +90,7 @@ public final class AcknowledgedMessagesStorage implements StorableObject { final PacketWrapper chatSessionUpdate = wrapper.create(ServerboundPackets1_20_3.CHAT_SESSION_UPDATE); chatSessionUpdate.write(Type.UUID, chatSession.sessionId()); chatSessionUpdate.write(Type.PROFILE_KEY, chatSession.profileKey()); - chatSessionUpdate.sendToServer(Protocol1_20_5To1_20_3.class); + chatSessionUpdate.sendToServer(Protocol1_20_3To1_20_5.class); chatSession = null; } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/storage/BannerPatternStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/storage/BannerPatternStorage.java similarity index 89% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/storage/BannerPatternStorage.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/storage/BannerPatternStorage.java index b83537c3c..3153cb0d0 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/storage/BannerPatternStorage.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/storage/BannerPatternStorage.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.storage; +package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.storage; import com.viaversion.viaversion.api.connection.StorableObject; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.BannerPatterns1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.BannerPatterns1_20_5; import com.viaversion.viaversion.util.KeyMappings; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/Protocol1_20_2To1_20.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/Protocol1_20To1_20_2.java similarity index 91% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/Protocol1_20_2To1_20.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/Protocol1_20To1_20_2.java index f86199896..7d6f670d7 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/Protocol1_20_2To1_20.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/Protocol1_20To1_20_2.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_2to1_20; +package com.viaversion.viaversion.protocols.v1_20to1_20_2; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.google.gson.JsonElement; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.ProtocolInfo; @@ -40,32 +40,32 @@ import com.viaversion.viaversion.exception.CancelException; import com.viaversion.viaversion.exception.InformativeException; import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets; import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ClientboundPackets1_19_4; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ServerboundPackets1_19_4; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ClientboundConfigurationPackets1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ClientboundPackets1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ServerboundConfigurationPackets1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ServerboundPackets1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.rewriter.BlockItemPacketRewriter1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.rewriter.EntityPacketRewriter1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.storage.ConfigurationState; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.storage.ConfigurationState.BridgePhase; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.storage.LastResourcePack; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.storage.LastTags; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ClientboundPackets1_19_4; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ServerboundPackets1_19_4; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ClientboundConfigurationPackets1_20_2; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ClientboundPackets1_20_2; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ServerboundConfigurationPackets1_20_2; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ServerboundPackets1_20_2; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.rewriter.BlockItemPacketRewriter1_20_2; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.rewriter.EntityPacketRewriter1_20_2; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.storage.ConfigurationState; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.storage.ConfigurationState.BridgePhase; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.storage.LastResourcePack; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.storage.LastTags; import com.viaversion.viaversion.rewriter.SoundRewriter; import com.viaversion.viaversion.rewriter.TagRewriter; import java.util.UUID; import com.viaversion.viaversion.util.Key; import org.checkerframework.checker.nullness.qual.Nullable; -public final class Protocol1_20_2To1_20 extends AbstractProtocol { +public final class Protocol1_20To1_20_2 extends AbstractProtocol { public static final MappingData MAPPINGS = new MappingDataBase("1.20", "1.20.2"); private final EntityPacketRewriter1_20_2 entityPacketRewriter = new EntityPacketRewriter1_20_2(this); private final BlockItemPacketRewriter1_20_2 itemPacketRewriter = new BlockItemPacketRewriter1_20_2(this); private final TagRewriter tagRewriter = new TagRewriter<>(this); - public Protocol1_20_2To1_20() { + public Protocol1_20To1_20_2() { super(ClientboundPackets1_19_4.class, ClientboundPackets1_20_2.class, ServerboundPackets1_19_4.class, ServerboundPackets1_20_2.class); } @@ -208,7 +208,7 @@ public final class Protocol1_20_2To1_20 extends AbstractProtocol getEntityRewriter() { + public EntityRewriter getEntityRewriter() { return entityPacketRewriter; } @Override - public ItemRewriter getItemRewriter() { + public ItemRewriter getItemRewriter() { return itemPacketRewriter; } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/packet/ClientboundConfigurationPackets1_20_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/packet/ClientboundConfigurationPackets1_20_2.java similarity index 95% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/packet/ClientboundConfigurationPackets1_20_2.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/packet/ClientboundConfigurationPackets1_20_2.java index 2f8311cf6..afc15aaa8 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/packet/ClientboundConfigurationPackets1_20_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/packet/ClientboundConfigurationPackets1_20_2.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet; +package com.viaversion.viaversion.protocols.v1_20to1_20_2.packet; import com.viaversion.viaversion.api.protocol.packet.State; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/packet/ClientboundPacket1_20_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/packet/ClientboundPacket1_20_2.java similarity index 92% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/packet/ClientboundPacket1_20_2.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/packet/ClientboundPacket1_20_2.java index d1332078b..1abf26b0e 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/packet/ClientboundPacket1_20_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/packet/ClientboundPacket1_20_2.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet; +package com.viaversion.viaversion.protocols.v1_20to1_20_2.packet; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/packet/ClientboundPackets1_20_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/packet/ClientboundPackets1_20_2.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/packet/ClientboundPackets1_20_2.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/packet/ClientboundPackets1_20_2.java index fb1097ba9..e2fe7ce34 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/packet/ClientboundPackets1_20_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/packet/ClientboundPackets1_20_2.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet; +package com.viaversion.viaversion.protocols.v1_20to1_20_2.packet; public enum ClientboundPackets1_20_2 implements ClientboundPacket1_20_2 { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/packet/ServerboundConfigurationPackets1_20_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/packet/ServerboundConfigurationPackets1_20_2.java similarity index 88% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/packet/ServerboundConfigurationPackets1_20_2.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/packet/ServerboundConfigurationPackets1_20_2.java index 7ba3e7957..4fa7c8604 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/packet/ServerboundConfigurationPackets1_20_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/packet/ServerboundConfigurationPackets1_20_2.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet; +package com.viaversion.viaversion.protocols.v1_20to1_20_2.packet; import com.viaversion.viaversion.api.protocol.packet.State; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ServerboundPacket1_20_3; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ServerboundPacket1_20_3; public enum ServerboundConfigurationPackets1_20_2 implements ServerboundPacket1_20_2, ServerboundPacket1_20_3 { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/packet/ServerboundPacket1_20_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/packet/ServerboundPacket1_20_2.java similarity index 92% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/packet/ServerboundPacket1_20_2.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/packet/ServerboundPacket1_20_2.java index 1cb045e2c..c88059fa9 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/packet/ServerboundPacket1_20_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/packet/ServerboundPacket1_20_2.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet; +package com.viaversion.viaversion.protocols.v1_20to1_20_2.packet; import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/packet/ServerboundPackets1_20_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/packet/ServerboundPackets1_20_2.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/packet/ServerboundPackets1_20_2.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/packet/ServerboundPackets1_20_2.java index 2fcf00e97..16b301667 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/packet/ServerboundPackets1_20_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/packet/ServerboundPackets1_20_2.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet; +package com.viaversion.viaversion.protocols.v1_20to1_20_2.packet; public enum ServerboundPackets1_20_2 implements ServerboundPacket1_20_2 { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/rewriter/BlockItemPacketRewriter1_20_2.java similarity index 95% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/rewriter/BlockItemPacketRewriter1_20_2.java index 09acfd5c6..77b28d577 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/rewriter/BlockItemPacketRewriter1_20_2.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_2to1_20.rewriter; +package com.viaversion.viaversion.protocols.v1_20to1_20_2.rewriter; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.IntTag; -import com.github.steveice10.opennbt.tag.builtin.ListTag; -import com.github.steveice10.opennbt.tag.builtin.NumberTag; -import com.github.steveice10.opennbt.tag.builtin.StringTag; -import com.github.steveice10.opennbt.tag.builtin.Tag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.IntTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.NumberTag; +import com.viaversion.nbt.tag.StringTag; +import com.viaversion.nbt.tag.Tag; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.data.ParticleMappings; import com.viaversion.viaversion.api.data.entity.EntityTracker; @@ -38,19 +38,19 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_18; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_20_2; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ClientboundPackets1_19_4; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.rewriter.RecipeRewriter1_19_4; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.Protocol1_20_2To1_20; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ServerboundPackets1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.util.PotionEffects1_20_2; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ClientboundPackets1_19_4; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.rewriter.RecipeRewriter1_19_4; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.Protocol1_20To1_20_2; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ServerboundPackets1_20_2; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.util.PotionEffects1_20_2; import com.viaversion.viaversion.rewriter.BlockRewriter; import com.viaversion.viaversion.rewriter.ItemRewriter; import com.viaversion.viaversion.util.MathUtil; import org.checkerframework.checker.nullness.qual.Nullable; -public final class BlockItemPacketRewriter1_20_2 extends ItemRewriter { +public final class BlockItemPacketRewriter1_20_2 extends ItemRewriter { - public BlockItemPacketRewriter1_20_2(final Protocol1_20_2To1_20 protocol) { + public BlockItemPacketRewriter1_20_2(final Protocol1_20To1_20_2 protocol) { super(protocol, Type.ITEM1_13_2, Type.ITEM1_13_2_ARRAY); } @@ -246,7 +246,7 @@ public final class BlockItemPacketRewriter1_20_2 extends ItemRewriter { final int id = wrapper.get(Type.VAR_INT, 0); - final ParticleMappings mappings = Protocol1_20_2To1_20.MAPPINGS.getParticleMappings(); + final ParticleMappings mappings = Protocol1_20To1_20_2.MAPPINGS.getParticleMappings(); if (mappings.isBlockParticle(id)) { final int data = wrapper.read(Type.VAR_INT); wrapper.write(Type.VAR_INT, protocol.getMappingData().getNewBlockStateId(data)); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/rewriter/EntityPacketRewriter1_20_2.java similarity index 92% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/rewriter/EntityPacketRewriter1_20_2.java index ae20d5217..0784f0357 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/rewriter/EntityPacketRewriter1_20_2.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_2to1_20.rewriter; +package com.viaversion.viaversion.protocols.v1_20to1_20_2.rewriter; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_19_4; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; @@ -25,15 +25,15 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_20; import com.viaversion.viaversion.api.type.types.version.Types1_20_2; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ClientboundPackets1_19_4; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.Protocol1_20_2To1_20; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ClientboundPackets1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.storage.ConfigurationState; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ClientboundPackets1_19_4; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.Protocol1_20To1_20_2; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ClientboundPackets1_20_2; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.storage.ConfigurationState; import com.viaversion.viaversion.rewriter.EntityRewriter; -public final class EntityPacketRewriter1_20_2 extends EntityRewriter { +public final class EntityPacketRewriter1_20_2 extends EntityRewriter { - public EntityPacketRewriter1_20_2(final Protocol1_20_2To1_20 protocol) { + public EntityPacketRewriter1_20_2(final Protocol1_20To1_20_2 protocol) { super(protocol); } @@ -105,7 +105,7 @@ public final class EntityPacketRewriter1_20_2 extends EntityRewriter. */ -package com.viaversion.viaversion.protocols.protocol1_20_2to1_20.rewriter; +package com.viaversion.viaversion.protocols.v1_20to1_20_2.rewriter; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.Protocol; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.rewriter.RecipeRewriter1_19_4; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.rewriter.RecipeRewriter1_19_4; public class RecipeRewriter1_20_2 extends RecipeRewriter1_19_4 { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/storage/ConfigurationState.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/storage/ConfigurationState.java similarity index 95% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/storage/ConfigurationState.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/storage/ConfigurationState.java index 7261ad536..16c3fa80b 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/storage/ConfigurationState.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/storage/ConfigurationState.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_2to1_20.storage; +package com.viaversion.viaversion.protocols.v1_20to1_20_2.storage; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.connection.StorableObject; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.protocol.packet.PacketType; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ServerboundPackets1_19_4; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.Protocol1_20_2To1_20; +import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ServerboundPackets1_19_4; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.Protocol1_20To1_20_2; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import java.util.ArrayList; @@ -132,9 +132,9 @@ public class ConfigurationState implements StorableObject { } if (packet.clientbound()) { - queuedWrapper.send(Protocol1_20_2To1_20.class, packet.skipCurrentPipeline()); + queuedWrapper.send(Protocol1_20To1_20_2.class, packet.skipCurrentPipeline()); } else { - queuedWrapper.sendToServer(Protocol1_20_2To1_20.class, packet.skipCurrentPipeline()); + queuedWrapper.sendToServer(Protocol1_20To1_20_2.class, packet.skipCurrentPipeline()); } } finally { packet.buf().release(); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/storage/LastResourcePack.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/storage/LastResourcePack.java similarity index 94% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/storage/LastResourcePack.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/storage/LastResourcePack.java index 0079b461c..bb15125cb 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/storage/LastResourcePack.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/storage/LastResourcePack.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_2to1_20.storage; +package com.viaversion.viaversion.protocols.v1_20to1_20_2.storage; import com.google.gson.JsonElement; import com.viaversion.viaversion.api.connection.StorableObject; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/storage/LastTags.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/storage/LastTags.java similarity index 89% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/storage/LastTags.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/storage/LastTags.java index a248b870c..34cc5afc8 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/storage/LastTags.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/storage/LastTags.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_2to1_20.storage; +package com.viaversion.viaversion.protocols.v1_20to1_20_2.storage; import com.viaversion.viaversion.api.connection.StorableObject; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.Protocol1_20_2To1_20; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ClientboundConfigurationPackets1_20_2; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.Protocol1_20To1_20_2; +import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ClientboundConfigurationPackets1_20_2; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -62,7 +62,7 @@ public class LastTags implements StorableObject { packet.write(Type.VAR_INT_ARRAY_PRIMITIVE, Arrays.copyOf(tag.ids, tag.ids.length)); } } - packet.send(Protocol1_20_2To1_20.class); + packet.send(Protocol1_20To1_20_2.class); } private record RegistryTags(String registryKey, List tags) { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/util/PotionEffects1_20_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/util/PotionEffects1_20_2.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/util/PotionEffects1_20_2.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/util/PotionEffects1_20_2.java index 64a0ff77e..181bbcb3a 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/util/PotionEffects1_20_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/util/PotionEffects1_20_2.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_2to1_20.util; +package com.viaversion.viaversion.protocols.v1_20to1_20_2.util; import com.viaversion.viaversion.util.Key; import it.unimi.dsi.fastutil.objects.Object2IntMap; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_8/ClientboundPackets1_8.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8/packet/ClientboundPackets1_8.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_8/ClientboundPackets1_8.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8/packet/ClientboundPackets1_8.java index c14ba8b3e..f203642f3 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_8/ClientboundPackets1_8.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8/packet/ClientboundPackets1_8.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_8; +package com.viaversion.viaversion.protocols.v1_8.packet; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_8/ServerboundPackets1_8.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8/packet/ServerboundPackets1_8.java similarity index 96% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_8/ServerboundPackets1_8.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8/packet/ServerboundPackets1_8.java index bab0b03c1..c12b23b3f 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_8/ServerboundPackets1_8.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8/packet/ServerboundPackets1_8.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_8; +package com.viaversion.viaversion.protocols.v1_8.packet; import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ArmorType.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/ArmorType.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ArmorType.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/ArmorType.java index 4e8bf2c02..87fdacfc9 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ArmorType.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/ArmorType.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8; +package com.viaversion.viaversion.protocols.v1_8to1_9; import java.util.HashMap; import java.util.Map; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ItemRewriter.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/ItemRewriter.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ItemRewriter.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/ItemRewriter.java index 58edf33d5..3d8d8e4bc 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ItemRewriter.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/ItemRewriter.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8; +package com.viaversion.viaversion.protocols.v1_8to1_9; -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.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.StringTag; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.util.ComponentUtil; import com.viaversion.viaversion.util.Key; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/Protocol1_9To1_8.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/Protocol1_8To1_9.java similarity index 68% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/Protocol1_9To1_8.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/Protocol1_8To1_9.java index 912f1d56e..b2a82225b 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/Protocol1_9To1_8.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/Protocol1_8To1_9.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8; +package com.viaversion.viaversion.protocols.v1_8to1_9; import com.google.gson.JsonElement; import com.viaversion.viaversion.api.Via; @@ -29,30 +29,32 @@ import com.viaversion.viaversion.api.protocol.packet.State; import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets; -import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8; -import com.viaversion.viaversion.protocols.protocol1_8.ServerboundPackets1_8; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.metadata.MetadataRewriter1_9To1_8; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.packets.EntityPackets; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.packets.InventoryPackets; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.packets.PlayerPackets; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.packets.SpawnPackets; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.packets.WorldPackets; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.BossBarProvider; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.CommandBlockProvider; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.CompressionProvider; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.EntityIdProvider; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.HandItemProvider; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MainHandProvider; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.ClientChunks; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.CommandBlockStorage; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.InventoryTracker; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.MovementTracker; +import com.viaversion.viaversion.protocols.v1_8.packet.ClientboundPackets1_8; +import com.viaversion.viaversion.protocols.v1_8.packet.ServerboundPackets1_8; +import com.viaversion.viaversion.protocols.v1_8to1_9.metadata.MetadataRewriter1_9To1_8; +import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ServerboundPackets1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.BossBarProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.CommandBlockProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.CompressionProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.EntityIdProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.HandItemProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.MainHandProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.MovementTransmitterProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.rewriter.EntityPacketRewriter1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.rewriter.ItemPacketRewriter1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.rewriter.PlayerPackets1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.rewriter.SpawnPackets1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.rewriter.WorldPacketRewriter1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.storage.ClientChunks; +import com.viaversion.viaversion.protocols.v1_8to1_9.storage.CommandBlockStorage; +import com.viaversion.viaversion.protocols.v1_8to1_9.storage.EntityTracker1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.storage.InventoryTracker; +import com.viaversion.viaversion.protocols.v1_8to1_9.storage.MovementTracker; import com.viaversion.viaversion.util.ComponentUtil; import com.viaversion.viaversion.util.SerializerVersion; -public class Protocol1_9To1_8 extends AbstractProtocol { +public class Protocol1_8To1_9 extends AbstractProtocol { public static final ValueTransformer STRING_TO_JSON = new ValueTransformer<>(Type.COMPONENT) { @Override @@ -62,7 +64,7 @@ public class Protocol1_9To1_8 extends AbstractProtocol. */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8; +package com.viaversion.viaversion.protocols.v1_8to1_9; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.ProtocolInfo; import com.viaversion.viaversion.api.connection.UserConnection; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.MovementTracker; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.MovementTransmitterProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.storage.MovementTracker; public class ViaIdleThread implements Runnable { @@ -29,7 +29,7 @@ public class ViaIdleThread implements Runnable { public void run() { for (UserConnection info : Via.getManager().getConnectionManager().getConnections()) { ProtocolInfo protocolInfo = info.getProtocolInfo(); - if (protocolInfo == null || !protocolInfo.getPipeline().contains(Protocol1_9To1_8.class)) continue; + if (protocolInfo == null || !protocolInfo.getPipeline().contains(Protocol1_8To1_9.class)) continue; MovementTracker movementTracker = info.get(MovementTracker.class); if (movementTracker == null) continue; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/chat/ChatRewriter.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/chat/ChatRewriter.java similarity index 88% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/chat/ChatRewriter.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/chat/ChatRewriter.java index 94dfaff7f..02b51d2f5 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/chat/ChatRewriter.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/chat/ChatRewriter.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8.chat; +package com.viaversion.viaversion.protocols.v1_8to1_9.chat; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.viaversion.viaversion.api.connection.UserConnection; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.storage.EntityTracker1_9; public class ChatRewriter { /** @@ -33,7 +33,7 @@ public class ChatRewriter { public static void toClient(JsonObject obj, UserConnection user) { //Check gamemode change if (obj.get("translate") != null && obj.get("translate").getAsString().equals("gameMode.changed")) { - EntityTracker1_9 tracker = user.getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = user.getEntityTracker(Protocol1_8To1_9.class); String gameMode = tracker.getGameMode().getText(); JsonObject gameModeObject = new JsonObject(); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/chat/GameMode.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/chat/GameMode.java similarity index 95% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/chat/GameMode.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/chat/GameMode.java index 95d5f59db..9ba58c297 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/chat/GameMode.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/chat/GameMode.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8.chat; +package com.viaversion.viaversion.protocols.v1_8to1_9.chat; public enum GameMode { SURVIVAL(0, "Survival Mode"), diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/metadata/MetaIndex.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/metadata/MetaIndex.java similarity index 99% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/metadata/MetaIndex.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/metadata/MetaIndex.java index 0abf29289..e2bd88f49 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/metadata/MetaIndex.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/metadata/MetaIndex.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8.metadata; +package com.viaversion.viaversion.protocols.v1_8to1_9.metadata; import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/metadata/MetadataRewriter1_9To1_8.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/metadata/MetadataRewriter1_9To1_8.java similarity index 93% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/metadata/MetadataRewriter1_9To1_8.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/metadata/MetadataRewriter1_9To1_8.java index 036d05fc0..3d2dc1cca 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/metadata/MetadataRewriter1_9To1_8.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/metadata/MetadataRewriter1_9To1_8.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8.metadata; +package com.viaversion.viaversion.protocols.v1_8to1_9.metadata; import com.viaversion.viaversion.api.minecraft.EulerAngle; import com.viaversion.viaversion.api.minecraft.Vector; @@ -25,18 +25,18 @@ import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.minecraft.metadata.MetaType; import com.viaversion.viaversion.api.minecraft.metadata.Metadata; import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_8; -import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ItemRewriter; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8; +import com.viaversion.viaversion.protocols.v1_8.packet.ClientboundPackets1_8; +import com.viaversion.viaversion.protocols.v1_8to1_9.ItemRewriter; +import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9; import com.viaversion.viaversion.rewriter.EntityRewriter; import com.viaversion.viaversion.rewriter.meta.MetaHandlerEvent; import com.viaversion.viaversion.util.ComponentUtil; import com.viaversion.viaversion.util.SerializerVersion; import java.util.UUID; -public class MetadataRewriter1_9To1_8 extends EntityRewriter { +public class MetadataRewriter1_9To1_8 extends EntityRewriter { - public MetadataRewriter1_9To1_8(Protocol1_9To1_8 protocol) { + public MetadataRewriter1_9To1_8(Protocol1_8To1_9 protocol) { super(protocol); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ClientboundPackets1_9.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/packet/ClientboundPackets1_9.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ClientboundPackets1_9.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/packet/ClientboundPackets1_9.java index 93a36487a..329d6ff38 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ClientboundPackets1_9.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/packet/ClientboundPackets1_9.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8; +package com.viaversion.viaversion.protocols.v1_8to1_9.packet; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ServerboundPackets1_9.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/packet/ServerboundPackets1_9.java similarity index 96% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ServerboundPackets1_9.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/packet/ServerboundPackets1_9.java index 422ffb7ae..42a480212 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/ServerboundPackets1_9.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/packet/ServerboundPackets1_9.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8; +package com.viaversion.viaversion.protocols.v1_8to1_9.packet; import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/BossBarProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/providers/BossBarProvider.java similarity index 94% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/BossBarProvider.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/providers/BossBarProvider.java index 183cccd70..62356d2ad 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/BossBarProvider.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/providers/BossBarProvider.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8.providers; +package com.viaversion.viaversion.protocols.v1_8to1_9.providers; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.platform.providers.Provider; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/CommandBlockProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/providers/CommandBlockProvider.java similarity index 83% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/CommandBlockProvider.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/providers/CommandBlockProvider.java index 94327cc12..88b9b00c9 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/CommandBlockProvider.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/providers/CommandBlockProvider.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8.providers; +package com.viaversion.viaversion.protocols.v1_8to1_9.providers; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.Position; import com.viaversion.viaversion.api.platform.providers.Provider; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ClientboundPackets1_9; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.CommandBlockStorage; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.storage.CommandBlockStorage; +import com.viaversion.viaversion.protocols.v1_8to1_9.storage.EntityTracker1_9; import java.util.Optional; public class CommandBlockProvider implements Provider { @@ -53,11 +53,11 @@ public class CommandBlockProvider implements Provider { public void sendPermission(UserConnection user) { PacketWrapper wrapper = PacketWrapper.create(ClientboundPackets1_9.ENTITY_STATUS, null, user); // Entity status - EntityTracker1_9 tracker = user.getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = user.getEntityTracker(Protocol1_8To1_9.class); wrapper.write(Type.INT, tracker.getProvidedEntityId()); // Entity ID wrapper.write(Type.BYTE, (byte) 26); // Hardcoded op permission level - wrapper.scheduleSend(Protocol1_9To1_8.class); + wrapper.scheduleSend(Protocol1_8To1_9.class); user.get(CommandBlockStorage.class).setPermissions(true); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/CompressionProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/providers/CompressionProvider.java similarity index 98% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/CompressionProvider.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/providers/CompressionProvider.java index c1184fd12..17b781ea7 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/CompressionProvider.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/providers/CompressionProvider.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8.providers; +package com.viaversion.viaversion.protocols.v1_8to1_9.providers; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/EntityIdProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/providers/EntityIdProvider.java similarity index 83% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/EntityIdProvider.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/providers/EntityIdProvider.java index d40f77e65..73362a719 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/EntityIdProvider.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/providers/EntityIdProvider.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8.providers; +package com.viaversion.viaversion.protocols.v1_8to1_9.providers; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.platform.providers.Provider; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8; +import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9; public class EntityIdProvider implements Provider { public int getEntityId(UserConnection user) throws Exception { - return user.getEntityTracker(Protocol1_9To1_8.class).clientEntityId(); + return user.getEntityTracker(Protocol1_8To1_9.class).clientEntityId(); } } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/HandItemProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/providers/HandItemProvider.java similarity index 94% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/HandItemProvider.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/providers/HandItemProvider.java index 71fcab72c..c9b2e634a 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/HandItemProvider.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/providers/HandItemProvider.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8.providers; +package com.viaversion.viaversion.protocols.v1_8to1_9.providers; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.item.DataItem; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/MainHandProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/providers/MainHandProvider.java similarity index 93% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/MainHandProvider.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/providers/MainHandProvider.java index 39cef6520..fbb376624 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/MainHandProvider.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/providers/MainHandProvider.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8.providers; +package com.viaversion.viaversion.protocols.v1_8to1_9.providers; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.platform.providers.Provider; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/MovementTransmitterProvider.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/providers/MovementTransmitterProvider.java similarity index 82% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/MovementTransmitterProvider.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/providers/MovementTransmitterProvider.java index b293ef3e0..bf32f4a70 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/providers/MovementTransmitterProvider.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/providers/MovementTransmitterProvider.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8.providers; +package com.viaversion.viaversion.protocols.v1_8to1_9.providers; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; @@ -23,15 +23,15 @@ import com.viaversion.viaversion.api.platform.providers.Provider; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.protocol.packet.State; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_8.ServerboundPackets1_8; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.MovementTracker; +import com.viaversion.viaversion.protocols.v1_8.packet.ServerboundPackets1_8; +import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.storage.MovementTracker; import java.util.logging.Level; public class MovementTransmitterProvider implements Provider { public void sendPlayer(UserConnection userConnection) { - if (userConnection.getProtocolInfo().getClientState() != State.PLAY || userConnection.getEntityTracker(Protocol1_9To1_8.class).clientEntityId() == -1) { + if (userConnection.getProtocolInfo().getClientState() != State.PLAY || userConnection.getEntityTracker(Protocol1_8To1_9.class).clientEntityId() == -1) { return; } @@ -41,7 +41,7 @@ public class MovementTransmitterProvider implements Provider { try { final PacketWrapper playerMovement = PacketWrapper.create(ServerboundPackets1_8.PLAYER_MOVEMENT, userConnection); playerMovement.write(Type.BOOLEAN, movementTracker.isGround()); // on ground - playerMovement.scheduleSendToServer(Protocol1_9To1_8.class); + playerMovement.scheduleSendToServer(Protocol1_8To1_9.class); } catch (Throwable e) { Via.getPlatform().getLogger().log(Level.WARNING, "Failed to send player movement packet", e); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/rewriter/EntityPacketRewriter1_9.java similarity index 91% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/EntityPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/rewriter/EntityPacketRewriter1_9.java index 34b73bb1c..1a30c40f4 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/EntityPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/rewriter/EntityPacketRewriter1_9.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8.packets; +package com.viaversion.viaversion.protocols.v1_8to1_9.rewriter; import com.google.common.collect.ImmutableList; import com.viaversion.viaversion.api.Via; @@ -27,13 +27,13 @@ import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_8; import com.viaversion.viaversion.api.type.types.version.Types1_9; -import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ClientboundPackets1_9; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ItemRewriter; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ServerboundPackets1_9; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.metadata.MetadataRewriter1_9To1_8; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9; +import com.viaversion.viaversion.protocols.v1_8.packet.ClientboundPackets1_8; +import com.viaversion.viaversion.protocols.v1_8to1_9.ItemRewriter; +import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.metadata.MetadataRewriter1_9To1_8; +import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ServerboundPackets1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.storage.EntityTracker1_9; import com.viaversion.viaversion.util.Pair; import com.viaversion.viaversion.util.Triple; import java.util.ArrayList; @@ -42,7 +42,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; -public class EntityPackets { +public class EntityPacketRewriter1_9 { public static final ValueTransformer toNewShort = new ValueTransformer<>(Type.SHORT) { @Override public Short transform(PacketWrapper wrapper, Byte inputValue) { @@ -50,7 +50,7 @@ public class EntityPackets { } }; - public static void register(Protocol1_9To1_8 protocol) { + public static void register(Protocol1_8To1_9 protocol) { // Attach Entity Packet protocol.registerClientbound(ClientboundPackets1_8.ATTACH_ENTITY, new PacketHandlers() { @@ -61,7 +61,7 @@ public class EntityPackets { handler(wrapper -> { final short leashState = wrapper.read(Type.UNSIGNED_BYTE); - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); if (leashState == 0) { int passenger = wrapper.get(Type.INT, 0); int vehicle = wrapper.get(Type.INT, 1); @@ -81,7 +81,7 @@ public class EntityPackets { passengerPacket.write(Type.VAR_INT_ARRAY_PRIMITIVE, new int[]{passenger}); tracker.getVehicleMap().put(passenger, vehicle); } - passengerPacket.send(Protocol1_9To1_8.class); // Send the packet + passengerPacket.send(Protocol1_8To1_9.class); // Send the packet } }); } @@ -91,9 +91,9 @@ public class EntityPackets { @Override public void register() { map(Type.VAR_INT); // 0 - Entity ID - map(Type.INT, SpawnPackets.toNewDouble); // 1 - X - Needs to be divided by 32 - map(Type.INT, SpawnPackets.toNewDouble); // 2 - Y - Needs to be divided by 32 - map(Type.INT, SpawnPackets.toNewDouble); // 3 - Z - Needs to be divided by 32 + map(Type.INT, SpawnPackets1_9.toNewDouble); // 1 - X - Needs to be divided by 32 + map(Type.INT, SpawnPackets1_9.toNewDouble); // 2 - Y - Needs to be divided by 32 + map(Type.INT, SpawnPackets1_9.toNewDouble); // 3 - Z - Needs to be divided by 32 map(Type.BYTE); // 4 - Pitch map(Type.BYTE); // 5 - Yaw @@ -103,7 +103,7 @@ public class EntityPackets { handler(wrapper -> { int entityID = wrapper.get(Type.VAR_INT, 0); if (Via.getConfig().isHologramPatch()) { - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); if (tracker.getKnownHolograms().contains(entityID)) { Double newValue = wrapper.get(Type.DOUBLE, 1); newValue += (Via.getConfig().getHologramYOffset()); @@ -152,7 +152,7 @@ public class EntityPackets { @Override public Integer transform(PacketWrapper wrapper, Short slot) { int entityId = wrapper.get(Type.VAR_INT, 0); - int receiverId = wrapper.user().getEntityTracker(Protocol1_9To1_8.class).clientEntityId(); + int receiverId = wrapper.user().getEntityTracker(Protocol1_8To1_9.class).clientEntityId(); // Cancel invalid slots as they would cause a packet read error in 1.9 // 1.8 handled invalid slots gracefully, but 1.9 does not @@ -178,11 +178,11 @@ public class EntityPackets { }); // Blocking handler(wrapper -> { - EntityTracker1_9 entityTracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 entityTracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); int entityID = wrapper.get(Type.VAR_INT, 0); Item stack = wrapper.get(Type.ITEM1_8, 0); - if (stack != null && Protocol1_9To1_8.isSword(stack.identifier())) { + if (stack != null && Protocol1_8To1_9.isSword(stack.identifier())) { entityTracker.getValidBlocking().add(entityID); return; } @@ -200,7 +200,7 @@ public class EntityPackets { handler(wrapper -> { List metadataList = wrapper.get(Types1_9.METADATA_LIST, 0); int entityId = wrapper.get(Type.VAR_INT, 0); - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); if (tracker.hasEntity(entityId)) { protocol.get(MetadataRewriter1_9To1_8.class).handleMetadata(entityId, metadataList, wrapper.user()); } else { @@ -212,7 +212,7 @@ public class EntityPackets { handler(wrapper -> { List metadataList = wrapper.get(Types1_9.METADATA_LIST, 0); int entityID = wrapper.get(Type.VAR_INT, 0); - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); tracker.handleMetadata(entityID, metadataList); }); @@ -253,7 +253,7 @@ public class EntityPackets { if (wrapper.get(Type.VAR_INT, 0) == 2) { // entity dead wrapper.passthrough(Type.VAR_INT); //Player id wrapper.passthrough(Type.INT); //Entity id - Protocol1_9To1_8.STRING_TO_JSON.write(wrapper, wrapper.read(Type.STRING)); + Protocol1_8To1_9.STRING_TO_JSON.write(wrapper, wrapper.read(Type.STRING)); } }); } @@ -266,7 +266,7 @@ public class EntityPackets { handler(wrapper -> { if (!Via.getConfig().isMinimizeCooldown()) return; - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); if (wrapper.get(Type.VAR_INT, 0) != tracker.getProvidedEntityId()) { return; } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/rewriter/ItemPacketRewriter1_9.java similarity index 93% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/InventoryPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/rewriter/ItemPacketRewriter1_9.java index 379397ad0..6d16a23be 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/InventoryPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/rewriter/ItemPacketRewriter1_9.java @@ -15,23 +15,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8.packets; +package com.viaversion.viaversion.protocols.v1_8to1_9.rewriter; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ClientboundPackets1_9; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ItemRewriter; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ServerboundPackets1_9; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.InventoryTracker; +import com.viaversion.viaversion.protocols.v1_8.packet.ClientboundPackets1_8; +import com.viaversion.viaversion.protocols.v1_8to1_9.ItemRewriter; +import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ServerboundPackets1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.storage.EntityTracker1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.storage.InventoryTracker; -public class InventoryPackets { +public class ItemPacketRewriter1_9 { - public static void register(Protocol1_9To1_8 protocol) { + public static void register(Protocol1_8To1_9 protocol) { protocol.registerClientbound(ClientboundPackets1_8.WINDOW_PROPERTY, new PacketHandlers() { @Override @@ -54,7 +54,7 @@ public class InventoryPackets { propertyPacket.write(Type.UNSIGNED_BYTE, windowId); propertyPacket.write(Type.SHORT, property); propertyPacket.write(Type.SHORT, enchantID); - }).scheduleSend(Protocol1_9To1_8.class); + }).scheduleSend(Protocol1_8To1_9.class); wrapper.set(Type.SHORT, 0, (short) (property + 3)); wrapper.set(Type.SHORT, 1, level); @@ -69,7 +69,7 @@ public class InventoryPackets { public void register() { map(Type.UNSIGNED_BYTE); // 0 - Window ID map(Type.STRING); // 1 - Window Type - map(Type.STRING, Protocol1_9To1_8.STRING_TO_JSON); // 2 - Window Title + map(Type.STRING, Protocol1_8To1_9.STRING_TO_JSON); // 2 - Window Title map(Type.UNSIGNED_BYTE); // 3 - Slot Count // There is a horse parameter after this, we don't handle it and let it passthrough // Inventory tracking @@ -102,7 +102,7 @@ public class InventoryPackets { // Check if it is the inventory of the player if (showShieldWhenSwordInHand) { InventoryTracker inventoryTracker = wrapper.user().get(InventoryTracker.class); - EntityTracker1_9 entityTracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 entityTracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); short slotID = wrapper.get(Type.SHORT, 0); byte windowId = wrapper.get(Type.UNSIGNED_BYTE, 0).byteValue(); @@ -141,7 +141,7 @@ public class InventoryPackets { Short windowId = wrapper.get(Type.UNSIGNED_BYTE, 0); InventoryTracker inventoryTracker = wrapper.user().get(InventoryTracker.class); - EntityTracker1_9 entityTracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 entityTracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); boolean showShieldWhenSwordInHand = Via.getConfig().isShowShieldWhenSwordInHand() && Via.getConfig().isShieldBlocking(); @@ -225,7 +225,7 @@ public class InventoryPackets { if (showShieldWhenSwordInHand) { InventoryTracker inventoryTracker = wrapper.user().get(InventoryTracker.class); - EntityTracker1_9 entityTracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 entityTracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); short slotID = wrapper.get(Type.SHORT, 0); // Update item in slot @@ -247,7 +247,7 @@ public class InventoryPackets { w.write(Type.UNSIGNED_BYTE, (short) 0); w.write(Type.SHORT, slot); w.write(Type.ITEM1_8, null); - }).send(Protocol1_9To1_8.class); + }).send(Protocol1_8To1_9.class); // Finally reset to simulate throwing item wrapper.set(Type.SHORT, 0, (short) -999); // Set slot to -999 } @@ -302,7 +302,7 @@ public class InventoryPackets { w.write(Type.UNSIGNED_BYTE, windowID); w.write(Type.SHORT, slot); w.write(Type.ITEM1_8, null); - }).scheduleSend(Protocol1_9To1_8.class); + }).scheduleSend(Protocol1_8To1_9.class); // Finally reset to simulate throwing item wrapper.set(Type.BYTE, 0, (byte) 0); // Set button to 0 wrapper.set(Type.BYTE, 1, (byte) 0); // Set mode to 0 @@ -341,7 +341,7 @@ public class InventoryPackets { boolean showShieldWhenSwordInHand = Via.getConfig().isShowShieldWhenSwordInHand() && Via.getConfig().isShieldBlocking(); - EntityTracker1_9 entityTracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 entityTracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); if (entityTracker.isBlocking()) { entityTracker.setBlocking(false); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/PlayerPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/rewriter/PlayerPackets1_9.java similarity index 90% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/PlayerPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/rewriter/PlayerPackets1_9.java index e8a3401c6..fd57fb349 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/PlayerPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/rewriter/PlayerPackets1_9.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8.packets; +package com.viaversion.viaversion.protocols.v1_8to1_9.rewriter; import com.google.gson.JsonObject; import com.viaversion.viaversion.api.Via; @@ -25,27 +25,27 @@ import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ItemRewriter; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ServerboundPackets1_9; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.chat.ChatRewriter; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.chat.GameMode; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.CommandBlockProvider; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.CompressionProvider; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MainHandProvider; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.ClientChunks; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.MovementTracker; +import com.viaversion.viaversion.protocols.v1_8.packet.ClientboundPackets1_8; +import com.viaversion.viaversion.protocols.v1_8to1_9.ItemRewriter; +import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.chat.ChatRewriter; +import com.viaversion.viaversion.protocols.v1_8to1_9.chat.GameMode; +import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ServerboundPackets1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.CommandBlockProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.CompressionProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.MainHandProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.storage.ClientChunks; +import com.viaversion.viaversion.protocols.v1_8to1_9.storage.EntityTracker1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.storage.MovementTracker; import com.viaversion.viaversion.util.ComponentUtil; import java.util.logging.Level; -public class PlayerPackets { - public static void register(Protocol1_9To1_8 protocol) { +public class PlayerPackets1_9 { + public static void register(Protocol1_8To1_9 protocol) { protocol.registerClientbound(ClientboundPackets1_8.CHAT_MESSAGE, new PacketHandlers() { @Override public void register() { - map(Type.STRING, Protocol1_9To1_8.STRING_TO_JSON); // 0 - Chat Message (json) + map(Type.STRING, Protocol1_8To1_9.STRING_TO_JSON); // 0 - Chat Message (json) map(Type.BYTE); // 1 - Chat Position handler(wrapper -> { @@ -58,15 +58,15 @@ public class PlayerPackets { protocol.registerClientbound(ClientboundPackets1_8.TAB_LIST, new PacketHandlers() { @Override public void register() { - map(Type.STRING, Protocol1_9To1_8.STRING_TO_JSON); // 0 - Header - map(Type.STRING, Protocol1_9To1_8.STRING_TO_JSON); // 1 - Footer + map(Type.STRING, Protocol1_8To1_9.STRING_TO_JSON); // 0 - Header + map(Type.STRING, Protocol1_8To1_9.STRING_TO_JSON); // 1 - Footer } }); protocol.registerClientbound(ClientboundPackets1_8.DISCONNECT, new PacketHandlers() { @Override public void register() { - map(Type.STRING, Protocol1_9To1_8.STRING_TO_JSON); // 0 - Reason + map(Type.STRING, Protocol1_8To1_9.STRING_TO_JSON); // 0 - Reason } }); @@ -78,7 +78,7 @@ public class PlayerPackets { handler(wrapper -> { int action = wrapper.get(Type.VAR_INT, 0); if (action == 0 || action == 1) { - Protocol1_9To1_8.STRING_TO_JSON.write(wrapper, wrapper.read(Type.STRING)); + Protocol1_8To1_9.STRING_TO_JSON.write(wrapper, wrapper.read(Type.STRING)); } }); // Everything else is handled. @@ -124,7 +124,7 @@ public class PlayerPackets { if (mode == 0 || mode == 3 || mode == 4) { String[] players = wrapper.passthrough(Type.STRING_ARRAY); // Players - final EntityTracker1_9 entityTracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + final EntityTracker1_9 entityTracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); String myName = wrapper.user().getProtocolInfo().getUsername(); String teamName = wrapper.get(Type.STRING, 0); for (String player : players) { @@ -132,7 +132,7 @@ public class PlayerPackets { if (mode == 4) { // since removing add to auto team // Workaround for packet order issue - wrapper.send(Protocol1_9To1_8.class); + wrapper.send(Protocol1_8To1_9.class); wrapper.cancel(); entityTracker.sendTeamPacket(true, true); entityTracker.setCurrentTeam("viaversion"); @@ -146,13 +146,13 @@ public class PlayerPackets { } if (mode == 1) { // Remove team - final EntityTracker1_9 entityTracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + final EntityTracker1_9 entityTracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); String teamName = wrapper.get(Type.STRING, 0); if (entityTracker.isAutoTeam() && teamName.equals(entityTracker.getCurrentTeam())) { // team was removed // Workaround for packet order issue - wrapper.send(Protocol1_9To1_8.class); + wrapper.send(Protocol1_8To1_9.class); wrapper.cancel(); entityTracker.sendTeamPacket(true, true); entityTracker.setCurrentTeam("viaversion"); @@ -169,7 +169,7 @@ public class PlayerPackets { // Parse this info handler(wrapper -> { int entityId = wrapper.get(Type.INT, 0); - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); tracker.addEntity(entityId, EntityTypes1_10.EntityType.PLAYER); tracker.setClientEntityId(entityId); }); @@ -181,7 +181,7 @@ public class PlayerPackets { map(Type.BOOLEAN); // 6 - Reduced Debug info handler(wrapper -> { - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); tracker.setGameMode(GameMode.getById(wrapper.get(Type.UNSIGNED_BYTE, 0))); //Set player gamemode }); @@ -200,11 +200,11 @@ public class PlayerPackets { // Scoreboard will be cleared when join game is received handler(wrapper -> { - EntityTracker1_9 entityTracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 entityTracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); if (Via.getConfig().isAutoTeam()) { entityTracker.setAutoTeam(true); // Workaround for packet order issue - wrapper.send(Protocol1_9To1_8.class); + wrapper.send(Protocol1_8To1_9.class); wrapper.cancel(); entityTracker.sendTeamPacket(true, true); entityTracker.setCurrentTeam("viaversion"); @@ -243,13 +243,13 @@ public class PlayerPackets { wrapper.passthrough(Type.VAR_INT); // ping String displayName = wrapper.read(Type.OPTIONAL_STRING); wrapper.write(Type.OPTIONAL_COMPONENT, displayName != null ? - Protocol1_9To1_8.STRING_TO_JSON.transform(wrapper, displayName) : null); + Protocol1_8To1_9.STRING_TO_JSON.transform(wrapper, displayName) : null); } else if ((action == 1) || (action == 2)) { // update gamemode || update latency wrapper.passthrough(Type.VAR_INT); } else if (action == 3) { // update display name String displayName = wrapper.read(Type.OPTIONAL_STRING); wrapper.write(Type.OPTIONAL_COMPONENT, displayName != null ? - Protocol1_9To1_8.STRING_TO_JSON.transform(wrapper, displayName) : null); + Protocol1_8To1_9.STRING_TO_JSON.transform(wrapper, displayName) : null); } } }); @@ -313,7 +313,7 @@ public class PlayerPackets { wrapper.user().get(ClientChunks.class).getLoadedChunks().clear(); int gamemode = wrapper.get(Type.UNSIGNED_BYTE, 0); - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); tracker.setGameMode(GameMode.getById(gamemode)); }); @@ -336,7 +336,7 @@ public class PlayerPackets { short reason = wrapper.get(Type.UNSIGNED_BYTE, 0); if (reason == 3) { //Change gamemode int gamemode = wrapper.get(Type.FLOAT, 0).intValue(); - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); tracker.setGameMode(GameMode.getById(gamemode)); } else if (reason == 4) { //Open credits screen wrapper.set(Type.FLOAT, 0, 1F); @@ -379,7 +379,7 @@ public class PlayerPackets { if (Via.getConfig().isLeftHandedHandling() && hand == 0) { wrapper.set(Type.UNSIGNED_BYTE, 0, (short) (wrapper.get(Type.UNSIGNED_BYTE, 0).intValue() | 0x80)); } - wrapper.sendToServer(Protocol1_9To1_8.class); + wrapper.sendToServer(Protocol1_8To1_9.class); wrapper.cancel(); Via.getManager().getProviders().get(MainHandProvider.class).setMainHand(wrapper.user(), hand); }); @@ -435,7 +435,7 @@ public class PlayerPackets { int action = wrapper.get(Type.VAR_INT, 0); if (action == 2) { // cancel any blocking >.> - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); if (tracker.isBlocking()) { if (!Via.getConfig().isShowShieldWhenSwordInHand()) { tracker.setSecondHand(null); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/SpawnPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/rewriter/SpawnPackets1_9.java similarity index 91% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/SpawnPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/rewriter/SpawnPackets1_9.java index 405b73bb7..3b6533866 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/SpawnPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/rewriter/SpawnPackets1_9.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8.packets; +package com.viaversion.viaversion.protocols.v1_8to1_9.rewriter; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.data.entity.EntityTracker; @@ -30,17 +30,17 @@ import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_8; import com.viaversion.viaversion.api.type.types.version.Types1_9; -import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ClientboundPackets1_9; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ItemRewriter; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.metadata.MetadataRewriter1_9To1_8; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9; +import com.viaversion.viaversion.protocols.v1_8.packet.ClientboundPackets1_8; +import com.viaversion.viaversion.protocols.v1_8to1_9.ItemRewriter; +import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.metadata.MetadataRewriter1_9To1_8; +import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.storage.EntityTracker1_9; import java.util.ArrayList; import java.util.List; import java.util.logging.Level; -public class SpawnPackets { +public class SpawnPackets1_9 { public static final ValueTransformer toNewDouble = new ValueTransformer<>(Type.DOUBLE) { @Override public Double transform(PacketWrapper wrapper, Integer inputValue) { @@ -48,7 +48,7 @@ public class SpawnPackets { } }; - public static void register(Protocol1_9To1_8 protocol) { + public static void register(Protocol1_8To1_9 protocol) { protocol.registerClientbound(ClientboundPackets1_8.SPAWN_ENTITY, new PacketHandlers() { @Override public void register() { @@ -56,7 +56,7 @@ public class SpawnPackets { handler(wrapper -> { int entityID = wrapper.get(Type.VAR_INT, 0); - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); wrapper.write(Type.UUID, tracker.getEntityUUID(entityID)); // 1 - UUID }); map(Type.BYTE); // 2 - Type @@ -65,7 +65,7 @@ public class SpawnPackets { handler(wrapper -> { int entityID = wrapper.get(Type.VAR_INT, 0); int typeID = wrapper.get(Type.BYTE, 0); - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); tracker.addEntity(entityID, EntityTypes1_10.getTypeFromId(typeID, true)); }); @@ -115,8 +115,8 @@ public class SpawnPackets { wrapper1.write(Types1_9.METADATA_LIST, meta); }); // Fix packet order - wrapper.send(Protocol1_9To1_8.class); - metaPacket.send(Protocol1_9To1_8.class); + wrapper.send(Protocol1_8To1_9.class); + metaPacket.send(Protocol1_8To1_9.class); wrapper.cancel(); } }); @@ -131,7 +131,7 @@ public class SpawnPackets { // Parse this info handler(wrapper -> { int entityID = wrapper.get(Type.VAR_INT, 0); - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); tracker.addEntity(entityID, EntityTypes1_10.EntityType.EXPERIENCE_ORB); }); @@ -152,7 +152,7 @@ public class SpawnPackets { handler(wrapper -> { // Currently only lightning uses this int entityID = wrapper.get(Type.VAR_INT, 0); - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); tracker.addEntity(entityID, EntityTypes1_10.EntityType.LIGHTNING); }); @@ -169,7 +169,7 @@ public class SpawnPackets { handler(wrapper -> { int entityID = wrapper.get(Type.VAR_INT, 0); - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); wrapper.write(Type.UUID, tracker.getEntityUUID(entityID)); // 1 - UUID }); map(Type.UNSIGNED_BYTE); // 2 - Type @@ -178,7 +178,7 @@ public class SpawnPackets { handler(wrapper -> { int entityID = wrapper.get(Type.VAR_INT, 0); int typeID = wrapper.get(Type.UNSIGNED_BYTE, 0); - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); tracker.addEntity(entityID, EntityTypes1_10.getTypeFromId(typeID, false)); }); @@ -198,7 +198,7 @@ public class SpawnPackets { handler(wrapper -> { List metadataList = wrapper.get(Types1_9.METADATA_LIST, 0); int entityId = wrapper.get(Type.VAR_INT, 0); - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); if (tracker.hasEntity(entityId)) { protocol.get(MetadataRewriter1_9To1_8.class).handleMetadata(entityId, metadataList, wrapper.user()); } else { @@ -210,7 +210,7 @@ public class SpawnPackets { handler(wrapper -> { List metadataList = wrapper.get(Types1_9.METADATA_LIST, 0); int entityID = wrapper.get(Type.VAR_INT, 0); - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); tracker.handleMetadata(entityID, metadataList); }); } @@ -224,12 +224,12 @@ public class SpawnPackets { // Parse this info handler(wrapper -> { int entityID = wrapper.get(Type.VAR_INT, 0); - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); tracker.addEntity(entityID, EntityTypes1_10.EntityType.PAINTING); }); handler(wrapper -> { int entityID = wrapper.get(Type.VAR_INT, 0); - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); wrapper.write(Type.UUID, tracker.getEntityUUID(entityID)); // 1 - UUID }); @@ -248,7 +248,7 @@ public class SpawnPackets { // Parse this info handler(wrapper -> { int entityID = wrapper.get(Type.VAR_INT, 0); - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); tracker.addEntity(entityID, EntityTypes1_10.EntityType.PLAYER); }); @@ -267,7 +267,7 @@ public class SpawnPackets { packet.write(Type.VAR_INT, wrapper.get(Type.VAR_INT, 0)); packet.write(Type.VAR_INT, 0); packet.write(Type.ITEM1_8, new DataItem(item, (byte) 1, (short) 0, null)); - packet.send(Protocol1_9To1_8.class); + packet.send(Protocol1_8To1_9.class); } }); @@ -276,7 +276,7 @@ public class SpawnPackets { handler(wrapper -> { List metadataList = wrapper.get(Types1_9.METADATA_LIST, 0); int entityId = wrapper.get(Type.VAR_INT, 0); - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); if (tracker.hasEntity(entityId)) { protocol.get(MetadataRewriter1_9To1_8.class).handleMetadata(entityId, metadataList, wrapper.user()); } else { @@ -289,7 +289,7 @@ public class SpawnPackets { handler(wrapper -> { List metadataList = wrapper.get(Types1_9.METADATA_LIST, 0); int entityID = wrapper.get(Type.VAR_INT, 0); - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); tracker.handleMetadata(entityID, metadataList); }); } @@ -303,7 +303,7 @@ public class SpawnPackets { handler(wrapper -> { int[] entities = wrapper.get(Type.VAR_INT_ARRAY_PRIMITIVE, 0); - EntityTracker tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); for (int entity : entities) { // EntityTracker tracker.removeEntity(entity); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/rewriter/WorldPacketRewriter1_9.java similarity index 91% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/WorldPackets.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/rewriter/WorldPacketRewriter1_9.java index e3d148d9a..dd4cc40b4 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/WorldPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/rewriter/WorldPacketRewriter1_9.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8.packets; +package com.viaversion.viaversion.protocols.v1_8to1_9.rewriter; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.StringTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.StringTag; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.minecraft.BlockFace; import com.viaversion.viaversion.api.minecraft.ClientWorld; @@ -34,24 +34,24 @@ import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.chunk.BulkChunkType1_8; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_8; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_9_1; -import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8; -import com.viaversion.viaversion.protocols.protocol1_8.ServerboundPackets1_8; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ClientboundPackets1_9; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ItemRewriter; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ServerboundPackets1_9; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.CommandBlockProvider; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.sounds.Effect; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.sounds.SoundEffect; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.ClientChunks; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9; +import com.viaversion.viaversion.protocols.v1_8.packet.ClientboundPackets1_8; +import com.viaversion.viaversion.protocols.v1_8.packet.ServerboundPackets1_8; +import com.viaversion.viaversion.protocols.v1_8to1_9.ItemRewriter; +import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ServerboundPackets1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.CommandBlockProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.sounds.Effect; +import com.viaversion.viaversion.protocols.v1_8to1_9.sounds.SoundEffect; +import com.viaversion.viaversion.protocols.v1_8to1_9.storage.ClientChunks; +import com.viaversion.viaversion.protocols.v1_8to1_9.storage.EntityTracker1_9; import com.viaversion.viaversion.util.ComponentUtil; import com.viaversion.viaversion.util.Key; import java.util.ArrayList; import java.util.Optional; -public class WorldPackets { - public static void register(Protocol1_9To1_8 protocol) { +public class WorldPacketRewriter1_9 { + public static void register(Protocol1_8To1_9 protocol) { protocol.registerClientbound(ClientboundPackets1_8.UPDATE_SIGN, new PacketHandlers() { @Override public void register() { @@ -59,7 +59,7 @@ public class WorldPackets { handler(wrapper -> { for (int i = 0; i < 4; i++) { final String line = wrapper.read(Type.STRING); // Should be Type.COMPONENT but would break in some cases - Protocol1_9To1_8.STRING_TO_JSON.write(wrapper, line); + Protocol1_8To1_9.STRING_TO_JSON.write(wrapper, line); } }); } @@ -111,7 +111,7 @@ public class WorldPackets { wrapper.set(Type.STRING, 0, newname); wrapper.write(Type.VAR_INT, catid); // Write Category ID if (effect != null && effect.isBreakSound()) { - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); int x = wrapper.passthrough(Type.INT); //Position X int y = wrapper.passthrough(Type.INT); //Position Y int z = wrapper.passthrough(Type.INT); //Position Z @@ -151,7 +151,7 @@ public class WorldPackets { PacketWrapper unloadChunk = wrapper.create(ClientboundPackets1_9.UNLOAD_CHUNK); unloadChunk.write(Type.INT, chunkX); unloadChunk.write(Type.INT, chunkZ); - unloadChunk.send(Protocol1_9To1_8.class); + unloadChunk.send(Protocol1_8To1_9.class); } } } @@ -170,7 +170,7 @@ public class WorldPackets { PacketWrapper emptyChunk = wrapper.create(ClientboundPackets1_9.CHUNK_DATA); Chunk c = new BaseChunk(chunkX, chunkZ, true, false, 0, new ChunkSection[16], new int[256], new ArrayList<>()); emptyChunk.write(chunkType, c); - emptyChunk.send(Protocol1_9To1_8.class); + emptyChunk.send(Protocol1_8To1_9.class); } } } @@ -188,7 +188,7 @@ public class WorldPackets { for (Chunk chunk : chunks) { PacketWrapper chunkData = wrapper.create(ClientboundPackets1_9.CHUNK_DATA); chunkData.write(chunkType, chunk); - chunkData.send(Protocol1_9To1_8.class); + chunkData.send(Protocol1_8To1_9.class); clientChunks.getLoadedChunks().add(ClientChunks.toLong(chunk.getX(), chunk.getZ())); @@ -201,7 +201,7 @@ public class WorldPackets { PacketWrapper emptyChunk = wrapper.create(ClientboundPackets1_9.CHUNK_DATA); Chunk c = new BaseChunk(chunkX, chunkZ, true, false, 0, new ChunkSection[16], new int[256], new ArrayList<>()); emptyChunk.write(chunkType, c); - emptyChunk.send(Protocol1_9To1_8.class); + emptyChunk.send(Protocol1_8To1_9.class); } } } @@ -272,7 +272,7 @@ public class WorldPackets { handler(wrapper -> { int status = wrapper.get(Type.VAR_INT, 0); if (status == 5 || status == 4 || status == 3) { - EntityTracker1_9 entityTracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 entityTracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); if (entityTracker.isBlocking()) { entityTracker.setBlocking(false); if (!Via.getConfig().isShowShieldWhenSwordInHand()) { @@ -292,17 +292,17 @@ public class WorldPackets { wrapper.write(Type.POSITION1_8, new Position(-1, (short) -1, -1)); wrapper.write(Type.UNSIGNED_BYTE, (short) 255); // Write item in hand - Item item = Protocol1_9To1_8.getHandItem(wrapper.user()); + Item item = Protocol1_8To1_9.getHandItem(wrapper.user()); // Blocking patch if (Via.getConfig().isShieldBlocking()) { - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); // Check if the shield is already there or if we have to give it here boolean showShieldWhenSwordInHand = Via.getConfig().isShowShieldWhenSwordInHand(); // Method to identify the sword in hand boolean isSword = showShieldWhenSwordInHand ? tracker.hasSwordInHand() - : item != null && Protocol1_9To1_8.isSword(item.identifier()); + : item != null && Protocol1_8To1_9.isSword(item.identifier()); if (isSword) { if (hand == 0 && !tracker.isBlocking()) { @@ -349,7 +349,7 @@ public class WorldPackets { if (hand != 0) wrapper.cancel(); }); handler(wrapper -> { - Item item = Protocol1_9To1_8.getHandItem(wrapper.user()); + Item item = Protocol1_8To1_9.getHandItem(wrapper.user()); wrapper.write(Type.ITEM1_8, item); // 3 - Item }); map(Type.UNSIGNED_BYTE); // 4 - X @@ -373,7 +373,7 @@ public class WorldPackets { case 4 -> x--; case 5 -> x++; } - EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class); tracker.addBlockInteraction(new Position(x, y, z)); }); @@ -391,7 +391,7 @@ public class WorldPackets { updateBlockEntity.write(Type.UNSIGNED_BYTE, (short) 2); updateBlockEntity.write(Type.NAMED_COMPOUND_TAG, tag.get()); - updateBlockEntity.scheduleSend(Protocol1_9To1_8.class); + updateBlockEntity.scheduleSend(Protocol1_8To1_9.class); } }); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/sounds/Effect.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/sounds/Effect.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/sounds/Effect.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/sounds/Effect.java index 6277ee9a3..7728eed03 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/sounds/Effect.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/sounds/Effect.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8.sounds; +package com.viaversion.viaversion.protocols.v1_8to1_9.sounds; import it.unimi.dsi.fastutil.ints.Int2IntMap; import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/sounds/SoundCategory.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/sounds/SoundCategory.java similarity index 95% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/sounds/SoundCategory.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/sounds/SoundCategory.java index 388d5274e..2555a4cb4 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/sounds/SoundCategory.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/sounds/SoundCategory.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8.sounds; +package com.viaversion.viaversion.protocols.v1_8to1_9.sounds; public enum SoundCategory { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/sounds/SoundEffect.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/sounds/SoundEffect.java similarity index 99% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/sounds/SoundEffect.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/sounds/SoundEffect.java index 4dae1a18a..29786e699 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/sounds/SoundEffect.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/sounds/SoundEffect.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8.sounds; +package com.viaversion.viaversion.protocols.v1_8to1_9.sounds; import java.util.HashMap; import java.util.Locale; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/ClientChunks.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/storage/ClientChunks.java similarity index 94% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/ClientChunks.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/storage/ClientChunks.java index cf98ae9dd..561e56233 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/ClientChunks.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/storage/ClientChunks.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8.storage; +package com.viaversion.viaversion.protocols.v1_8to1_9.storage; import com.google.common.collect.Sets; import com.viaversion.viaversion.api.connection.StorableObject; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/CommandBlockStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/storage/CommandBlockStorage.java similarity index 94% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/CommandBlockStorage.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/storage/CommandBlockStorage.java index 1c968b128..40cf41193 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/CommandBlockStorage.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/storage/CommandBlockStorage.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8.storage; +package com.viaversion.viaversion.protocols.v1_8to1_9.storage; -import com.github.steveice10.opennbt.tag.builtin.ByteTag; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.ByteTag; +import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.viaversion.api.connection.StorableObject; import com.viaversion.viaversion.api.minecraft.Position; import com.viaversion.viaversion.util.Pair; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/EntityTracker1_9.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/storage/EntityTracker1_9.java similarity index 95% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/EntityTracker1_9.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/storage/EntityTracker1_9.java index 5215e8c1c..f2b57f6f2 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/EntityTracker1_9.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/storage/EntityTracker1_9.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8.storage; +package com.viaversion.viaversion.protocols.v1_8to1_9.storage; import com.google.common.cache.CacheBuilder; import com.viaversion.viaversion.api.Via; @@ -32,11 +32,11 @@ import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_9; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.data.entity.EntityTrackerBase; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ClientboundPackets1_9; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.chat.GameMode; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.BossBarProvider; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.EntityIdProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.chat.GameMode; +import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.BossBarProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.EntityIdProvider; import it.unimi.dsi.fastutil.ints.Int2IntMap; import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; @@ -90,7 +90,7 @@ public class EntityTracker1_9 extends EntityTrackerBase { wrapper.write(Type.VAR_INT, entityID); wrapper.write(Type.VAR_INT, 1); // slot wrapper.write(Type.ITEM1_8, this.itemInSecondHand = item); - wrapper.scheduleSend(Protocol1_9To1_8.class); + wrapper.scheduleSend(Protocol1_8To1_9.class); } public Item getItemInSecondHand() { @@ -124,7 +124,7 @@ public class EntityTracker1_9 extends EntityTrackerBase { int inventorySlot = this.heldItemSlot + 36; // Hotbar slot index to inventory slot int itemIdentifier = inventoryTracker.getItemId((short) 0, (short) inventorySlot); - return Protocol1_9To1_8.isSword(itemIdentifier); + return Protocol1_8To1_9.isSword(itemIdentifier); } @Override @@ -218,7 +218,7 @@ public class EntityTracker1_9 extends EntityTrackerBase { wrapper.write(Type.SHORT, (short) (128D * (Via.getConfig().getHologramYOffset() * 32D))); wrapper.write(Type.SHORT, (short) 0); wrapper.write(Type.BOOLEAN, true); - wrapper.scheduleSend(Protocol1_9To1_8.class); + wrapper.scheduleSend(Protocol1_8To1_9.class); } } } @@ -294,9 +294,9 @@ public class EntityTracker1_9 extends EntityTrackerBase { } teamExists = add; if (now) { - wrapper.send(Protocol1_9To1_8.class); + wrapper.send(Protocol1_8To1_9.class); } else { - wrapper.scheduleSend(Protocol1_9To1_8.class); + wrapper.scheduleSend(Protocol1_8To1_9.class); } } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/InventoryTracker.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/storage/InventoryTracker.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/InventoryTracker.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/storage/InventoryTracker.java index 3cbf9f7df..03162c6f5 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/InventoryTracker.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/storage/InventoryTracker.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8.storage; +package com.viaversion.viaversion.protocols.v1_8to1_9.storage; import com.viaversion.viaversion.api.connection.StorableObject; import com.viaversion.viaversion.api.connection.UserConnection; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8; +import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9; import java.util.HashMap; import java.util.Map; @@ -79,7 +79,7 @@ public class InventoryTracker implements StorableObject { * @param button The button to use in the click */ public void handleWindowClick(UserConnection user, short windowId, byte mode, short hoverSlot, byte button) { - EntityTracker1_9 entityTracker = user.getEntityTracker(Protocol1_9To1_8.class); + EntityTracker1_9 entityTracker = user.getEntityTracker(Protocol1_8To1_9.class); // Skip inventory background clicks if (hoverSlot == -1) { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/MovementTracker.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/storage/MovementTracker.java similarity index 95% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/MovementTracker.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/storage/MovementTracker.java index 192c13426..bc3a26559 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/MovementTracker.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/storage/MovementTracker.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9to1_8.storage; +package com.viaversion.viaversion.protocols.v1_8to1_9.storage; import com.viaversion.viaversion.api.connection.StorableObject; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/Protocol1_9_3To1_9_1_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_9_1to1_9_3/Protocol1_9_1To1_9_3.java similarity index 89% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/Protocol1_9_3To1_9_1_2.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_9_1to1_9_3/Protocol1_9_1To1_9_3.java index 133e0dc67..670742ffc 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/Protocol1_9_3To1_9_1_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_9_1to1_9_3/Protocol1_9_1To1_9_3.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2; +package com.viaversion.viaversion.protocols.v1_9_1to1_9_3; -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 com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.IntTag; +import com.viaversion.nbt.tag.StringTag; import com.google.gson.JsonElement; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.ClientWorld; @@ -35,12 +35,14 @@ import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_9_1; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_9_3; -import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.data.FakeTileEntity; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ClientboundPackets1_9; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ServerboundPackets1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ServerboundPackets1_9; +import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.data.FakeTileEntity; +import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ClientboundPackets1_9_3; +import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ServerboundPackets1_9_3; import java.util.List; -public class Protocol1_9_3To1_9_1_2 extends AbstractProtocol { +public class Protocol1_9_1To1_9_3 extends AbstractProtocol { public static final ValueTransformer ADJUST_PITCH = new ValueTransformer<>(Type.UNSIGNED_BYTE, Type.UNSIGNED_BYTE) { @Override @@ -49,7 +51,7 @@ public class Protocol1_9_3To1_9_1_2 extends AbstractProtocol. */ -package com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.data; +package com.viaversion.viaversion.protocols.v1_9_1to1_9_3.data; -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 com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.IntTag; +import com.viaversion.nbt.tag.StringTag; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/ClientboundPackets1_9_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_9_1to1_9_3/packet/ClientboundPackets1_9_3.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/ClientboundPackets1_9_3.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_9_1to1_9_3/packet/ClientboundPackets1_9_3.java index 25fbf125a..6bc2e2392 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/ClientboundPackets1_9_3.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_9_1to1_9_3/packet/ClientboundPackets1_9_3.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2; +package com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/ServerboundPackets1_9_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_9_1to1_9_3/packet/ServerboundPackets1_9_3.java similarity index 96% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/ServerboundPackets1_9_3.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_9_1to1_9_3/packet/ServerboundPackets1_9_3.java index 3895b51ce..2ee078d18 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_3to1_9_1_2/ServerboundPackets1_9_3.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_9_1to1_9_3/packet/ServerboundPackets1_9_3.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2; +package com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet; import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/Protocol1_10To1_9_3_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_9_3to1_10/Protocol1_9_3To1_10.java similarity index 92% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/Protocol1_10To1_9_3_4.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_9_3to1_10/Protocol1_9_3To1_10.java index 3cbb379ac..8f13f8b00 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/Protocol1_10To1_9_3_4.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_9_3to1_10/Protocol1_9_3To1_10.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_10to1_9_3; +package com.viaversion.viaversion.protocols.v1_9_3to1_10; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; @@ -31,14 +31,14 @@ import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_9_3; import com.viaversion.viaversion.api.type.types.version.Types1_9; -import com.viaversion.viaversion.protocols.protocol1_10to1_9_3.packets.InventoryPackets; -import com.viaversion.viaversion.protocols.protocol1_10to1_9_3.storage.ResourcePackTracker; -import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; -import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3; +import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ClientboundPackets1_9_3; +import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ServerboundPackets1_9_3; +import com.viaversion.viaversion.protocols.v1_9_3to1_10.rewriter.ItemPacketRewriter1_10; +import com.viaversion.viaversion.protocols.v1_9_3to1_10.storage.ResourcePackTracker; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -public class Protocol1_10To1_9_3_4 extends AbstractProtocol { +public class Protocol1_9_3To1_10 extends AbstractProtocol { public static final ValueTransformer TO_NEW_PITCH = new ValueTransformer<>(Type.FLOAT) { @Override @@ -57,9 +57,9 @@ public class Protocol1_10To1_9_3_4 extends AbstractProtocol. */ -package com.viaversion.viaversion.protocols.protocol1_10to1_9_3.packets; +package com.viaversion.viaversion.protocols.v1_9_3to1_10.rewriter; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_10to1_9_3.Protocol1_10To1_9_3_4; -import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; -import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3; +import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ClientboundPackets1_9_3; +import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ServerboundPackets1_9_3; +import com.viaversion.viaversion.protocols.v1_9_3to1_10.Protocol1_9_3To1_10; import com.viaversion.viaversion.rewriter.ItemRewriter; -public class InventoryPackets extends ItemRewriter { +public class ItemPacketRewriter1_10 extends ItemRewriter { - public InventoryPackets(Protocol1_10To1_9_3_4 protocol) { + public ItemPacketRewriter1_10(Protocol1_9_3To1_10 protocol) { super(protocol, Type.ITEM1_8, null); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/storage/ResourcePackTracker.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_9_3to1_10/storage/ResourcePackTracker.java similarity index 94% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/storage/ResourcePackTracker.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_9_3to1_10/storage/ResourcePackTracker.java index e129347f5..96a959881 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_10to1_9_3/storage/ResourcePackTracker.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_9_3to1_10/storage/ResourcePackTracker.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_10to1_9_3.storage; +package com.viaversion.viaversion.protocols.v1_9_3to1_10.storage; import com.viaversion.viaversion.api.connection.StorableObject; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1to1_9/Protocol1_9_1To1_9.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_9to1_9_1/Protocol1_9To1_9_1.java similarity index 89% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1to1_9/Protocol1_9_1To1_9.java rename to common/src/main/java/com/viaversion/viaversion/protocols/v1_9to1_9_1/Protocol1_9To1_9_1.java index 9c0237a07..907822f86 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9_1to1_9/Protocol1_9_1To1_9.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_9to1_9_1/Protocol1_9To1_9_1.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_9_1to1_9; +package com.viaversion.viaversion.protocols.v1_9to1_9_1; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ClientboundPackets1_9; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.ServerboundPackets1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_9; +import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ServerboundPackets1_9; -public class Protocol1_9_1To1_9 extends AbstractProtocol { +public class Protocol1_9To1_9_1 extends AbstractProtocol { - public Protocol1_9_1To1_9() { + public Protocol1_9To1_9_1() { super(ClientboundPackets1_9.class, ClientboundPackets1_9.class, ServerboundPackets1_9.class, ServerboundPackets1_9.class); } diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/BlockRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/BlockRewriter.java index 34aff060d..6bfeec003 100644 --- a/common/src/main/java/com/viaversion/viaversion/rewriter/BlockRewriter.java +++ b/common/src/main/java/com/viaversion/viaversion/rewriter/BlockRewriter.java @@ -17,7 +17,7 @@ */ package com.viaversion.viaversion.rewriter; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; +import com.viaversion.nbt.tag.CompoundTag; import com.google.common.base.Preconditions; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.data.Mappings; diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/ComponentRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/ComponentRewriter.java index 72aa8c513..f9e241144 100644 --- a/common/src/main/java/com/viaversion/viaversion/rewriter/ComponentRewriter.java +++ b/common/src/main/java/com/viaversion/viaversion/rewriter/ComponentRewriter.java @@ -17,10 +17,10 @@ */ package com.viaversion.viaversion.rewriter; -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 com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.StringTag; +import com.viaversion.nbt.tag.Tag; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java index 4c3735489..d132e9223 100644 --- a/common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java +++ b/common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java @@ -17,9 +17,9 @@ */ package com.viaversion.viaversion.rewriter; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.ListTag; -import com.github.steveice10.opennbt.tag.builtin.NumberTag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.NumberTag; import com.google.common.base.Preconditions; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; diff --git a/common/src/main/java/com/viaversion/viaversion/util/ComponentUtil.java b/common/src/main/java/com/viaversion/viaversion/util/ComponentUtil.java index 98a0297ad..d39d20f39 100644 --- a/common/src/main/java/com/viaversion/viaversion/util/ComponentUtil.java +++ b/common/src/main/java/com/viaversion/viaversion/util/ComponentUtil.java @@ -17,9 +17,9 @@ */ package com.viaversion.viaversion.util; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.StringTag; -import com.github.steveice10.opennbt.tag.builtin.Tag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.StringTag; +import com.viaversion.nbt.tag.Tag; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.viaversion.viaversion.api.Via; diff --git a/common/src/main/java/com/viaversion/viaversion/util/KeyMappings.java b/common/src/main/java/com/viaversion/viaversion/util/KeyMappings.java index ea8da059f..0f94b468e 100644 --- a/common/src/main/java/com/viaversion/viaversion/util/KeyMappings.java +++ b/common/src/main/java/com/viaversion/viaversion/util/KeyMappings.java @@ -17,8 +17,8 @@ */ package com.viaversion.viaversion.util; -import com.github.steveice10.opennbt.tag.builtin.ListTag; -import com.github.steveice10.opennbt.tag.builtin.StringTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.StringTag; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import java.util.Collection; diff --git a/common/src/main/java/com/viaversion/viaversion/util/SerializerVersion.java b/common/src/main/java/com/viaversion/viaversion/util/SerializerVersion.java index 6cfa41c44..8cdbc57a1 100644 --- a/common/src/main/java/com/viaversion/viaversion/util/SerializerVersion.java +++ b/common/src/main/java/com/viaversion/viaversion/util/SerializerVersion.java @@ -17,7 +17,7 @@ */ package com.viaversion.viaversion.util; -import com.github.steveice10.opennbt.tag.builtin.Tag; +import com.viaversion.nbt.tag.Tag; import com.google.gson.JsonElement; import net.lenni0451.mcstructs.snbt.SNbtSerializer; import net.lenni0451.mcstructs.snbt.exceptions.SNbtDeserializeException; diff --git a/common/src/main/java/com/viaversion/viaversion/util/TagUtil.java b/common/src/main/java/com/viaversion/viaversion/util/TagUtil.java index 74e44a3cb..5febaecd7 100644 --- a/common/src/main/java/com/viaversion/viaversion/util/TagUtil.java +++ b/common/src/main/java/com/viaversion/viaversion/util/TagUtil.java @@ -17,9 +17,9 @@ */ package com.viaversion.viaversion.util; -import com.github.steveice10.opennbt.tag.builtin.CompoundTag; -import com.github.steveice10.opennbt.tag.builtin.ListTag; -import com.github.steveice10.opennbt.tag.builtin.Tag; +import com.viaversion.nbt.tag.CompoundTag; +import com.viaversion.nbt.tag.ListTag; +import com.viaversion.nbt.tag.Tag; import java.util.Map; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/common/src/test/java/com/viaversion/viaversion/common/nbt/NBTTagTest.java b/common/src/test/java/com/viaversion/viaversion/common/nbt/NBTTagTest.java index 899d47fb8..030d22ba7 100644 --- a/common/src/test/java/com/viaversion/viaversion/common/nbt/NBTTagTest.java +++ b/common/src/test/java/com/viaversion/viaversion/common/nbt/NBTTagTest.java @@ -21,8 +21,8 @@ import java.io.IOException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import static com.github.steveice10.opennbt.stringified.SNBT.deserialize; -import static com.github.steveice10.opennbt.stringified.SNBT.deserializeCompoundTag; +import static com.viaversion.nbt.stringified.SNBT.deserialize; +import static com.viaversion.nbt.stringified.SNBT.deserializeCompoundTag; public class NBTTagTest { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 75b394cca..c67a0f76c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ metadata.format.version = "1.1" gson = "2.10.1" fastutil = "8.5.12" -vianbt = "4.4.4" +vianbt = "5.0.0-SNAPSHOT" mcstructs = "2.5.0-SNAPSHOT" # Common provided diff --git a/settings.gradle.kts b/settings.gradle.kts index 2ed77abe1..4e831cdae 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,6 +3,7 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") dependencyResolutionManagement { // configures repositories for all projects repositories { + mavenLocal() maven("https://repo.viaversion.com") maven("https://repo.papermc.io/repository/maven-public/") maven("https://oss.sonatype.org/content/repositories/snapshots/") diff --git a/template/src/main/java/com/viaversion/viaversion/template/protocols/Protocol1_99To_98.java b/template/src/main/java/com/viaversion/viaversion/template/protocols/Protocol1_99To_98.java index a1a1a1a19..9cb6df5fa 100644 --- a/template/src/main/java/com/viaversion/viaversion/template/protocols/Protocol1_99To_98.java +++ b/template/src/main/java/com/viaversion/viaversion/template/protocols/Protocol1_99To_98.java @@ -23,10 +23,10 @@ import com.viaversion.viaversion.api.data.MappingDataBase; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_20_5; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.data.entity.EntityTrackerBase; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ClientboundConfigurationPackets1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ClientboundPacket1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ClientboundPackets1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ServerboundPacket1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ClientboundConfigurationPackets1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ClientboundPacket1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ClientboundPackets1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ServerboundPacket1_20_5; import com.viaversion.viaversion.rewriter.AttributeRewriter; import com.viaversion.viaversion.rewriter.SoundRewriter; import com.viaversion.viaversion.rewriter.StatisticsRewriter; diff --git a/template/src/main/java/com/viaversion/viaversion/template/protocols/rewriter/BlockItemPacketRewriter1_99.java b/template/src/main/java/com/viaversion/viaversion/template/protocols/rewriter/BlockItemPacketRewriter1_99.java index 694c7ef51..b1e00af18 100644 --- a/template/src/main/java/com/viaversion/viaversion/template/protocols/rewriter/BlockItemPacketRewriter1_99.java +++ b/template/src/main/java/com/viaversion/viaversion/template/protocols/rewriter/BlockItemPacketRewriter1_99.java @@ -19,11 +19,11 @@ package com.viaversion.viaversion.template.protocols.rewriter; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_20_2; import com.viaversion.viaversion.api.type.types.version.Types1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.rewriter.RecipeRewriter1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ClientboundPacket1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ClientboundPackets1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ServerboundPacket1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ServerboundPackets1_20_5; +import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.rewriter.RecipeRewriter1_20_3; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ClientboundPacket1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ClientboundPackets1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ServerboundPacket1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ServerboundPackets1_20_5; import com.viaversion.viaversion.rewriter.BlockRewriter; import com.viaversion.viaversion.rewriter.StructuredItemRewriter; import com.viaversion.viaversion.template.protocols.Protocol1_99To_98; diff --git a/template/src/main/java/com/viaversion/viaversion/template/protocols/rewriter/EntityPacketRewriter1_99.java b/template/src/main/java/com/viaversion/viaversion/template/protocols/rewriter/EntityPacketRewriter1_99.java index 85fef94e9..5005e7711 100644 --- a/template/src/main/java/com/viaversion/viaversion/template/protocols/rewriter/EntityPacketRewriter1_99.java +++ b/template/src/main/java/com/viaversion/viaversion/template/protocols/rewriter/EntityPacketRewriter1_99.java @@ -22,9 +22,9 @@ import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_20_5; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ClientboundConfigurationPackets1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ClientboundPacket1_20_5; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ClientboundPackets1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ClientboundConfigurationPackets1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ClientboundPacket1_20_5; +import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ClientboundPackets1_20_5; import com.viaversion.viaversion.rewriter.EntityRewriter; import com.viaversion.viaversion.template.protocols.Protocol1_99To_98; diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaLoader.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaLoader.java index e91a9a469..4db6b1347 100644 --- a/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaLoader.java +++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaLoader.java @@ -23,7 +23,7 @@ import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.platform.ViaPlatformLoader; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import com.viaversion.viaversion.api.protocol.version.VersionProvider; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.BossBarProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.BossBarProvider; import com.viaversion.viaversion.velocity.listeners.UpdateListener; import com.viaversion.viaversion.velocity.providers.VelocityBossBarProvider; import com.viaversion.viaversion.velocity.providers.VelocityVersionProvider; diff --git a/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityBossBarProvider.java b/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityBossBarProvider.java index 78d4ff79f..2dd1bc913 100644 --- a/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityBossBarProvider.java +++ b/velocity/src/main/java/com/viaversion/viaversion/velocity/providers/VelocityBossBarProvider.java @@ -18,7 +18,7 @@ package com.viaversion.viaversion.velocity.providers; import com.viaversion.viaversion.api.connection.UserConnection; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.BossBarProvider; +import com.viaversion.viaversion.protocols.v1_8to1_9.providers.BossBarProvider; import com.viaversion.viaversion.velocity.storage.VelocityStorage; import java.util.UUID;