Update ViaLegacy API usage

ViaVersion · May 17, 2024 · 6c372c2 · 6c372c2
1 parent d9458d1
commit 6c372c2
Show file tree

Hide file tree

Showing 26 changed files with 59 additions and 59 deletions.
diff --git a/...main/java/de/florianmichael/viafabricplus/event/LoadClassicProtocolExtensionCallback.java b/...main/java/de/florianmichael/viafabricplus/event/LoadClassicProtocolExtensionCallback.java
@@ -21,7 +21,7 @@
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
-import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.data.ClassicProtocolExtension;
+import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.data.ClassicProtocolExtension;
 
 /**
  * This event is fired when a classic protocol extension is loaded.

diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/ClientsideFixes.java b/src/main/java/de/florianmichael/viafabricplus/fixes/ClientsideFixes.java
@@ -43,8 +43,8 @@
 import net.raphimc.viabedrock.api.BedrockProtocolVersion;
 import net.raphimc.viabedrock.protocol.data.ProtocolConstants;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
-import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.data.ClassicProtocolExtension;
-import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.storage.ExtensionProtocolMetadataStorage;
+import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.data.ClassicProtocolExtension;
+import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.storage.ExtensionProtocolMetadataStorage;
 
 import java.util.Map;
 import java.util.Objects;

diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/data/ItemRegistryDiff.java b/src/main/java/de/florianmichael/viafabricplus/fixes/data/ItemRegistryDiff.java
@@ -25,8 +25,8 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.item.Item;
-import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.data.ClassicProtocolExtension;
-import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.storage.ExtensionProtocolMetadataStorage;
+import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.data.ClassicProtocolExtension;
+import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.storage.ExtensionProtocolMetadataStorage;
 import net.raphimc.vialoader.util.VersionRange;
 
 import java.util.ArrayList;

diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/CPEAdditions.java b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/CPEAdditions.java
@@ -22,8 +22,8 @@
 import com.viaversion.viaversion.api.connection.UserConnection;
 import io.netty.buffer.ByteBuf;
 import net.lenni0451.reflect.Enums;
-import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.ClientboundPacketsc0_30cpe;
-import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.data.ClassicProtocolExtension;
+import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.data.ClassicProtocolExtension;
+import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.packet.ClientboundPacketsc0_30cpe;
 
 import java.util.Arrays;
 import java.util.HashMap;

diff --git a/...main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/WorldHeightSupport.java b/...main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/WorldHeightSupport.java
@@ -25,14 +25,13 @@
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
-import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_17;
 import com.viaversion.nbt.tag.CompoundTag;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
-import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.model.ClassicLevel;
-import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.providers.ClassicWorldHeightProvider;
-import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.storage.ClassicLevelStorage;
+import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.model.ClassicLevel;
+import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.provider.ClassicWorldHeightProvider;
+import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.storage.ClassicLevelStorage;
 
 import java.util.ArrayList;
 import java.util.BitSet;

diff --git a/...e/florianmichael/viafabricplus/fixes/versioned/classic/command/ListExtensionsCommand.java b/...e/florianmichael/viafabricplus/fixes/versioned/classic/command/ListExtensionsCommand.java
@@ -24,7 +24,7 @@
 import de.florianmichael.viafabricplus.protocoltranslator.impl.command.VFPViaSubCommand;
 import net.minecraft.util.Formatting;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
-import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.storage.ExtensionProtocolMetadataStorage;
+import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.storage.ExtensionProtocolMetadataStorage;
 
 public class ListExtensionsCommand implements VFPViaSubCommand {
 

diff --git a/.../java/de/florianmichael/viafabricplus/fixes/versioned/classic/command/SetTimeCommand.java b/.../java/de/florianmichael/viafabricplus/fixes/versioned/classic/command/SetTimeCommand.java
@@ -23,7 +23,7 @@
 import de.florianmichael.viafabricplus.protocoltranslator.impl.command.VFPViaSubCommand;
 import net.minecraft.util.Formatting;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
-import net.raphimc.vialegacy.protocols.alpha.protocola1_0_17_1_0_17_4toa1_0_16_2.storage.TimeLockStorage;
+import net.raphimc.vialegacy.protocol.alpha.a1_0_16_2toa1_0_17_1_0_17_4.storage.TimeLockStorage;
 
 public class SetTimeCommand implements VFPViaSubCommand {
 

diff --git a/...a/de/florianmichael/viafabricplus/injection/access/IExtensionProtocolMetadataStorage.java b/...a/de/florianmichael/viafabricplus/injection/access/IExtensionProtocolMetadataStorage.java
@@ -19,11 +19,12 @@
 
 package de.florianmichael.viafabricplus.injection.access;
 
-import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.data.ClassicProtocolExtension;
+import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.data.ClassicProtocolExtension;
 
 import java.util.EnumMap;
 
 public interface IExtensionProtocolMetadataStorage {
 
     EnumMap<ClassicProtocolExtension, Integer> viaFabricPlus$getServerExtensions();
+
 }
diff --git a/...ianmichael/viafabricplus/injection/mixin/base/connect/MixinClientLoginNetworkHandler.java b/...ianmichael/viafabricplus/injection/mixin/base/connect/MixinClientLoginNetworkHandler.java
@@ -24,7 +24,7 @@
 import net.minecraft.network.ClientConnection;
 import net.minecraft.text.Text;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
-import net.raphimc.vialegacy.protocols.release.protocol1_7_2_5to1_6_4.storage.ProtocolMetadataStorage;
+import net.raphimc.vialegacy.protocol.release.r1_6_4tor1_7_2_5.storage.ProtocolMetadataStorage;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

diff --git a/.../java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinDebugHud.java b/.../java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinDebugHud.java
@@ -35,9 +35,9 @@
 import net.raphimc.viabedrock.protocol.storage.ChunkTracker;
 import net.raphimc.viabedrock.protocol.storage.GameSessionStorage;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
-import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.storage.ExtensionProtocolMetadataStorage;
-import net.raphimc.vialegacy.protocols.release.protocol1_2_1_3to1_1.storage.SeedStorage;
-import net.raphimc.vialegacy.protocols.release.protocol1_8to1_7_6_10.storage.EntityTracker;
+import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.storage.ExtensionProtocolMetadataStorage;
+import net.raphimc.vialegacy.protocol.release.r1_1tor1_2_1_3.storage.SeedStorage;
+import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.storage.EntityTracker;
 import org.cloudburstmc.netty.channel.raknet.RakClientChannel;
 import org.cloudburstmc.netty.handler.codec.raknet.common.RakSessionCodec;
 import org.spongepowered.asm.mixin.Mixin;

diff --git a/...michael/viafabricplus/injection/mixin/base/integration/MixinDownloadingTerrainScreen.java b/...michael/viafabricplus/injection/mixin/base/integration/MixinDownloadingTerrainScreen.java
@@ -27,7 +27,7 @@
 import net.minecraft.client.gui.screen.DownloadingTerrainScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.Text;
-import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.storage.ClassicProgressStorage;
+import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.storage.ClassicProgressStorage;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

diff --git a/...michael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinClientPlayerEntity.java b/...michael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinClientPlayerEntity.java
@@ -39,8 +39,8 @@
 import net.minecraft.network.packet.Packet;
 import net.minecraft.util.math.MathHelper;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
-import net.raphimc.vialegacy.protocols.release.protocol1_6_1to1_5_2.Protocol1_6_1to1_5_2;
-import net.raphimc.vialegacy.protocols.release.protocol1_6_1to1_5_2.ServerboundPackets1_5_2;
+import net.raphimc.vialegacy.protocol.release.r1_5_2tor1_6_1.Protocolr1_5_2Tor1_6_1;
+import net.raphimc.vialegacy.protocol.release.r1_5_2tor1_6_1.packet.ServerboundPackets1_5_2;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -227,7 +227,7 @@ private void modifyPositionPacket(ClientPlayNetworkHandler instance, Packet<?> p
             playerPosition.write(Types.FLOAT, this.getYaw()); // yaw
             playerPosition.write(Types.FLOAT, this.getPitch()); // pitch
             playerPosition.write(Types.BOOLEAN, this.isOnGround()); // onGround
-            playerPosition.scheduleSendToServer(Protocol1_6_1to1_5_2.class);
+            playerPosition.scheduleSendToServer(Protocolr1_5_2Tor1_6_1.class);
             return;
         }
         instance.sendPacket(packet);

diff --git a/...nmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinClassicProtocolExtension.java b/...nmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinClassicProtocolExtension.java
@@ -20,7 +20,7 @@
 package de.florianmichael.viafabricplus.injection.mixin.fixes.vialegacy;
 
 import de.florianmichael.viafabricplus.fixes.versioned.classic.CPEAdditions;
-import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.data.ClassicProtocolExtension;
+import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.data.ClassicProtocolExtension;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

diff --git a/...ichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinClientboundPacketsc0_30cpe.java b/...ichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinClientboundPacketsc0_30cpe.java
@@ -20,7 +20,7 @@
 package de.florianmichael.viafabricplus.injection.mixin.fixes.vialegacy;
 
 import de.florianmichael.viafabricplus.fixes.versioned.classic.CPEAdditions;
-import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.ClientboundPacketsc0_30cpe;
+import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.packet.ClientboundPacketsc0_30cpe;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

diff --git a/...alegacy/MixinProtocolc0_30toc0_30cpe.java → ...gacy/MixinProtocolc0_30cpeToc0_28_30.java b/...alegacy/MixinProtocolc0_30toc0_30cpe.java → ...gacy/MixinProtocolc0_30cpeToc0_28_30.java
@@ -26,18 +26,18 @@
 import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.Protocol1_19_3To1_19_4;
 import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ClientboundPackets1_19_4;
 import de.florianmichael.viafabricplus.fixes.versioned.classic.CPEAdditions;
-import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.ClientboundPacketsc0_28;
-import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.ServerboundPacketsc0_28;
-import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.ClientboundPacketsc0_30cpe;
-import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.Protocolc0_30toc0_30cpe;
-import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.ServerboundPacketsc0_30cpe;
+import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.packet.ClientboundPacketsc0_28;
+import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.packet.ServerboundPacketsc0_28;
+import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.Protocolc0_30cpeToc0_28_30;
+import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.packet.ClientboundPacketsc0_30cpe;
+import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.packet.ServerboundPacketsc0_30cpe;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(value = Protocolc0_30toc0_30cpe.class, remap = false)
-public abstract class MixinProtocolc0_30toc0_30cpe extends AbstractProtocol<ClientboundPacketsc0_30cpe, ClientboundPacketsc0_28, ServerboundPacketsc0_30cpe, ServerboundPacketsc0_28> {
+@Mixin(value = Protocolc0_30cpeToc0_28_30.class, remap = false)
+public abstract class MixinProtocolc0_30cpeToc0_28_30 extends AbstractProtocol<ClientboundPacketsc0_30cpe, ClientboundPacketsc0_28, ServerboundPacketsc0_30cpe, ServerboundPacketsc0_28> {
 
     @Inject(method = "registerPackets", at = @At("RETURN"))
     private void extendPackets(CallbackInfo ci) {

diff --git a/...vialegacy/MixinProtocol1_8to1_7_6_10.java → ...alegacy/MixinProtocolr1_7_6_10Tor1_8.java b/...vialegacy/MixinProtocol1_8to1_7_6_10.java → ...alegacy/MixinProtocolr1_7_6_10Tor1_8.java
@@ -26,16 +26,16 @@
 import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_8;
 import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ServerboundPackets1_8;
 import de.florianmichael.viafabricplus.fixes.tracker.TeleportTracker;
-import net.raphimc.vialegacy.protocols.release.protocol1_7_6_10to1_7_2_5.ClientboundPackets1_7_2;
-import net.raphimc.vialegacy.protocols.release.protocol1_7_6_10to1_7_2_5.ServerboundPackets1_7_2;
-import net.raphimc.vialegacy.protocols.release.protocol1_8to1_7_6_10.Protocol1_8to1_7_6_10;
+import net.raphimc.vialegacy.protocol.release.r1_7_2_5tor1_7_6_10.packet.ClientboundPackets1_7_2;
+import net.raphimc.vialegacy.protocol.release.r1_7_2_5tor1_7_6_10.packet.ServerboundPackets1_7_2;
+import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.Protocolr1_7_6_10Tor1_8;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(value = Protocol1_8to1_7_6_10.class, remap = false)
-public abstract class MixinProtocol1_8to1_7_6_10 extends AbstractProtocol<ClientboundPackets1_7_2, ClientboundPackets1_8, ServerboundPackets1_7_2, ServerboundPackets1_8> {
+@Mixin(value = Protocolr1_7_6_10Tor1_8.class, remap = false)
+public abstract class MixinProtocolr1_7_6_10Tor1_8 extends AbstractProtocol<ClientboundPackets1_7_2, ClientboundPackets1_8, ServerboundPackets1_7_2, ServerboundPackets1_8> {
 
     @Inject(method = "registerPackets", at = @At("RETURN"))
     private void addTeleportTracker(CallbackInfo ci) {

diff --git a/...ichael/viafabricplus/injection/mixin/vialegacy/MixinExtensionProtocolMetadataStorage.java b/...ichael/viafabricplus/injection/mixin/vialegacy/MixinExtensionProtocolMetadataStorage.java
@@ -21,8 +21,8 @@
 
 import de.florianmichael.viafabricplus.event.LoadClassicProtocolExtensionCallback;
 import de.florianmichael.viafabricplus.injection.access.IExtensionProtocolMetadataStorage;
-import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.data.ClassicProtocolExtension;
-import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.storage.ExtensionProtocolMetadataStorage;
+import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.data.ClassicProtocolExtension;
+import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.storage.ExtensionProtocolMetadataStorage;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

diff --git a/...cplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusAlphaInventoryProvider.java b/...cplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusAlphaInventoryProvider.java
@@ -26,11 +26,11 @@
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
-import net.raphimc.vialegacy.protocols.alpha.protocolb1_0_1_1_1toa1_2_3_5_1_2_6.providers.AlphaInventoryProvider;
+import net.raphimc.vialegacy.protocol.alpha.a1_2_3_5_1_2_6tob1_0_1_1_1.provider.AlphaInventoryProvider;
 
 import java.util.List;
 
-import static net.raphimc.vialegacy.protocols.alpha.protocolb1_0_1_1_1toa1_2_3_5_1_2_6.Protocolb1_0_1_1_1toa1_2_3_5_1_2_6.copyItems;
+import static net.raphimc.vialegacy.protocol.alpha.a1_2_3_5_1_2_6tob1_0_1_1_1.Protocola1_2_3_5_1_2_6Tob1_0_1_1_1.copyItems;
 
 public class ViaFabricPlusAlphaInventoryProvider extends AlphaInventoryProvider {
 

diff --git a/...icplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusClassicMPPassProvider.java b/...icplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusClassicMPPassProvider.java
@@ -24,9 +24,9 @@
 import de.florianmichael.classic4j.BetaCraftHandler;
 import de.florianmichael.viafabricplus.ViaFabricPlus;
 import de.florianmichael.viafabricplus.settings.impl.AuthenticationSettings;
-import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.providers.ClassicMPPassProvider;
-import net.raphimc.vialegacy.protocols.release.protocol1_3_1_2to1_2_4_5.providers.OldAuthProvider;
-import net.raphimc.vialegacy.protocols.release.protocol1_7_2_5to1_6_4.storage.HandshakeStorage;
+import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.provider.ClassicMPPassProvider;
+import net.raphimc.vialegacy.protocol.release.r1_2_4_5tor1_3_1_2.provider.OldAuthProvider;
+import net.raphimc.vialegacy.protocol.release.r1_6_4tor1_7_2_5.storage.HandshakeStorage;
 
 public class ViaFabricPlusClassicMPPassProvider extends ClassicMPPassProvider {
 

diff --git a/...s/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusClassicWorldHeightProvider.java b/...s/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusClassicWorldHeightProvider.java
@@ -20,7 +20,7 @@
 package de.florianmichael.viafabricplus.protocoltranslator.impl.provider.vialegacy;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
-import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.providers.ClassicWorldHeightProvider;
+import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.provider.ClassicWorldHeightProvider;
 
 public class ViaFabricPlusClassicWorldHeightProvider extends ClassicWorldHeightProvider {
 

diff --git a/...abricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusEncryptionProvider.java b/...abricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusEncryptionProvider.java
@@ -22,7 +22,7 @@
 import com.viaversion.viaversion.api.connection.UserConnection;
 import de.florianmichael.viafabricplus.injection.access.IClientConnection;
 import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import net.raphimc.vialegacy.protocols.release.protocol1_7_2_5to1_6_4.providers.EncryptionProvider;
+import net.raphimc.vialegacy.protocol.release.r1_6_4tor1_7_2_5.provider.EncryptionProvider;
 
 public class ViaFabricPlusEncryptionProvider extends EncryptionProvider {
 

diff --git a/...abricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusGameProfileFetcher.java b/...abricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusGameProfileFetcher.java
@@ -26,8 +26,8 @@
 import com.mojang.authlib.yggdrasil.ProfileNotFoundException;
 import com.mojang.authlib.yggdrasil.ProfileResult;
 import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
-import net.raphimc.vialegacy.protocols.release.protocol1_8to1_7_6_10.model.GameProfile;
-import net.raphimc.vialegacy.protocols.release.protocol1_8to1_7_6_10.providers.GameProfileFetcher;
+import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.model.GameProfile;
+import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.provider.GameProfileFetcher;
 
 import java.net.Proxy;
 import java.util.UUID;

diff --git a/...iafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusOldAuthProvider.java b/...iafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusOldAuthProvider.java
@@ -26,7 +26,7 @@
 import de.florianmichael.viafabricplus.util.ChatUtil;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.Text;
-import net.raphimc.vialegacy.protocols.release.protocol1_3_1_2to1_2_4_5.providers.OldAuthProvider;
+import net.raphimc.vialegacy.protocol.release.r1_2_4_5tor1_3_1_2.provider.OldAuthProvider;
 
 public class ViaFabricPlusOldAuthProvider extends OldAuthProvider {
 

diff --git a/...lorianmichael/viafabricplus/protocoltranslator/impl/viaversion/ViaFabricPlusVLLoader.java b/...lorianmichael/viafabricplus/protocoltranslator/impl/viaversion/ViaFabricPlusVLLoader.java
@@ -33,12 +33,12 @@
 import de.florianmichael.viafabricplus.protocoltranslator.impl.provider.viaversion.*;
 import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
 import net.raphimc.viabedrock.protocol.providers.NettyPipelineProvider;
-import net.raphimc.vialegacy.protocols.alpha.protocolb1_0_1_1_1toa1_2_3_5_1_2_6.providers.AlphaInventoryProvider;
-import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.providers.ClassicMPPassProvider;
-import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.providers.ClassicWorldHeightProvider;
-import net.raphimc.vialegacy.protocols.release.protocol1_3_1_2to1_2_4_5.providers.OldAuthProvider;
-import net.raphimc.vialegacy.protocols.release.protocol1_7_2_5to1_6_4.providers.EncryptionProvider;
-import net.raphimc.vialegacy.protocols.release.protocol1_8to1_7_6_10.providers.GameProfileFetcher;
+import net.raphimc.vialegacy.protocol.alpha.a1_2_3_5_1_2_6tob1_0_1_1_1.provider.AlphaInventoryProvider;
+import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.provider.ClassicMPPassProvider;
+import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.provider.ClassicWorldHeightProvider;
+import net.raphimc.vialegacy.protocol.release.r1_2_4_5tor1_3_1_2.provider.OldAuthProvider;
+import net.raphimc.vialegacy.protocol.release.r1_6_4tor1_7_2_5.provider.EncryptionProvider;
+import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.provider.GameProfileFetcher;
 import net.raphimc.vialoader.impl.viaversion.VLLoader;
 
 public class ViaFabricPlusVLLoader extends VLLoader {

diff --git a/...in/java/de/florianmichael/viafabricplus/protocoltranslator/translator/ItemTranslator.java b/...in/java/de/florianmichael/viafabricplus/protocoltranslator/translator/ItemTranslator.java
@@ -37,9 +37,9 @@
 import net.minecraft.network.RegistryByteBuf;
 import net.minecraft.registry.Registries;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
-import net.raphimc.vialegacy.protocols.beta.protocol1_0_0_1tob1_8_0_1.ClientboundPacketsb1_8;
-import net.raphimc.vialegacy.protocols.beta.protocol1_0_0_1tob1_8_0_1.types.Typesb1_8_0_1;
-import net.raphimc.vialegacy.protocols.release.protocol1_4_4_5to1_4_2.types.Types1_4_2;
+import net.raphimc.vialegacy.protocol.beta.b1_8_0_1tor1_0_0_1.packet.ClientboundPacketsb1_8;
+import net.raphimc.vialegacy.protocol.beta.b1_8_0_1tor1_0_0_1.types.Typesb1_8_0_1;
+import net.raphimc.vialegacy.protocol.release.r1_4_2tor1_4_4_5.types.Types1_4_2;
 
 public class ItemTranslator {
 

diff --git a/src/main/resources/viafabricplus.mixins.json b/src/main/resources/viafabricplus.mixins.json
@@ -162,8 +162,8 @@
     "fixes.minecraft.screen.screenhandler.MixinScreenHandler",
     "fixes.vialegacy.MixinClassicProtocolExtension",
     "fixes.vialegacy.MixinClientboundPacketsc0_30cpe",
-    "fixes.vialegacy.MixinProtocol1_8to1_7_6_10",
-    "fixes.vialegacy.MixinProtocolc0_30toc0_30cpe",
+    "fixes.vialegacy.MixinProtocolr1_7_6_10Tor1_8",
+    "fixes.vialegacy.MixinProtocolc0_30cpeToc0_28_30",
     "fixes.viaversion.MixinBlockItemPacketRewriter1_20_5",
     "fixes.viaversion.MixinCommandBlockProvider",
     "fixes.viaversion.MixinCommonBoss",