Updated VLB usage

gradle.properties

@@ -14,7 +14,7 @@ maven_group=de.florianmichael
 archives_base_name=viafabricplus
 
 # base lib
-vialoadingbase_version=a6bda59904
+vialoadingbase_version=c0c310671d
 raknet_transport_version=1.0.0.CR1-SNAPSHOT
 
 # viaversion (and required) libs

src/main/java/de/florianmichael/viafabricplus/definition/v1_14_4/LegacyServerAddress.java

@@ -19,8 +19,8 @@ package de.florianmichael.viafabricplus.definition.v1_14_4;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import de.florianmichael.vialoadingbase.ViaLoadingBase;
-import de.florianmichael.vialoadingbase.platform.ComparableProtocolVersion;
+import de.florianmichael.vialoadingbase.model.ComparableProtocolVersion;
-import de.florianmichael.vialoadingbase.platform.ProtocolRange;
+import de.florianmichael.vialoadingbase.model.ProtocolRange;
 import net.minecraft.client.network.AllowedAddressResolver;
 import net.minecraft.client.network.ServerAddress;
 import net.raphimc.viabedrock.api.BedrockProtocolVersion;
@@ -30,7 +30,7 @@ public class LegacyServerAddress {
     private final static ProtocolRange SRV_RANGE = new ProtocolRange(ProtocolVersion.v1_16_4, LegacyProtocolVersion.r1_3_1tor1_3_2);
 
     public static ServerAddress parse(ComparableProtocolVersion version, String address) {
-        if (version == null) version = ViaLoadingBase.getClassWrapper().getTargetVersion();
+        if (version == null) version = ViaLoadingBase.getInstance().getTargetVersion();
         final ServerAddress mc = ServerAddress.parse(address);
         if (SRV_RANGE.contains(version) || version.isEqualTo(BedrockProtocolVersion.bedrockLatest)) {
             if (!mc.equals(ServerAddress.INVALID)) {

src/main/java/de/florianmichael/viafabricplus/event/ChangeProtocolVersionCallback.java

@@ -17,7 +17,7 @@
  */
 package de.florianmichael.viafabricplus.event;
 
-import de.florianmichael.vialoadingbase.platform.ComparableProtocolVersion;
+import de.florianmichael.vialoadingbase.model.ComparableProtocolVersion;
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
 

src/main/java/de/florianmichael/viafabricplus/information/AbstractInformationGroup.java

@@ -18,7 +18,7 @@
 package de.florianmichael.viafabricplus.information;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
-import de.florianmichael.vialoadingbase.platform.ProtocolRange;
+import de.florianmichael.vialoadingbase.model.ProtocolRange;
 
 import java.util.List;
 

src/main/java/de/florianmichael/viafabricplus/information/impl/BedrockInformation.java

@@ -24,7 +24,7 @@ import de.florianmichael.viafabricplus.definition.bedrock.ModelFormats;
 import de.florianmichael.viafabricplus.information.AbstractInformationGroup;
 import de.florianmichael.viafabricplus.protocolhack.provider.viabedrock.ViaFabricPlusBlobCacheProvider;
 import de.florianmichael.viafabricplus.util.ScreenUtil;
-import de.florianmichael.vialoadingbase.platform.ProtocolRange;
+import de.florianmichael.vialoadingbase.model.ProtocolRange;
 import net.lenni0451.reflect.stream.RStream;
 import net.lenni0451.reflect.stream.field.FieldStream;
 import net.raphimc.viabedrock.api.BedrockProtocolVersion;

src/main/java/de/florianmichael/viafabricplus/information/impl/C0_30CPEInformation.java

@@ -19,7 +19,7 @@ package de.florianmichael.viafabricplus.information.impl;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import de.florianmichael.viafabricplus.information.AbstractInformationGroup;
-import de.florianmichael.vialoadingbase.platform.ProtocolRange;
+import de.florianmichael.vialoadingbase.model.ProtocolRange;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
 import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.storage.ExtensionProtocolMetadataStorage;
 

src/main/java/de/florianmichael/viafabricplus/information/impl/GeneralInformation.java

@@ -33,7 +33,7 @@ public class GeneralInformation extends AbstractInformationGroup {
     @Override
     public void applyInformation(UserConnection userConnection, List<String> output) {
         output.add("Pipeline count: " + userConnection.getProtocolInfo().getPipeline().pipes().size());
-        output.add("Selected version (in the GUI): " + ViaLoadingBase.getClassWrapper().getTargetVersion().getName() + " (" + ViaLoadingBase.getClassWrapper().getTargetVersion().getVersion() + ")");
+        output.add("Selected version (in the GUI): " + ViaLoadingBase.getInstance().getTargetVersion().getName() + " (" + ViaLoadingBase.getInstance().getTargetVersion().getVersion() + ")");
         output.add("Connected version: " + ProtocolHack.getTargetVersion().getName() + " (" + ProtocolHack.getTargetVersion().getVersion() + ")");
     }
 }

src/main/java/de/florianmichael/viafabricplus/information/impl/V1_1Information.java

@@ -19,7 +19,7 @@ package de.florianmichael.viafabricplus.information.impl;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import de.florianmichael.viafabricplus.information.AbstractInformationGroup;
-import de.florianmichael.vialoadingbase.platform.ProtocolRange;
+import de.florianmichael.vialoadingbase.model.ProtocolRange;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
 import net.raphimc.vialegacy.protocols.release.protocol1_2_1_3to1_1.storage.SeedStorage;
 

src/main/java/de/florianmichael/viafabricplus/information/impl/V1_2_4_5Information.java

@@ -19,7 +19,7 @@ package de.florianmichael.viafabricplus.information.impl;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import de.florianmichael.viafabricplus.information.AbstractInformationGroup;
-import de.florianmichael.vialoadingbase.platform.ProtocolRange;
+import de.florianmichael.vialoadingbase.model.ProtocolRange;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
 import net.raphimc.vialegacy.protocols.release.protocol1_3_1_2to1_2_4_5.storage.EntityTracker;
 

src/main/java/de/florianmichael/viafabricplus/information/impl/V1_5_2Information.java

@@ -19,7 +19,7 @@ package de.florianmichael.viafabricplus.information.impl;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import de.florianmichael.viafabricplus.information.AbstractInformationGroup;
-import de.florianmichael.vialoadingbase.platform.ProtocolRange;
+import de.florianmichael.vialoadingbase.model.ProtocolRange;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
 import net.raphimc.vialegacy.protocols.release.protocol1_6_1to1_5_2.storage.EntityTracker;
 

src/main/java/de/florianmichael/viafabricplus/information/impl/V1_7_10Information.java

@@ -20,7 +20,7 @@ package de.florianmichael.viafabricplus.information.impl;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import de.florianmichael.viafabricplus.information.AbstractInformationGroup;
-import de.florianmichael.vialoadingbase.platform.ProtocolRange;
+import de.florianmichael.vialoadingbase.model.ProtocolRange;
 import net.raphimc.vialegacy.protocols.release.protocol1_8to1_7_6_10.storage.EntityTracker;
 
 import java.util.List;

src/main/java/de/florianmichael/viafabricplus/injection/access/IServerInfo.java

@@ -17,7 +17,7 @@
  */
 package de.florianmichael.viafabricplus.injection.access;
 
-import de.florianmichael.vialoadingbase.platform.ComparableProtocolVersion;
+import de.florianmichael.vialoadingbase.model.ComparableProtocolVersion;
 
 public interface IServerInfo {
 

src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinClientConnection.java

@@ -25,7 +25,7 @@ import de.florianmichael.viafabricplus.protocolhack.constants.BedrockRakNetConst
 import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
 import de.florianmichael.viafabricplus.protocolhack.PipelineInjector;
 import de.florianmichael.vialoadingbase.ViaLoadingBase;
-import de.florianmichael.vialoadingbase.event.PipelineReorderEvent;
+import de.florianmichael.vialoadingbase.netty.event.PipelineReorderEvent;
 import io.netty.channel.*;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.encryption.PacketDecryptor;
@@ -108,7 +108,7 @@ public abstract class MixinClientConnection extends SimpleChannelInboundHandler<
 
     @Inject(method = "disconnect", at = @At("RETURN"))
     public void resetStorages(Text disconnectReason, CallbackInfo ci) {
-        ChangeProtocolVersionCallback.EVENT.invoker().onChangeProtocolVersion(ViaLoadingBase.getClassWrapper().getTargetVersion());
+        ChangeProtocolVersionCallback.EVENT.invoker().onChangeProtocolVersion(ViaLoadingBase.getInstance().getTargetVersion());
         DisconnectConnectionCallback.EVENT.invoker().onDisconnect();
     }
 

src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMultiplayerServerListPinger.java

@@ -19,7 +19,7 @@ package de.florianmichael.viafabricplus.injection.mixin.base;
 
 import de.florianmichael.viafabricplus.injection.access.IServerInfo;
 import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
-import de.florianmichael.vialoadingbase.platform.ComparableProtocolVersion;
+import de.florianmichael.vialoadingbase.model.ComparableProtocolVersion;
 import net.minecraft.client.network.MultiplayerServerListPinger;
 import net.minecraft.client.network.ServerAddress;
 import net.minecraft.client.network.ServerInfo;

src/main/java/de/florianmichael/viafabricplus/injection/mixin/bridge/MixinAddServerScreen.java

@@ -19,7 +19,7 @@ package de.florianmichael.viafabricplus.injection.mixin.bridge;
 
 import de.florianmichael.viafabricplus.injection.access.IServerInfo;
 import de.florianmichael.viafabricplus.screen.ForceVersionScreen;
-import de.florianmichael.vialoadingbase.platform.ComparableProtocolVersion;
+import de.florianmichael.vialoadingbase.model.ComparableProtocolVersion;
 import net.minecraft.client.gui.screen.AddServerScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;

src/main/java/de/florianmichael/viafabricplus/injection/mixin/bridge/MixinServerInfo.java

@@ -18,8 +18,8 @@
 package de.florianmichael.viafabricplus.injection.mixin.bridge;
 
 import de.florianmichael.viafabricplus.injection.access.IServerInfo;
-import de.florianmichael.vialoadingbase.platform.ComparableProtocolVersion;
+import de.florianmichael.vialoadingbase.ViaLoadingBase;
-import de.florianmichael.vialoadingbase.platform.InternalProtocolList;
+import de.florianmichael.vialoadingbase.model.ComparableProtocolVersion;
 import net.minecraft.client.network.ServerInfo;
 import net.minecraft.nbt.NbtCompound;
 import org.spongepowered.asm.mixin.Mixin;
@@ -59,7 +59,7 @@ public class MixinServerInfo implements IServerInfo {
     @Inject(method = "fromNbt", at = @At("TAIL"), locals = LocalCapture.CAPTURE_FAILHARD)
     private static void loadForcedVersion(NbtCompound root, CallbackInfoReturnable<ServerInfo> cir, ServerInfo serverInfo) {
         if (root.contains("viafabricplus_forcedversion")) {
-            ((IServerInfo) serverInfo).viafabricplus_forceVersion(InternalProtocolList.fromProtocolVersion(InternalProtocolList.fromProtocolId(root.getInt("viafabricplus_forcedversion"))));
+            ((IServerInfo) serverInfo).viafabricplus_forceVersion(ViaLoadingBase.fromProtocolId(root.getInt("viafabricplus_forcedversion")));
         }
     }
 

src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroups.java

@@ -19,7 +19,7 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
 
 import de.florianmichael.viafabricplus.settings.groups.GeneralSettings;
 import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
-import de.florianmichael.vialoadingbase.platform.ComparableProtocolVersion;
+import de.florianmichael.vialoadingbase.model.ComparableProtocolVersion;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemGroups;
 import net.minecraft.registry.RegistryWrapper;

src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinConnectScreen_1.java

@@ -31,7 +31,7 @@ import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
 import de.florianmichael.viafabricplus.protocolhack.provider.vialegacy.ViaFabricPlusClassicMPPassProvider;
 import de.florianmichael.viafabricplus.settings.groups.MPPassSettings;
 import de.florianmichael.vialoadingbase.ViaLoadingBase;
-import de.florianmichael.vialoadingbase.platform.ComparableProtocolVersion;
+import de.florianmichael.vialoadingbase.model.ComparableProtocolVersion;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.ConnectScreen;
 import net.minecraft.client.network.ServerAddress;

src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialoadingbase/MixinVLBViaConfig.java

@@ -18,7 +18,7 @@
 package de.florianmichael.viafabricplus.injection.mixin.fixes.vialoadingbase;
 
 import com.viaversion.viaversion.configuration.AbstractViaConfig;
-import de.florianmichael.vialoadingbase.defaults.viaversion.VLBViaConfig;
+import de.florianmichael.vialoadingbase.platform.viaversion.VLBViaConfig;
 import org.spongepowered.asm.mixin.Mixin;
 
 import java.io.File;

src/main/java/de/florianmichael/viafabricplus/mappings/ItemReleaseVersionMappings.java

@@ -20,8 +20,8 @@ package de.florianmichael.viafabricplus.mappings;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import de.florianmichael.viafabricplus.event.ChangeProtocolVersionCallback;
 import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
-import de.florianmichael.vialoadingbase.platform.ComparableProtocolVersion;
+import de.florianmichael.vialoadingbase.model.ComparableProtocolVersion;
-import de.florianmichael.vialoadingbase.platform.ProtocolRange;
+import de.florianmichael.vialoadingbase.model.ProtocolRange;
 import net.minecraft.item.Item;
 import net.minecraft.item.Items;
 import net.minecraft.registry.Registries;

src/main/java/de/florianmichael/viafabricplus/protocolhack/PipelineInjector.java

@@ -31,7 +31,7 @@ import de.florianmichael.viafabricplus.protocolhack.platform.vialegacy.VFPPreNet
 import de.florianmichael.viafabricplus.protocolhack.platform.vialegacy.VFPPreNettyEncoder;
 import de.florianmichael.viafabricplus.protocolhack.replacement.ViaFabricPlusVLBViaDecodeHandler;
 import de.florianmichael.vialoadingbase.netty.NettyConstants;
-import de.florianmichael.vialoadingbase.netty.VLBViaEncodeHandler;
+import de.florianmichael.vialoadingbase.netty.handler.VLBViaEncodeHandler;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.*;
 import io.netty.channel.epoll.EpollDatagramChannel;

src/main/java/de/florianmichael/viafabricplus/protocolhack/ProtocolHack.java

@@ -37,8 +37,8 @@ import de.florianmichael.viafabricplus.protocolhack.provider.viaversion.ViaFabri
 import de.florianmichael.viafabricplus.protocolhack.provider.viaversion.ViaFabricPlusMovementTransmitterProvider;
 import de.florianmichael.viafabricplus.protocolhack.replacement.ViaFabricPlusVLBBaseVersionProvider;
 import de.florianmichael.vialoadingbase.ViaLoadingBase;
-import de.florianmichael.vialoadingbase.platform.ComparableProtocolVersion;
+import de.florianmichael.vialoadingbase.model.ComparableProtocolVersion;
-import de.florianmichael.vialoadingbase.platform.SubPlatform;
+import de.florianmichael.vialoadingbase.model.Platform;
 import io.netty.channel.Channel;
 import io.netty.util.AttributeKey;
 import net.minecraft.SharedConstants;
@@ -76,7 +76,7 @@ public class ProtocolHack {
     public static ComparableProtocolVersion getTargetVersion(final Channel channel) {
         if (channel != null && channel.hasAttr(FORCED_VERSION)) return channel.attr(FORCED_VERSION).get();
 
-        return ViaLoadingBase.getClassWrapper().getTargetVersion();
+        return ViaLoadingBase.getInstance().getTargetVersion();
     }
 
     public static Map<InetSocketAddress, ComparableProtocolVersion> getForcedVersions() {
@@ -102,8 +102,8 @@ public class ProtocolHack {
     public ProtocolHack() {
         ViaLoadingBase.ViaLoadingBaseBuilder builder = ViaLoadingBase.ViaLoadingBaseBuilder.create();
 
-        builder = builder.subPlatform(new SubPlatform("ViaBedrock", () -> true, ViaBedrockPlatformImpl::new, protocolVersions -> protocolVersions.add(BedrockProtocolVersion.bedrockLatest)), 0);
+        builder = builder.platform(new Platform("ViaBedrock", () -> true, ViaBedrockPlatformImpl::new, protocolVersions -> protocolVersions.add(BedrockProtocolVersion.bedrockLatest)), 0);
-        builder = builder.subPlatform(new SubPlatform("ViaLegacy", () -> true, ViaLegacyPlatformImpl::new, protocolVersions -> {
+        builder = builder.platform(new Platform("ViaLegacy", () -> true, ViaLegacyPlatformImpl::new, protocolVersions -> {
             final List<ProtocolVersion> legacyProtocols = new ArrayList<>(LegacyProtocolVersion.PROTOCOLS);
             Collections.reverse(legacyProtocols);
 
@@ -112,7 +112,7 @@ public class ProtocolHack {
 
             protocolVersions.addAll(legacyProtocols);
         }));
-        builder = builder.subPlatform(new SubPlatform("ViaAprilFools", () -> true, ViaAprilFoolsPlatformImpl::new, protocolVersions -> {
+        builder = builder.platform(new Platform("ViaAprilFools", () -> true, ViaAprilFoolsPlatformImpl::new, protocolVersions -> {
             protocolVersions.add(protocolVersions.indexOf(ProtocolVersion.v1_14) + 1, AprilFoolsProtocolVersion.s3d_shareware);
             protocolVersions.add(protocolVersions.indexOf(ProtocolVersion.v1_16) + 1, AprilFoolsProtocolVersion.s20w14infinite);
             protocolVersions.add(protocolVersions.indexOf(ProtocolVersion.v1_16_2) + 1, AprilFoolsProtocolVersion.sCombatTest8c);

src/main/java/de/florianmichael/viafabricplus/protocolhack/replacement/ViaFabricPlusVLBViaDecodeHandler.java

@@ -21,7 +21,7 @@ import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.exception.CancelCodecException;
 import com.viaversion.viaversion.util.PipelineUtil;
-import de.florianmichael.vialoadingbase.netty.VLBViaDecodeHandler;
+import de.florianmichael.vialoadingbase.netty.handler.VLBViaDecodeHandler;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 

src/main/java/de/florianmichael/viafabricplus/protocolhack/usage/ItemTranslator.java

@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
 public class ItemTranslator {
 
     public static Item minecraftToViaVersion(final UserConnection user, final ItemStack stack, final int targetVersion) {
-        final List<ProtocolPathEntry> protocolPath = Via.getManager().getProtocolManager().getProtocolPath(ViaLoadingBase.getClassWrapper().getNativeVersion(), targetVersion);
+        final List<ProtocolPathEntry> protocolPath = Via.getManager().getProtocolManager().getProtocolPath(ViaLoadingBase.getInstance().getNativeVersion(), targetVersion);
         if (protocolPath == null) return null;
 
         final CreativeInventoryActionC2SPacket dummyPacket = new CreativeInventoryActionC2SPacket(36, stack);

src/main/java/de/florianmichael/viafabricplus/screen/ClassicItemSelectionScreen.java

@@ -18,7 +18,7 @@
 package de.florianmichael.viafabricplus.screen;
 
 import de.florianmichael.viafabricplus.event.ChangeProtocolVersionCallback;
-import de.florianmichael.vialoadingbase.platform.ComparableProtocolVersion;
+import de.florianmichael.vialoadingbase.model.ComparableProtocolVersion;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.sound.PositionedSoundInstance;

src/main/java/de/florianmichael/viafabricplus/screen/ForceVersionScreen.java

@@ -18,13 +18,12 @@
 package de.florianmichael.viafabricplus.screen;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.vialoadingbase.platform.ComparableProtocolVersion;
+import de.florianmichael.vialoadingbase.ViaLoadingBase;
-import de.florianmichael.vialoadingbase.platform.InternalProtocolList;
+import de.florianmichael.vialoadingbase.model.ComparableProtocolVersion;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.AlwaysSelectedEntryListWidget;
-import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.sound.PositionedSoundInstance;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.sound.SoundEvents;
@@ -33,7 +32,6 @@ import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 
 import java.awt.*;
-import java.util.List;
 import java.util.function.Consumer;
 
 @SuppressWarnings({"DataFlowIssue", "DuplicatedCode"})
@@ -78,7 +76,7 @@ public class ForceVersionScreen extends Screen {
             super(minecraftClient, width, height, top, bottom, entryHeight);
 
             this.addEntry(new ResetProtocolSlot());
-            InternalProtocolList.getProtocols().stream().map(ViaProtocolSlot::new).forEach(this::addEntry);
+            ViaLoadingBase.getProtocols().stream().map(ViaProtocolSlot::new).forEach(this::addEntry);
         }
     }
 
@@ -123,7 +121,7 @@ public class ForceVersionScreen extends Screen {
 
         @Override
         public boolean mouseClicked(double mouseX, double mouseY, int button) {
-            ForceVersionScreen.this.selectionConsumer.accept(InternalProtocolList.fromProtocolVersion(protocolVersion));
+            ForceVersionScreen.this.selectionConsumer.accept(ViaLoadingBase.fromProtocolVersion(protocolVersion));
             MinecraftClient.getInstance().getSoundManager().play(PositionedSoundInstance.master(SoundEvents.UI_BUTTON_CLICK, 1.0F));
             ForceVersionScreen.this.close();
             return super.mouseClicked(mouseX, mouseY, button);

src/main/java/de/florianmichael/viafabricplus/screen/ProtocolSelectionScreen.java

@@ -28,7 +28,6 @@ import de.florianmichael.viafabricplus.screen.settings.SettingsScreen;
 import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
 import de.florianmichael.viafabricplus.util.ScreenUtil;
 import de.florianmichael.vialoadingbase.ViaLoadingBase;
-import de.florianmichael.vialoadingbase.platform.InternalProtocolList;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.screen.NoticeScreen;
@@ -119,7 +118,7 @@ public class ProtocolSelectionScreen extends Screen {
         public SlotList(MinecraftClient minecraftClient, int width, int height, int top, int bottom, int entryHeight) {
             super(minecraftClient, width, height, top, bottom, entryHeight);
 
-            InternalProtocolList.getProtocols().stream().map(ProtocolSlot::new).forEach(this::addEntry);
+            ViaLoadingBase.getProtocols().stream().map(ProtocolSlot::new).forEach(this::addEntry);
         }
     }
 
@@ -137,7 +136,7 @@ public class ProtocolSelectionScreen extends Screen {
 
         @Override
         public boolean mouseClicked(double mouseX, double mouseY, int button) {
-            ViaLoadingBase.getClassWrapper().reload(this.protocolVersion);
+            ViaLoadingBase.getInstance().reload(this.protocolVersion);
             ScreenUtil.playClickSound();
             return super.mouseClicked(mouseX, mouseY, button);
         }

src/main/java/de/florianmichael/viafabricplus/screen/classicube/ClassiCubeServerListScreen.java

@@ -28,10 +28,9 @@ import de.florianmichael.viafabricplus.screen.ProtocolSelectionScreen;
 import de.florianmichael.viafabricplus.screen.base.MappedSlotEntry;
 import de.florianmichael.viafabricplus.settings.groups.MPPassSettings;
 import de.florianmichael.viafabricplus.util.ScreenUtil;
-import de.florianmichael.vialoadingbase.platform.InternalProtocolList;
+import de.florianmichael.vialoadingbase.ViaLoadingBase;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.client.gui.screen.ConnectScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.TitleScreen;
@@ -145,7 +144,7 @@ public class ClassiCubeServerListScreen extends Screen {
             ViaFabricPlusClassicMPPassProvider.classiCubeMPPass = classiCubeServerInfo.mppass();
 
             if (MPPassSettings.INSTANCE.forceCPEIfUsingClassiCube.getValue()) {
-                ((IServerInfo) entry).viafabricplus_forceVersion(InternalProtocolList.fromProtocolVersion(LegacyProtocolVersion.c0_30cpe));
+                ((IServerInfo) entry).viafabricplus_forceVersion(ViaLoadingBase.fromProtocolVersion(LegacyProtocolVersion.c0_30cpe));
             }
 
             ConnectScreen.connect(MinecraftClient.getInstance().currentScreen, MinecraftClient.getInstance(), serverAddress, entry);

src/main/java/de/florianmichael/viafabricplus/settings/SettingsSystem.java

@@ -23,9 +23,7 @@ import de.florianmichael.viafabricplus.settings.base.AbstractSetting;
 import de.florianmichael.viafabricplus.settings.base.SettingGroup;
 import de.florianmichael.viafabricplus.settings.groups.*;
 import de.florianmichael.viafabricplus.util.FileSaver;
-import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
 import de.florianmichael.vialoadingbase.ViaLoadingBase;
-import de.florianmichael.vialoadingbase.platform.InternalProtocolList;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -56,7 +54,7 @@ public class SettingsSystem extends FileSaver {
 
     @Override
     public void write(JsonObject object) {
-        object.addProperty("protocol", ViaLoadingBase.getClassWrapper().getTargetVersion().getVersion());
+        object.addProperty("protocol", ViaLoadingBase.getInstance().getTargetVersion().getVersion());
         for (SettingGroup group : groups) {
             for (AbstractSetting<?> setting : group.getSettings()) {
                 setting.write(object);
@@ -67,7 +65,7 @@ public class SettingsSystem extends FileSaver {
     @Override
     public void read(JsonObject object) {
         if (object.has("protocol")) {
-            ViaLoadingBase.getClassWrapper().reload(InternalProtocolList.fromProtocolId(object.get("protocol").getAsInt()));
+            ViaLoadingBase.getInstance().reload(ViaLoadingBase.fromProtocolId(object.get("protocol").getAsInt()));
         }
         for (SettingGroup group : groups) {
             for (AbstractSetting<?> setting : group.getSettings()) {

src/main/java/de/florianmichael/viafabricplus/settings/groups/DebugSettings.java

@@ -20,7 +20,7 @@ package de.florianmichael.viafabricplus.settings.groups;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import de.florianmichael.viafabricplus.settings.base.SettingGroup;
 import de.florianmichael.viafabricplus.settings.type_impl.ProtocolSyncBooleanSetting;
-import de.florianmichael.vialoadingbase.platform.ProtocolRange;
+import de.florianmichael.vialoadingbase.model.ProtocolRange;
 import net.minecraft.text.Text;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
 

src/main/java/de/florianmichael/viafabricplus/settings/groups/VisualSettings.java

@@ -20,7 +20,7 @@ package de.florianmichael.viafabricplus.settings.groups;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import de.florianmichael.viafabricplus.settings.base.SettingGroup;
 import de.florianmichael.viafabricplus.settings.type_impl.ProtocolSyncBooleanSetting;
-import de.florianmichael.vialoadingbase.platform.ProtocolRange;
+import de.florianmichael.vialoadingbase.model.ProtocolRange;
 import net.minecraft.text.Text;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
 

src/main/java/de/florianmichael/viafabricplus/settings/type_impl/ProtocolSyncBooleanSetting.java

@@ -23,7 +23,7 @@ import de.florianmichael.viafabricplus.screen.settings.settingrenderer.ProtocolS
 import de.florianmichael.viafabricplus.settings.base.SettingGroup;
 import de.florianmichael.viafabricplus.settings.groups.GeneralSettings;
 import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
-import de.florianmichael.vialoadingbase.platform.ProtocolRange;
+import de.florianmichael.vialoadingbase.model.ProtocolRange;
 import net.minecraft.text.MutableText;
 
 public class ProtocolSyncBooleanSetting extends BooleanSetting {