diff --git a/build.gradle.kts b/build.gradle.kts index f1392b18..5f99ee5d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } allprojects { - group = "nl.matsv" + group = "com.viaversion" version = "4.0.0-21w16a" description = "Allow older clients to join newer server versions." } @@ -35,6 +35,7 @@ subprojects { } repositories { + mavenLocal() maven("https://repo.viaversion.com") maven("https://papermc.io/repo/repository/maven-public/") maven("https://oss.sonatype.org/content/repositories/snapshots/") diff --git a/buildSrc/src/main/kotlin/extensions.kt b/buildSrc/src/main/kotlin/extensions.kt index e8bf125f..16238782 100644 --- a/buildSrc/src/main/kotlin/extensions.kt +++ b/buildSrc/src/main/kotlin/extensions.kt @@ -31,14 +31,8 @@ fun Project.configureShadowJar() { } private fun ShadowJar.configureRelocations() { - relocate("com.google.gson", "us.myles.viaversion.libs.gson") - relocate("net.md_5.bungee", "us.myles.viaversion.libs.bungeecordchat") { - include("net.md_5.bungee.api.chat.*") - include("net.md_5.bungee.api.ChatColor") - include("net.md_5.bungee.api.ChatMessageType") - include("net.md_5.bungee.chat.*") - } - relocate("it.unimi.dsi.fastutil", "us.myles.viaversion.libs.fastutil") + relocate("com.google.gson", "com.viaversion.viaversion.libs.gson") + relocate("it.unimi.dsi.fastutil", "com.viaversion.viaversion.libs.fastutil") } fun Project.latestCommitHash(): String { diff --git a/bukkit/src/main/java/nl/matsv/viabackwards/BukkitPlugin.java b/bukkit/src/main/java/nl/matsv/viabackwards/BukkitPlugin.java index 7b406aa5..828da1bf 100644 --- a/bukkit/src/main/java/nl/matsv/viabackwards/BukkitPlugin.java +++ b/bukkit/src/main/java/nl/matsv/viabackwards/BukkitPlugin.java @@ -23,9 +23,9 @@ import nl.matsv.viabackwards.listener.FireDamageListener; import nl.matsv.viabackwards.listener.FireExtinguishListener; import nl.matsv.viabackwards.listener.LecternInteractListener; import org.bukkit.plugin.java.JavaPlugin; -import us.myles.ViaVersion.api.Via; -import us.myles.ViaVersion.api.protocol.ProtocolVersion; -import us.myles.ViaVersion.bukkit.platform.BukkitViaLoader; +import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; +import com.viaversion.viaversion.bukkit.platform.BukkitViaLoader; public class BukkitPlugin extends JavaPlugin implements ViaBackwardsPlatform { diff --git a/bukkit/src/main/java/nl/matsv/viabackwards/listener/FireDamageListener.java b/bukkit/src/main/java/nl/matsv/viabackwards/listener/FireDamageListener.java index 0e560d03..148f8bbe 100644 --- a/bukkit/src/main/java/nl/matsv/viabackwards/listener/FireDamageListener.java +++ b/bukkit/src/main/java/nl/matsv/viabackwards/listener/FireDamageListener.java @@ -26,7 +26,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.entity.EntityDamageEvent; -import us.myles.ViaVersion.bukkit.listeners.ViaBukkitListener; +import com.viaversion.viaversion.bukkit.listeners.ViaBukkitListener; public class FireDamageListener extends ViaBukkitListener { diff --git a/bukkit/src/main/java/nl/matsv/viabackwards/listener/FireExtinguishListener.java b/bukkit/src/main/java/nl/matsv/viabackwards/listener/FireExtinguishListener.java index bcd65acd..c9aecda1 100644 --- a/bukkit/src/main/java/nl/matsv/viabackwards/listener/FireExtinguishListener.java +++ b/bukkit/src/main/java/nl/matsv/viabackwards/listener/FireExtinguishListener.java @@ -26,7 +26,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.block.Action; import org.bukkit.event.player.PlayerInteractEvent; -import us.myles.ViaVersion.bukkit.listeners.ViaBukkitListener; +import com.viaversion.viaversion.bukkit.listeners.ViaBukkitListener; public class FireExtinguishListener extends ViaBukkitListener { diff --git a/bukkit/src/main/java/nl/matsv/viabackwards/listener/LecternInteractListener.java b/bukkit/src/main/java/nl/matsv/viabackwards/listener/LecternInteractListener.java index 39187eae..30575df3 100644 --- a/bukkit/src/main/java/nl/matsv/viabackwards/listener/LecternInteractListener.java +++ b/bukkit/src/main/java/nl/matsv/viabackwards/listener/LecternInteractListener.java @@ -28,7 +28,7 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.BookMeta; -import us.myles.ViaVersion.bukkit.listeners.ViaBukkitListener; +import com.viaversion.viaversion.bukkit.listeners.ViaBukkitListener; public class LecternInteractListener extends ViaBukkitListener { diff --git a/bungee/src/main/java/nl/matsv/viabackwards/BungeePlugin.java b/bungee/src/main/java/nl/matsv/viabackwards/BungeePlugin.java index eea8102c..29d52cf4 100644 --- a/bungee/src/main/java/nl/matsv/viabackwards/BungeePlugin.java +++ b/bungee/src/main/java/nl/matsv/viabackwards/BungeePlugin.java @@ -20,7 +20,7 @@ package nl.matsv.viabackwards; import net.md_5.bungee.api.plugin.Plugin; import nl.matsv.viabackwards.api.ViaBackwardsPlatform; -import us.myles.ViaVersion.api.Via; +import com.viaversion.viaversion.api.Via; public class BungeePlugin extends Plugin implements ViaBackwardsPlatform { diff --git a/common/src/main/java/nl/matsv/viabackwards/ViaBackwardsConfig.java b/common/src/main/java/nl/matsv/viabackwards/ViaBackwardsConfig.java index f72f3d52..3171f028 100644 --- a/common/src/main/java/nl/matsv/viabackwards/ViaBackwardsConfig.java +++ b/common/src/main/java/nl/matsv/viabackwards/ViaBackwardsConfig.java @@ -17,7 +17,7 @@ */ package nl.matsv.viabackwards; -import us.myles.ViaVersion.util.Config; +import com.viaversion.viaversion.util.Config; import java.io.File; import java.net.URL; diff --git a/common/src/main/java/nl/matsv/viabackwards/api/BackwardsProtocol.java b/common/src/main/java/nl/matsv/viabackwards/api/BackwardsProtocol.java index 32cee59a..dce56c54 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/BackwardsProtocol.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/BackwardsProtocol.java @@ -20,11 +20,11 @@ package nl.matsv.viabackwards.api; import nl.matsv.viabackwards.api.data.BackwardsMappings; import nl.matsv.viabackwards.api.entities.storage.EntityTracker; import org.checkerframework.checker.nullness.qual.Nullable; -import us.myles.ViaVersion.api.Via; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.api.protocol.ClientboundPacketType; -import us.myles.ViaVersion.api.protocol.Protocol; -import us.myles.ViaVersion.api.protocol.ServerboundPacketType; +import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; +import com.viaversion.viaversion.api.protocol.Protocol; +import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; public abstract class BackwardsProtocol extends Protocol { diff --git a/common/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java b/common/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java index 28c6c06f..2f9eca66 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java @@ -44,10 +44,10 @@ import nl.matsv.viabackwards.protocol.protocol1_16_3to1_16_4.Protocol1_16_3To1_1 import nl.matsv.viabackwards.protocol.protocol1_16_4to1_17.Protocol1_16_4To1_17; import nl.matsv.viabackwards.protocol.protocol1_16to1_16_1.Protocol1_16To1_16_1; import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.Protocol1_9_4To1_10; -import us.myles.ViaVersion.api.Via; -import us.myles.ViaVersion.api.protocol.ProtocolManager; -import us.myles.ViaVersion.api.protocol.ProtocolVersion; -import us.myles.ViaVersion.update.Version; +import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.api.protocol.ProtocolManager; +import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; +import com.viaversion.viaversion.update.Version; import java.io.File; import java.util.logging.Logger; diff --git a/common/src/main/java/nl/matsv/viabackwards/api/data/BackwardsMappings.java b/common/src/main/java/nl/matsv/viabackwards/api/data/BackwardsMappings.java index bec56b31..628e1702 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/data/BackwardsMappings.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/data/BackwardsMappings.java @@ -20,12 +20,12 @@ package nl.matsv.viabackwards.api.data; import com.google.common.base.Preconditions; import nl.matsv.viabackwards.api.BackwardsProtocol; import org.checkerframework.checker.nullness.qual.Nullable; -import us.myles.ViaVersion.api.Via; -import us.myles.ViaVersion.api.data.MappingData; -import us.myles.ViaVersion.api.data.Mappings; -import us.myles.ViaVersion.api.protocol.Protocol; -import us.myles.viaversion.libs.fastutil.ints.Int2ObjectMap; -import us.myles.viaversion.libs.gson.JsonObject; +import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.api.data.MappingData; +import com.viaversion.viaversion.api.data.Mappings; +import com.viaversion.viaversion.api.protocol.Protocol; +import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap; +import com.viaversion.viaversion.libs.gson.JsonObject; import java.util.Map; diff --git a/common/src/main/java/nl/matsv/viabackwards/api/data/MappedItem.java b/common/src/main/java/nl/matsv/viabackwards/api/data/MappedItem.java index 5538a5ca..d8fc024e 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/data/MappedItem.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/data/MappedItem.java @@ -17,7 +17,7 @@ */ package nl.matsv.viabackwards.api.data; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ChatRewriter; +import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter; public class MappedItem { diff --git a/common/src/main/java/nl/matsv/viabackwards/api/data/MappedLegacyBlockItem.java b/common/src/main/java/nl/matsv/viabackwards/api/data/MappedLegacyBlockItem.java index 40ab4454..76983629 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/data/MappedLegacyBlockItem.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/data/MappedLegacyBlockItem.java @@ -19,7 +19,7 @@ package nl.matsv.viabackwards.api.data; import nl.matsv.viabackwards.utils.Block; import org.checkerframework.checker.nullness.qual.Nullable; -import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; public class MappedLegacyBlockItem { diff --git a/common/src/main/java/nl/matsv/viabackwards/api/data/VBMappingDataLoader.java b/common/src/main/java/nl/matsv/viabackwards/api/data/VBMappingDataLoader.java index d83e224d..2fc8dac0 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/data/VBMappingDataLoader.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/data/VBMappingDataLoader.java @@ -18,17 +18,17 @@ package nl.matsv.viabackwards.api.data; import nl.matsv.viabackwards.ViaBackwards; -import us.myles.ViaVersion.api.Via; -import us.myles.ViaVersion.api.data.MappingDataLoader; -import us.myles.ViaVersion.util.GsonUtil; -import us.myles.viaversion.libs.fastutil.ints.Int2ObjectMap; -import us.myles.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap; -import us.myles.viaversion.libs.fastutil.objects.Object2IntMap; -import us.myles.viaversion.libs.gson.JsonElement; -import us.myles.viaversion.libs.gson.JsonIOException; -import us.myles.viaversion.libs.gson.JsonObject; -import us.myles.viaversion.libs.gson.JsonPrimitive; -import us.myles.viaversion.libs.gson.JsonSyntaxException; +import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.api.data.MappingDataLoader; +import com.viaversion.viaversion.util.GsonUtil; +import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap; +import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap; +import com.viaversion.viaversion.libs.fastutil.objects.Object2IntMap; +import com.viaversion.viaversion.libs.gson.JsonElement; +import com.viaversion.viaversion.libs.gson.JsonIOException; +import com.viaversion.viaversion.libs.gson.JsonObject; +import com.viaversion.viaversion.libs.gson.JsonPrimitive; +import com.viaversion.viaversion.libs.gson.JsonSyntaxException; import java.io.File; import java.io.FileReader; diff --git a/common/src/main/java/nl/matsv/viabackwards/api/data/VBMappings.java b/common/src/main/java/nl/matsv/viabackwards/api/data/VBMappings.java index 6d9acd95..e89d6074 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/data/VBMappings.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/data/VBMappings.java @@ -17,9 +17,9 @@ */ package nl.matsv.viabackwards.api.data; -import us.myles.ViaVersion.api.data.Mappings; -import us.myles.viaversion.libs.gson.JsonArray; -import us.myles.viaversion.libs.gson.JsonObject; +import com.viaversion.viaversion.api.data.Mappings; +import com.viaversion.viaversion.libs.gson.JsonArray; +import com.viaversion.viaversion.libs.gson.JsonObject; import java.util.Arrays; diff --git a/common/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandler.java b/common/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandler.java index 4d43a7f6..414ca7d6 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandler.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandler.java @@ -19,7 +19,7 @@ package nl.matsv.viabackwards.api.entities.meta; import nl.matsv.viabackwards.api.exceptions.RemovedValueException; -import us.myles.ViaVersion.api.minecraft.metadata.Metadata; +import com.viaversion.viaversion.api.minecraft.metadata.Metadata; public interface MetaHandler { diff --git a/common/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandlerEvent.java b/common/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandlerEvent.java index af686c9f..07de4b4a 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandlerEvent.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandlerEvent.java @@ -21,8 +21,8 @@ package nl.matsv.viabackwards.api.entities.meta; import nl.matsv.viabackwards.api.entities.storage.EntityTracker; import nl.matsv.viabackwards.api.entities.storage.MetaStorage; import org.checkerframework.checker.nullness.qual.Nullable; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.api.minecraft.metadata.Metadata; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.minecraft.metadata.Metadata; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandlerSettings.java b/common/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandlerSettings.java index 26308a99..c2dd7a1b 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandlerSettings.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandlerSettings.java @@ -20,8 +20,8 @@ package nl.matsv.viabackwards.api.entities.meta; import nl.matsv.viabackwards.api.exceptions.RemovedValueException; import org.checkerframework.checker.nullness.qual.Nullable; -import us.myles.ViaVersion.api.entities.EntityType; -import us.myles.ViaVersion.api.minecraft.metadata.Metadata; +import com.viaversion.viaversion.api.minecraft.entities.EntityType; +import com.viaversion.viaversion.api.minecraft.metadata.Metadata; public class MetaHandlerSettings { private EntityType filterType; diff --git a/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityData.java b/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityData.java index 0e2d8daa..498b827f 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityData.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityData.java @@ -19,7 +19,7 @@ package nl.matsv.viabackwards.api.entities.storage; import org.checkerframework.checker.nullness.qual.Nullable; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ChatRewriter; +import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter; public class EntityData { private final int id; diff --git a/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityPositionHandler.java b/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityPositionHandler.java index 5a0cfd2a..3270e694 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityPositionHandler.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityPositionHandler.java @@ -19,10 +19,10 @@ package nl.matsv.viabackwards.api.entities.storage; import nl.matsv.viabackwards.ViaBackwards; import nl.matsv.viabackwards.api.rewriters.EntityRewriterBase; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.Via; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.api.type.Type; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.type.Type; import java.util.function.Supplier; diff --git a/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityTracker.java b/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityTracker.java index ab2c1f3d..ccaa9122 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityTracker.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityTracker.java @@ -20,9 +20,9 @@ package nl.matsv.viabackwards.api.entities.storage; import nl.matsv.viabackwards.api.BackwardsProtocol; import org.checkerframework.checker.nullness.qual.Nullable; -import us.myles.ViaVersion.api.data.StoredObject; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.api.entities.EntityType; +import com.viaversion.viaversion.api.connection.StoredObject; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.minecraft.entities.EntityType; import java.util.HashMap; import java.util.Map; diff --git a/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/MetaStorage.java b/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/MetaStorage.java index bb5b3fab..92ca7b25 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/MetaStorage.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/MetaStorage.java @@ -19,7 +19,7 @@ package nl.matsv.viabackwards.api.entities.storage; import org.checkerframework.checker.nullness.qual.Nullable; -import us.myles.ViaVersion.api.minecraft.metadata.Metadata; +import com.viaversion.viaversion.api.minecraft.metadata.Metadata; import java.util.List; diff --git a/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/PlayerPositionStorage.java b/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/PlayerPositionStorage.java index e44b15ad..8040f6aa 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/PlayerPositionStorage.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/PlayerPositionStorage.java @@ -17,10 +17,10 @@ */ package nl.matsv.viabackwards.api.entities.storage; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.data.StoredObject; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.api.type.Type; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.connection.StoredObject; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.type.Type; public abstract class PlayerPositionStorage extends StoredObject { private double x; diff --git a/common/src/main/java/nl/matsv/viabackwards/api/rewriters/EnchantmentRewriter.java b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/EnchantmentRewriter.java index 38bf8a8e..ebd0a87b 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/rewriters/EnchantmentRewriter.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/EnchantmentRewriter.java @@ -17,14 +17,14 @@ */ package nl.matsv.viabackwards.api.rewriters; -import us.myles.ViaVersion.api.minecraft.item.Item; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ChatRewriter; -import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.ListTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.NumberTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.ShortTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.StringTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.Tag; +import com.viaversion.viaversion.api.minecraft.item.Item; +import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.NumberTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.ShortTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; import java.util.ArrayList; import java.util.HashMap; diff --git a/common/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriter.java b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriter.java index 77e1bc0a..defde2d8 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriter.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriter.java @@ -20,15 +20,15 @@ package nl.matsv.viabackwards.api.rewriters; import nl.matsv.viabackwards.api.BackwardsProtocol; import nl.matsv.viabackwards.api.entities.storage.EntityData; import nl.matsv.viabackwards.api.entities.storage.MetaStorage; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.entities.EntityType; -import us.myles.ViaVersion.api.minecraft.metadata.MetaType; -import us.myles.ViaVersion.api.minecraft.metadata.Metadata; -import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_14; -import us.myles.ViaVersion.api.protocol.ClientboundPacketType; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.minecraft.entities.EntityType; +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_14; +import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.type.Type; import java.util.List; diff --git a/common/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriterBase.java b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriterBase.java index f5348571..d890b0a6 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriterBase.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriterBase.java @@ -27,25 +27,25 @@ import nl.matsv.viabackwards.api.entities.storage.EntityTracker; import nl.matsv.viabackwards.api.entities.storage.MetaStorage; import nl.matsv.viabackwards.api.exceptions.RemovedValueException; import org.checkerframework.checker.nullness.qual.Nullable; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.Via; -import us.myles.ViaVersion.api.data.ParticleMappings; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.api.entities.EntityType; -import us.myles.ViaVersion.api.minecraft.metadata.MetaType; -import us.myles.ViaVersion.api.minecraft.metadata.Metadata; -import us.myles.ViaVersion.api.protocol.ClientboundPacketType; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.api.type.types.Particle; -import us.myles.ViaVersion.exception.CancelException; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; -import us.myles.viaversion.libs.fastutil.ints.Int2IntMap; -import us.myles.viaversion.libs.fastutil.ints.Int2IntOpenHashMap; -import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.IntTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.Tag; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.api.data.ParticleMappings; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.minecraft.entities.EntityType; +import com.viaversion.viaversion.api.minecraft.metadata.MetaType; +import com.viaversion.viaversion.api.minecraft.metadata.Metadata; +import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.api.type.types.Particle; +import com.viaversion.viaversion.exception.CancelException; +import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; +import com.viaversion.viaversion.libs.fastutil.ints.Int2IntMap; +import com.viaversion.viaversion.libs.fastutil.ints.Int2IntOpenHashMap; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; import java.util.ArrayList; import java.util.Comparator; diff --git a/common/src/main/java/nl/matsv/viabackwards/api/rewriters/ItemRewriter.java b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/ItemRewriter.java index 86a336b9..4fe169c1 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/rewriters/ItemRewriter.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/ItemRewriter.java @@ -20,13 +20,13 @@ package nl.matsv.viabackwards.api.rewriters; import nl.matsv.viabackwards.api.BackwardsProtocol; import nl.matsv.viabackwards.api.data.MappedItem; import org.checkerframework.checker.nullness.qual.Nullable; -import us.myles.ViaVersion.api.minecraft.item.Item; -import us.myles.viaversion.libs.opennbt.tag.builtin.ByteTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.IntTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.ListTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.StringTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.Tag; +import com.viaversion.viaversion.api.minecraft.item.Item; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.ByteTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; public abstract class ItemRewriter extends ItemRewriterBase { diff --git a/common/src/main/java/nl/matsv/viabackwards/api/rewriters/ItemRewriterBase.java b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/ItemRewriterBase.java index c0621076..a36e4e94 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/rewriters/ItemRewriterBase.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/ItemRewriterBase.java @@ -19,11 +19,11 @@ package nl.matsv.viabackwards.api.rewriters; import nl.matsv.viabackwards.api.BackwardsProtocol; import org.checkerframework.checker.nullness.qual.Nullable; -import us.myles.ViaVersion.api.minecraft.item.Item; -import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.ListTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.StringTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.Tag; +import com.viaversion.viaversion.api.minecraft.item.Item; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; public abstract class ItemRewriterBase extends Rewriter { diff --git a/common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyBlockItemRewriter.java b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyBlockItemRewriter.java index 2c659bbb..0defba1d 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyBlockItemRewriter.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyBlockItemRewriter.java @@ -24,21 +24,21 @@ import nl.matsv.viabackwards.api.data.VBMappingDataLoader; import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.data.BlockColors; import nl.matsv.viabackwards.utils.Block; import org.checkerframework.checker.nullness.qual.Nullable; -import us.myles.ViaVersion.api.minecraft.chunks.Chunk; -import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection; -import us.myles.ViaVersion.api.minecraft.item.Item; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ChatRewriter; -import us.myles.viaversion.libs.fastutil.ints.Int2ObjectMap; -import us.myles.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap; -import us.myles.viaversion.libs.gson.JsonElement; -import us.myles.viaversion.libs.gson.JsonObject; -import us.myles.viaversion.libs.gson.JsonPrimitive; -import us.myles.viaversion.libs.opennbt.tag.builtin.ByteTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.IntTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.NumberTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.StringTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.Tag; +import com.viaversion.viaversion.api.minecraft.chunks.Chunk; +import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection; +import com.viaversion.viaversion.api.minecraft.item.Item; +import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter; +import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap; +import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap; +import com.viaversion.viaversion.libs.gson.JsonElement; +import com.viaversion.viaversion.libs.gson.JsonObject; +import com.viaversion.viaversion.libs.gson.JsonPrimitive; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.ByteTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.NumberTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; import java.util.HashMap; import java.util.Map; diff --git a/common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyEnchantmentRewriter.java b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyEnchantmentRewriter.java index a6bd3e9b..60cd0130 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyEnchantmentRewriter.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyEnchantmentRewriter.java @@ -17,7 +17,7 @@ */ package nl.matsv.viabackwards.api.rewriters; -import us.myles.viaversion.libs.opennbt.tag.builtin.*; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.*; import java.util.*; diff --git a/common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyEntityRewriter.java b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyEntityRewriter.java index 787a8bc5..e366b07c 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyEntityRewriter.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyEntityRewriter.java @@ -23,16 +23,16 @@ import nl.matsv.viabackwards.api.entities.storage.EntityData; import nl.matsv.viabackwards.api.entities.storage.EntityObjectData; import nl.matsv.viabackwards.api.entities.storage.MetaStorage; import org.checkerframework.checker.nullness.qual.Nullable; -import us.myles.ViaVersion.api.entities.EntityType; -import us.myles.ViaVersion.api.entities.ObjectType; -import us.myles.ViaVersion.api.minecraft.metadata.MetaType; -import us.myles.ViaVersion.api.minecraft.metadata.Metadata; -import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_9; -import us.myles.ViaVersion.api.protocol.ClientboundPacketType; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; +import com.viaversion.viaversion.api.minecraft.entities.EntityType; +import com.viaversion.viaversion.api.minecraft.entities.ObjectType; +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_9; +import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; import java.util.HashMap; import java.util.List; diff --git a/common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacySoundRewriter.java b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacySoundRewriter.java index 8381816e..c907b5af 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacySoundRewriter.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacySoundRewriter.java @@ -19,8 +19,8 @@ package nl.matsv.viabackwards.api.rewriters; import nl.matsv.viabackwards.api.BackwardsProtocol; -import us.myles.viaversion.libs.fastutil.ints.Int2ObjectMap; -import us.myles.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap; +import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap; +import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap; @Deprecated public abstract class LegacySoundRewriter extends Rewriter { diff --git a/common/src/main/java/nl/matsv/viabackwards/api/rewriters/SoundRewriter.java b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/SoundRewriter.java index b082e098..94de8bde 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/rewriters/SoundRewriter.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/SoundRewriter.java @@ -18,12 +18,12 @@ package nl.matsv.viabackwards.api.rewriters; import nl.matsv.viabackwards.api.BackwardsProtocol; -import us.myles.ViaVersion.api.protocol.ClientboundPacketType; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; +import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.type.Type; -public class SoundRewriter extends us.myles.ViaVersion.api.rewriters.SoundRewriter { +public class SoundRewriter extends com.viaversion.viaversion.rewriter.SoundRewriter { private final BackwardsProtocol protocol; diff --git a/common/src/main/java/nl/matsv/viabackwards/api/rewriters/TranslatableRewriter.java b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/TranslatableRewriter.java index c732c0c9..ed90f445 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/rewriters/TranslatableRewriter.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/TranslatableRewriter.java @@ -20,13 +20,13 @@ package nl.matsv.viabackwards.api.rewriters; import nl.matsv.viabackwards.ViaBackwards; import nl.matsv.viabackwards.api.BackwardsProtocol; import nl.matsv.viabackwards.api.data.VBMappingDataLoader; -import us.myles.ViaVersion.api.protocol.ClientboundPacketType; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.rewriters.ComponentRewriter; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.packets.State; -import us.myles.viaversion.libs.gson.JsonElement; -import us.myles.viaversion.libs.gson.JsonObject; +import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.rewriter.ComponentRewriter; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.api.protocol.packet.State; +import com.viaversion.viaversion.libs.gson.JsonElement; +import com.viaversion.viaversion.libs.gson.JsonObject; import java.util.HashMap; import java.util.Map; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/PotionSplashHandler.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/PotionSplashHandler.java index 7affc1d3..e1914b1e 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/PotionSplashHandler.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/PotionSplashHandler.java @@ -17,8 +17,8 @@ */ package nl.matsv.viabackwards.protocol.protocol1_10to1_11; -import us.myles.viaversion.libs.fastutil.ints.Int2IntMap; -import us.myles.viaversion.libs.fastutil.ints.Int2IntOpenHashMap; +import com.viaversion.viaversion.libs.fastutil.ints.Int2IntMap; +import com.viaversion.viaversion.libs.fastutil.ints.Int2IntOpenHashMap; public class PotionSplashHandler { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java index 90179197..dd676224 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java @@ -25,10 +25,10 @@ import nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets.BlockItemPacket import nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets.EntityPackets1_11; import nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets.PlayerPackets1_11; import nl.matsv.viabackwards.protocol.protocol1_10to1_11.storage.WindowTracker; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; +import com.viaversion.viaversion.api.connection.UserConnection; +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_9_3to1_9_1_2.storage.ClientWorld; public class Protocol1_10To1_11 extends BackwardsProtocol { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java index 8b197952..527b1212 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java @@ -25,26 +25,26 @@ import nl.matsv.viabackwards.api.rewriters.LegacyEnchantmentRewriter; import nl.matsv.viabackwards.protocol.protocol1_10to1_11.Protocol1_10To1_11; import nl.matsv.viabackwards.protocol.protocol1_10to1_11.storage.ChestedHorseStorage; import nl.matsv.viabackwards.protocol.protocol1_10to1_11.storage.WindowTracker; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.api.entities.Entity1_11Types; -import us.myles.ViaVersion.api.minecraft.BlockChangeRecord; -import us.myles.ViaVersion.api.minecraft.chunks.Chunk; -import us.myles.ViaVersion.api.minecraft.item.Item; -import us.myles.ViaVersion.api.minecraft.metadata.Metadata; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.rewriters.ItemRewriter; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_11to1_10.EntityIdRewriter; -import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; -import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.ListTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.StringTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.Tag; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.minecraft.entities.Entity1_11Types; +import com.viaversion.viaversion.api.minecraft.BlockChangeRecord; +import com.viaversion.viaversion.api.minecraft.chunks.Chunk; +import com.viaversion.viaversion.api.minecraft.item.Item; +import com.viaversion.viaversion.api.minecraft.metadata.Metadata; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.rewriter.ItemRewriter; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.protocols.protocol1_11to1_10.EntityIdRewriter; +import com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type; +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_9_3to1_9_1_2.storage.ClientWorld; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; import java.util.Arrays; import java.util.Optional; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets1_11.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets1_11.java index ba8deb41..f0f0b7c2 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets1_11.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets1_11.java @@ -26,17 +26,17 @@ import nl.matsv.viabackwards.protocol.protocol1_10to1_11.PotionSplashHandler; import nl.matsv.viabackwards.protocol.protocol1_10to1_11.Protocol1_10To1_11; import nl.matsv.viabackwards.protocol.protocol1_10to1_11.storage.ChestedHorseStorage; import nl.matsv.viabackwards.utils.Block; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.entities.Entity1_11Types; -import us.myles.ViaVersion.api.entities.Entity1_12Types; -import us.myles.ViaVersion.api.entities.EntityType; -import us.myles.ViaVersion.api.minecraft.metadata.Metadata; -import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_9; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.api.type.types.version.Types1_9; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.minecraft.entities.Entity1_11Types; +import com.viaversion.viaversion.api.minecraft.entities.Entity1_12Types; +import com.viaversion.viaversion.api.minecraft.entities.EntityType; +import com.viaversion.viaversion.api.minecraft.metadata.Metadata; +import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_9; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.api.type.types.version.Types1_9; +import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; import java.util.Optional; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java index 84f13296..f025aeb0 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java @@ -19,16 +19,16 @@ package nl.matsv.viabackwards.protocol.protocol1_10to1_11.packets; import nl.matsv.viabackwards.protocol.protocol1_10to1_11.Protocol1_10To1_11; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.remapper.ValueTransformer; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3; -import us.myles.viaversion.libs.gson.JsonElement; -import us.myles.viaversion.libs.gson.JsonObject; -import us.myles.viaversion.libs.kyori.adventure.text.serializer.gson.GsonComponentSerializer; -import us.myles.viaversion.libs.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer; +import com.viaversion.viaversion.api.type.Type; +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.libs.gson.JsonElement; +import com.viaversion.viaversion.libs.gson.JsonObject; +import com.viaversion.viaversion.libs.kyori.adventure.text.serializer.gson.GsonComponentSerializer; +import com.viaversion.viaversion.libs.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; public class PlayerPackets1_11 { private static final ValueTransformer TO_NEW_FLOAT = new ValueTransformer(Type.FLOAT) { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/storage/WindowTracker.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/storage/WindowTracker.java index 84deaf42..7d1cbce4 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/storage/WindowTracker.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/storage/WindowTracker.java @@ -18,8 +18,8 @@ package nl.matsv.viabackwards.protocol.protocol1_10to1_11.storage; -import us.myles.ViaVersion.api.data.StoredObject; -import us.myles.ViaVersion.api.data.UserConnection; +import com.viaversion.viaversion.api.connection.StoredObject; +import com.viaversion.viaversion.api.connection.UserConnection; public class WindowTracker extends StoredObject { private String inventory; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/Protocol1_11_1To1_12.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/Protocol1_11_1To1_12.java index 1781e264..6bf9cced 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/Protocol1_11_1To1_12.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/Protocol1_11_1To1_12.java @@ -24,16 +24,16 @@ import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.packets.BlockItemPack import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.packets.ChatPackets1_12; import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.packets.EntityPackets1_12; import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.packets.SoundPackets1_12; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_12to1_11_1.ClientboundPackets1_12; -import us.myles.ViaVersion.protocols.protocol1_12to1_11_1.ServerboundPackets1_12; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; -import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9To1_8; -import us.myles.viaversion.libs.gson.JsonElement; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.type.Type; +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.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_9_3to1_9_1_2.storage.ClientWorld; +import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8; +import com.viaversion.viaversion.libs.gson.JsonElement; public class Protocol1_11_1To1_12 extends BackwardsProtocol { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/MapColorMapping.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/MapColorMapping.java index 9ba5e29a..d8a628b5 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/MapColorMapping.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/MapColorMapping.java @@ -17,8 +17,8 @@ */ package nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.data; -import us.myles.viaversion.libs.fastutil.ints.Int2IntMap; -import us.myles.viaversion.libs.fastutil.ints.Int2IntOpenHashMap; +import com.viaversion.viaversion.libs.fastutil.ints.Int2IntMap; +import com.viaversion.viaversion.libs.fastutil.ints.Int2IntOpenHashMap; public class MapColorMapping { private static final Int2IntMap MAPPING = new Int2IntOpenHashMap(64, 1F); diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/ShoulderTracker.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/ShoulderTracker.java index aab55471..25307459 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/ShoulderTracker.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/ShoulderTracker.java @@ -20,11 +20,11 @@ package nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.data; import nl.matsv.viabackwards.ViaBackwards; import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.Protocol1_11_1To1_12; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.data.StoredObject; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9To1_8; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.connection.StoredObject; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8; public class ShoulderTracker extends StoredObject { private int entityId; @@ -36,7 +36,7 @@ public class ShoulderTracker extends StoredObject { } public void update() { - PacketWrapper wrapper = new PacketWrapper(0x0F, null, getUser()); + PacketWrapper wrapper = PacketWrapper.create(0x0F, null, getUser()); wrapper.write(Type.COMPONENT, Protocol1_9To1_8.fixJson(generateString())); wrapper.write(Type.BYTE, (byte) 2); diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java index 6cd0637c..eab7366f 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java @@ -22,23 +22,23 @@ import nl.matsv.viabackwards.api.rewriters.LegacyBlockItemRewriter; import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.Protocol1_11_1To1_12; import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.data.MapColorMapping; import org.checkerframework.checker.nullness.qual.Nullable; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.minecraft.BlockChangeRecord; -import us.myles.ViaVersion.api.minecraft.chunks.Chunk; -import us.myles.ViaVersion.api.minecraft.item.Item; -import us.myles.ViaVersion.api.minecraft.metadata.Metadata; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.rewriters.ItemRewriter; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_12to1_11_1.ClientboundPackets1_12; -import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; -import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.IntArrayTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.LongArrayTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.Tag; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.minecraft.BlockChangeRecord; +import com.viaversion.viaversion.api.minecraft.chunks.Chunk; +import com.viaversion.viaversion.api.minecraft.item.Item; +import com.viaversion.viaversion.api.minecraft.metadata.Metadata; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.rewriter.ItemRewriter; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ClientboundPackets1_12; +import com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type; +import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3; +import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntArrayTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.LongArrayTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; import java.util.Iterator; import java.util.Map; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChatItemRewriter.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChatItemRewriter.java index b96033d0..5881fc08 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChatItemRewriter.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChatItemRewriter.java @@ -17,11 +17,11 @@ */ package nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.packets; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.viaversion.libs.gson.JsonArray; -import us.myles.viaversion.libs.gson.JsonElement; -import us.myles.viaversion.libs.gson.JsonObject; -import us.myles.viaversion.libs.gson.JsonPrimitive; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.libs.gson.JsonArray; +import com.viaversion.viaversion.libs.gson.JsonElement; +import com.viaversion.viaversion.libs.gson.JsonObject; +import com.viaversion.viaversion.libs.gson.JsonPrimitive; public class ChatItemRewriter { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChatPackets1_12.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChatPackets1_12.java index 6223427c..3c2f8451 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChatPackets1_12.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChatPackets1_12.java @@ -21,12 +21,12 @@ package nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.packets; import nl.matsv.viabackwards.api.rewriters.Rewriter; import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.Protocol1_11_1To1_12; import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.data.AdvancementTranslations; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.rewriters.ComponentRewriter; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_12to1_11_1.ClientboundPackets1_12; -import us.myles.viaversion.libs.gson.JsonElement; -import us.myles.viaversion.libs.gson.JsonObject; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.rewriter.ComponentRewriter; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ClientboundPackets1_12; +import com.viaversion.viaversion.libs.gson.JsonElement; +import com.viaversion.viaversion.libs.gson.JsonObject; public class ChatPackets1_12 extends Rewriter { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/EntityPackets1_12.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/EntityPackets1_12.java index c13afee0..0a272da9 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/EntityPackets1_12.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/EntityPackets1_12.java @@ -24,17 +24,17 @@ import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.Protocol1_11_1To1_12; import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.data.ParrotStorage; import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.data.ShoulderTracker; import nl.matsv.viabackwards.utils.Block; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.entities.Entity1_12Types; -import us.myles.ViaVersion.api.entities.EntityType; -import us.myles.ViaVersion.api.minecraft.metadata.Metadata; -import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_12; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.api.type.types.version.Types1_12; -import us.myles.ViaVersion.protocols.protocol1_12to1_11_1.ClientboundPackets1_12; -import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.minecraft.entities.Entity1_12Types; +import com.viaversion.viaversion.api.minecraft.entities.EntityType; +import com.viaversion.viaversion.api.minecraft.metadata.Metadata; +import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_12; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.api.type.types.version.Types1_12; +import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ClientboundPackets1_12; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; import java.util.Optional; @@ -154,7 +154,7 @@ public class EntityPackets1_12 extends LegacyEntityRewriter { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/Protocol1_11To1_11_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/Protocol1_11To1_11_1.java index 7fc12848..a2ee2ed1 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/Protocol1_11To1_11_1.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/Protocol1_11To1_11_1.java @@ -21,10 +21,10 @@ package nl.matsv.viabackwards.protocol.protocol1_11to1_11_1; import nl.matsv.viabackwards.api.BackwardsProtocol; import nl.matsv.viabackwards.protocol.protocol1_11to1_11_1.packets.EntityPackets1_11_1; import nl.matsv.viabackwards.protocol.protocol1_11to1_11_1.packets.ItemPackets1_11_1; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; +import com.viaversion.viaversion.api.connection.UserConnection; +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_9_3to1_9_1_2.storage.ClientWorld; public class Protocol1_11To1_11_1 extends BackwardsProtocol { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets1_11_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets1_11_1.java index 13f80641..ef08a2b7 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets1_11_1.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets1_11_1.java @@ -20,12 +20,12 @@ package nl.matsv.viabackwards.protocol.protocol1_11to1_11_1.packets; import nl.matsv.viabackwards.api.rewriters.LegacyEntityRewriter; import nl.matsv.viabackwards.protocol.protocol1_11to1_11_1.Protocol1_11To1_11_1; -import us.myles.ViaVersion.api.entities.Entity1_11Types; -import us.myles.ViaVersion.api.entities.EntityType; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.api.type.types.version.Types1_9; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; +import com.viaversion.viaversion.api.minecraft.entities.Entity1_11Types; +import com.viaversion.viaversion.api.minecraft.entities.EntityType; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.api.type.types.version.Types1_9; +import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; public class EntityPackets1_11_1 extends LegacyEntityRewriter { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/ItemPackets1_11_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/ItemPackets1_11_1.java index a6114c42..d52c0cbb 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/ItemPackets1_11_1.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/ItemPackets1_11_1.java @@ -21,17 +21,17 @@ package nl.matsv.viabackwards.protocol.protocol1_11to1_11_1.packets; import nl.matsv.viabackwards.api.rewriters.LegacyBlockItemRewriter; import nl.matsv.viabackwards.api.rewriters.LegacyEnchantmentRewriter; import nl.matsv.viabackwards.protocol.protocol1_11to1_11_1.Protocol1_11To1_11_1; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.minecraft.item.Item; -import us.myles.ViaVersion.api.minecraft.metadata.Metadata; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.rewriters.ItemRewriter; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3; -import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.ListTag; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.minecraft.item.Item; +import com.viaversion.viaversion.api.minecraft.metadata.Metadata; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.rewriter.ItemRewriter; +import com.viaversion.viaversion.api.type.Type; +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.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag; public class ItemPackets1_11_1 extends LegacyBlockItemRewriter { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_1to1_12_2/KeepAliveTracker.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_1to1_12_2/KeepAliveTracker.java index eea2de45..b6aca5f8 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_1to1_12_2/KeepAliveTracker.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_1to1_12_2/KeepAliveTracker.java @@ -18,8 +18,8 @@ package nl.matsv.viabackwards.protocol.protocol1_12_1to1_12_2; -import us.myles.ViaVersion.api.data.StoredObject; -import us.myles.ViaVersion.api.data.UserConnection; +import com.viaversion.viaversion.api.connection.StoredObject; +import com.viaversion.viaversion.api.connection.UserConnection; public class KeepAliveTracker extends StoredObject { private long keepAlive = Integer.MAX_VALUE; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_1to1_12_2/Protocol1_12_1To1_12_2.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_1to1_12_2/Protocol1_12_1To1_12_2.java index 8a63fdcb..0de558f8 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_1to1_12_2/Protocol1_12_1To1_12_2.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_1to1_12_2/Protocol1_12_1To1_12_2.java @@ -19,13 +19,13 @@ package nl.matsv.viabackwards.protocol.protocol1_12_1to1_12_2; import nl.matsv.viabackwards.api.BackwardsProtocol; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1; -import us.myles.ViaVersion.protocols.protocol1_12_1to1_12.ServerboundPackets1_12_1; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +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; public class Protocol1_12_1To1_12_2 extends BackwardsProtocol { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java index 850499aa..4c646f07 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java @@ -31,15 +31,15 @@ import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.providers.BackwardsBl import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.storage.BackwardsBlockStorage; import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.storage.PlayerPositionStorage1_13; import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.storage.TabCompleteStorage; -import us.myles.ViaVersion.api.Via; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1; -import us.myles.ViaVersion.protocols.protocol1_12_1to1_12.ServerboundPackets1_12_1; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; -import us.myles.viaversion.libs.gson.JsonObject; +import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.api.connection.UserConnection; +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.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_9_3to1_9_1_2.storage.ClientWorld; +import com.viaversion.viaversion.libs.gson.JsonObject; public class Protocol1_12_2To1_13 extends BackwardsProtocol { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/BannerHandler.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/BannerHandler.java index a979945a..59443c97 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/BannerHandler.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/BannerHandler.java @@ -20,11 +20,11 @@ package nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.block_entity_handler import nl.matsv.viabackwards.ViaBackwards; import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.providers.BackwardsBlockEntityProvider.BackwardsBlockEntityHandler; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.IntTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.ListTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.Tag; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; public class BannerHandler implements BackwardsBlockEntityHandler { private static final int WALL_BANNER_START = 7110; // 4 each diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/BedHandler.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/BedHandler.java index f8c1c0b1..03c83dfa 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/BedHandler.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/BedHandler.java @@ -19,9 +19,9 @@ package nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.block_entity_handlers; import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.providers.BackwardsBlockEntityProvider; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.IntTag; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntTag; public class BedHandler implements BackwardsBlockEntityProvider.BackwardsBlockEntityHandler { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/FlowerPotHandler.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/FlowerPotHandler.java index 5b67d8fc..c3ec116b 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/FlowerPotHandler.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/FlowerPotHandler.java @@ -19,13 +19,13 @@ package nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.block_entity_handlers; import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.providers.BackwardsBlockEntityProvider; -import us.myles.ViaVersion.api.Pair; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.viaversion.libs.fastutil.ints.Int2ObjectMap; -import us.myles.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap; -import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.IntTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.StringTag; +import com.viaversion.viaversion.util.Pair; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap; +import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag; public class FlowerPotHandler implements BackwardsBlockEntityProvider.BackwardsBlockEntityHandler { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/PistonHandler.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/PistonHandler.java index 8ad3fef7..25321b2e 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/PistonHandler.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/PistonHandler.java @@ -19,16 +19,16 @@ package nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.block_entity_handler import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.Protocol1_12_2To1_13; import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.providers.BackwardsBlockEntityProvider; -import us.myles.ViaVersion.api.Via; -import us.myles.ViaVersion.api.data.MappingDataLoader; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.blockconnections.ConnectionData; -import us.myles.viaversion.libs.gson.JsonElement; -import us.myles.viaversion.libs.gson.JsonObject; -import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.IntTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.StringTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.Tag; +import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.api.data.MappingDataLoader; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.blockconnections.ConnectionData; +import com.viaversion.viaversion.libs.gson.JsonElement; +import com.viaversion.viaversion.libs.gson.JsonObject; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; import java.lang.reflect.Field; import java.util.HashMap; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/SkullHandler.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/SkullHandler.java index 492f3bc3..c9864379 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/SkullHandler.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/SkullHandler.java @@ -19,9 +19,9 @@ package nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.block_entity_handlers; import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.providers.BackwardsBlockEntityProvider.BackwardsBlockEntityHandler; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.viaversion.libs.opennbt.tag.builtin.ByteTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.ByteTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; public class SkullHandler implements BackwardsBlockEntityHandler { private static final int SKULL_START = 5447; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/SpawnerHandler.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/SpawnerHandler.java index 554ac143..6a75cd29 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/SpawnerHandler.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/SpawnerHandler.java @@ -20,10 +20,10 @@ package nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.block_entity_handler import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.data.EntityNameRewrites; import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.providers.BackwardsBlockEntityProvider; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.StringTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.Tag; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; public class SpawnerHandler implements BackwardsBlockEntityProvider.BackwardsBlockEntityHandler { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/BackwardsMappings.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/BackwardsMappings.java index cd38b818..7a1a8ca2 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/BackwardsMappings.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/BackwardsMappings.java @@ -21,17 +21,17 @@ package nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.data; import nl.matsv.viabackwards.ViaBackwards; import nl.matsv.viabackwards.api.data.VBMappings; import org.checkerframework.checker.nullness.qual.Nullable; -import us.myles.ViaVersion.api.Via; -import us.myles.ViaVersion.api.data.MappingDataLoader; -import us.myles.ViaVersion.api.data.Mappings; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.data.StatisticMappings; -import us.myles.viaversion.libs.fastutil.ints.Int2ObjectMap; -import us.myles.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap; -import us.myles.viaversion.libs.fastutil.objects.Object2IntMap; -import us.myles.viaversion.libs.gson.JsonElement; -import us.myles.viaversion.libs.gson.JsonObject; -import us.myles.viaversion.libs.gson.JsonPrimitive; +import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.api.data.MappingDataLoader; +import com.viaversion.viaversion.api.data.Mappings; +import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2; +import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.StatisticMappings; +import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap; +import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap; +import com.viaversion.viaversion.libs.fastutil.objects.Object2IntMap; +import com.viaversion.viaversion.libs.gson.JsonElement; +import com.viaversion.viaversion.libs.gson.JsonObject; +import com.viaversion.viaversion.libs.gson.JsonPrimitive; import java.util.Arrays; import java.util.HashMap; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/EntityTypeMapping.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/EntityTypeMapping.java index f9548ad2..42f715fe 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/EntityTypeMapping.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/EntityTypeMapping.java @@ -17,9 +17,9 @@ */ package nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.data; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.data.EntityTypeRewriter; -import us.myles.viaversion.libs.fastutil.ints.Int2IntMap; -import us.myles.viaversion.libs.fastutil.ints.Int2IntOpenHashMap; +import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.EntityTypeRewriter; +import com.viaversion.viaversion.libs.fastutil.ints.Int2IntMap; +import com.viaversion.viaversion.libs.fastutil.ints.Int2IntOpenHashMap; import java.lang.reflect.Field; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/NamedSoundMapping.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/NamedSoundMapping.java index 111a71c2..3e49eee9 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/NamedSoundMapping.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/NamedSoundMapping.java @@ -17,7 +17,7 @@ */ package nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.data; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.data.NamedSoundRewriter; +import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.NamedSoundRewriter; import java.lang.reflect.Field; import java.util.HashMap; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/PaintingMapping.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/PaintingMapping.java index c0516f1b..b8a3fbd2 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/PaintingMapping.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/PaintingMapping.java @@ -17,8 +17,8 @@ */ package nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.data; -import us.myles.viaversion.libs.fastutil.ints.Int2ObjectMap; -import us.myles.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap; +import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap; +import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap; public class PaintingMapping { private static final Int2ObjectMap PAINTINGS = new Int2ObjectOpenHashMap<>(26, 1F); diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/ParticleMapping.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/ParticleMapping.java index 57f9ae36..87a5766c 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/ParticleMapping.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/ParticleMapping.java @@ -19,10 +19,10 @@ package nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.data; import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.Protocol1_12_2To1_13; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.minecraft.item.Item; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.api.type.types.Particle; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.minecraft.item.Item; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.api.type.types.Particle; import java.util.List; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java index 4306412a..01a4e51d 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java @@ -25,36 +25,36 @@ import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.Protocol1_12_2To1_13; import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.block_entity_handlers.FlowerPotHandler; import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.providers.BackwardsBlockEntityProvider; import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.storage.BackwardsBlockStorage; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.Via; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.api.minecraft.BlockChangeRecord; -import us.myles.ViaVersion.api.minecraft.Position; -import us.myles.ViaVersion.api.minecraft.chunks.Chunk; -import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection; -import us.myles.ViaVersion.api.minecraft.item.Item; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.rewriters.ItemRewriter; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_12_1to1_12.ServerboundPackets1_12_1; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ChatRewriter; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.data.BlockIdData; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.data.SpawnEggRewriter; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.types.Chunk1_13Type; -import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; -import us.myles.viaversion.libs.opennbt.conversion.ConverterRegistry; -import us.myles.viaversion.libs.opennbt.tag.builtin.ByteTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.IntTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.ListTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.NumberTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.ShortTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.StringTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.Tag; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.minecraft.BlockChangeRecord; +import com.viaversion.viaversion.api.minecraft.Position; +import com.viaversion.viaversion.api.minecraft.chunks.Chunk; +import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection; +import com.viaversion.viaversion.api.minecraft.item.Item; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.rewriter.ItemRewriter; +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.ChatRewriter; +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.data.BlockIdData; +import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.SpawnEggRewriter; +import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.types.Chunk1_13Type; +import com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type; +import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; +import com.viaversion.viaversion.libs.opennbt.conversion.ConverterRegistry; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.ByteTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.NumberTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.ShortTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; import java.util.ArrayList; import java.util.HashMap; @@ -993,19 +993,19 @@ public class BlockItemPackets1_13 extends nl.matsv.viabackwards.api.rewriters.It CompoundTag nbt = beProvider.transform(user, position, "minecraft:flower_pot"); // Remove the flowerpot - PacketWrapper blockUpdateRemove = new PacketWrapper(0x0B, null, user); + PacketWrapper blockUpdateRemove = PacketWrapper.create(0x0B, null, user); blockUpdateRemove.write(Type.POSITION, position); blockUpdateRemove.write(Type.VAR_INT, 0); blockUpdateRemove.send(Protocol1_12_2To1_13.class, true); // Create the flowerpot - PacketWrapper blockCreate = new PacketWrapper(0x0B, null, user); + PacketWrapper blockCreate = PacketWrapper.create(0x0B, null, user); blockCreate.write(Type.POSITION, position); blockCreate.write(Type.VAR_INT, Protocol1_12_2To1_13.MAPPINGS.getNewBlockStateId(blockState)); blockCreate.send(Protocol1_12_2To1_13.class, true); // Send a block entity update - PacketWrapper wrapper = new PacketWrapper(0x09, null, user); + PacketWrapper wrapper = PacketWrapper.create(0x09, null, user); wrapper.write(Type.POSITION, position); wrapper.write(Type.UNSIGNED_BYTE, (short) 5); wrapper.write(Type.NBT, nbt); diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java index beb0a8cd..22f87430 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java @@ -27,21 +27,21 @@ import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.data.PaintingMapping; import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.data.ParticleMapping; import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.storage.BackwardsBlockStorage; import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.storage.PlayerPositionStorage1_13; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.entities.Entity1_13Types; -import us.myles.ViaVersion.api.entities.EntityType; -import us.myles.ViaVersion.api.minecraft.item.Item; -import us.myles.ViaVersion.api.minecraft.metadata.Metadata; -import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_12; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.api.type.types.Particle; -import us.myles.ViaVersion.api.type.types.version.Types1_12; -import us.myles.ViaVersion.api.type.types.version.Types1_13; -import us.myles.ViaVersion.protocols.protocol1_12_1to1_12.ServerboundPackets1_12_1; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ChatRewriter; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types; +import com.viaversion.viaversion.api.minecraft.entities.EntityType; +import com.viaversion.viaversion.api.minecraft.item.Item; +import com.viaversion.viaversion.api.minecraft.metadata.Metadata; +import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_12; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.api.type.types.Particle; +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.ServerboundPackets1_12_1; +import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter; +import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; import java.util.Optional; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java index 5a362861..ea641f28 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java @@ -24,22 +24,22 @@ import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.Protocol1_12_2To1_13; import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.data.ParticleMapping; import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.storage.TabCompleteStorage; import nl.matsv.viabackwards.utils.ChatUtil; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.Via; -import us.myles.ViaVersion.api.minecraft.Position; -import us.myles.ViaVersion.api.minecraft.item.Item; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.remapper.ValueCreator; -import us.myles.ViaVersion.api.rewriters.CommandRewriter; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.packets.State; -import us.myles.ViaVersion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1; -import us.myles.ViaVersion.protocols.protocol1_12_1to1_12.ServerboundPackets1_12_1; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ChatRewriter; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.packets.InventoryPackets; -import us.myles.viaversion.libs.gson.JsonElement; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +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.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.protocol.remapper.ValueCreator; +import com.viaversion.viaversion.rewriter.CommandRewriter; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.api.protocol.packet.State; +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.ChatRewriter; +import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; +import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.packets.InventoryPackets; +import com.viaversion.viaversion.libs.gson.JsonElement; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/SoundPackets1_13.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/SoundPackets1_13.java index 8494c690..a0467e1e 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/SoundPackets1_13.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/SoundPackets1_13.java @@ -21,11 +21,11 @@ import nl.matsv.viabackwards.ViaBackwards; import nl.matsv.viabackwards.api.rewriters.Rewriter; import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.Protocol1_12_2To1_13; import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.data.NamedSoundMapping; -import us.myles.ViaVersion.api.Via; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; +import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +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; public class SoundPackets1_13 extends Rewriter { private static final String[] SOUND_SOURCES = {"master", "music", "record", "weather", "block", "hostile", "neutral", "player", "ambient", "voice"}; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/providers/BackwardsBlockEntityProvider.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/providers/BackwardsBlockEntityProvider.java index ac367264..ca65e28c 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/providers/BackwardsBlockEntityProvider.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/providers/BackwardsBlockEntityProvider.java @@ -21,13 +21,13 @@ package nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.providers; import nl.matsv.viabackwards.ViaBackwards; import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.block_entity_handlers.*; import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.storage.BackwardsBlockStorage; -import us.myles.ViaVersion.api.Via; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.api.minecraft.Position; -import us.myles.ViaVersion.api.platform.providers.Provider; -import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.IntTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.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.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag; import java.util.HashMap; import java.util.Map; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/BackwardsBlockStorage.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/BackwardsBlockStorage.java index dacb13bd..fb85f23f 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/BackwardsBlockStorage.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/BackwardsBlockStorage.java @@ -18,11 +18,11 @@ package nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.storage; -import us.myles.ViaVersion.api.data.StoredObject; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.api.minecraft.Position; -import us.myles.viaversion.libs.fastutil.ints.IntOpenHashSet; -import us.myles.viaversion.libs.fastutil.ints.IntSet; +import com.viaversion.viaversion.api.connection.StoredObject; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.minecraft.Position; +import com.viaversion.viaversion.libs.fastutil.ints.IntOpenHashSet; +import com.viaversion.viaversion.libs.fastutil.ints.IntSet; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/PlayerPositionStorage1_13.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/PlayerPositionStorage1_13.java index c1d944ff..36971b38 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/PlayerPositionStorage1_13.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/PlayerPositionStorage1_13.java @@ -18,7 +18,7 @@ package nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.storage; import nl.matsv.viabackwards.api.entities.storage.PlayerPositionStorage; -import us.myles.ViaVersion.api.data.UserConnection; +import com.viaversion.viaversion.api.connection.UserConnection; public class PlayerPositionStorage1_13 extends PlayerPositionStorage { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/TabCompleteStorage.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/TabCompleteStorage.java index 59779579..d92055a0 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/TabCompleteStorage.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/TabCompleteStorage.java @@ -17,8 +17,8 @@ */ package nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.storage; -import us.myles.ViaVersion.api.data.StoredObject; -import us.myles.ViaVersion.api.data.UserConnection; +import com.viaversion.viaversion.api.connection.StoredObject; +import com.viaversion.viaversion.api.connection.UserConnection; import java.util.HashMap; import java.util.HashSet; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_12_1/Protocol1_12To1_12_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_12_1/Protocol1_12To1_12_1.java index 95a6b205..911f3035 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_12_1/Protocol1_12To1_12_1.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_12_1/Protocol1_12To1_12_1.java @@ -18,10 +18,10 @@ package nl.matsv.viabackwards.protocol.protocol1_12to1_12_1; import nl.matsv.viabackwards.api.BackwardsProtocol; -import us.myles.ViaVersion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1; -import us.myles.ViaVersion.protocols.protocol1_12_1to1_12.ServerboundPackets1_12_1; -import us.myles.ViaVersion.protocols.protocol1_12to1_11_1.ClientboundPackets1_12; -import us.myles.ViaVersion.protocols.protocol1_12to1_11_1.ServerboundPackets1_12; +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_12to1_11_1.ClientboundPackets1_12; +import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ServerboundPackets1_12; public class Protocol1_12To1_12_1 extends BackwardsProtocol { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/Protocol1_13_1To1_13_2.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/Protocol1_13_1To1_13_2.java index d7b2ce19..ac2e4de7 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/Protocol1_13_1To1_13_2.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/Protocol1_13_1To1_13_2.java @@ -21,13 +21,13 @@ import nl.matsv.viabackwards.api.BackwardsProtocol; import nl.matsv.viabackwards.protocol.protocol1_13_1to1_13_2.packets.EntityPackets1_13_2; import nl.matsv.viabackwards.protocol.protocol1_13_1to1_13_2.packets.InventoryPackets1_13_2; import nl.matsv.viabackwards.protocol.protocol1_13_1to1_13_2.packets.WorldPackets1_13_2; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.minecraft.item.Item; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.minecraft.item.Item; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +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; public class Protocol1_13_1To1_13_2 extends BackwardsProtocol { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/EntityPackets1_13_2.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/EntityPackets1_13_2.java index 6b0c16c1..d8088944 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/EntityPackets1_13_2.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/EntityPackets1_13_2.java @@ -18,16 +18,16 @@ package nl.matsv.viabackwards.protocol.protocol1_13_1to1_13_2.packets; import nl.matsv.viabackwards.protocol.protocol1_13_1to1_13_2.Protocol1_13_1To1_13_2; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.minecraft.metadata.Metadata; -import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_13; -import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_13_2; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.api.type.types.version.Types1_13; -import us.myles.ViaVersion.api.type.types.version.Types1_13_2; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.minecraft.metadata.Metadata; +import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_13; +import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_13_2; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +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_13to1_12_2.ClientboundPackets1_13; public class EntityPackets1_13_2 { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/InventoryPackets1_13_2.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/InventoryPackets1_13_2.java index 7f602475..b3270487 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/InventoryPackets1_13_2.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/InventoryPackets1_13_2.java @@ -18,12 +18,12 @@ package nl.matsv.viabackwards.protocol.protocol1_13_1to1_13_2.packets; import nl.matsv.viabackwards.protocol.protocol1_13_1to1_13_2.Protocol1_13_1To1_13_2; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +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; public class InventoryPackets1_13_2 { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/WorldPackets1_13_2.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/WorldPackets1_13_2.java index 14ddd3df..91de03a2 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/WorldPackets1_13_2.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/WorldPackets1_13_2.java @@ -18,11 +18,11 @@ package nl.matsv.viabackwards.protocol.protocol1_13_1to1_13_2.packets; import nl.matsv.viabackwards.protocol.protocol1_13_1to1_13_2.Protocol1_13_1To1_13_2; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; public class WorldPackets1_13_2 { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java index 07b6f15f..70f16dc6 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java @@ -26,18 +26,18 @@ import nl.matsv.viabackwards.protocol.protocol1_13_2to1_14.packets.EntityPackets import nl.matsv.viabackwards.protocol.protocol1_13_2to1_14.packets.PlayerPackets1_14; import nl.matsv.viabackwards.protocol.protocol1_13_2to1_14.packets.SoundPackets1_14; import nl.matsv.viabackwards.protocol.protocol1_13_2to1_14.storage.ChunkLightStorage; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.rewriters.StatisticsRewriter; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.Protocol1_14To1_13_2; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.rewriter.StatisticsRewriter; +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_9_3to1_9_1_2.storage.ClientWorld; public class Protocol1_13_2To1_14 extends BackwardsProtocol { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/data/CommandRewriter1_14.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/data/CommandRewriter1_14.java index 75e615ec..d2cd67ce 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/data/CommandRewriter1_14.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/data/CommandRewriter1_14.java @@ -18,9 +18,9 @@ package nl.matsv.viabackwards.protocol.protocol1_13_2to1_14.data; import org.checkerframework.checker.nullness.qual.Nullable; -import us.myles.ViaVersion.api.protocol.Protocol; -import us.myles.ViaVersion.api.rewriters.CommandRewriter; -import us.myles.ViaVersion.api.type.Type; +import com.viaversion.viaversion.api.protocol.Protocol; +import com.viaversion.viaversion.rewriter.CommandRewriter; +import com.viaversion.viaversion.api.type.Type; public class CommandRewriter1_14 extends CommandRewriter { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java index eda5b33d..3c40d85c 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java @@ -24,38 +24,38 @@ import nl.matsv.viabackwards.api.rewriters.EnchantmentRewriter; import nl.matsv.viabackwards.api.rewriters.TranslatableRewriter; import nl.matsv.viabackwards.protocol.protocol1_13_2to1_14.Protocol1_13_2To1_14; import nl.matsv.viabackwards.protocol.protocol1_13_2to1_14.storage.ChunkLightStorage; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.Via; -import us.myles.ViaVersion.api.entities.Entity1_14Types; -import us.myles.ViaVersion.api.entities.EntityType; -import us.myles.ViaVersion.api.minecraft.Environment; -import us.myles.ViaVersion.api.minecraft.chunks.Chunk; -import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection; -import us.myles.ViaVersion.api.minecraft.item.Item; -import us.myles.ViaVersion.api.minecraft.metadata.Metadata; -import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_13_2; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.rewriters.BlockRewriter; -import us.myles.ViaVersion.api.rewriters.ItemRewriter; -import us.myles.ViaVersion.api.rewriters.RecipeRewriter; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.api.type.types.version.Types1_13; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ChatRewriter; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.data.RecipeRewriter1_13_2; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.types.Chunk1_13Type; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.Protocol1_14To1_13_2; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.types.Chunk1_14Type; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; -import us.myles.viaversion.libs.gson.JsonElement; -import us.myles.viaversion.libs.gson.JsonObject; -import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.ListTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.StringTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.Tag; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types; +import com.viaversion.viaversion.api.minecraft.entities.EntityType; +import com.viaversion.viaversion.api.minecraft.Environment; +import com.viaversion.viaversion.api.minecraft.chunks.Chunk; +import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection; +import com.viaversion.viaversion.api.minecraft.item.Item; +import com.viaversion.viaversion.api.minecraft.metadata.Metadata; +import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_13_2; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.rewriter.BlockRewriter; +import com.viaversion.viaversion.rewriter.ItemRewriter; +import com.viaversion.viaversion.rewriter.RecipeRewriter; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.api.type.types.version.Types1_13; +import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter; +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_13to1_12_2.data.RecipeRewriter1_13_2; +import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.types.Chunk1_13Type; +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.types.Chunk1_14Type; +import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; +import com.viaversion.viaversion.libs.gson.JsonElement; +import com.viaversion.viaversion.libs.gson.JsonObject; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java index 98cb8af3..45559d95 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java @@ -27,24 +27,24 @@ import nl.matsv.viabackwards.api.rewriters.LegacyEntityRewriter; import nl.matsv.viabackwards.protocol.protocol1_13_2to1_14.Protocol1_13_2To1_14; import nl.matsv.viabackwards.protocol.protocol1_13_2to1_14.storage.ChunkLightStorage; import nl.matsv.viabackwards.protocol.protocol1_13_2to1_14.storage.EntityPositionStorage1_14; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.entities.Entity1_13Types; -import us.myles.ViaVersion.api.entities.Entity1_14Types; -import us.myles.ViaVersion.api.entities.EntityType; -import us.myles.ViaVersion.api.minecraft.Position; -import us.myles.ViaVersion.api.minecraft.VillagerData; -import us.myles.ViaVersion.api.minecraft.item.Item; -import us.myles.ViaVersion.api.minecraft.metadata.MetaType; -import us.myles.ViaVersion.api.minecraft.metadata.Metadata; -import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_13_2; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.api.type.types.Particle; -import us.myles.ViaVersion.api.type.types.version.Types1_13_2; -import us.myles.ViaVersion.api.type.types.version.Types1_14; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types; +import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types; +import com.viaversion.viaversion.api.minecraft.entities.EntityType; +import com.viaversion.viaversion.api.minecraft.Position; +import com.viaversion.viaversion.api.minecraft.VillagerData; +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_13_2; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.api.type.types.Particle; +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_14to1_13_2.ClientboundPackets1_14; +import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; public class EntityPackets1_14 extends LegacyEntityRewriter { @@ -480,7 +480,7 @@ public class EntityPackets1_14 extends LegacyEntityRewriter { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/SoundPackets1_14.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/SoundPackets1_14.java index b444dce5..65fd913e 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/SoundPackets1_14.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/SoundPackets1_14.java @@ -23,10 +23,10 @@ import nl.matsv.viabackwards.api.rewriters.Rewriter; import nl.matsv.viabackwards.api.rewriters.SoundRewriter; import nl.matsv.viabackwards.protocol.protocol1_13_2to1_14.Protocol1_13_2To1_14; import nl.matsv.viabackwards.protocol.protocol1_13_2to1_14.storage.EntityPositionStorage1_14; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; public class SoundPackets1_14 extends Rewriter { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/storage/ChunkLightStorage.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/storage/ChunkLightStorage.java index 36bead7a..5eae62e2 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/storage/ChunkLightStorage.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/storage/ChunkLightStorage.java @@ -17,8 +17,8 @@ */ package nl.matsv.viabackwards.protocol.protocol1_13_2to1_14.storage; -import us.myles.ViaVersion.api.data.StoredObject; -import us.myles.ViaVersion.api.data.UserConnection; +import com.viaversion.viaversion.api.connection.StoredObject; +import com.viaversion.viaversion.api.connection.UserConnection; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java index b17156da..aac55d12 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java @@ -25,23 +25,23 @@ import nl.matsv.viabackwards.protocol.protocol1_13to1_13_1.data.CommandRewriter1 import nl.matsv.viabackwards.protocol.protocol1_13to1_13_1.packets.EntityPackets1_13_1; import nl.matsv.viabackwards.protocol.protocol1_13to1_13_1.packets.InventoryPackets1_13_1; import nl.matsv.viabackwards.protocol.protocol1_13to1_13_1.packets.WorldPackets1_13_1; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.api.minecraft.item.Item; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.remapper.ValueTransformer; -import us.myles.ViaVersion.api.rewriters.RegistryType; -import us.myles.ViaVersion.api.rewriters.StatisticsRewriter; -import us.myles.ViaVersion.api.rewriters.TagRewriter; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_13_1to1_13.Protocol1_13_1To1_13; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ChatRewriter; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; -import us.myles.viaversion.libs.gson.JsonElement; -import us.myles.viaversion.libs.gson.JsonObject; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.minecraft.item.Item; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer; +import com.viaversion.viaversion.rewriter.RegistryType; +import com.viaversion.viaversion.rewriter.StatisticsRewriter; +import com.viaversion.viaversion.rewriter.TagRewriter; +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.ChatRewriter; +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_9_3to1_9_1_2.storage.ClientWorld; +import com.viaversion.viaversion.libs.gson.JsonElement; +import com.viaversion.viaversion.libs.gson.JsonObject; public class Protocol1_13To1_13_1 extends BackwardsProtocol { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/data/CommandRewriter1_13_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/data/CommandRewriter1_13_1.java index c33e943a..9a48db9a 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/data/CommandRewriter1_13_1.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/data/CommandRewriter1_13_1.java @@ -18,9 +18,9 @@ package nl.matsv.viabackwards.protocol.protocol1_13to1_13_1.data; import org.checkerframework.checker.nullness.qual.Nullable; -import us.myles.ViaVersion.api.protocol.Protocol; -import us.myles.ViaVersion.api.rewriters.CommandRewriter; -import us.myles.ViaVersion.api.type.Type; +import com.viaversion.viaversion.api.protocol.Protocol; +import com.viaversion.viaversion.rewriter.CommandRewriter; +import com.viaversion.viaversion.api.type.Type; public class CommandRewriter1_13_1 extends CommandRewriter { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/EntityPackets1_13_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/EntityPackets1_13_1.java index c9d5ba44..2ed01219 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/EntityPackets1_13_1.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/EntityPackets1_13_1.java @@ -21,18 +21,18 @@ import nl.matsv.viabackwards.ViaBackwards; import nl.matsv.viabackwards.api.entities.storage.MetaStorage; import nl.matsv.viabackwards.api.rewriters.LegacyEntityRewriter; import nl.matsv.viabackwards.protocol.protocol1_13to1_13_1.Protocol1_13To1_13_1; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.entities.Entity1_13Types; -import us.myles.ViaVersion.api.entities.EntityType; -import us.myles.ViaVersion.api.minecraft.item.Item; -import us.myles.ViaVersion.api.minecraft.metadata.Metadata; -import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_13; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.api.type.types.Particle; -import us.myles.ViaVersion.api.type.types.version.Types1_13; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types; +import com.viaversion.viaversion.api.minecraft.entities.EntityType; +import com.viaversion.viaversion.api.minecraft.item.Item; +import com.viaversion.viaversion.api.minecraft.metadata.Metadata; +import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_13; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.api.type.types.Particle; +import com.viaversion.viaversion.api.type.types.version.Types1_13; +import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; public class EntityPackets1_13_1 extends LegacyEntityRewriter { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/InventoryPackets1_13_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/InventoryPackets1_13_1.java index 9c99b30e..74b86998 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/InventoryPackets1_13_1.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/InventoryPackets1_13_1.java @@ -18,15 +18,15 @@ package nl.matsv.viabackwards.protocol.protocol1_13to1_13_1.packets; import nl.matsv.viabackwards.protocol.protocol1_13to1_13_1.Protocol1_13To1_13_1; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.minecraft.item.Item; -import us.myles.ViaVersion.api.protocol.Protocol; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.rewriters.ItemRewriter; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.minecraft.item.Item; +import com.viaversion.viaversion.api.protocol.Protocol; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.rewriter.ItemRewriter; +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; public class InventoryPackets1_13_1 { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/WorldPackets1_13_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/WorldPackets1_13_1.java index a08fa86f..7a47d639 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/WorldPackets1_13_1.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/WorldPackets1_13_1.java @@ -17,17 +17,17 @@ */ package nl.matsv.viabackwards.protocol.protocol1_13to1_13_1.packets; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.minecraft.chunks.Chunk; -import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection; -import us.myles.ViaVersion.api.protocol.Protocol; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.rewriters.BlockRewriter; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.types.Chunk1_13Type; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.minecraft.chunks.Chunk; +import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection; +import com.viaversion.viaversion.api.protocol.Protocol; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.rewriter.BlockRewriter; +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.types.Chunk1_13Type; +import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; public class WorldPackets1_13_1 { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_1to1_14_2/Protocol1_14_1To1_14_2.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_1to1_14_2/Protocol1_14_1To1_14_2.java index f89349e5..4d5d7329 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_1to1_14_2/Protocol1_14_1To1_14_2.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_1to1_14_2/Protocol1_14_1To1_14_2.java @@ -18,8 +18,8 @@ package nl.matsv.viabackwards.protocol.protocol1_14_1to1_14_2; import nl.matsv.viabackwards.api.BackwardsProtocol; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; +import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; +import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; public class Protocol1_14_1To1_14_2 extends BackwardsProtocol { } diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_2to1_14_3/Protocol1_14_2To1_14_3.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_2to1_14_3/Protocol1_14_2To1_14_3.java index d000d5b0..13957a61 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_2to1_14_3/Protocol1_14_2To1_14_3.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_2to1_14_3/Protocol1_14_2To1_14_3.java @@ -18,14 +18,14 @@ package nl.matsv.viabackwards.protocol.protocol1_14_2to1_14_3; import nl.matsv.viabackwards.api.BackwardsProtocol; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.rewriters.RecipeRewriter; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.data.RecipeRewriter1_14; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.rewriter.RecipeRewriter; +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.protocol1_14to1_13_2.data.RecipeRewriter1_14; public class Protocol1_14_2To1_14_3 extends BackwardsProtocol { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_3to1_14_4/Protocol1_14_3To1_14_4.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_3to1_14_4/Protocol1_14_3To1_14_4.java index ebcda67b..9ee85c64 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_3to1_14_4/Protocol1_14_3To1_14_4.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_3to1_14_4/Protocol1_14_3To1_14_4.java @@ -18,12 +18,12 @@ package nl.matsv.viabackwards.protocol.protocol1_14_3to1_14_4; import nl.matsv.viabackwards.api.BackwardsProtocol; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +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; public class Protocol1_14_3To1_14_4 extends BackwardsProtocol { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java index 251f193a..fb52eb29 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java @@ -26,17 +26,17 @@ import nl.matsv.viabackwards.protocol.protocol1_14_4to1_15.data.EntityTypeMappin import nl.matsv.viabackwards.protocol.protocol1_14_4to1_15.data.ImmediateRespawn; import nl.matsv.viabackwards.protocol.protocol1_14_4to1_15.packets.BlockItemPackets1_15; import nl.matsv.viabackwards.protocol.protocol1_14_4to1_15.packets.EntityPackets1_15; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.rewriters.RegistryType; -import us.myles.ViaVersion.api.rewriters.StatisticsRewriter; -import us.myles.ViaVersion.api.rewriters.TagRewriter; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; -import us.myles.ViaVersion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; -import us.myles.ViaVersion.protocols.protocol1_15to1_14_4.Protocol1_15To1_14_4; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.rewriter.RegistryType; +import com.viaversion.viaversion.rewriter.StatisticsRewriter; +import com.viaversion.viaversion.rewriter.TagRewriter; +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.protocol1_15to1_14_4.ClientboundPackets1_15; +import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.Protocol1_15To1_14_4; public class Protocol1_14_4To1_15 extends BackwardsProtocol { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/data/EntityTypeMapping.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/data/EntityTypeMapping.java index 82ddfac2..5c4d3068 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/data/EntityTypeMapping.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/data/EntityTypeMapping.java @@ -17,7 +17,7 @@ */ package nl.matsv.viabackwards.protocol.protocol1_14_4to1_15.data; -import us.myles.ViaVersion.api.entities.Entity1_14Types; +import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types; public class EntityTypeMapping { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/data/ImmediateRespawn.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/data/ImmediateRespawn.java index 6aeee2f1..b8fea86a 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/data/ImmediateRespawn.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/data/ImmediateRespawn.java @@ -17,8 +17,8 @@ */ package nl.matsv.viabackwards.protocol.protocol1_14_4to1_15.data; -import us.myles.ViaVersion.api.data.StoredObject; -import us.myles.ViaVersion.api.data.UserConnection; +import com.viaversion.viaversion.api.connection.StoredObject; +import com.viaversion.viaversion.api.connection.UserConnection; public class ImmediateRespawn extends StoredObject { private boolean immediateRespawn; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java index c5ddcd41..4ed2063f 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java @@ -19,20 +19,20 @@ package nl.matsv.viabackwards.protocol.protocol1_14_4to1_15.packets; import nl.matsv.viabackwards.api.rewriters.TranslatableRewriter; import nl.matsv.viabackwards.protocol.protocol1_14_4to1_15.Protocol1_14_4To1_15; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.minecraft.chunks.Chunk; -import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection; -import us.myles.ViaVersion.api.minecraft.item.Item; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.rewriters.BlockRewriter; -import us.myles.ViaVersion.api.rewriters.ItemRewriter; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.data.RecipeRewriter1_14; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.types.Chunk1_14Type; -import us.myles.ViaVersion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; -import us.myles.ViaVersion.protocols.protocol1_15to1_14_4.types.Chunk1_15Type; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.minecraft.chunks.Chunk; +import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection; +import com.viaversion.viaversion.api.minecraft.item.Item; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.rewriter.BlockRewriter; +import com.viaversion.viaversion.rewriter.ItemRewriter; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; +import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.data.RecipeRewriter1_14; +import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.types.Chunk1_14Type; +import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; +import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.types.Chunk1_15Type; public class BlockItemPackets1_15 extends nl.matsv.viabackwards.api.rewriters.ItemRewriter { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/EntityPackets1_15.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/EntityPackets1_15.java index fcc83c7c..3d38a1c7 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/EntityPackets1_15.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/EntityPackets1_15.java @@ -22,18 +22,18 @@ import nl.matsv.viabackwards.api.rewriters.EntityRewriter; import nl.matsv.viabackwards.protocol.protocol1_14_4to1_15.Protocol1_14_4To1_15; import nl.matsv.viabackwards.protocol.protocol1_14_4to1_15.data.EntityTypeMapping; import nl.matsv.viabackwards.protocol.protocol1_14_4to1_15.data.ImmediateRespawn; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.entities.Entity1_15Types; -import us.myles.ViaVersion.api.entities.EntityType; -import us.myles.ViaVersion.api.minecraft.item.Item; -import us.myles.ViaVersion.api.minecraft.metadata.MetaType; -import us.myles.ViaVersion.api.minecraft.metadata.Metadata; -import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_14; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.api.type.types.Particle; -import us.myles.ViaVersion.api.type.types.version.Types1_14; -import us.myles.ViaVersion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.minecraft.entities.Entity1_15Types; +import com.viaversion.viaversion.api.minecraft.entities.EntityType; +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_14; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.api.type.types.Particle; +import com.viaversion.viaversion.api.type.types.version.Types1_14; +import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; import java.util.ArrayList; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/Protocol1_14To1_14_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/Protocol1_14To1_14_1.java index 87d6e480..73132421 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/Protocol1_14To1_14_1.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/Protocol1_14To1_14_1.java @@ -19,9 +19,9 @@ package nl.matsv.viabackwards.protocol.protocol1_14to1_14_1; import nl.matsv.viabackwards.api.BackwardsProtocol; import nl.matsv.viabackwards.protocol.protocol1_14to1_14_1.packets.EntityPackets1_14_1; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; +import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; public class Protocol1_14To1_14_1 extends BackwardsProtocol { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/packets/EntityPackets1_14_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/packets/EntityPackets1_14_1.java index ccac64bb..d00200a4 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/packets/EntityPackets1_14_1.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/packets/EntityPackets1_14_1.java @@ -20,14 +20,14 @@ package nl.matsv.viabackwards.protocol.protocol1_14to1_14_1.packets; import nl.matsv.viabackwards.api.entities.storage.MetaStorage; import nl.matsv.viabackwards.api.rewriters.LegacyEntityRewriter; import nl.matsv.viabackwards.protocol.protocol1_14to1_14_1.Protocol1_14To1_14_1; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.entities.Entity1_14Types; -import us.myles.ViaVersion.api.entities.EntityType; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.api.type.types.version.Types1_14; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types; +import com.viaversion.viaversion.api.minecraft.entities.EntityType; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.api.type.types.version.Types1_14; +import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; public class EntityPackets1_14_1 extends LegacyEntityRewriter { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_1to1_15_2/Protocol1_15_1To1_15_2.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_1to1_15_2/Protocol1_15_1To1_15_2.java index 55c4f3eb..904a03c4 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_1to1_15_2/Protocol1_15_1To1_15_2.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_1to1_15_2/Protocol1_15_1To1_15_2.java @@ -18,8 +18,8 @@ package nl.matsv.viabackwards.protocol.protocol1_15_1to1_15_2; import nl.matsv.viabackwards.api.BackwardsProtocol; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; -import us.myles.ViaVersion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; +import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; +import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; public class Protocol1_15_1To1_15_2 extends BackwardsProtocol { } diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/Protocol1_15_2To1_16.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/Protocol1_15_2To1_16.java index 4d2f7d4e..4d484331 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/Protocol1_15_2To1_16.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/Protocol1_15_2To1_16.java @@ -27,22 +27,22 @@ import nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.data.WorldNameTracker import nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.packets.BlockItemPackets1_16; import nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.packets.EntityPackets1_16; import nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.storage.PlayerSneakStorage; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.rewriters.RegistryType; -import us.myles.ViaVersion.api.rewriters.StatisticsRewriter; -import us.myles.ViaVersion.api.rewriters.TagRewriter; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.packets.State; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; -import us.myles.ViaVersion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; -import us.myles.ViaVersion.protocols.protocol1_16to1_15_2.ClientboundPackets1_16; -import us.myles.ViaVersion.protocols.protocol1_16to1_15_2.Protocol1_16To1_15_2; -import us.myles.ViaVersion.protocols.protocol1_16to1_15_2.ServerboundPackets1_16; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; -import us.myles.ViaVersion.util.GsonUtil; -import us.myles.viaversion.libs.gson.JsonElement; -import us.myles.viaversion.libs.gson.JsonObject; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.rewriter.RegistryType; +import com.viaversion.viaversion.rewriter.StatisticsRewriter; +import com.viaversion.viaversion.rewriter.TagRewriter; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.api.protocol.packet.State; +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.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_9_3to1_9_1_2.storage.ClientWorld; +import com.viaversion.viaversion.util.GsonUtil; +import com.viaversion.viaversion.libs.gson.JsonElement; +import com.viaversion.viaversion.libs.gson.JsonObject; import java.util.UUID; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/chat/TagSerializer.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/chat/TagSerializer.java index 817685ca..149cfe05 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/chat/TagSerializer.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/chat/TagSerializer.java @@ -18,13 +18,13 @@ package nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.chat; import com.google.common.base.Preconditions; -import us.myles.viaversion.libs.gson.JsonArray; -import us.myles.viaversion.libs.gson.JsonElement; -import us.myles.viaversion.libs.gson.JsonObject; -import us.myles.viaversion.libs.gson.JsonPrimitive; -import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.ListTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.Tag; +import com.viaversion.viaversion.libs.gson.JsonArray; +import com.viaversion.viaversion.libs.gson.JsonElement; +import com.viaversion.viaversion.libs.gson.JsonObject; +import com.viaversion.viaversion.libs.gson.JsonPrimitive; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; import java.util.Map; import java.util.regex.Pattern; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/chat/TranslatableRewriter1_16.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/chat/TranslatableRewriter1_16.java index 2dd13e6b..a1b432f3 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/chat/TranslatableRewriter1_16.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/chat/TranslatableRewriter1_16.java @@ -19,9 +19,9 @@ package nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.chat; import nl.matsv.viabackwards.api.BackwardsProtocol; import nl.matsv.viabackwards.api.rewriters.TranslatableRewriter; -import us.myles.viaversion.libs.gson.JsonElement; -import us.myles.viaversion.libs.gson.JsonObject; -import us.myles.viaversion.libs.gson.JsonPrimitive; +import com.viaversion.viaversion.libs.gson.JsonElement; +import com.viaversion.viaversion.libs.gson.JsonObject; +import com.viaversion.viaversion.libs.gson.JsonPrimitive; public class TranslatableRewriter1_16 extends TranslatableRewriter { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/BackwardsMappings.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/BackwardsMappings.java index a01a7caa..6290e761 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/BackwardsMappings.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/BackwardsMappings.java @@ -17,8 +17,8 @@ */ package nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.data; -import us.myles.ViaVersion.protocols.protocol1_16to1_15_2.Protocol1_16To1_15_2; -import us.myles.viaversion.libs.gson.JsonObject; +import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.Protocol1_16To1_15_2; +import com.viaversion.viaversion.libs.gson.JsonObject; import java.util.HashMap; import java.util.Map; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/CommandRewriter1_16.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/CommandRewriter1_16.java index 6bb82257..bc6153ad 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/CommandRewriter1_16.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/CommandRewriter1_16.java @@ -18,8 +18,8 @@ package nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.data; import org.checkerframework.checker.nullness.qual.Nullable; -import us.myles.ViaVersion.api.protocol.Protocol; -import us.myles.ViaVersion.api.rewriters.CommandRewriter; +import com.viaversion.viaversion.api.protocol.Protocol; +import com.viaversion.viaversion.rewriter.CommandRewriter; public class CommandRewriter1_16 extends CommandRewriter { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/MapColorRewriter.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/MapColorRewriter.java index 7b32fc55..87c8add4 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/MapColorRewriter.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/MapColorRewriter.java @@ -17,8 +17,8 @@ */ package nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.data; -import us.myles.viaversion.libs.fastutil.ints.Int2IntMap; -import us.myles.viaversion.libs.fastutil.ints.Int2IntOpenHashMap; +import com.viaversion.viaversion.libs.fastutil.ints.Int2IntMap; +import com.viaversion.viaversion.libs.fastutil.ints.Int2IntOpenHashMap; public class MapColorRewriter { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/WorldNameTracker.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/WorldNameTracker.java index 0aa3381a..04579759 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/WorldNameTracker.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/WorldNameTracker.java @@ -17,8 +17,8 @@ */ package nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.data; -import us.myles.ViaVersion.api.data.StoredObject; -import us.myles.ViaVersion.api.data.UserConnection; +import com.viaversion.viaversion.api.connection.StoredObject; +import com.viaversion.viaversion.api.connection.UserConnection; public class WorldNameTracker extends StoredObject { private String worldName; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java index 8aef9f46..0b385d2e 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java @@ -21,29 +21,29 @@ import nl.matsv.viabackwards.api.rewriters.EnchantmentRewriter; import nl.matsv.viabackwards.api.rewriters.TranslatableRewriter; import nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.Protocol1_15_2To1_16; import nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.data.MapColorRewriter; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.minecraft.Position; -import us.myles.ViaVersion.api.minecraft.chunks.Chunk; -import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection; -import us.myles.ViaVersion.api.minecraft.item.Item; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.rewriters.BlockRewriter; -import us.myles.ViaVersion.api.rewriters.ItemRewriter; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.api.type.types.UUIDIntArrayType; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.data.RecipeRewriter1_14; -import us.myles.ViaVersion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; -import us.myles.ViaVersion.protocols.protocol1_15to1_14_4.types.Chunk1_15Type; -import us.myles.ViaVersion.protocols.protocol1_16to1_15_2.ClientboundPackets1_16; -import us.myles.ViaVersion.protocols.protocol1_16to1_15_2.packets.InventoryPackets; -import us.myles.ViaVersion.protocols.protocol1_16to1_15_2.types.Chunk1_16Type; -import us.myles.ViaVersion.util.CompactArrayUtil; -import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.IntArrayTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.LongArrayTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.StringTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.Tag; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.minecraft.Position; +import com.viaversion.viaversion.api.minecraft.chunks.Chunk; +import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection; +import com.viaversion.viaversion.api.minecraft.item.Item; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.rewriter.BlockRewriter; +import com.viaversion.viaversion.rewriter.ItemRewriter; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.api.type.types.UUIDIntArrayType; +import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; +import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.data.RecipeRewriter1_14; +import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; +import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.types.Chunk1_15Type; +import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ClientboundPackets1_16; +import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.packets.InventoryPackets; +import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.types.Chunk1_16Type; +import com.viaversion.viaversion.util.CompactArrayUtil; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntArrayTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.LongArrayTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java index 9085e018..6b54889f 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java @@ -20,24 +20,24 @@ package nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.packets; import nl.matsv.viabackwards.api.rewriters.EntityRewriter; import nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.Protocol1_15_2To1_16; import nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.data.WorldNameTracker; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.Via; -import us.myles.ViaVersion.api.entities.Entity1_15Types; -import us.myles.ViaVersion.api.entities.Entity1_16Types; -import us.myles.ViaVersion.api.entities.EntityType; -import us.myles.ViaVersion.api.minecraft.item.Item; -import us.myles.ViaVersion.api.minecraft.metadata.MetaType; -import us.myles.ViaVersion.api.minecraft.metadata.Metadata; -import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_14; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.remapper.ValueTransformer; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.api.type.types.Particle; -import us.myles.ViaVersion.api.type.types.version.Types1_14; -import us.myles.ViaVersion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; -import us.myles.ViaVersion.protocols.protocol1_16to1_15_2.ClientboundPackets1_16; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; -import us.myles.viaversion.libs.gson.JsonElement; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.api.minecraft.entities.Entity1_15Types; +import com.viaversion.viaversion.api.minecraft.entities.Entity1_16Types; +import com.viaversion.viaversion.api.minecraft.entities.EntityType; +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_14; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.api.type.types.Particle; +import com.viaversion.viaversion.api.type.types.version.Types1_14; +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_9_3to1_9_1_2.storage.ClientWorld; +import com.viaversion.viaversion.libs.gson.JsonElement; public class EntityPackets1_16 extends EntityRewriter { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/storage/PlayerSneakStorage.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/storage/PlayerSneakStorage.java index f3986d42..7fa797ce 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/storage/PlayerSneakStorage.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/storage/PlayerSneakStorage.java @@ -17,8 +17,8 @@ */ package nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.storage; -import us.myles.ViaVersion.api.data.StoredObject; -import us.myles.ViaVersion.api.data.UserConnection; +import com.viaversion.viaversion.api.connection.StoredObject; +import com.viaversion.viaversion.api.connection.UserConnection; public class PlayerSneakStorage extends StoredObject { private boolean sneaking; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15to1_15_1/Protocol1_15To1_15_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15to1_15_1/Protocol1_15To1_15_1.java index 1981ff5d..96f6e6d8 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15to1_15_1/Protocol1_15To1_15_1.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15to1_15_1/Protocol1_15To1_15_1.java @@ -18,8 +18,8 @@ package nl.matsv.viabackwards.protocol.protocol1_15to1_15_1; import nl.matsv.viabackwards.api.BackwardsProtocol; -import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; -import us.myles.ViaVersion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; +import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14; +import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; public class Protocol1_15To1_15_1 extends BackwardsProtocol { } diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/Protocol1_16_1To1_16_2.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/Protocol1_16_1To1_16_2.java index 8a7c8490..7becf3f4 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/Protocol1_16_1To1_16_2.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/Protocol1_16_1To1_16_2.java @@ -24,20 +24,20 @@ import nl.matsv.viabackwards.api.rewriters.TranslatableRewriter; import nl.matsv.viabackwards.protocol.protocol1_16_1to1_16_2.data.CommandRewriter1_16_2; import nl.matsv.viabackwards.protocol.protocol1_16_1to1_16_2.packets.BlockItemPackets1_16_2; import nl.matsv.viabackwards.protocol.protocol1_16_1to1_16_2.packets.EntityPackets1_16_2; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.rewriters.RegistryType; -import us.myles.ViaVersion.api.rewriters.StatisticsRewriter; -import us.myles.ViaVersion.api.rewriters.TagRewriter; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2; -import us.myles.ViaVersion.protocols.protocol1_16_2to1_16_1.Protocol1_16_2To1_16_1; -import us.myles.ViaVersion.protocols.protocol1_16_2to1_16_1.ServerboundPackets1_16_2; -import us.myles.ViaVersion.protocols.protocol1_16to1_15_2.ClientboundPackets1_16; -import us.myles.ViaVersion.protocols.protocol1_16to1_15_2.ServerboundPackets1_16; -import us.myles.viaversion.libs.gson.JsonElement; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.rewriter.RegistryType; +import com.viaversion.viaversion.rewriter.StatisticsRewriter; +import com.viaversion.viaversion.rewriter.TagRewriter; +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.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.protocol1_16to1_15_2.ServerboundPackets1_16; +import com.viaversion.viaversion.libs.gson.JsonElement; public class Protocol1_16_1To1_16_2 extends BackwardsProtocol { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/data/CommandRewriter1_16_2.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/data/CommandRewriter1_16_2.java index 1d3860ae..1c9cb98b 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/data/CommandRewriter1_16_2.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/data/CommandRewriter1_16_2.java @@ -18,9 +18,9 @@ package nl.matsv.viabackwards.protocol.protocol1_16_1to1_16_2.data; import org.checkerframework.checker.nullness.qual.Nullable; -import us.myles.ViaVersion.api.protocol.Protocol; -import us.myles.ViaVersion.api.rewriters.CommandRewriter; -import us.myles.ViaVersion.api.type.Type; +import com.viaversion.viaversion.api.protocol.Protocol; +import com.viaversion.viaversion.rewriter.CommandRewriter; +import com.viaversion.viaversion.api.type.Type; public class CommandRewriter1_16_2 extends CommandRewriter { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/packets/BlockItemPackets1_16_2.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/packets/BlockItemPackets1_16_2.java index 1377c797..c87d1ac3 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/packets/BlockItemPackets1_16_2.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/packets/BlockItemPackets1_16_2.java @@ -19,26 +19,26 @@ package nl.matsv.viabackwards.protocol.protocol1_16_1to1_16_2.packets; import nl.matsv.viabackwards.api.rewriters.TranslatableRewriter; import nl.matsv.viabackwards.protocol.protocol1_16_1to1_16_2.Protocol1_16_1To1_16_2; -import us.myles.ViaVersion.api.minecraft.BlockChangeRecord; -import us.myles.ViaVersion.api.minecraft.BlockChangeRecord1_8; -import us.myles.ViaVersion.api.minecraft.Position; -import us.myles.ViaVersion.api.minecraft.chunks.Chunk; -import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.rewriters.BlockRewriter; -import us.myles.ViaVersion.api.rewriters.ItemRewriter; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2; -import us.myles.ViaVersion.protocols.protocol1_16_2to1_16_1.types.Chunk1_16_2Type; -import us.myles.ViaVersion.protocols.protocol1_16to1_15_2.ServerboundPackets1_16; -import us.myles.ViaVersion.protocols.protocol1_16to1_15_2.data.RecipeRewriter1_16; -import us.myles.ViaVersion.protocols.protocol1_16to1_15_2.types.Chunk1_16Type; -import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.IntArrayTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.IntTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.ListTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.StringTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.Tag; +import com.viaversion.viaversion.api.minecraft.BlockChangeRecord; +import com.viaversion.viaversion.api.minecraft.BlockChangeRecord1_8; +import com.viaversion.viaversion.api.minecraft.Position; +import com.viaversion.viaversion.api.minecraft.chunks.Chunk; +import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.rewriter.BlockRewriter; +import com.viaversion.viaversion.rewriter.ItemRewriter; +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.types.Chunk1_16_2Type; +import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ServerboundPackets1_16; +import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.data.RecipeRewriter1_16; +import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.types.Chunk1_16Type; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntArrayTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; public class BlockItemPackets1_16_2 extends nl.matsv.viabackwards.api.rewriters.ItemRewriter { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/packets/EntityPackets1_16_2.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/packets/EntityPackets1_16_2.java index 0a661665..db64e5dd 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/packets/EntityPackets1_16_2.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/packets/EntityPackets1_16_2.java @@ -20,22 +20,22 @@ package nl.matsv.viabackwards.protocol.protocol1_16_1to1_16_2.packets; import com.google.common.collect.Sets; import nl.matsv.viabackwards.api.rewriters.EntityRewriter; import nl.matsv.viabackwards.protocol.protocol1_16_1to1_16_2.Protocol1_16_1To1_16_2; -import us.myles.ViaVersion.api.entities.Entity1_16Types; -import us.myles.ViaVersion.api.entities.Entity1_16_2Types; -import us.myles.ViaVersion.api.entities.EntityType; -import us.myles.ViaVersion.api.minecraft.item.Item; -import us.myles.ViaVersion.api.minecraft.metadata.MetaType; -import us.myles.ViaVersion.api.minecraft.metadata.Metadata; -import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_14; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.api.type.types.Particle; -import us.myles.ViaVersion.api.type.types.version.Types1_14; -import us.myles.ViaVersion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2; -import us.myles.ViaVersion.protocols.protocol1_16to1_15_2.packets.EntityPackets; -import us.myles.viaversion.libs.gson.JsonElement; -import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.StringTag; +import com.viaversion.viaversion.api.minecraft.entities.Entity1_16Types; +import com.viaversion.viaversion.api.minecraft.entities.Entity1_16_2Types; +import com.viaversion.viaversion.api.minecraft.entities.EntityType; +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_14; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.api.type.types.Particle; +import com.viaversion.viaversion.api.type.types.version.Types1_14; +import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2; +import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.packets.EntityPackets; +import com.viaversion.viaversion.libs.gson.JsonElement; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag; import java.util.Set; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_2to1_16_3/Protocol1_16_2To1_16_3.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_2to1_16_3/Protocol1_16_2To1_16_3.java index c47e5b18..af61d8f8 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_2to1_16_3/Protocol1_16_2To1_16_3.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_2to1_16_3/Protocol1_16_2To1_16_3.java @@ -18,8 +18,8 @@ package nl.matsv.viabackwards.protocol.protocol1_16_2to1_16_3; import nl.matsv.viabackwards.api.BackwardsProtocol; -import us.myles.ViaVersion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2; -import us.myles.ViaVersion.protocols.protocol1_16_2to1_16_1.ServerboundPackets1_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.ServerboundPackets1_16_2; public class Protocol1_16_2To1_16_3 extends BackwardsProtocol { } diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_3to1_16_4/Protocol1_16_3To1_16_4.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_3to1_16_4/Protocol1_16_3To1_16_4.java index 47df7ea1..4b3cfe30 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_3to1_16_4/Protocol1_16_3To1_16_4.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_3to1_16_4/Protocol1_16_3To1_16_4.java @@ -19,11 +19,11 @@ package nl.matsv.viabackwards.protocol.protocol1_16_3to1_16_4; import nl.matsv.viabackwards.api.BackwardsProtocol; import nl.matsv.viabackwards.protocol.protocol1_16_3to1_16_4.storage.PlayerHandStorage; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2; -import us.myles.ViaVersion.protocols.protocol1_16_2to1_16_1.ServerboundPackets1_16_2; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +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; public class Protocol1_16_3To1_16_4 extends BackwardsProtocol { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_3to1_16_4/storage/PlayerHandStorage.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_3to1_16_4/storage/PlayerHandStorage.java index 1713774e..32bf1e07 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_3to1_16_4/storage/PlayerHandStorage.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_3to1_16_4/storage/PlayerHandStorage.java @@ -17,8 +17,8 @@ */ package nl.matsv.viabackwards.protocol.protocol1_16_3to1_16_4.storage; -import us.myles.ViaVersion.api.data.StoredObject; -import us.myles.ViaVersion.api.data.UserConnection; +import com.viaversion.viaversion.api.connection.StoredObject; +import com.viaversion.viaversion.api.connection.UserConnection; public class PlayerHandStorage extends StoredObject { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java index 17b62c29..96ba824d 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java @@ -23,20 +23,20 @@ import nl.matsv.viabackwards.api.rewriters.SoundRewriter; import nl.matsv.viabackwards.api.rewriters.TranslatableRewriter; import nl.matsv.viabackwards.protocol.protocol1_16_4to1_17.packets.BlockItemPackets1_17; import nl.matsv.viabackwards.protocol.protocol1_16_4to1_17.packets.EntityPackets1_17; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.rewriters.IdRewriteFunction; -import us.myles.ViaVersion.api.rewriters.RegistryType; -import us.myles.ViaVersion.api.rewriters.StatisticsRewriter; -import us.myles.ViaVersion.api.rewriters.TagRewriter; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2; -import us.myles.ViaVersion.protocols.protocol1_16_2to1_16_1.ServerboundPackets1_16_2; -import us.myles.ViaVersion.protocols.protocol1_17to1_16_4.ClientboundPackets1_17; -import us.myles.ViaVersion.protocols.protocol1_17to1_16_4.Protocol1_17To1_16_4; -import us.myles.ViaVersion.protocols.protocol1_17to1_16_4.ServerboundPackets1_17; -import us.myles.viaversion.libs.fastutil.ints.IntArrayList; -import us.myles.viaversion.libs.fastutil.ints.IntList; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.rewriter.IdRewriteFunction; +import com.viaversion.viaversion.rewriter.RegistryType; +import com.viaversion.viaversion.rewriter.StatisticsRewriter; +import com.viaversion.viaversion.rewriter.TagRewriter; +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.libs.fastutil.ints.IntArrayList; +import com.viaversion.viaversion.libs.fastutil.ints.IntList; import java.util.ArrayList; import java.util.HashMap; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java index cebacbca..b0eac23c 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java @@ -20,20 +20,20 @@ package nl.matsv.viabackwards.protocol.protocol1_16_4to1_17.packets; import nl.matsv.viabackwards.api.entities.storage.EntityTracker; import nl.matsv.viabackwards.api.rewriters.TranslatableRewriter; import nl.matsv.viabackwards.protocol.protocol1_16_4to1_17.Protocol1_16_4To1_17; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.minecraft.BlockChangeRecord; -import us.myles.ViaVersion.api.minecraft.chunks.Chunk; -import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.rewriters.BlockRewriter; -import us.myles.ViaVersion.api.rewriters.ItemRewriter; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2; -import us.myles.ViaVersion.protocols.protocol1_16_2to1_16_1.ServerboundPackets1_16_2; -import us.myles.ViaVersion.protocols.protocol1_16_2to1_16_1.types.Chunk1_16_2Type; -import us.myles.ViaVersion.protocols.protocol1_16to1_15_2.data.RecipeRewriter1_16; -import us.myles.ViaVersion.protocols.protocol1_17to1_16_4.ClientboundPackets1_17; -import us.myles.ViaVersion.protocols.protocol1_17to1_16_4.types.Chunk1_17Type; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.minecraft.BlockChangeRecord; +import com.viaversion.viaversion.api.minecraft.chunks.Chunk; +import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.rewriter.BlockRewriter; +import com.viaversion.viaversion.rewriter.ItemRewriter; +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_16_2to1_16_1.types.Chunk1_16_2Type; +import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.data.RecipeRewriter1_16; +import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ClientboundPackets1_17; +import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.types.Chunk1_17Type; import java.util.ArrayList; import java.util.Arrays; diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java index df35e34d..d08a440d 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java @@ -20,26 +20,26 @@ package nl.matsv.viabackwards.protocol.protocol1_16_4to1_17.packets; import nl.matsv.viabackwards.ViaBackwards; import nl.matsv.viabackwards.api.rewriters.EntityRewriter; import nl.matsv.viabackwards.protocol.protocol1_16_4to1_17.Protocol1_16_4To1_17; -import us.myles.ViaVersion.api.entities.Entity1_16_2Types; -import us.myles.ViaVersion.api.entities.Entity1_17Types; -import us.myles.ViaVersion.api.entities.EntityType; -import us.myles.ViaVersion.api.minecraft.item.Item; -import us.myles.ViaVersion.api.minecraft.metadata.MetaType; -import us.myles.ViaVersion.api.minecraft.metadata.Metadata; -import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_14; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.api.type.types.Particle; -import us.myles.ViaVersion.api.type.types.version.Types1_14; -import us.myles.ViaVersion.api.type.types.version.Types1_17; -import us.myles.ViaVersion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2; -import us.myles.ViaVersion.protocols.protocol1_17to1_16_4.ClientboundPackets1_17; -import us.myles.viaversion.libs.gson.JsonElement; -import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.IntTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.ListTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.StringTag; -import us.myles.viaversion.libs.opennbt.tag.builtin.Tag; +import com.viaversion.viaversion.api.minecraft.entities.Entity1_16_2Types; +import com.viaversion.viaversion.api.minecraft.entities.Entity1_17Types; +import com.viaversion.viaversion.api.minecraft.entities.EntityType; +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_14; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.api.type.types.Particle; +import com.viaversion.viaversion.api.type.types.version.Types1_14; +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.libs.gson.JsonElement; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; public class EntityPackets1_17 extends EntityRewriter { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16to1_16_1/Protocol1_16To1_16_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16to1_16_1/Protocol1_16To1_16_1.java index 9de123e8..ed209817 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16to1_16_1/Protocol1_16To1_16_1.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16to1_16_1/Protocol1_16To1_16_1.java @@ -18,8 +18,8 @@ package nl.matsv.viabackwards.protocol.protocol1_16to1_16_1; import nl.matsv.viabackwards.api.BackwardsProtocol; -import us.myles.ViaVersion.protocols.protocol1_16to1_15_2.ClientboundPackets1_16; -import us.myles.ViaVersion.protocols.protocol1_16to1_15_2.ServerboundPackets1_16; +import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ClientboundPackets1_16; +import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ServerboundPackets1_16; public class Protocol1_16To1_16_1 extends BackwardsProtocol { } diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java index fbacb46f..cff27596 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java @@ -23,14 +23,14 @@ import nl.matsv.viabackwards.api.data.BackwardsMappings; import nl.matsv.viabackwards.api.rewriters.SoundRewriter; import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets.BlockItemPackets1_10; import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets.EntityPackets1_10; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.remapper.ValueTransformer; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer; +import com.viaversion.viaversion.api.type.Type; +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_9_3to1_9_1_2.storage.ClientWorld; public class Protocol1_9_4To1_10 extends BackwardsProtocol { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java index f6dd3e4b..d744db30 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java @@ -20,19 +20,19 @@ package nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.packets; import nl.matsv.viabackwards.api.rewriters.LegacyBlockItemRewriter; import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.Protocol1_9_4To1_10; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.minecraft.BlockChangeRecord; -import us.myles.ViaVersion.api.minecraft.chunks.Chunk; -import us.myles.ViaVersion.api.minecraft.item.Item; -import us.myles.ViaVersion.api.minecraft.metadata.Metadata; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.rewriters.ItemRewriter; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.minecraft.BlockChangeRecord; +import com.viaversion.viaversion.api.minecraft.chunks.Chunk; +import com.viaversion.viaversion.api.minecraft.item.Item; +import com.viaversion.viaversion.api.minecraft.metadata.Metadata; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.rewriter.ItemRewriter; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type; +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_9_3to1_9_1_2.storage.ClientWorld; public class BlockItemPackets1_10 extends LegacyBlockItemRewriter { diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/EntityPackets1_10.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/EntityPackets1_10.java index 98c061e4..ba92e570 100644 --- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/EntityPackets1_10.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/EntityPackets1_10.java @@ -24,18 +24,18 @@ import nl.matsv.viabackwards.api.exceptions.RemovedValueException; import nl.matsv.viabackwards.api.rewriters.LegacyEntityRewriter; import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.Protocol1_9_4To1_10; import nl.matsv.viabackwards.utils.Block; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.entities.Entity1_10Types; -import us.myles.ViaVersion.api.entities.Entity1_11Types; -import us.myles.ViaVersion.api.entities.Entity1_12Types; -import us.myles.ViaVersion.api.entities.EntityType; -import us.myles.ViaVersion.api.minecraft.metadata.Metadata; -import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_9; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; -import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.api.type.types.version.Types1_9; -import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.minecraft.entities.Entity1_10Types; +import com.viaversion.viaversion.api.minecraft.entities.Entity1_11Types; +import com.viaversion.viaversion.api.minecraft.entities.Entity1_12Types; +import com.viaversion.viaversion.api.minecraft.entities.EntityType; +import com.viaversion.viaversion.api.minecraft.metadata.Metadata; +import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_9; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; +import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.api.type.types.version.Types1_9; +import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; import java.util.Optional; diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 26c90a90..c348e617 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ metadata.format.version = "1.0" [versions] # ViaVersion -viaver = "3.3.0-21w14a" +viaver = "4.0.0-21w16a" # Common provided netty = "4.0.20.Final" @@ -22,7 +22,7 @@ fabricLoader = "0.4.8+build.154" [libraries] -viaver = { group = "us.myles", name = "viaversion", version.ref = "viaver" } +viaver = { group = "com.viaversion", name = "viaversion", version.ref = "viaver" } netty = { group = "io.netty", name = "netty-all", version.ref = "netty" } guava = { group = "com.google.guava", name = "guava", version.ref = "guava" } diff --git a/sponge/src/main/java/nl/matsv/viabackwards/SpongePlugin.java b/sponge/src/main/java/nl/matsv/viabackwards/SpongePlugin.java index bc0c0385..a90a1a1b 100644 --- a/sponge/src/main/java/nl/matsv/viabackwards/SpongePlugin.java +++ b/sponge/src/main/java/nl/matsv/viabackwards/SpongePlugin.java @@ -27,8 +27,8 @@ import org.spongepowered.api.event.Order; import org.spongepowered.api.event.game.state.GameInitializationEvent; import org.spongepowered.api.plugin.Dependency; import org.spongepowered.api.plugin.Plugin; -import us.myles.ViaVersion.api.Via; -import us.myles.ViaVersion.sponge.util.LoggerWrapper; +import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.sponge.util.LoggerWrapper; import java.io.File; import java.nio.file.Path; diff --git a/velocity/src/main/java/nl/matsv/viabackwards/VelocityPlugin.java b/velocity/src/main/java/nl/matsv/viabackwards/VelocityPlugin.java index e36eca8b..3fcdb59b 100644 --- a/velocity/src/main/java/nl/matsv/viabackwards/VelocityPlugin.java +++ b/velocity/src/main/java/nl/matsv/viabackwards/VelocityPlugin.java @@ -27,8 +27,8 @@ import com.velocitypowered.api.plugin.Plugin; import com.velocitypowered.api.plugin.annotation.DataDirectory; import nl.matsv.viabackwards.api.ViaBackwardsPlatform; import nl.matsv.viabackwards.utils.VersionInfo; -import us.myles.ViaVersion.api.Via; -import us.myles.ViaVersion.sponge.util.LoggerWrapper; +import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.sponge.util.LoggerWrapper; import java.io.File; import java.nio.file.Path;