Repackage modern fabric platforms

viafabric-mc1122/src/main/resources/fabric.mod.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "id": "viafabric-mc112",
+  "id": "viafabric-mc1122",
   "name": "ViaFabric for 1.12",
   "version": "${version}",
   "description": "${description}",

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/ViaFabric.java

@@ -15,9 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114;
+package com.viaversion.fabric.mc1144;
 
-import com.google.common.collect.Range;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
@@ -26,9 +25,9 @@ import com.viaversion.fabric.common.config.VFConfig;
 import com.viaversion.fabric.common.platform.FabricInjector;
 import com.viaversion.fabric.common.protocol.HostnameParserProtocol;
 import com.viaversion.fabric.common.util.JLoggerToLog4j;
-import com.viaversion.fabric.mc114.commands.VFCommandHandler;
-import com.viaversion.fabric.mc114.platform.FabricPlatform;
-import com.viaversion.fabric.mc114.platform.VFLoader;
+import com.viaversion.fabric.mc1144.commands.VFCommandHandler;
+import com.viaversion.fabric.mc1144.platform.FabricPlatform;
+import com.viaversion.fabric.mc1144.platform.VFLoader;
 import com.viaversion.viaversion.ViaManagerImpl;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/commands/NMSCommandSender.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.commands;
+package com.viaversion.fabric.mc1144.commands;
 
 import com.viaversion.viaversion.api.command.ViaCommandSender;
 import com.viaversion.viaversion.util.ComponentUtil;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/commands/VFClientCommands.java

@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115.commands;
+package com.viaversion.fabric.mc1144.commands;
 
-import com.viaversion.fabric.mc115.ViaFabric;
+import com.viaversion.fabric.mc1144.ViaFabric;
 import com.mojang.brigadier.CommandDispatcher;
 import io.github.cottonmc.clientcommands.ClientCommandPlugin;
 import io.github.cottonmc.clientcommands.CottonClientCommandSource;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/commands/VFCommandHandler.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115.commands;
+package com.viaversion.fabric.mc1144.commands;
 
 import com.viaversion.fabric.common.commands.subs.LeakDetectSubCommand;
 import com.mojang.brigadier.arguments.StringArgumentType;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/gui/ModMenuConfig.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.gui;
+package com.viaversion.fabric.mc1144.gui;
 
 import io.github.prospector.modmenu.api.ModMenuApi;
 import net.minecraft.client.gui.screen.Screen;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/gui/ViaConfigScreen.java

@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115.gui;
+package com.viaversion.fabric.mc1144.gui;
 
 import com.viaversion.fabric.common.config.AbstractViaConfigScreen;
-import com.viaversion.fabric.mc115.ViaFabric;
+import com.viaversion.fabric.mc1144.ViaFabric;
 import com.viaversion.fabric.common.util.ProtocolUtils;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.fabricmc.api.EnvType;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinConnectScreenThread.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115.mixin.address.client;
+package com.viaversion.fabric.mc1144.mixin.address.client;
 
 import com.viaversion.fabric.common.AddressParser;
 import org.spongepowered.asm.mixin.Mixin;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinServerAddress.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115.mixin.address.client;
+package com.viaversion.fabric.mc1144.mixin.address.client;
 
 import com.viaversion.fabric.common.AddressParser;
 import net.minecraft.network.ServerAddress;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinServerPinger.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.mixin.address.client;
+package com.viaversion.fabric.mc1144.mixin.address.client;
 
 import com.viaversion.fabric.common.AddressParser;
 import net.minecraft.client.network.MultiplayerServerListPinger;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/debug/client/MixinClientConnection.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc117.mixin.debug.client;
+package com.viaversion.fabric.mc1144.mixin.debug.client;
 
 import io.netty.channel.ChannelHandlerContext;
 import net.minecraft.network.ClientConnection;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/debug/client/MixinClientConnectionAccessor.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc116.mixin.debug.client;
+package com.viaversion.fabric.mc1144.mixin.debug.client;
 
 import io.netty.channel.Channel;
 import net.minecraft.network.ClientConnection;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/debug/client/MixinDebugHud.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115.mixin.debug.client;
+package com.viaversion.fabric.mc1144.mixin.debug.client;
 
 import com.viaversion.fabric.common.handler.CommonTransformer;
 import com.viaversion.fabric.common.handler.FabricDecodeHandler;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/gui/client/MixinMultiplayerScreen.java

@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115.mixin.gui.client;
+package com.viaversion.fabric.mc1144.mixin.gui.client;
 
-import com.viaversion.fabric.mc115.ViaFabric;
-import com.viaversion.fabric.mc115.gui.ViaConfigScreen;
+import com.viaversion.fabric.mc1144.ViaFabric;
+import com.viaversion.fabric.mc1144.gui.ViaConfigScreen;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/gui/client/MixinMultiplayerServerListPingerListener.java

@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115.mixin.gui.client;
+package com.viaversion.fabric.mc1144.mixin.gui.client;
 
 
 import com.viaversion.fabric.common.gui.ViaServerInfo;
 import com.viaversion.fabric.common.handler.FabricDecodeHandler;
-import com.viaversion.fabric.mc115.mixin.debug.client.MixinClientConnectionAccessor;
+import com.viaversion.fabric.mc1144.mixin.debug.client.MixinClientConnectionAccessor;
 import net.minecraft.client.network.ServerInfo;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.listener.ClientQueryPacketListener;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/gui/client/MixinServerEntry.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115.mixin.gui.client;
+package com.viaversion.fabric.mc1144.mixin.gui.client;
 
 import com.viaversion.fabric.common.gui.ViaServerInfo;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/gui/client/MixinServerInfo.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115.mixin.gui.client;
+package com.viaversion.fabric.mc1144.mixin.gui.client;
 
 import com.viaversion.fabric.common.gui.ViaServerInfo;
 import net.minecraft.client.network.ServerInfo;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/pipeline/MixinClientConnection.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.mixin.pipeline;
+package com.viaversion.fabric.mc1144.mixin.pipeline;
 
 import com.viaversion.fabric.common.handler.PipelineReorderEvent;
 import io.netty.channel.Channel;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/pipeline/MixinServerNetworkIoChInit.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc116.mixin.pipeline;
+package com.viaversion.fabric.mc1144.mixin.pipeline;
 
 import com.viaversion.fabric.common.handler.CommonTransformer;
 import com.viaversion.fabric.common.handler.FabricDecodeHandler;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/pipeline/client/MixinClientConnection.java

@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc116.mixin.pipeline.client;
+package com.viaversion.fabric.mc1144.mixin.pipeline.client;
 
-import com.viaversion.fabric.mc116.ViaFabric;
-import com.viaversion.fabric.mc116.service.ProtocolAutoDetector;
+import com.viaversion.fabric.mc1144.ViaFabric;
+import com.viaversion.fabric.mc1144.service.ProtocolAutoDetector;
 import net.minecraft.network.ClientConnection;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/pipeline/client/MixinClientConnectionChInit.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc116.mixin.pipeline.client;
+package com.viaversion.fabric.mc1144.mixin.pipeline.client;
 
 import com.viaversion.fabric.common.handler.FabricDecodeHandler;
 import com.viaversion.fabric.common.handler.FabricEncodeHandler;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/platform/FabricNativeVersionProvider.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115.platform;
+package com.viaversion.fabric.mc1144.platform;
 
 import com.viaversion.fabric.common.platform.NativeVersionProvider;
 import net.minecraft.SharedConstants;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/platform/FabricPlatform.java

@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115.platform;
+package com.viaversion.fabric.mc1144.platform;
 
 import com.viaversion.fabric.common.commands.UserCommandSender;
 import com.viaversion.fabric.common.platform.NativeVersionProvider;
 import com.viaversion.fabric.common.provider.AbstractFabricPlatform;
 import com.viaversion.fabric.common.util.FutureTaskId;
-import com.viaversion.fabric.mc115.ViaFabric;
-import com.viaversion.fabric.mc115.commands.NMSCommandSender;
+import com.viaversion.fabric.mc1144.ViaFabric;
+import com.viaversion.fabric.mc1144.commands.NMSCommandSender;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.command.ViaCommandSender;
 import io.netty.channel.EventLoop;
@@ -54,21 +54,6 @@ public class FabricPlatform extends AbstractFabricPlatform {
         return MinecraftClient.getInstance().getServer();
     }
 
-    @Override
-    protected void installNativeVersionProvider() {
-        Via.getManager().getProviders().use(NativeVersionProvider.class, new FabricNativeVersionProvider());
-    }
-
-    @Override
-    protected ExecutorService asyncService() {
-        return ViaFabric.ASYNC_EXECUTOR;
-    }
-
-    @Override
-    protected EventLoop eventLoop() {
-        return ViaFabric.EVENT_LOOP;
-    }
-
     @Override
     public FutureTaskId runSync(Runnable runnable) {
         if (getServer() != null) {
@@ -138,4 +123,19 @@ public class FabricPlatform extends AbstractFabricPlatform {
         }
         return false;  // Can't know if it worked
     }
+
+    @Override
+    protected void installNativeVersionProvider() {
+        Via.getManager().getProviders().use(NativeVersionProvider.class, new FabricNativeVersionProvider());
+    }
+
+    @Override
+    protected ExecutorService asyncService() {
+        return ViaFabric.ASYNC_EXECUTOR;
+    }
+
+    @Override
+    protected EventLoop eventLoop() {
+        return ViaFabric.EVENT_LOOP;
+    }
 }

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/platform/VFLoader.java

@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115.platform;
+package com.viaversion.fabric.mc1144.platform;
 
-import com.viaversion.fabric.mc115.providers.VFHandItemProvider;
-import com.viaversion.fabric.mc115.providers.FabricVersionProvider;
-import com.viaversion.fabric.mc115.providers.VFPlayerLookTargetProvider;
+import com.viaversion.fabric.mc1144.providers.VFHandItemProvider;
+import com.viaversion.fabric.mc1144.providers.FabricVersionProvider;
+import com.viaversion.fabric.mc1144.providers.VFPlayerLookTargetProvider;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.PlayerLookTargetProvider;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.loader.api.FabricLoader;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/providers/FabricVersionProvider.java

@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.providers;
+package com.viaversion.fabric.mc1144.providers;
 
 import com.viaversion.fabric.common.config.VFConfig;
 import com.viaversion.fabric.common.provider.AbstractFabricVersionProvider;
-import com.viaversion.fabric.mc114.ViaFabric;
-import com.viaversion.fabric.mc114.service.ProtocolAutoDetector;
+import com.viaversion.fabric.mc1144.ViaFabric;
+import com.viaversion.fabric.mc1144.service.ProtocolAutoDetector;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 
 import java.net.InetSocketAddress;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/providers/VFHandItemProvider.java

@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.providers;
+package com.viaversion.fabric.mc1144.providers;
 
 import com.viaversion.fabric.common.util.RemappingUtil;
-import com.viaversion.fabric.mc114.ViaFabric;
+import com.viaversion.fabric.mc1144.ViaFabric;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/providers/VFPlayerLookTargetProvider.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc116.providers;
+package com.viaversion.fabric.mc1144.providers;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Position;

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/service/ProtocolAutoDetector.java

@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115.service;
+package com.viaversion.fabric.mc1144.service;
 
 import com.viaversion.fabric.common.AddressParser;
-import com.viaversion.fabric.mc115.ViaFabric;
+import com.viaversion.fabric.mc1144.ViaFabric;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;

viafabric-mc1144/src/main/resources/fabric.mod.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "id": "viafabric-mc114",
+  "id": "viafabric-mc1144",
   "name": "ViaFabric for 1.14",
   "version": "${version}",
   "description": "${description}",
@@ -47,13 +47,13 @@
   ],
   "entrypoints": {
     "main": [
-      "com.viaversion.fabric.mc114.ViaFabric"
+      "com.viaversion.fabric.mc1144.ViaFabric"
     ],
     "cotton-client-commands": [
-      "com.viaversion.fabric.mc114.commands.VFClientCommands"
+      "com.viaversion.fabric.mc1144.commands.VFClientCommands"
     ],
     "modmenu": [
-      "com.viaversion.fabric.mc114.gui.ModMenuConfig"
+      "com.viaversion.fabric.mc1144.gui.ModMenuConfig"
     ]
   },
   "depends": {
@@ -66,10 +66,10 @@
     "cotton-client-commands": "*"
   },
   "mixins": [
-    "mixins.viafabric114.address.json",
-    "mixins.viafabric114.gui.json",
-    "mixins.viafabric114.debug.json",
-    "mixins.viafabric114.pipeline.json"
+    "mixins.viafabric1144.address.json",
+    "mixins.viafabric1144.gui.json",
+    "mixins.viafabric1144.debug.json",
+    "mixins.viafabric1144.pipeline.json"
   ],
   "custom": {
     "modmenu": {

viafabric-mc1144/src/main/resources/mixins.viafabric1144.address.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "compatibilityLevel": "JAVA_8",
-  "package": "com.viaversion.fabric.mc114.mixin.address",
+  "package": "com.viaversion.fabric.mc1144.mixin.address",
   "mixins": [
   ],
   "client": [

viafabric-mc1144/src/main/resources/mixins.viafabric1144.debug.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "compatibilityLevel": "JAVA_8",
-  "package": "com.viaversion.fabric.mc116.mixin.debug",
+  "package": "com.viaversion.fabric.mc1144.mixin.debug",
   "mixins": [
   ],
   "client": [

viafabric-mc1144/src/main/resources/mixins.viafabric1144.gui.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "compatibilityLevel": "JAVA_8",
-  "package": "com.viaversion.fabric.mc115.mixin.gui",
+  "package": "com.viaversion.fabric.mc1144.mixin.gui",
   "mixins": [
     "client.MixinMultiplayerServerListPingerListener"
   ],

viafabric-mc1144/src/main/resources/mixins.viafabric1144.pipeline.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "compatibilityLevel": "JAVA_8",
-  "package": "com.viaversion.fabric.mc115.mixin.pipeline",
+  "package": "com.viaversion.fabric.mc1144.mixin.pipeline",
   "mixins": [
     "MixinClientConnection",
     "MixinServerNetworkIoChInit"

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/ViaFabric.java

@@ -15,9 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115;
+package com.viaversion.fabric.mc1152;
 
-import com.google.common.collect.Range;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
@@ -26,9 +25,9 @@ import com.viaversion.fabric.common.config.VFConfig;
 import com.viaversion.fabric.common.platform.FabricInjector;
 import com.viaversion.fabric.common.protocol.HostnameParserProtocol;
 import com.viaversion.fabric.common.util.JLoggerToLog4j;
-import com.viaversion.fabric.mc115.commands.VFCommandHandler;
-import com.viaversion.fabric.mc115.platform.FabricPlatform;
-import com.viaversion.fabric.mc115.platform.VFLoader;
+import com.viaversion.fabric.mc1152.commands.VFCommandHandler;
+import com.viaversion.fabric.mc1152.platform.FabricPlatform;
+import com.viaversion.fabric.mc1152.platform.VFLoader;
 import com.viaversion.viaversion.ViaManagerImpl;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/commands/NMSCommandSender.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115.commands;
+package com.viaversion.fabric.mc1152.commands;
 
 import com.viaversion.viaversion.api.command.ViaCommandSender;
 import com.viaversion.viaversion.util.ComponentUtil;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/commands/VFClientCommands.java

@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.commands;
+package com.viaversion.fabric.mc1152.commands;
 
-import com.viaversion.fabric.mc114.ViaFabric;
+import com.viaversion.fabric.mc1152.ViaFabric;
 import com.mojang.brigadier.CommandDispatcher;
 import io.github.cottonmc.clientcommands.ClientCommandPlugin;
 import io.github.cottonmc.clientcommands.CottonClientCommandSource;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/commands/VFCommandHandler.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.commands;
+package com.viaversion.fabric.mc1152.commands;
 
 import com.viaversion.fabric.common.commands.subs.LeakDetectSubCommand;
 import com.mojang.brigadier.arguments.StringArgumentType;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/gui/ModMenuConfig.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115.gui;
+package com.viaversion.fabric.mc1152.gui;
 
 import com.google.common.collect.ImmutableMap;
 import io.github.prospector.modmenu.api.ConfigScreenFactory;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/gui/ViaConfigScreen.java

@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.gui;
+package com.viaversion.fabric.mc1152.gui;
 
 import com.viaversion.fabric.common.config.AbstractViaConfigScreen;
-import com.viaversion.fabric.mc114.ViaFabric;
+import com.viaversion.fabric.mc1152.ViaFabric;
 import com.viaversion.fabric.common.util.ProtocolUtils;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.fabricmc.api.EnvType;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinConnectScreenThread.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.mixin.address.client;
+package com.viaversion.fabric.mc1152.mixin.address.client;
 
 import com.viaversion.fabric.common.AddressParser;
 import org.spongepowered.asm.mixin.Mixin;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinServerAddress.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.mixin.address.client;
+package com.viaversion.fabric.mc1152.mixin.address.client;
 
 import com.viaversion.fabric.common.AddressParser;
 import net.minecraft.network.ServerAddress;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinServerPinger.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc116.mixin.address.client;
+package com.viaversion.fabric.mc1152.mixin.address.client;
 
 import com.viaversion.fabric.common.AddressParser;
 import net.minecraft.client.network.MultiplayerServerListPinger;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/debug/client/MixinClientConnection.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.mixin.debug.client;
+package com.viaversion.fabric.mc1152.mixin.debug.client;
 
 import io.netty.channel.ChannelHandlerContext;
 import net.minecraft.network.ClientConnection;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/debug/client/MixinClientConnectionAccessor.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.mixin.debug.client;
+package com.viaversion.fabric.mc1152.mixin.debug.client;
 
 import io.netty.channel.Channel;
 import net.minecraft.network.ClientConnection;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/debug/client/MixinDebugHud.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc116.mixin.debug.client;
+package com.viaversion.fabric.mc1152.mixin.debug.client;
 
 import com.viaversion.fabric.common.handler.CommonTransformer;
 import com.viaversion.fabric.common.handler.FabricDecodeHandler;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/gui/client/MixinMultiplayerScreen.java

@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.mixin.gui.client;
+package com.viaversion.fabric.mc1152.mixin.gui.client;
 
-import com.viaversion.fabric.mc114.ViaFabric;
-import com.viaversion.fabric.mc114.gui.ViaConfigScreen;
+import com.viaversion.fabric.mc1152.ViaFabric;
+import com.viaversion.fabric.mc1152.gui.ViaConfigScreen;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/gui/client/MixinMultiplayerServerListPingerListener.java

@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc116.mixin.gui.client;
+package com.viaversion.fabric.mc1152.mixin.gui.client;
 
 
 import com.viaversion.fabric.common.gui.ViaServerInfo;
 import com.viaversion.fabric.common.handler.FabricDecodeHandler;
-import com.viaversion.fabric.mc116.mixin.debug.client.MixinClientConnectionAccessor;
+import com.viaversion.fabric.mc1152.mixin.debug.client.MixinClientConnectionAccessor;
 import net.minecraft.client.network.ServerInfo;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.listener.ClientQueryPacketListener;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/gui/client/MixinServerEntry.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.mixin.gui.client;
+package com.viaversion.fabric.mc1152.mixin.gui.client;
 
 import com.viaversion.fabric.common.gui.ViaServerInfo;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/gui/client/MixinServerInfo.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc117.mixin.gui.client;
+package com.viaversion.fabric.mc1152.mixin.gui.client;
 
 import com.viaversion.fabric.common.gui.ViaServerInfo;
 import net.minecraft.client.network.ServerInfo;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/pipeline/MixinClientConnection.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc116.mixin.pipeline;
+package com.viaversion.fabric.mc1152.mixin.pipeline;
 
 import com.viaversion.fabric.common.handler.PipelineReorderEvent;
 import io.netty.channel.Channel;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/pipeline/MixinServerNetworkIoChInit.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.mixin.pipeline;
+package com.viaversion.fabric.mc1152.mixin.pipeline;
 
 import com.viaversion.fabric.common.handler.CommonTransformer;
 import com.viaversion.fabric.common.handler.FabricDecodeHandler;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/pipeline/client/MixinClientConnection.java

@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.mixin.pipeline.client;
+package com.viaversion.fabric.mc1152.mixin.pipeline.client;
 
-import com.viaversion.fabric.mc114.ViaFabric;
-import com.viaversion.fabric.mc114.service.ProtocolAutoDetector;
+import com.viaversion.fabric.mc1152.ViaFabric;
+import com.viaversion.fabric.mc1152.service.ProtocolAutoDetector;
 import net.minecraft.network.ClientConnection;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/pipeline/client/MixinClientConnectionChInit.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc117.mixin.pipeline.client;
+package com.viaversion.fabric.mc1152.mixin.pipeline.client;
 
 import com.viaversion.fabric.common.handler.FabricDecodeHandler;
 import com.viaversion.fabric.common.handler.FabricEncodeHandler;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/platform/FabricNativeVersionProvider.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc116.platform;
+package com.viaversion.fabric.mc1152.platform;
 
 import com.viaversion.fabric.common.platform.NativeVersionProvider;
 import net.minecraft.SharedConstants;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/platform/FabricPlatform.java

@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.platform;
+package com.viaversion.fabric.mc1152.platform;
 
 import com.viaversion.fabric.common.commands.UserCommandSender;
 import com.viaversion.fabric.common.platform.NativeVersionProvider;
 import com.viaversion.fabric.common.provider.AbstractFabricPlatform;
 import com.viaversion.fabric.common.util.FutureTaskId;
-import com.viaversion.fabric.mc114.ViaFabric;
-import com.viaversion.fabric.mc114.commands.NMSCommandSender;
+import com.viaversion.fabric.mc1152.ViaFabric;
+import com.viaversion.fabric.mc1152.commands.NMSCommandSender;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.command.ViaCommandSender;
 import io.netty.channel.EventLoop;
@@ -54,6 +54,21 @@ public class FabricPlatform extends AbstractFabricPlatform {
         return MinecraftClient.getInstance().getServer();
     }
 
+    @Override
+    protected void installNativeVersionProvider() {
+        Via.getManager().getProviders().use(NativeVersionProvider.class, new FabricNativeVersionProvider());
+    }
+
+    @Override
+    protected ExecutorService asyncService() {
+        return ViaFabric.ASYNC_EXECUTOR;
+    }
+
+    @Override
+    protected EventLoop eventLoop() {
+        return ViaFabric.EVENT_LOOP;
+    }
+
     @Override
     public FutureTaskId runSync(Runnable runnable) {
         if (getServer() != null) {
@@ -123,19 +138,4 @@ public class FabricPlatform extends AbstractFabricPlatform {
         }
         return false;  // Can't know if it worked
     }
-
-    @Override
-    protected void installNativeVersionProvider() {
-        Via.getManager().getProviders().use(NativeVersionProvider.class, new FabricNativeVersionProvider());
-    }
-
-    @Override
-    protected ExecutorService asyncService() {
-        return ViaFabric.ASYNC_EXECUTOR;
-    }
-
-    @Override
-    protected EventLoop eventLoop() {
-        return ViaFabric.EVENT_LOOP;
-    }
 }

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/platform/VFLoader.java

@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.platform;
+package com.viaversion.fabric.mc1152.platform;
 
-import com.viaversion.fabric.mc114.providers.VFHandItemProvider;
-import com.viaversion.fabric.mc114.providers.FabricVersionProvider;
-import com.viaversion.fabric.mc114.providers.VFPlayerLookTargetProvider;
+import com.viaversion.fabric.mc1152.providers.VFHandItemProvider;
+import com.viaversion.fabric.mc1152.providers.FabricVersionProvider;
+import com.viaversion.fabric.mc1152.providers.VFPlayerLookTargetProvider;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.PlayerLookTargetProvider;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.loader.api.FabricLoader;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/providers/FabricVersionProvider.java

@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc116.providers;
+package com.viaversion.fabric.mc1152.providers;
 
 import com.viaversion.fabric.common.config.VFConfig;
 import com.viaversion.fabric.common.provider.AbstractFabricVersionProvider;
-import com.viaversion.fabric.mc116.ViaFabric;
-import com.viaversion.fabric.mc116.service.ProtocolAutoDetector;
+import com.viaversion.fabric.mc1152.ViaFabric;
+import com.viaversion.fabric.mc1152.service.ProtocolAutoDetector;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import io.netty.channel.ChannelPipeline;
 import net.minecraft.network.ClientConnection;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/providers/VFHandItemProvider.java

@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc116.providers;
+package com.viaversion.fabric.mc1152.providers;
 
 import com.viaversion.fabric.common.util.RemappingUtil;
-import com.viaversion.fabric.mc116.ViaFabric;
+import com.viaversion.fabric.mc1152.ViaFabric;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.item.DataItem;
 import com.viaversion.viaversion.api.minecraft.item.Item;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/providers/VFPlayerLookTargetProvider.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115.providers;
+package com.viaversion.fabric.mc1152.providers;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Position;

viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/service/ProtocolAutoDetector.java

@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.service;
+package com.viaversion.fabric.mc1152.service;
 
 import com.viaversion.fabric.common.AddressParser;
-import com.viaversion.fabric.mc114.ViaFabric;
+import com.viaversion.fabric.mc1152.ViaFabric;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;

viafabric-mc1152/src/main/resources/fabric.mod.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "id": "viafabric-mc115",
+  "id": "viafabric-mc1152",
   "name": "ViaFabric for 1.15",
   "version": "${version}",
   "description": "${description}",
@@ -47,13 +47,13 @@
   ],
   "entrypoints": {
     "main": [
-      "com.viaversion.fabric.mc115.ViaFabric"
+      "com.viaversion.fabric.mc1152.ViaFabric"
     ],
     "cotton-client-commands": [
-      "com.viaversion.fabric.mc115.commands.VFClientCommands"
+      "com.viaversion.fabric.mc1152.commands.VFClientCommands"
     ],
     "modmenu": [
-      "com.viaversion.fabric.mc115.gui.ModMenuConfig"
+      "com.viaversion.fabric.mc1152.gui.ModMenuConfig"
     ]
   },
   "depends": {
@@ -66,10 +66,10 @@
     "cotton-client-commands": "*"
   },
   "mixins": [
-    "mixins.viafabric115.address.json",
-    "mixins.viafabric115.gui.json",
-    "mixins.viafabric115.debug.json",
-    "mixins.viafabric115.pipeline.json"
+    "mixins.viafabric1152.address.json",
+    "mixins.viafabric1152.gui.json",
+    "mixins.viafabric1152.debug.json",
+    "mixins.viafabric1152.pipeline.json"
   ],
   "custom": {
     "modmenu": {

viafabric-mc1152/src/main/resources/mixins.viafabric1152.address.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "compatibilityLevel": "JAVA_8",
-  "package": "com.viaversion.fabric.mc116.mixin.address",
+  "package": "com.viaversion.fabric.mc1152.mixin.address",
   "mixins": [
   ],
   "client": [

viafabric-mc1152/src/main/resources/mixins.viafabric1152.debug.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "compatibilityLevel": "JAVA_8",
-  "package": "com.viaversion.fabric.mc114.mixin.debug",
+  "package": "com.viaversion.fabric.mc1152.mixin.debug",
   "mixins": [
   ],
   "client": [

viafabric-mc1152/src/main/resources/mixins.viafabric1152.gui.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "compatibilityLevel": "JAVA_8",
-  "package": "com.viaversion.fabric.mc116.mixin.gui",
+  "package": "com.viaversion.fabric.mc1152.mixin.gui",
   "mixins": [
     "client.MixinMultiplayerServerListPingerListener"
   ],

viafabric-mc1152/src/main/resources/mixins.viafabric1152.pipeline.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "compatibilityLevel": "JAVA_8",
-  "package": "com.viaversion.fabric.mc116.mixin.pipeline",
+  "package": "com.viaversion.fabric.mc1152.mixin.pipeline",
   "mixins": [
     "MixinClientConnection",
     "MixinServerNetworkIoChInit"

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/ViaFabric.java

@@ -15,9 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc116;
+package com.viaversion.fabric.mc1165;
 
-import com.google.common.collect.Range;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
@@ -26,9 +25,9 @@ import com.viaversion.fabric.common.config.VFConfig;
 import com.viaversion.fabric.common.platform.FabricInjector;
 import com.viaversion.fabric.common.protocol.HostnameParserProtocol;
 import com.viaversion.fabric.common.util.JLoggerToLog4j;
-import com.viaversion.fabric.mc116.commands.VFCommandHandler;
-import com.viaversion.fabric.mc116.platform.FabricPlatform;
-import com.viaversion.fabric.mc116.platform.VFLoader;
+import com.viaversion.fabric.mc1165.commands.VFCommandHandler;
+import com.viaversion.fabric.mc1165.platform.FabricPlatform;
+import com.viaversion.fabric.mc1165.platform.VFLoader;
 import com.viaversion.viaversion.ViaManagerImpl;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/commands/NMSCommandSender.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc116.commands;
+package com.viaversion.fabric.mc1165.commands;
 
 import com.viaversion.viaversion.api.command.ViaCommandSender;
 import com.viaversion.viaversion.util.ComponentUtil;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/commands/VFCommandHandler.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc117.commands;
+package com.viaversion.fabric.mc1165.commands;
 
 import com.viaversion.fabric.common.commands.subs.LeakDetectSubCommand;
 import com.mojang.brigadier.arguments.StringArgumentType;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/gui/ModMenuConfig.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc118.gui;
+package com.viaversion.fabric.mc1165.gui;
 
 import com.google.common.collect.ImmutableMap;
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/gui/ViaConfigScreen.java

@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc116.gui;
+package com.viaversion.fabric.mc1165.gui;
 
 import com.viaversion.fabric.common.config.AbstractViaConfigScreen;
-import com.viaversion.fabric.mc116.ViaFabric;
+import com.viaversion.fabric.mc1165.ViaFabric;
 import com.viaversion.fabric.common.util.ProtocolUtils;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.fabricmc.api.EnvType;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinConnectScreenThread.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc116.mixin.address.client;
+package com.viaversion.fabric.mc1165.mixin.address.client;
 
 import com.viaversion.fabric.common.AddressParser;
 import org.spongepowered.asm.mixin.Mixin;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinServerAddress.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc116.mixin.address.client;
+package com.viaversion.fabric.mc1165.mixin.address.client;
 
 import com.mojang.datafixers.util.Pair;
 import com.viaversion.fabric.common.AddressParser;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinServerPinger.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115.mixin.address.client;
+package com.viaversion.fabric.mc1165.mixin.address.client;
 
 import com.viaversion.fabric.common.AddressParser;
 import net.minecraft.client.network.MultiplayerServerListPinger;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/debug/client/MixinClientConnection.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115.mixin.debug.client;
+package com.viaversion.fabric.mc1165.mixin.debug.client;
 
 import io.netty.channel.ChannelHandlerContext;
 import net.minecraft.network.ClientConnection;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/debug/client/MixinClientConnectionAccessor.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115.mixin.debug.client;
+package com.viaversion.fabric.mc1165.mixin.debug.client;
 
 import io.netty.channel.Channel;
 import net.minecraft.network.ClientConnection;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/debug/client/MixinDebugHud.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.mixin.debug.client;
+package com.viaversion.fabric.mc1165.mixin.debug.client;
 
 import com.viaversion.fabric.common.handler.CommonTransformer;
 import com.viaversion.fabric.common.handler.FabricDecodeHandler;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/gui/client/MixinMultiplayerScreen.java

@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc116.mixin.gui.client;
+package com.viaversion.fabric.mc1165.mixin.gui.client;
 
-import com.viaversion.fabric.mc116.ViaFabric;
-import com.viaversion.fabric.mc116.gui.ViaConfigScreen;
+import com.viaversion.fabric.mc1165.ViaFabric;
+import com.viaversion.fabric.mc1165.gui.ViaConfigScreen;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/gui/client/MixinMultiplayerServerListPingerListener.java

@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.mixin.gui.client;
+package com.viaversion.fabric.mc1165.mixin.gui.client;
 
 
 import com.viaversion.fabric.common.gui.ViaServerInfo;
 import com.viaversion.fabric.common.handler.FabricDecodeHandler;
-import com.viaversion.fabric.mc114.mixin.debug.client.MixinClientConnectionAccessor;
+import com.viaversion.fabric.mc1165.mixin.debug.client.MixinClientConnectionAccessor;
 import net.minecraft.client.network.ServerInfo;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.listener.ClientQueryPacketListener;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/gui/client/MixinServerEntry.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc116.mixin.gui.client;
+package com.viaversion.fabric.mc1165.mixin.gui.client;
 
 import com.viaversion.fabric.common.gui.ViaServerInfo;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/gui/client/MixinServerInfo.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.mixin.gui.client;
+package com.viaversion.fabric.mc1165.mixin.gui.client;
 
 import com.viaversion.fabric.common.gui.ViaServerInfo;
 import net.minecraft.client.network.ServerInfo;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/pipeline/MixinClientConnection.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115.mixin.pipeline;
+package com.viaversion.fabric.mc1165.mixin.pipeline;
 
 import com.viaversion.fabric.common.handler.PipelineReorderEvent;
 import io.netty.channel.Channel;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/pipeline/MixinServerNetworkIoChInit.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc117.mixin.pipeline;
+package com.viaversion.fabric.mc1165.mixin.pipeline;
 
 import com.viaversion.fabric.common.handler.CommonTransformer;
 import com.viaversion.fabric.common.handler.FabricDecodeHandler;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/pipeline/client/MixinClientConnection.java

@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115.mixin.pipeline.client;
+package com.viaversion.fabric.mc1165.mixin.pipeline.client;
 
-import com.viaversion.fabric.mc115.ViaFabric;
-import com.viaversion.fabric.mc115.service.ProtocolAutoDetector;
+import com.viaversion.fabric.mc1165.ViaFabric;
+import com.viaversion.fabric.mc1165.service.ProtocolAutoDetector;
 import net.minecraft.network.ClientConnection;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/pipeline/client/MixinClientConnectionChInit.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.mixin.pipeline.client;
+package com.viaversion.fabric.mc1165.mixin.pipeline.client;
 
 import com.viaversion.fabric.common.handler.FabricDecodeHandler;
 import com.viaversion.fabric.common.handler.FabricEncodeHandler;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/platform/FabricNativeVersionProvider.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc117.platform;
+package com.viaversion.fabric.mc1165.platform;
 
 import com.viaversion.fabric.common.platform.NativeVersionProvider;
 import net.minecraft.SharedConstants;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/platform/FabricPlatform.java

@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc117.platform;
+package com.viaversion.fabric.mc1165.platform;
 
 import com.viaversion.fabric.common.commands.UserCommandSender;
 import com.viaversion.fabric.common.platform.NativeVersionProvider;
 import com.viaversion.fabric.common.provider.AbstractFabricPlatform;
 import com.viaversion.fabric.common.util.FutureTaskId;
-import com.viaversion.fabric.mc117.ViaFabric;
-import com.viaversion.fabric.mc117.commands.NMSCommandSender;
+import com.viaversion.fabric.mc1165.ViaFabric;
+import com.viaversion.fabric.mc1165.commands.NMSCommandSender;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.command.ViaCommandSender;
 import io.netty.channel.EventLoop;
@@ -53,6 +53,21 @@ public class FabricPlatform extends AbstractFabricPlatform {
         return MinecraftClient.getInstance().getServer();
     }
 
+    @Override
+    protected void installNativeVersionProvider() {
+        Via.getManager().getProviders().use(NativeVersionProvider.class, new FabricNativeVersionProvider());
+    }
+
+    @Override
+    protected ExecutorService asyncService() {
+        return ViaFabric.ASYNC_EXECUTOR;
+    }
+
+    @Override
+    protected EventLoop eventLoop() {
+        return ViaFabric.EVENT_LOOP;
+    }
+
     @Override
     public FutureTaskId runSync(Runnable runnable) {
         if (getServer() != null) {
@@ -122,19 +137,4 @@ public class FabricPlatform extends AbstractFabricPlatform {
         }
         return false;  // Can't know if it worked
     }
-
-    @Override
-    protected void installNativeVersionProvider() {
-        Via.getManager().getProviders().use(NativeVersionProvider.class, new FabricNativeVersionProvider());
-    }
-
-    @Override
-    protected ExecutorService asyncService() {
-        return ViaFabric.ASYNC_EXECUTOR;
-    }
-
-    @Override
-    protected EventLoop eventLoop() {
-        return ViaFabric.EVENT_LOOP;
-    }
 }

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/platform/VFLoader.java

@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc116.platform;
+package com.viaversion.fabric.mc1165.platform;
 
-import com.viaversion.fabric.mc116.providers.VFHandItemProvider;
-import com.viaversion.fabric.mc116.providers.FabricVersionProvider;
-import com.viaversion.fabric.mc116.providers.VFPlayerAbilitiesProvider;
-import com.viaversion.fabric.mc116.providers.VFPlayerLookTargetProvider;
+import com.viaversion.fabric.mc1165.providers.VFHandItemProvider;
+import com.viaversion.fabric.mc1165.providers.FabricVersionProvider;
+import com.viaversion.fabric.mc1165.providers.VFPlayerAbilitiesProvider;
+import com.viaversion.fabric.mc1165.providers.VFPlayerLookTargetProvider;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.PlayerLookTargetProvider;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.provider.PlayerAbilitiesProvider;
 import net.fabricmc.api.EnvType;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/providers/FabricVersionProvider.java

@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115.providers;
+package com.viaversion.fabric.mc1165.providers;
 
 import com.viaversion.fabric.common.config.VFConfig;
 import com.viaversion.fabric.common.provider.AbstractFabricVersionProvider;
-import com.viaversion.fabric.mc115.ViaFabric;
-import com.viaversion.fabric.mc115.service.ProtocolAutoDetector;
+import com.viaversion.fabric.mc1165.ViaFabric;
+import com.viaversion.fabric.mc1165.service.ProtocolAutoDetector;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import io.netty.channel.ChannelPipeline;
 import net.minecraft.network.ClientConnection;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/providers/VFHandItemProvider.java

@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc115.providers;
+package com.viaversion.fabric.mc1165.providers;
 
 import com.viaversion.fabric.common.util.RemappingUtil;
-import com.viaversion.fabric.mc115.ViaFabric;
+import com.viaversion.fabric.mc1165.ViaFabric;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.item.DataItem;
 import com.viaversion.viaversion.api.minecraft.item.Item;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/providers/VFPlayerAbilitiesProvider.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc116.providers;
+package com.viaversion.fabric.mc1165.providers;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.provider.PlayerAbilitiesProvider;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/providers/VFPlayerLookTargetProvider.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc114.providers;
+package com.viaversion.fabric.mc1165.providers;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Position;

viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/service/ProtocolAutoDetector.java

@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc116.service;
+package com.viaversion.fabric.mc1165.service;
 
 import com.viaversion.fabric.common.AddressParser;
-import com.viaversion.fabric.mc116.ViaFabric;
+import com.viaversion.fabric.mc1165.ViaFabric;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;

viafabric-mc1165/src/main/resources/fabric.mod.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "id": "viafabric-mc116",
+  "id": "viafabric-mc1165",
   "name": "ViaFabric for 1.16",
   "version": "${version}",
   "description": "${description}",
@@ -47,10 +47,10 @@
   ],
   "entrypoints": {
     "main": [
-      "com.viaversion.fabric.mc116.ViaFabric"
+      "com.viaversion.fabric.mc1165.ViaFabric"
     ],
     "modmenu": [
-      "com.viaversion.fabric.mc116.gui.ModMenuConfig"
+      "com.viaversion.fabric.mc1165.gui.ModMenuConfig"
     ]
   },
   "depends": {
@@ -62,10 +62,10 @@
     "fabric-command-api-v1": "*"
   },
   "mixins": [
-    "mixins.viafabric116.address.json",
-    "mixins.viafabric116.gui.json",
-    "mixins.viafabric116.debug.json",
-    "mixins.viafabric116.pipeline.json"
+    "mixins.viafabric1165.address.json",
+    "mixins.viafabric1165.gui.json",
+    "mixins.viafabric1165.debug.json",
+    "mixins.viafabric1165.pipeline.json"
   ],
   "custom": {
     "modmenu": {

viafabric-mc1165/src/main/resources/mixins.viafabric1165.address.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "compatibilityLevel": "JAVA_8",
-  "package": "com.viaversion.fabric.mc115.mixin.address",
+  "package": "com.viaversion.fabric.mc1165.mixin.address",
   "mixins": [
   ],
   "client": [

viafabric-mc1165/src/main/resources/mixins.viafabric1165.debug.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "compatibilityLevel": "JAVA_8",
-  "package": "com.viaversion.fabric.mc115.mixin.debug",
+  "package": "com.viaversion.fabric.mc1165.mixin.debug",
   "mixins": [
   ],
   "client": [

viafabric-mc1165/src/main/resources/mixins.viafabric1165.gui.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "compatibilityLevel": "JAVA_8",
-  "package": "com.viaversion.fabric.mc114.mixin.gui",
+  "package": "com.viaversion.fabric.mc1165.mixin.gui",
   "mixins": [
     "client.MixinMultiplayerServerListPingerListener"
   ],

viafabric-mc1165/src/main/resources/mixins.viafabric1165.pipeline.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "compatibilityLevel": "JAVA_8",
-  "package": "com.viaversion.fabric.mc114.mixin.pipeline",
+  "package": "com.viaversion.fabric.mc1165.mixin.pipeline",
   "mixins": [
     "MixinClientConnection",
     "MixinServerNetworkIoChInit"

viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/ViaFabric.java

@@ -15,9 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc117;
+package com.viaversion.fabric.mc1171;
 
-import com.google.common.collect.Range;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
@@ -26,9 +25,9 @@ import com.viaversion.fabric.common.config.VFConfig;
 import com.viaversion.fabric.common.platform.FabricInjector;
 import com.viaversion.fabric.common.protocol.HostnameParserProtocol;
 import com.viaversion.fabric.common.util.JLoggerToLog4j;
-import com.viaversion.fabric.mc117.commands.VFCommandHandler;
-import com.viaversion.fabric.mc117.platform.FabricPlatform;
-import com.viaversion.fabric.mc117.platform.VFLoader;
+import com.viaversion.fabric.mc1171.commands.VFCommandHandler;
+import com.viaversion.fabric.mc1171.platform.FabricPlatform;
+import com.viaversion.fabric.mc1171.platform.VFLoader;
 import com.viaversion.viaversion.ViaManagerImpl;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;

viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/ViaFabricClient.java

@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc118;
+package com.viaversion.fabric.mc1171;
 
-import com.viaversion.fabric.mc118.gui.ViaConfigScreen;
+import com.viaversion.fabric.mc1171.gui.ViaConfigScreen;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
 import net.fabricmc.fabric.api.client.screen.v1.Screens;

viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/commands/NMSCommandSender.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.fabric.mc117.commands;
+package com.viaversion.fabric.mc1171.commands;
 
 import com.viaversion.viaversion.util.ComponentUtil;
 import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource;