From 5651643360c2653e5a71b6702c7a2261dab2b6f4 Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Sun, 21 Apr 2024 16:29:57 +0200 Subject: [PATCH] Repackage legacy fabric platforms --- .../com/viaversion/fabric/mc1122}/ViaFabric.java | 11 +++++------ .../{mc112 => mc1122}/commands/NMSCommandImpl.java | 3 +-- .../{mc112 => mc1122}/commands/NMSCommandSender.java | 2 +- .../{mc112 => mc1122}/commands/VFCommandHandler.java | 2 +- .../fabric/mc1122}/gui/ChangedListener.java | 2 +- .../fabric/mc1122}/gui/ListeneableButton.java | 2 +- .../fabric/{mc112 => mc1122}/gui/ViaButton.java | 2 +- .../{mc112 => mc1122}/gui/ViaConfigScreen.java | 4 ++-- .../address/client/MixinConnectScreenThread.java | 2 +- .../mixin/address/client/MixinServerAddress.java | 2 +- .../mixin/address/client/MixinServerPinger.java | 2 +- .../mixin/debug/client/MixinClientConnection.java | 2 +- .../debug/client/MixinClientConnectionAccessor.java | 2 +- .../mc1122}/mixin/debug/client/MixinDebugHud.java | 2 +- .../mixin/gui/client/MixinMultiplayerScreen.java | 8 ++++---- .../mixin/pipeline/MixinClientConnection.java | 2 +- .../mixin/pipeline/MixinServerNetworkIoChInit.java | 2 +- .../mixin/pipeline/client/MixinClientConnection.java | 6 +++--- .../pipeline/client/MixinClientConnectionChInit.java | 2 +- .../pipeline/client/MixinHandshakeC2SPacket.java | 4 ++-- .../platform/FabricNativeVersionProvider.java | 3 +-- .../{mc112 => mc1122}/platform/FabricPlatform.java | 6 +++--- .../viaversion/fabric/mc1122}/platform/VFLoader.java | 6 +++--- .../providers/FabricVersionProvider.java | 6 +++--- .../providers/VFHandItemProvider.java | 4 ++-- .../service/ProtocolAutoDetector.java | 4 ++-- viafabric-mc1122/src/main/resources/fabric.mod.json | 10 +++++----- .../main/resources/mixins.viafabric1122.address.json | 2 +- ...12.debug.json => mixins.viafabric1122.debug.json} | 2 +- ...ric112.gui.json => mixins.viafabric1122.gui.json} | 2 +- ...eline.json => mixins.viafabric1122.pipeline.json} | 2 +- .../java/com/viaversion/fabric/mc189}/ViaFabric.java | 11 +++++------ .../{mc18 => mc189}/commands/NMSCommandImpl.java | 2 +- .../{mc18 => mc189}/commands/NMSCommandSender.java | 2 +- .../{mc18 => mc189}/commands/VFCommandHandler.java | 2 +- .../fabric/mc189}/gui/ChangedListener.java | 2 +- .../fabric/mc189}/gui/ListeneableButton.java | 2 +- .../fabric/{mc18 => mc189}/gui/ModMenuConfig.java | 2 +- .../fabric/{mc18 => mc189}/gui/ViaButton.java | 2 +- .../fabric/{mc18 => mc189}/gui/ViaConfigScreen.java | 4 ++-- .../address/client/MixinConnectScreenThread.java | 2 +- .../mixin/address/client/MixinServerAddress.java | 2 +- .../mixin/address/client/MixinServerPinger.java | 2 +- .../mixin/debug/client/MixinClientConnection.java | 2 +- .../debug/client/MixinClientConnectionAccessor.java | 2 +- .../mc189}/mixin/debug/client/MixinDebugHud.java | 2 +- .../mixin/gui/client/MixinMultiplayerScreen.java | 8 ++++---- .../mc189}/mixin/pipeline/MixinClientConnection.java | 2 +- .../mixin/pipeline/MixinServerNetworkIoChInit.java | 2 +- .../mixin/pipeline/client/MixinClientConnection.java | 6 +++--- .../pipeline/client/MixinClientConnectionChInit.java | 2 +- .../platform/FabricNativeVersionProvider.java | 2 +- .../{mc18 => mc189}/platform/FabricPlatform.java | 6 +++--- .../viaversion/fabric/mc189}/platform/VFLoader.java | 6 +++--- .../providers/FabricVersionProvider.java | 6 +++--- .../providers/VFHandItemProvider.java | 4 ++-- .../service/ProtocolAutoDetector.java | 4 ++-- viafabric-mc189/src/main/resources/fabric.mod.json | 12 ++++++------ .../main/resources/mixins.viafabric189.address.json | 2 +- ...c18.debug.json => mixins.viafabric189.debug.json} | 2 +- ...abric18.gui.json => mixins.viafabric189.gui.json} | 2 +- ...peline.json => mixins.viafabric189.pipeline.json} | 2 +- 62 files changed, 108 insertions(+), 112 deletions(-) rename {viafabric-mc189/src/main/java/com/viaversion/fabric/mc18 => viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122}/ViaFabric.java (92%) rename viafabric-mc1122/src/main/java/com/viaversion/fabric/{mc112 => mc1122}/commands/NMSCommandImpl.java (95%) rename viafabric-mc1122/src/main/java/com/viaversion/fabric/{mc112 => mc1122}/commands/NMSCommandSender.java (97%) rename viafabric-mc1122/src/main/java/com/viaversion/fabric/{mc112 => mc1122}/commands/VFCommandHandler.java (96%) rename {viafabric-mc189/src/main/java/com/viaversion/fabric/mc18 => viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122}/gui/ChangedListener.java (97%) rename {viafabric-mc189/src/main/java/com/viaversion/fabric/mc18 => viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122}/gui/ListeneableButton.java (96%) rename viafabric-mc1122/src/main/java/com/viaversion/fabric/{mc112 => mc1122}/gui/ViaButton.java (98%) rename viafabric-mc1122/src/main/java/com/viaversion/fabric/{mc112 => mc1122}/gui/ViaConfigScreen.java (98%) rename viafabric-mc1122/src/main/java/com/viaversion/fabric/{mc112 => mc1122}/mixin/address/client/MixinConnectScreenThread.java (96%) rename {viafabric-mc189/src/main/java/com/viaversion/fabric/mc18 => viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122}/mixin/address/client/MixinServerAddress.java (96%) rename viafabric-mc1122/src/main/java/com/viaversion/fabric/{mc112 => mc1122}/mixin/address/client/MixinServerPinger.java (96%) rename viafabric-mc1122/src/main/java/com/viaversion/fabric/{mc112 => mc1122}/mixin/debug/client/MixinClientConnection.java (96%) rename viafabric-mc1122/src/main/java/com/viaversion/fabric/{mc112 => mc1122}/mixin/debug/client/MixinClientConnectionAccessor.java (94%) rename {viafabric-mc189/src/main/java/com/viaversion/fabric/mc18 => viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122}/mixin/debug/client/MixinDebugHud.java (97%) rename viafabric-mc1122/src/main/java/com/viaversion/fabric/{mc112 => mc1122}/mixin/gui/client/MixinMultiplayerScreen.java (91%) rename {viafabric-mc189/src/main/java/com/viaversion/fabric/mc18 => viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122}/mixin/pipeline/MixinClientConnection.java (96%) rename viafabric-mc1122/src/main/java/com/viaversion/fabric/{mc112 => mc1122}/mixin/pipeline/MixinServerNetworkIoChInit.java (97%) rename {viafabric-mc189/src/main/java/com/viaversion/fabric/mc18 => viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122}/mixin/pipeline/client/MixinClientConnection.java (91%) rename {viafabric-mc189/src/main/java/com/viaversion/fabric/mc18 => viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122}/mixin/pipeline/client/MixinClientConnectionChInit.java (97%) rename viafabric-mc1122/src/main/java/com/viaversion/fabric/{mc112 => mc1122}/mixin/pipeline/client/MixinHandshakeC2SPacket.java (78%) rename viafabric-mc1122/src/main/java/com/viaversion/fabric/{mc112 => mc1122}/platform/FabricNativeVersionProvider.java (95%) rename viafabric-mc1122/src/main/java/com/viaversion/fabric/{mc112 => mc1122}/platform/FabricPlatform.java (97%) rename {viafabric-mc189/src/main/java/com/viaversion/fabric/mc18 => viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122}/platform/VFLoader.java (90%) rename viafabric-mc1122/src/main/java/com/viaversion/fabric/{mc112 => mc1122}/providers/FabricVersionProvider.java (90%) rename viafabric-mc1122/src/main/java/com/viaversion/fabric/{mc112 => mc1122}/providers/VFHandItemProvider.java (97%) rename viafabric-mc1122/src/main/java/com/viaversion/fabric/{mc112 => mc1122}/service/ProtocolAutoDetector.java (98%) rename viafabric-mc189/src/main/resources/mixins.viafabric18.address.json => viafabric-mc1122/src/main/resources/mixins.viafabric1122.address.json (80%) rename viafabric-mc1122/src/main/resources/{mixins.viafabric112.debug.json => mixins.viafabric1122.debug.json} (81%) rename viafabric-mc1122/src/main/resources/{mixins.viafabric112.gui.json => mixins.viafabric1122.gui.json} (76%) rename viafabric-mc1122/src/main/resources/{mixins.viafabric112.pipeline.json => mixins.viafabric1122.pipeline.json} (84%) rename {viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112 => viafabric-mc189/src/main/java/com/viaversion/fabric/mc189}/ViaFabric.java (92%) rename viafabric-mc189/src/main/java/com/viaversion/fabric/{mc18 => mc189}/commands/NMSCommandImpl.java (97%) rename viafabric-mc189/src/main/java/com/viaversion/fabric/{mc18 => mc189}/commands/NMSCommandSender.java (97%) rename viafabric-mc189/src/main/java/com/viaversion/fabric/{mc18 => mc189}/commands/VFCommandHandler.java (96%) rename {viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112 => viafabric-mc189/src/main/java/com/viaversion/fabric/mc189}/gui/ChangedListener.java (97%) rename {viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112 => viafabric-mc189/src/main/java/com/viaversion/fabric/mc189}/gui/ListeneableButton.java (97%) rename viafabric-mc189/src/main/java/com/viaversion/fabric/{mc18 => mc189}/gui/ModMenuConfig.java (96%) rename viafabric-mc189/src/main/java/com/viaversion/fabric/{mc18 => mc189}/gui/ViaButton.java (98%) rename viafabric-mc189/src/main/java/com/viaversion/fabric/{mc18 => mc189}/gui/ViaConfigScreen.java (98%) rename viafabric-mc189/src/main/java/com/viaversion/fabric/{mc18 => mc189}/mixin/address/client/MixinConnectScreenThread.java (96%) rename {viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112 => viafabric-mc189/src/main/java/com/viaversion/fabric/mc189}/mixin/address/client/MixinServerAddress.java (96%) rename viafabric-mc189/src/main/java/com/viaversion/fabric/{mc18 => mc189}/mixin/address/client/MixinServerPinger.java (96%) rename viafabric-mc189/src/main/java/com/viaversion/fabric/{mc18 => mc189}/mixin/debug/client/MixinClientConnection.java (96%) rename viafabric-mc189/src/main/java/com/viaversion/fabric/{mc18 => mc189}/mixin/debug/client/MixinClientConnectionAccessor.java (95%) rename {viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112 => viafabric-mc189/src/main/java/com/viaversion/fabric/mc189}/mixin/debug/client/MixinDebugHud.java (98%) rename viafabric-mc189/src/main/java/com/viaversion/fabric/{mc18 => mc189}/mixin/gui/client/MixinMultiplayerScreen.java (91%) rename {viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112 => viafabric-mc189/src/main/java/com/viaversion/fabric/mc189}/mixin/pipeline/MixinClientConnection.java (96%) rename viafabric-mc189/src/main/java/com/viaversion/fabric/{mc18 => mc189}/mixin/pipeline/MixinServerNetworkIoChInit.java (97%) rename {viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112 => viafabric-mc189/src/main/java/com/viaversion/fabric/mc189}/mixin/pipeline/client/MixinClientConnection.java (91%) rename {viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112 => viafabric-mc189/src/main/java/com/viaversion/fabric/mc189}/mixin/pipeline/client/MixinClientConnectionChInit.java (97%) rename viafabric-mc189/src/main/java/com/viaversion/fabric/{mc18 => mc189}/platform/FabricNativeVersionProvider.java (97%) rename viafabric-mc189/src/main/java/com/viaversion/fabric/{mc18 => mc189}/platform/FabricPlatform.java (97%) rename {viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112 => viafabric-mc189/src/main/java/com/viaversion/fabric/mc189}/platform/VFLoader.java (91%) rename viafabric-mc189/src/main/java/com/viaversion/fabric/{mc18 => mc189}/providers/FabricVersionProvider.java (90%) rename viafabric-mc189/src/main/java/com/viaversion/fabric/{mc18 => mc189}/providers/VFHandItemProvider.java (97%) rename viafabric-mc189/src/main/java/com/viaversion/fabric/{mc18 => mc189}/service/ProtocolAutoDetector.java (98%) rename viafabric-mc1122/src/main/resources/mixins.viafabric112.address.json => viafabric-mc189/src/main/resources/mixins.viafabric189.address.json (80%) rename viafabric-mc189/src/main/resources/{mixins.viafabric18.debug.json => mixins.viafabric189.debug.json} (81%) rename viafabric-mc189/src/main/resources/{mixins.viafabric18.gui.json => mixins.viafabric189.gui.json} (76%) rename viafabric-mc189/src/main/resources/{mixins.viafabric18.pipeline.json => mixins.viafabric189.pipeline.json} (82%) diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/ViaFabric.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/ViaFabric.java similarity index 92% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/ViaFabric.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/ViaFabric.java index d7e8879..c2fd018 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/ViaFabric.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/ViaFabric.java @@ -15,18 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.fabric.mc18; +package com.viaversion.fabric.mc1122; -import com.google.common.collect.Range; import com.google.common.util.concurrent.ThreadFactoryBuilder; 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.mc18.commands.NMSCommandImpl; -import com.viaversion.fabric.mc18.commands.VFCommandHandler; -import com.viaversion.fabric.mc18.platform.FabricPlatform; -import com.viaversion.fabric.mc18.platform.VFLoader; +import com.viaversion.fabric.mc1122.commands.NMSCommandImpl; +import com.viaversion.fabric.mc1122.commands.VFCommandHandler; +import com.viaversion.fabric.mc1122.platform.FabricPlatform; +import com.viaversion.fabric.mc1122.platform.VFLoader; import com.viaversion.viaversion.ViaManagerImpl; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/commands/NMSCommandImpl.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/commands/NMSCommandImpl.java similarity index 95% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/commands/NMSCommandImpl.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/commands/NMSCommandImpl.java index 51f3dee..a570d56 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/commands/NMSCommandImpl.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/commands/NMSCommandImpl.java @@ -15,10 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.fabric.mc112.commands; +package com.viaversion.fabric.mc1122.commands; import net.minecraft.command.AbstractCommand; -import net.minecraft.command.CommandException; import net.minecraft.command.CommandSource; import net.minecraft.server.MinecraftServer; import net.minecraft.util.math.BlockPos; diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/commands/NMSCommandSender.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/commands/NMSCommandSender.java similarity index 97% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/commands/NMSCommandSender.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/commands/NMSCommandSender.java index d30546d..4e33caf 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/commands/NMSCommandSender.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/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 . */ -package com.viaversion.fabric.mc112.commands; +package com.viaversion.fabric.mc1122.commands; import com.viaversion.viaversion.api.command.ViaCommandSender; import com.viaversion.viaversion.util.ComponentUtil; diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/commands/VFCommandHandler.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/commands/VFCommandHandler.java similarity index 96% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/commands/VFCommandHandler.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/commands/VFCommandHandler.java index a67996b..d8b3b98 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/commands/VFCommandHandler.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/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 . */ -package com.viaversion.fabric.mc112.commands; +package com.viaversion.fabric.mc1122.commands; import com.viaversion.fabric.common.commands.subs.LeakDetectSubCommand; import com.viaversion.viaversion.commands.ViaCommandHandler; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/gui/ChangedListener.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/gui/ChangedListener.java similarity index 97% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/gui/ChangedListener.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/gui/ChangedListener.java index 29c3f19..7d0dd6f 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/gui/ChangedListener.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/gui/ChangedListener.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.fabric.mc18.gui; +package com.viaversion.fabric.mc1122.gui; import net.minecraft.client.gui.widget.PagedEntryListWidget; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/gui/ListeneableButton.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/gui/ListeneableButton.java similarity index 96% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/gui/ListeneableButton.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/gui/ListeneableButton.java index 652b70f..df2967d 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/gui/ListeneableButton.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/gui/ListeneableButton.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.fabric.mc18.gui; +package com.viaversion.fabric.mc1122.gui; import net.minecraft.client.gui.widget.ButtonWidget; diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/gui/ViaButton.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/gui/ViaButton.java similarity index 98% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/gui/ViaButton.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/gui/ViaButton.java index f5f0b07..e616c65 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/gui/ViaButton.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/gui/ViaButton.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.fabric.mc112.gui; +package com.viaversion.fabric.mc1122.gui; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.MinecraftClient; diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/gui/ViaConfigScreen.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/gui/ViaConfigScreen.java similarity index 98% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/gui/ViaConfigScreen.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/gui/ViaConfigScreen.java index 7b959e0..b56930a 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/gui/ViaConfigScreen.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/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 . */ -package com.viaversion.fabric.mc112.gui; +package com.viaversion.fabric.mc1122.gui; import com.viaversion.fabric.common.config.AbstractViaConfigScreen; -import com.viaversion.fabric.mc112.ViaFabric; +import com.viaversion.fabric.mc1122.ViaFabric; import com.viaversion.fabric.common.util.ProtocolUtils; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import net.fabricmc.api.EnvType; diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/address/client/MixinConnectScreenThread.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/address/client/MixinConnectScreenThread.java similarity index 96% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/address/client/MixinConnectScreenThread.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/address/client/MixinConnectScreenThread.java index f3c2ddb..bc85571 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/address/client/MixinConnectScreenThread.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/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 . */ -package com.viaversion.fabric.mc112.mixin.address.client; +package com.viaversion.fabric.mc1122.mixin.address.client; import com.viaversion.fabric.common.AddressParser; import org.spongepowered.asm.mixin.Mixin; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/address/client/MixinServerAddress.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/address/client/MixinServerAddress.java similarity index 96% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/address/client/MixinServerAddress.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/address/client/MixinServerAddress.java index 13b231c..b58a1e2 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/address/client/MixinServerAddress.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/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 . */ -package com.viaversion.fabric.mc18.mixin.address.client; +package com.viaversion.fabric.mc1122.mixin.address.client; import com.viaversion.fabric.common.AddressParser; import net.minecraft.network.ServerAddress; diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/address/client/MixinServerPinger.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/address/client/MixinServerPinger.java similarity index 96% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/address/client/MixinServerPinger.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/address/client/MixinServerPinger.java index 83721aa..bff283d 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/address/client/MixinServerPinger.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/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 . */ -package com.viaversion.fabric.mc112.mixin.address.client; +package com.viaversion.fabric.mc1122.mixin.address.client; import com.viaversion.fabric.common.AddressParser; import net.minecraft.client.network.MultiplayerServerListPinger; diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/debug/client/MixinClientConnection.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/debug/client/MixinClientConnection.java similarity index 96% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/debug/client/MixinClientConnection.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/debug/client/MixinClientConnection.java index b7f52dd..20d78c2 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/debug/client/MixinClientConnection.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/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 . */ -package com.viaversion.fabric.mc112.mixin.debug.client; +package com.viaversion.fabric.mc1122.mixin.debug.client; import io.netty.channel.ChannelHandlerContext; import net.minecraft.network.ClientConnection; diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/debug/client/MixinClientConnectionAccessor.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/debug/client/MixinClientConnectionAccessor.java similarity index 94% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/debug/client/MixinClientConnectionAccessor.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/debug/client/MixinClientConnectionAccessor.java index 651bd1d..ee08a73 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/debug/client/MixinClientConnectionAccessor.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/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 . */ -package com.viaversion.fabric.mc112.mixin.debug.client; +package com.viaversion.fabric.mc1122.mixin.debug.client; import io.netty.channel.Channel; import net.minecraft.network.ClientConnection; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/debug/client/MixinDebugHud.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/debug/client/MixinDebugHud.java similarity index 97% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/debug/client/MixinDebugHud.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/debug/client/MixinDebugHud.java index cabdc02..ab6e3cc 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/debug/client/MixinDebugHud.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/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 . */ -package com.viaversion.fabric.mc18.mixin.debug.client; +package com.viaversion.fabric.mc1122.mixin.debug.client; import com.viaversion.fabric.common.handler.CommonTransformer; import com.viaversion.fabric.common.handler.FabricDecodeHandler; diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/gui/client/MixinMultiplayerScreen.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/gui/client/MixinMultiplayerScreen.java similarity index 91% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/gui/client/MixinMultiplayerScreen.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/gui/client/MixinMultiplayerScreen.java index 636612b..315e101 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/gui/client/MixinMultiplayerScreen.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/gui/client/MixinMultiplayerScreen.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.fabric.mc112.mixin.gui.client; +package com.viaversion.fabric.mc1122.mixin.gui.client; -import com.viaversion.fabric.mc112.ViaFabric; -import com.viaversion.fabric.mc112.gui.ViaButton; -import com.viaversion.fabric.mc112.gui.ViaConfigScreen; +import com.viaversion.fabric.mc1122.ViaFabric; +import com.viaversion.fabric.mc1122.gui.ViaButton; +import com.viaversion.fabric.mc1122.gui.ViaConfigScreen; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/pipeline/MixinClientConnection.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/pipeline/MixinClientConnection.java similarity index 96% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/pipeline/MixinClientConnection.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/pipeline/MixinClientConnection.java index e15ca03..69f98f8 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/pipeline/MixinClientConnection.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/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 . */ -package com.viaversion.fabric.mc18.mixin.pipeline; +package com.viaversion.fabric.mc1122.mixin.pipeline; import com.viaversion.fabric.common.handler.PipelineReorderEvent; import io.netty.channel.Channel; diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/pipeline/MixinServerNetworkIoChInit.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/pipeline/MixinServerNetworkIoChInit.java similarity index 97% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/pipeline/MixinServerNetworkIoChInit.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/pipeline/MixinServerNetworkIoChInit.java index 284f385..f97539f 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/pipeline/MixinServerNetworkIoChInit.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/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 . */ -package com.viaversion.fabric.mc112.mixin.pipeline; +package com.viaversion.fabric.mc1122.mixin.pipeline; import com.viaversion.fabric.common.handler.CommonTransformer; import com.viaversion.fabric.common.handler.FabricDecodeHandler; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/pipeline/client/MixinClientConnection.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/pipeline/client/MixinClientConnection.java similarity index 91% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/pipeline/client/MixinClientConnection.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/pipeline/client/MixinClientConnection.java index 39d9874..1cd4c2f 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/pipeline/client/MixinClientConnection.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/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 . */ -package com.viaversion.fabric.mc18.mixin.pipeline.client; +package com.viaversion.fabric.mc1122.mixin.pipeline.client; -import com.viaversion.fabric.mc18.ViaFabric; -import com.viaversion.fabric.mc18.service.ProtocolAutoDetector; +import com.viaversion.fabric.mc1122.ViaFabric; +import com.viaversion.fabric.mc1122.service.ProtocolAutoDetector; import net.minecraft.network.ClientConnection; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/pipeline/client/MixinClientConnectionChInit.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/pipeline/client/MixinClientConnectionChInit.java similarity index 97% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/pipeline/client/MixinClientConnectionChInit.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/pipeline/client/MixinClientConnectionChInit.java index 4297020..d2583e2 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/pipeline/client/MixinClientConnectionChInit.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/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 . */ -package com.viaversion.fabric.mc18.mixin.pipeline.client; +package com.viaversion.fabric.mc1122.mixin.pipeline.client; import com.viaversion.fabric.common.handler.FabricDecodeHandler; import com.viaversion.fabric.common.handler.FabricEncodeHandler; diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/pipeline/client/MixinHandshakeC2SPacket.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/pipeline/client/MixinHandshakeC2SPacket.java similarity index 78% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/pipeline/client/MixinHandshakeC2SPacket.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/pipeline/client/MixinHandshakeC2SPacket.java index 529920d..0739cc3 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/pipeline/client/MixinHandshakeC2SPacket.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/pipeline/client/MixinHandshakeC2SPacket.java @@ -1,6 +1,6 @@ -package com.viaversion.fabric.mc112.mixin.pipeline.client; +package com.viaversion.fabric.mc1122.mixin.pipeline.client; -import com.viaversion.fabric.mc112.service.ProtocolAutoDetector; +import com.viaversion.fabric.mc1122.service.ProtocolAutoDetector; import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/platform/FabricNativeVersionProvider.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/platform/FabricNativeVersionProvider.java similarity index 95% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/platform/FabricNativeVersionProvider.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/platform/FabricNativeVersionProvider.java index ff4e83c..3b73c68 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/platform/FabricNativeVersionProvider.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/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 . */ -package com.viaversion.fabric.mc112.platform; +package com.viaversion.fabric.mc1122.platform; import com.viaversion.fabric.common.platform.NativeVersionProvider; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; @@ -24,7 +24,6 @@ import net.fabricmc.api.Environment; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.MinecraftClient; import net.minecraft.realms.RealmsSharedConstants; -import net.minecraft.server.MinecraftServer; import net.minecraft.server.ServerMetadata; public class FabricNativeVersionProvider implements NativeVersionProvider { diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/platform/FabricPlatform.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/platform/FabricPlatform.java similarity index 97% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/platform/FabricPlatform.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/platform/FabricPlatform.java index 4c3d469..018ef78 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/platform/FabricPlatform.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/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 . */ -package com.viaversion.fabric.mc112.platform; +package com.viaversion.fabric.mc1122.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.mc112.ViaFabric; -import com.viaversion.fabric.mc112.commands.NMSCommandSender; +import com.viaversion.fabric.mc1122.ViaFabric; +import com.viaversion.fabric.mc1122.commands.NMSCommandSender; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.command.ViaCommandSender; import com.viaversion.viaversion.util.ComponentUtil; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/platform/VFLoader.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/platform/VFLoader.java similarity index 90% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/platform/VFLoader.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/platform/VFLoader.java index cd5d713..f8fb220 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/platform/VFLoader.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/platform/VFLoader.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.fabric.mc18.platform; +package com.viaversion.fabric.mc1122.platform; -import com.viaversion.fabric.mc18.providers.VFHandItemProvider; -import com.viaversion.fabric.mc18.providers.FabricVersionProvider; +import com.viaversion.fabric.mc1122.providers.VFHandItemProvider; +import com.viaversion.fabric.mc1122.providers.FabricVersionProvider; import net.fabricmc.api.EnvType; import net.fabricmc.loader.api.FabricLoader; import com.viaversion.viaversion.api.Via; diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/providers/FabricVersionProvider.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/providers/FabricVersionProvider.java similarity index 90% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/providers/FabricVersionProvider.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/providers/FabricVersionProvider.java index 9704928..71e6661 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/providers/FabricVersionProvider.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/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 . */ -package com.viaversion.fabric.mc112.providers; +package com.viaversion.fabric.mc1122.providers; import com.viaversion.fabric.common.config.VFConfig; import com.viaversion.fabric.common.provider.AbstractFabricVersionProvider; -import com.viaversion.fabric.mc112.ViaFabric; -import com.viaversion.fabric.mc112.service.ProtocolAutoDetector; +import com.viaversion.fabric.mc1122.ViaFabric; +import com.viaversion.fabric.mc1122.service.ProtocolAutoDetector; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import java.net.InetSocketAddress; diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/providers/VFHandItemProvider.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/providers/VFHandItemProvider.java similarity index 97% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/providers/VFHandItemProvider.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/providers/VFHandItemProvider.java index b8041d4..b403d9c 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/providers/VFHandItemProvider.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/providers/VFHandItemProvider.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.fabric.mc112.providers; +package com.viaversion.fabric.mc1122.providers; -import com.viaversion.fabric.mc112.ViaFabric; +import com.viaversion.fabric.mc1122.ViaFabric; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.item.DataItem; import com.viaversion.viaversion.api.minecraft.item.Item; diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/service/ProtocolAutoDetector.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/service/ProtocolAutoDetector.java similarity index 98% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/service/ProtocolAutoDetector.java rename to viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/service/ProtocolAutoDetector.java index 5fef4ba..5bd2428 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/service/ProtocolAutoDetector.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/service/ProtocolAutoDetector.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.fabric.mc112.service; +package com.viaversion.fabric.mc1122.service; -import com.viaversion.fabric.mc112.ViaFabric; +import com.viaversion.fabric.mc1122.ViaFabric; import com.viaversion.fabric.common.AddressParser; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; diff --git a/viafabric-mc1122/src/main/resources/fabric.mod.json b/viafabric-mc1122/src/main/resources/fabric.mod.json index a2c75e5..27d8651 100644 --- a/viafabric-mc1122/src/main/resources/fabric.mod.json +++ b/viafabric-mc1122/src/main/resources/fabric.mod.json @@ -39,7 +39,7 @@ ], "entrypoints": { "main": [ - "com.viaversion.fabric.mc112.ViaFabric" + "com.viaversion.fabric.mc1122.ViaFabric" ] }, "depends": { @@ -51,9 +51,9 @@ "legacy-fabric-command-api-v1": "*" }, "mixins": [ - "mixins.viafabric112.address.json", - "mixins.viafabric112.gui.json", - "mixins.viafabric112.debug.json", - "mixins.viafabric112.pipeline.json" + "mixins.viafabric1122.address.json", + "mixins.viafabric1122.gui.json", + "mixins.viafabric1122.debug.json", + "mixins.viafabric1122.pipeline.json" ] } diff --git a/viafabric-mc189/src/main/resources/mixins.viafabric18.address.json b/viafabric-mc1122/src/main/resources/mixins.viafabric1122.address.json similarity index 80% rename from viafabric-mc189/src/main/resources/mixins.viafabric18.address.json rename to viafabric-mc1122/src/main/resources/mixins.viafabric1122.address.json index 04e30cf..77b53e9 100644 --- a/viafabric-mc189/src/main/resources/mixins.viafabric18.address.json +++ b/viafabric-mc1122/src/main/resources/mixins.viafabric1122.address.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_8", - "package": "com.viaversion.fabric.mc18.mixin.address", + "package": "com.viaversion.fabric.mc1122.mixin.address", "mixins": [ ], "client": [ diff --git a/viafabric-mc1122/src/main/resources/mixins.viafabric112.debug.json b/viafabric-mc1122/src/main/resources/mixins.viafabric1122.debug.json similarity index 81% rename from viafabric-mc1122/src/main/resources/mixins.viafabric112.debug.json rename to viafabric-mc1122/src/main/resources/mixins.viafabric1122.debug.json index 42d6c2d..bfa5033 100644 --- a/viafabric-mc1122/src/main/resources/mixins.viafabric112.debug.json +++ b/viafabric-mc1122/src/main/resources/mixins.viafabric1122.debug.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_8", - "package": "com.viaversion.fabric.mc112.mixin.debug", + "package": "com.viaversion.fabric.mc1122.mixin.debug", "mixins": [ ], "client": [ diff --git a/viafabric-mc1122/src/main/resources/mixins.viafabric112.gui.json b/viafabric-mc1122/src/main/resources/mixins.viafabric1122.gui.json similarity index 76% rename from viafabric-mc1122/src/main/resources/mixins.viafabric112.gui.json rename to viafabric-mc1122/src/main/resources/mixins.viafabric1122.gui.json index 1c1368b..e6f53bd 100644 --- a/viafabric-mc1122/src/main/resources/mixins.viafabric112.gui.json +++ b/viafabric-mc1122/src/main/resources/mixins.viafabric1122.gui.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_8", - "package": "com.viaversion.fabric.mc112.mixin.gui", + "package": "com.viaversion.fabric.mc1122.mixin.gui", "mixins": [ ], "client": [ diff --git a/viafabric-mc1122/src/main/resources/mixins.viafabric112.pipeline.json b/viafabric-mc1122/src/main/resources/mixins.viafabric1122.pipeline.json similarity index 84% rename from viafabric-mc1122/src/main/resources/mixins.viafabric112.pipeline.json rename to viafabric-mc1122/src/main/resources/mixins.viafabric1122.pipeline.json index 9b5f149..f9c0423 100644 --- a/viafabric-mc1122/src/main/resources/mixins.viafabric112.pipeline.json +++ b/viafabric-mc1122/src/main/resources/mixins.viafabric1122.pipeline.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_8", - "package": "com.viaversion.fabric.mc112.mixin.pipeline", + "package": "com.viaversion.fabric.mc1122.mixin.pipeline", "mixins": [ "MixinClientConnection", "MixinServerNetworkIoChInit" diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/ViaFabric.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/ViaFabric.java similarity index 92% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/ViaFabric.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/ViaFabric.java index 0ac3159..caa261c 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/ViaFabric.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/ViaFabric.java @@ -15,18 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.fabric.mc112; +package com.viaversion.fabric.mc189; -import com.google.common.collect.Range; import com.google.common.util.concurrent.ThreadFactoryBuilder; 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.mc112.commands.NMSCommandImpl; -import com.viaversion.fabric.mc112.commands.VFCommandHandler; -import com.viaversion.fabric.mc112.platform.FabricPlatform; -import com.viaversion.fabric.mc112.platform.VFLoader; +import com.viaversion.fabric.mc189.commands.NMSCommandImpl; +import com.viaversion.fabric.mc189.commands.VFCommandHandler; +import com.viaversion.fabric.mc189.platform.FabricPlatform; +import com.viaversion.fabric.mc189.platform.VFLoader; import com.viaversion.viaversion.ViaManagerImpl; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/commands/NMSCommandImpl.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/commands/NMSCommandImpl.java similarity index 97% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/commands/NMSCommandImpl.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/commands/NMSCommandImpl.java index 146e556..f41e7ef 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/commands/NMSCommandImpl.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/commands/NMSCommandImpl.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.fabric.mc18.commands; +package com.viaversion.fabric.mc189.commands; import net.minecraft.command.AbstractCommand; import net.minecraft.command.CommandSource; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/commands/NMSCommandSender.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/commands/NMSCommandSender.java similarity index 97% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/commands/NMSCommandSender.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/commands/NMSCommandSender.java index 70d1be2..d46513f 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/commands/NMSCommandSender.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/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 . */ -package com.viaversion.fabric.mc18.commands; +package com.viaversion.fabric.mc189.commands; import com.viaversion.viaversion.api.command.ViaCommandSender; import com.viaversion.viaversion.util.ComponentUtil; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/commands/VFCommandHandler.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/commands/VFCommandHandler.java similarity index 96% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/commands/VFCommandHandler.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/commands/VFCommandHandler.java index 5ed5931..a98923d 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/commands/VFCommandHandler.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/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 . */ -package com.viaversion.fabric.mc18.commands; +package com.viaversion.fabric.mc189.commands; import com.viaversion.fabric.common.commands.subs.LeakDetectSubCommand; import com.viaversion.viaversion.commands.ViaCommandHandler; diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/gui/ChangedListener.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/gui/ChangedListener.java similarity index 97% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/gui/ChangedListener.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/gui/ChangedListener.java index 29159d2..be9827e 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/gui/ChangedListener.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/gui/ChangedListener.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.fabric.mc112.gui; +package com.viaversion.fabric.mc189.gui; import net.minecraft.client.gui.widget.PagedEntryListWidget; diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/gui/ListeneableButton.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/gui/ListeneableButton.java similarity index 97% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/gui/ListeneableButton.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/gui/ListeneableButton.java index c0173a5..8bcac8b 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/gui/ListeneableButton.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/gui/ListeneableButton.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.fabric.mc112.gui; +package com.viaversion.fabric.mc189.gui; import net.minecraft.client.gui.widget.ButtonWidget; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/gui/ModMenuConfig.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/gui/ModMenuConfig.java similarity index 96% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/gui/ModMenuConfig.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/gui/ModMenuConfig.java index 8d232a8..b01669f 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/gui/ModMenuConfig.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/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 . */ -package com.viaversion.fabric.mc18.gui; +package com.viaversion.fabric.mc189.gui; import io.github.prospector.modmenu.api.ModMenuApi; import net.minecraft.client.gui.screen.Screen; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/gui/ViaButton.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/gui/ViaButton.java similarity index 98% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/gui/ViaButton.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/gui/ViaButton.java index 576cd7a..9928895 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/gui/ViaButton.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/gui/ViaButton.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.fabric.mc18.gui; +package com.viaversion.fabric.mc189.gui; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.MinecraftClient; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/gui/ViaConfigScreen.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/gui/ViaConfigScreen.java similarity index 98% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/gui/ViaConfigScreen.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/gui/ViaConfigScreen.java index ea10b18..18ae028 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/gui/ViaConfigScreen.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/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 . */ -package com.viaversion.fabric.mc18.gui; +package com.viaversion.fabric.mc189.gui; import com.viaversion.fabric.common.config.AbstractViaConfigScreen; -import com.viaversion.fabric.mc18.ViaFabric; +import com.viaversion.fabric.mc189.ViaFabric; import com.viaversion.fabric.common.util.ProtocolUtils; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import net.fabricmc.api.EnvType; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/address/client/MixinConnectScreenThread.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/address/client/MixinConnectScreenThread.java similarity index 96% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/address/client/MixinConnectScreenThread.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/address/client/MixinConnectScreenThread.java index a2e40c2..cf6916c 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/address/client/MixinConnectScreenThread.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/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 . */ -package com.viaversion.fabric.mc18.mixin.address.client; +package com.viaversion.fabric.mc189.mixin.address.client; import com.viaversion.fabric.common.AddressParser; import org.spongepowered.asm.mixin.Mixin; diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/address/client/MixinServerAddress.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/address/client/MixinServerAddress.java similarity index 96% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/address/client/MixinServerAddress.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/address/client/MixinServerAddress.java index 1655917..2cd6a27 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/address/client/MixinServerAddress.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/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 . */ -package com.viaversion.fabric.mc112.mixin.address.client; +package com.viaversion.fabric.mc189.mixin.address.client; import com.viaversion.fabric.common.AddressParser; import net.minecraft.network.ServerAddress; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/address/client/MixinServerPinger.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/address/client/MixinServerPinger.java similarity index 96% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/address/client/MixinServerPinger.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/address/client/MixinServerPinger.java index 78d1922..6a13b53 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/address/client/MixinServerPinger.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/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 . */ -package com.viaversion.fabric.mc18.mixin.address.client; +package com.viaversion.fabric.mc189.mixin.address.client; import com.viaversion.fabric.common.AddressParser; import net.minecraft.client.network.MultiplayerServerListPinger; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/debug/client/MixinClientConnection.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/debug/client/MixinClientConnection.java similarity index 96% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/debug/client/MixinClientConnection.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/debug/client/MixinClientConnection.java index 8fbab3c..6f6f540 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/debug/client/MixinClientConnection.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/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 . */ -package com.viaversion.fabric.mc18.mixin.debug.client; +package com.viaversion.fabric.mc189.mixin.debug.client; import io.netty.channel.ChannelHandlerContext; import net.minecraft.network.ClientConnection; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/debug/client/MixinClientConnectionAccessor.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/debug/client/MixinClientConnectionAccessor.java similarity index 95% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/debug/client/MixinClientConnectionAccessor.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/debug/client/MixinClientConnectionAccessor.java index 0947878..1fbc161 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/debug/client/MixinClientConnectionAccessor.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/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 . */ -package com.viaversion.fabric.mc18.mixin.debug.client; +package com.viaversion.fabric.mc189.mixin.debug.client; import io.netty.channel.Channel; import net.minecraft.network.ClientConnection; diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/debug/client/MixinDebugHud.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/debug/client/MixinDebugHud.java similarity index 98% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/debug/client/MixinDebugHud.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/debug/client/MixinDebugHud.java index bafaba8..ea3473f 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/debug/client/MixinDebugHud.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/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 . */ -package com.viaversion.fabric.mc112.mixin.debug.client; +package com.viaversion.fabric.mc189.mixin.debug.client; import com.viaversion.fabric.common.handler.CommonTransformer; import com.viaversion.fabric.common.handler.FabricDecodeHandler; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/gui/client/MixinMultiplayerScreen.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/gui/client/MixinMultiplayerScreen.java similarity index 91% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/gui/client/MixinMultiplayerScreen.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/gui/client/MixinMultiplayerScreen.java index 485b53e..0a92a41 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/gui/client/MixinMultiplayerScreen.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/gui/client/MixinMultiplayerScreen.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.fabric.mc18.mixin.gui.client; +package com.viaversion.fabric.mc189.mixin.gui.client; -import com.viaversion.fabric.mc18.ViaFabric; -import com.viaversion.fabric.mc18.gui.ViaButton; -import com.viaversion.fabric.mc18.gui.ViaConfigScreen; +import com.viaversion.fabric.mc189.ViaFabric; +import com.viaversion.fabric.mc189.gui.ViaButton; +import com.viaversion.fabric.mc189.gui.ViaConfigScreen; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/pipeline/MixinClientConnection.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/pipeline/MixinClientConnection.java similarity index 96% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/pipeline/MixinClientConnection.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/pipeline/MixinClientConnection.java index 9e40c1d..76a52cc 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/pipeline/MixinClientConnection.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/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 . */ -package com.viaversion.fabric.mc112.mixin.pipeline; +package com.viaversion.fabric.mc189.mixin.pipeline; import com.viaversion.fabric.common.handler.PipelineReorderEvent; import io.netty.channel.Channel; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/pipeline/MixinServerNetworkIoChInit.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/pipeline/MixinServerNetworkIoChInit.java similarity index 97% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/pipeline/MixinServerNetworkIoChInit.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/pipeline/MixinServerNetworkIoChInit.java index 8a509ca..9ff4048 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/mixin/pipeline/MixinServerNetworkIoChInit.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/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 . */ -package com.viaversion.fabric.mc18.mixin.pipeline; +package com.viaversion.fabric.mc189.mixin.pipeline; import com.viaversion.fabric.common.handler.CommonTransformer; import com.viaversion.fabric.common.handler.FabricDecodeHandler; diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/pipeline/client/MixinClientConnection.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/pipeline/client/MixinClientConnection.java similarity index 91% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/pipeline/client/MixinClientConnection.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/pipeline/client/MixinClientConnection.java index 0b7ae18..6896845 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/pipeline/client/MixinClientConnection.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/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 . */ -package com.viaversion.fabric.mc112.mixin.pipeline.client; +package com.viaversion.fabric.mc189.mixin.pipeline.client; -import com.viaversion.fabric.mc112.ViaFabric; -import com.viaversion.fabric.mc112.service.ProtocolAutoDetector; +import com.viaversion.fabric.mc189.ViaFabric; +import com.viaversion.fabric.mc189.service.ProtocolAutoDetector; import net.minecraft.network.ClientConnection; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/pipeline/client/MixinClientConnectionChInit.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/pipeline/client/MixinClientConnectionChInit.java similarity index 97% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/pipeline/client/MixinClientConnectionChInit.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/pipeline/client/MixinClientConnectionChInit.java index 194ca60..885261d 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/mixin/pipeline/client/MixinClientConnectionChInit.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/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 . */ -package com.viaversion.fabric.mc112.mixin.pipeline.client; +package com.viaversion.fabric.mc189.mixin.pipeline.client; import com.viaversion.fabric.common.handler.FabricDecodeHandler; import com.viaversion.fabric.common.handler.FabricEncodeHandler; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/platform/FabricNativeVersionProvider.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/platform/FabricNativeVersionProvider.java similarity index 97% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/platform/FabricNativeVersionProvider.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/platform/FabricNativeVersionProvider.java index fa4dfb7..c49c47f 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/platform/FabricNativeVersionProvider.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/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 . */ -package com.viaversion.fabric.mc18.platform; +package com.viaversion.fabric.mc189.platform; import com.viaversion.fabric.common.platform.NativeVersionProvider; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/platform/FabricPlatform.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/platform/FabricPlatform.java similarity index 97% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/platform/FabricPlatform.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/platform/FabricPlatform.java index 1a7ddba..3b70f08 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/platform/FabricPlatform.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/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 . */ -package com.viaversion.fabric.mc18.platform; +package com.viaversion.fabric.mc189.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.mc18.ViaFabric; -import com.viaversion.fabric.mc18.commands.NMSCommandSender; +import com.viaversion.fabric.mc189.ViaFabric; +import com.viaversion.fabric.mc189.commands.NMSCommandSender; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.command.ViaCommandSender; import com.viaversion.viaversion.util.ComponentUtil; diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/platform/VFLoader.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/platform/VFLoader.java similarity index 91% rename from viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/platform/VFLoader.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/platform/VFLoader.java index 3450969..cee4571 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc112/platform/VFLoader.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/platform/VFLoader.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.fabric.mc112.platform; +package com.viaversion.fabric.mc189.platform; -import com.viaversion.fabric.mc112.providers.VFHandItemProvider; -import com.viaversion.fabric.mc112.providers.FabricVersionProvider; +import com.viaversion.fabric.mc189.providers.VFHandItemProvider; +import com.viaversion.fabric.mc189.providers.FabricVersionProvider; import net.fabricmc.api.EnvType; import net.fabricmc.loader.api.FabricLoader; import com.viaversion.viaversion.api.Via; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/providers/FabricVersionProvider.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/providers/FabricVersionProvider.java similarity index 90% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/providers/FabricVersionProvider.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/providers/FabricVersionProvider.java index 89d69b0..5565ac5 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/providers/FabricVersionProvider.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/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 . */ -package com.viaversion.fabric.mc18.providers; +package com.viaversion.fabric.mc189.providers; import com.viaversion.fabric.common.config.VFConfig; import com.viaversion.fabric.common.provider.AbstractFabricVersionProvider; -import com.viaversion.fabric.mc18.ViaFabric; -import com.viaversion.fabric.mc18.service.ProtocolAutoDetector; +import com.viaversion.fabric.mc189.ViaFabric; +import com.viaversion.fabric.mc189.service.ProtocolAutoDetector; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import java.net.InetSocketAddress; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/providers/VFHandItemProvider.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/providers/VFHandItemProvider.java similarity index 97% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/providers/VFHandItemProvider.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/providers/VFHandItemProvider.java index ee32bae..9c02370 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/providers/VFHandItemProvider.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/providers/VFHandItemProvider.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.fabric.mc18.providers; +package com.viaversion.fabric.mc189.providers; -import com.viaversion.fabric.mc18.ViaFabric; +import com.viaversion.fabric.mc189.ViaFabric; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.item.DataItem; import com.viaversion.viaversion.api.minecraft.item.Item; diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/service/ProtocolAutoDetector.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/service/ProtocolAutoDetector.java similarity index 98% rename from viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/service/ProtocolAutoDetector.java rename to viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/service/ProtocolAutoDetector.java index 22154e2..04c2102 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc18/service/ProtocolAutoDetector.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/service/ProtocolAutoDetector.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.fabric.mc18.service; +package com.viaversion.fabric.mc189.service; -import com.viaversion.fabric.mc18.ViaFabric; +import com.viaversion.fabric.mc189.ViaFabric; import com.viaversion.fabric.common.AddressParser; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; diff --git a/viafabric-mc189/src/main/resources/fabric.mod.json b/viafabric-mc189/src/main/resources/fabric.mod.json index 339ea9c..824e9b2 100644 --- a/viafabric-mc189/src/main/resources/fabric.mod.json +++ b/viafabric-mc189/src/main/resources/fabric.mod.json @@ -47,10 +47,10 @@ ], "entrypoints": { "main": [ - "com.viaversion.fabric.mc18.ViaFabric" + "com.viaversion.fabric.mc189.ViaFabric" ], "modmenu": [ - "com.viaversion.fabric.mc18.gui.ModMenuConfig" + "com.viaversion.fabric.mc189.gui.ModMenuConfig" ] }, "depends": { @@ -62,10 +62,10 @@ "legacy-fabric-command-api-v1": "*" }, "mixins": [ - "mixins.viafabric18.address.json", - "mixins.viafabric18.gui.json", - "mixins.viafabric18.debug.json", - "mixins.viafabric18.pipeline.json" + "mixins.viafabric189.address.json", + "mixins.viafabric189.gui.json", + "mixins.viafabric189.debug.json", + "mixins.viafabric189.pipeline.json" ], "custom": { "modmenu": { diff --git a/viafabric-mc1122/src/main/resources/mixins.viafabric112.address.json b/viafabric-mc189/src/main/resources/mixins.viafabric189.address.json similarity index 80% rename from viafabric-mc1122/src/main/resources/mixins.viafabric112.address.json rename to viafabric-mc189/src/main/resources/mixins.viafabric189.address.json index 3c27479..adafc62 100644 --- a/viafabric-mc1122/src/main/resources/mixins.viafabric112.address.json +++ b/viafabric-mc189/src/main/resources/mixins.viafabric189.address.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_8", - "package": "com.viaversion.fabric.mc112.mixin.address", + "package": "com.viaversion.fabric.mc189.mixin.address", "mixins": [ ], "client": [ diff --git a/viafabric-mc189/src/main/resources/mixins.viafabric18.debug.json b/viafabric-mc189/src/main/resources/mixins.viafabric189.debug.json similarity index 81% rename from viafabric-mc189/src/main/resources/mixins.viafabric18.debug.json rename to viafabric-mc189/src/main/resources/mixins.viafabric189.debug.json index ee69186..079bfad 100644 --- a/viafabric-mc189/src/main/resources/mixins.viafabric18.debug.json +++ b/viafabric-mc189/src/main/resources/mixins.viafabric189.debug.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_8", - "package": "com.viaversion.fabric.mc18.mixin.debug", + "package": "com.viaversion.fabric.mc189.mixin.debug", "mixins": [ ], "client": [ diff --git a/viafabric-mc189/src/main/resources/mixins.viafabric18.gui.json b/viafabric-mc189/src/main/resources/mixins.viafabric189.gui.json similarity index 76% rename from viafabric-mc189/src/main/resources/mixins.viafabric18.gui.json rename to viafabric-mc189/src/main/resources/mixins.viafabric189.gui.json index 2723b1f..940327f 100644 --- a/viafabric-mc189/src/main/resources/mixins.viafabric18.gui.json +++ b/viafabric-mc189/src/main/resources/mixins.viafabric189.gui.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_8", - "package": "com.viaversion.fabric.mc18.mixin.gui", + "package": "com.viaversion.fabric.mc189.mixin.gui", "mixins": [ ], "client": [ diff --git a/viafabric-mc189/src/main/resources/mixins.viafabric18.pipeline.json b/viafabric-mc189/src/main/resources/mixins.viafabric189.pipeline.json similarity index 82% rename from viafabric-mc189/src/main/resources/mixins.viafabric18.pipeline.json rename to viafabric-mc189/src/main/resources/mixins.viafabric189.pipeline.json index df4b31a..d6e472c 100644 --- a/viafabric-mc189/src/main/resources/mixins.viafabric18.pipeline.json +++ b/viafabric-mc189/src/main/resources/mixins.viafabric189.pipeline.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_8", - "package": "com.viaversion.fabric.mc18.mixin.pipeline", + "package": "com.viaversion.fabric.mc189.mixin.pipeline", "mixins": [ "MixinClientConnection", "MixinServerNetworkIoChInit"