From b556e6528ad1ae6a5acd72d3d3a0a3b1ccb63e77 Mon Sep 17 00:00:00 2001 From: EnZaXD Date: Mon, 5 Aug 2024 09:48:01 +0200 Subject: [PATCH] Rename remaining packages in bukkit modules to new format (#4074) --- .../{protocol1_9to1_8 => v1_8to1_9}/ArmorListener.java | 4 ++-- .../{protocol1_9to1_8 => v1_8to1_9}/BlockListener.java | 2 +- .../{protocol1_9to1_8 => v1_8to1_9}/DeathListener.java | 2 +- .../{protocol1_9to1_8 => v1_8to1_9}/HandItemCache.java | 2 +- .../{protocol1_9to1_8 => v1_8to1_9}/PaperPatch.java | 2 +- .../viaversion/bukkit/platform/BukkitViaLoader.java | 10 +++++----- .../bukkit/providers/BukkitAckSequenceProvider.java | 4 ++-- .../providers/BukkitInventoryQuickMoveProvider.java | 4 ++-- .../BukkitInventoryUpdateTask.java | 4 ++-- .../AckSequenceTask.java | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) rename bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/{protocol1_9to1_8 => v1_8to1_9}/ArmorListener.java (98%) rename bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/{protocol1_9to1_8 => v1_8to1_9}/BlockListener.java (96%) rename bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/{protocol1_9to1_8 => v1_8to1_9}/DeathListener.java (97%) rename bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/{protocol1_9to1_8 => v1_8to1_9}/HandItemCache.java (96%) rename bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/{protocol1_9to1_8 => v1_8to1_9}/PaperPatch.java (98%) rename bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/{protocol1_12to1_11_1 => v1_11_1to1_12}/BukkitInventoryUpdateTask.java (97%) rename bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/{protocol1_19to1_18_2 => v1_18_2to1_19}/AckSequenceTask.java (96%) diff --git a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/ArmorListener.java b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/v1_8to1_9/ArmorListener.java similarity index 98% rename from bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/ArmorListener.java rename to bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/v1_8to1_9/ArmorListener.java index 7f289490f..a6cd9838f 100644 --- a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/ArmorListener.java +++ b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/v1_8to1_9/ArmorListener.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.bukkit.listeners.protocol1_9to1_8; +package com.viaversion.viaversion.bukkit.listeners.v1_8to1_9; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; @@ -117,4 +117,4 @@ public class ArmorListener extends ViaBukkitListener { if (!isOnPipe(player)) return; // Don't start a task if the player is not on the pipe Via.getPlatform().runSync(() -> sendArmorUpdate(player)); } -} \ No newline at end of file +} diff --git a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/BlockListener.java b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/v1_8to1_9/BlockListener.java similarity index 96% rename from bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/BlockListener.java rename to bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/v1_8to1_9/BlockListener.java index 1853c04ca..d26e1cf8b 100644 --- a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/BlockListener.java +++ b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/v1_8to1_9/BlockListener.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.bukkit.listeners.protocol1_9to1_8; +package com.viaversion.viaversion.bukkit.listeners.v1_8to1_9; import com.viaversion.viaversion.api.minecraft.BlockPosition; import com.viaversion.viaversion.bukkit.listeners.ViaBukkitListener; diff --git a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/DeathListener.java b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/v1_8to1_9/DeathListener.java similarity index 97% rename from bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/DeathListener.java rename to bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/v1_8to1_9/DeathListener.java index e0d0311bd..7e5d6b9b5 100644 --- a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/DeathListener.java +++ b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/v1_8to1_9/DeathListener.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.bukkit.listeners.protocol1_9to1_8; +package com.viaversion.viaversion.bukkit.listeners.v1_8to1_9; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; diff --git a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/HandItemCache.java b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/v1_8to1_9/HandItemCache.java similarity index 96% rename from bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/HandItemCache.java rename to bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/v1_8to1_9/HandItemCache.java index 882ce6f14..6289bc418 100644 --- a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/HandItemCache.java +++ b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/v1_8to1_9/HandItemCache.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.bukkit.listeners.protocol1_9to1_8; +package com.viaversion.viaversion.bukkit.listeners.v1_8to1_9; import com.viaversion.viaversion.api.minecraft.item.DataItem; import com.viaversion.viaversion.api.minecraft.item.Item; diff --git a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/PaperPatch.java b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/v1_8to1_9/PaperPatch.java similarity index 98% rename from bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/PaperPatch.java rename to bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/v1_8to1_9/PaperPatch.java index 944ab86d2..89e377975 100644 --- a/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_9to1_8/PaperPatch.java +++ b/bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/listeners/v1_8to1_9/PaperPatch.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.bukkit.listeners.protocol1_9to1_8; +package com.viaversion.viaversion.bukkit.listeners.v1_8to1_9; import com.viaversion.viaversion.bukkit.listeners.ViaBukkitListener; import com.viaversion.viaversion.bukkit.util.CollisionChecker; diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaLoader.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaLoader.java index c36d4bce8..12cfc29fb 100644 --- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaLoader.java +++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaLoader.java @@ -28,11 +28,11 @@ import com.viaversion.viaversion.bukkit.listeners.multiversion.PlayerSneakListen import com.viaversion.viaversion.bukkit.listeners.v1_14_4to1_15.EntityToggleGlideListener; import com.viaversion.viaversion.bukkit.listeners.v1_19_3to1_19_4.ArmorToggleListener; import com.viaversion.viaversion.bukkit.listeners.v1_18_2to1_19.BlockBreakListener; -import com.viaversion.viaversion.bukkit.listeners.protocol1_9to1_8.ArmorListener; -import com.viaversion.viaversion.bukkit.listeners.protocol1_9to1_8.BlockListener; -import com.viaversion.viaversion.bukkit.listeners.protocol1_9to1_8.DeathListener; -import com.viaversion.viaversion.bukkit.listeners.protocol1_9to1_8.HandItemCache; -import com.viaversion.viaversion.bukkit.listeners.protocol1_9to1_8.PaperPatch; +import com.viaversion.viaversion.bukkit.listeners.v1_8to1_9.ArmorListener; +import com.viaversion.viaversion.bukkit.listeners.v1_8to1_9.BlockListener; +import com.viaversion.viaversion.bukkit.listeners.v1_8to1_9.DeathListener; +import com.viaversion.viaversion.bukkit.listeners.v1_8to1_9.HandItemCache; +import com.viaversion.viaversion.bukkit.listeners.v1_8to1_9.PaperPatch; import com.viaversion.viaversion.bukkit.listeners.v1_20_5to1_21.PaperPlayerChangeItemListener; import com.viaversion.viaversion.bukkit.listeners.v1_20_5to1_21.PlayerChangeItemListener; import com.viaversion.viaversion.bukkit.providers.BukkitAckSequenceProvider; diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitAckSequenceProvider.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitAckSequenceProvider.java index 684fc861a..21e491eb1 100644 --- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitAckSequenceProvider.java +++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitAckSequenceProvider.java @@ -20,7 +20,7 @@ package com.viaversion.viaversion.bukkit.providers; import com.viaversion.viaversion.ViaVersionPlugin; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; -import com.viaversion.viaversion.bukkit.tasks.protocol1_19to1_18_2.AckSequenceTask; +import com.viaversion.viaversion.bukkit.tasks.v1_18_2to1_19.AckSequenceTask; import com.viaversion.viaversion.protocols.v1_18_2to1_19.provider.AckSequenceProvider; import com.viaversion.viaversion.protocols.v1_18_2to1_19.storage.SequenceStorage; @@ -45,4 +45,4 @@ public final class BukkitAckSequenceProvider extends AckSequenceProvider { } } } -} \ No newline at end of file +} diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitInventoryQuickMoveProvider.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitInventoryQuickMoveProvider.java index 730b0e83e..77f80588a 100644 --- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitInventoryQuickMoveProvider.java +++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/providers/BukkitInventoryQuickMoveProvider.java @@ -21,7 +21,7 @@ import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.ProtocolInfo; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; -import com.viaversion.viaversion.bukkit.tasks.protocol1_12to1_11_1.BukkitInventoryUpdateTask; +import com.viaversion.viaversion.bukkit.tasks.v1_11_1to1_12.BukkitInventoryUpdateTask; import com.viaversion.viaversion.bukkit.util.NMSUtil; import com.viaversion.viaversion.protocols.v1_11_1to1_12.provider.InventoryQuickMoveProvider; import com.viaversion.viaversion.protocols.v1_11_1to1_12.storage.ItemTransactionStorage; @@ -201,4 +201,4 @@ public class BukkitInventoryQuickMoveProvider extends InventoryQuickMoveProvider final ProtocolVersion protocol = Via.getAPI().getServerVersion().lowestSupportedProtocolVersion(); return protocol.newerThanOrEqualTo(ProtocolVersion.v1_8) && protocol.olderThanOrEqualTo(ProtocolVersion.v1_11_1); } -} \ No newline at end of file +} diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/protocol1_12to1_11_1/BukkitInventoryUpdateTask.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/v1_11_1to1_12/BukkitInventoryUpdateTask.java similarity index 97% rename from bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/protocol1_12to1_11_1/BukkitInventoryUpdateTask.java rename to bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/v1_11_1to1_12/BukkitInventoryUpdateTask.java index e08f004ff..035a7aaeb 100644 --- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/protocol1_12to1_11_1/BukkitInventoryUpdateTask.java +++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/v1_11_1to1_12/BukkitInventoryUpdateTask.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.bukkit.tasks.protocol1_12to1_11_1; +package com.viaversion.viaversion.bukkit.tasks.v1_11_1to1_12; import com.viaversion.viaversion.bukkit.providers.BukkitInventoryQuickMoveProvider; import com.viaversion.viaversion.protocols.v1_11_1to1_12.storage.ItemTransactionStorage; @@ -65,4 +65,4 @@ public class BukkitInventoryUpdateTask implements Runnable { provider.onTaskExecuted(uuid); } } -} \ No newline at end of file +} diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/protocol1_19to1_18_2/AckSequenceTask.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/v1_18_2to1_19/AckSequenceTask.java similarity index 96% rename from bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/protocol1_19to1_18_2/AckSequenceTask.java rename to bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/v1_18_2to1_19/AckSequenceTask.java index e69603a55..d16415daf 100644 --- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/protocol1_19to1_18_2/AckSequenceTask.java +++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/tasks/v1_18_2to1_19/AckSequenceTask.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.bukkit.tasks.protocol1_19to1_18_2; +package com.viaversion.viaversion.bukkit.tasks.v1_18_2to1_19; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection;