diff --git a/viafabric-mc1122/src/main/resources/fabric.mod.json b/viafabric-mc1122/src/main/resources/fabric.mod.json index 27d8651..b7835f1 100644 --- a/viafabric-mc1122/src/main/resources/fabric.mod.json +++ b/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}", diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/ViaFabric.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/ViaFabric.java similarity index 95% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/ViaFabric.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/ViaFabric.java index ef0210b..c732ecc 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/ViaFabric.java +++ b/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 . */ -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; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/commands/NMSCommandSender.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/commands/NMSCommandSender.java similarity index 98% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/commands/NMSCommandSender.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/commands/NMSCommandSender.java index baa9063..553e6c1 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/commands/NMSCommandSender.java +++ b/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 . */ -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; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/commands/VFClientCommands.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/commands/VFClientCommands.java similarity index 92% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/commands/VFClientCommands.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/commands/VFClientCommands.java index ffe250e..8766509 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/commands/VFClientCommands.java +++ b/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 . */ -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; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/commands/VFCommandHandler.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/commands/VFCommandHandler.java similarity index 98% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/commands/VFCommandHandler.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/commands/VFCommandHandler.java index 6d25ade..f4bd8e4 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/commands/VFCommandHandler.java +++ b/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 . */ -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; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/gui/ModMenuConfig.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/gui/ModMenuConfig.java similarity index 96% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/gui/ModMenuConfig.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/gui/ModMenuConfig.java index 8d08a20..56b7fa8 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/gui/ModMenuConfig.java +++ b/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 . */ -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; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/gui/ViaConfigScreen.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/gui/ViaConfigScreen.java similarity index 98% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/gui/ViaConfigScreen.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/gui/ViaConfigScreen.java index 6a4c865..1193446 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/gui/ViaConfigScreen.java +++ b/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 . */ -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; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/address/client/MixinConnectScreenThread.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinConnectScreenThread.java similarity index 96% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/address/client/MixinConnectScreenThread.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinConnectScreenThread.java index a66fadf..cb4e40d 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/address/client/MixinConnectScreenThread.java +++ b/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 . */ -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; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/address/client/MixinServerAddress.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinServerAddress.java similarity index 96% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/address/client/MixinServerAddress.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinServerAddress.java index 0f867e6..e166c4f 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/address/client/MixinServerAddress.java +++ b/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 . */ -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; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/address/client/MixinServerPinger.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinServerPinger.java similarity index 96% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/address/client/MixinServerPinger.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinServerPinger.java index 90d0011..b60851e 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/address/client/MixinServerPinger.java +++ b/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 . */ -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; diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/debug/client/MixinClientConnection.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/debug/client/MixinClientConnection.java similarity index 96% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/debug/client/MixinClientConnection.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/debug/client/MixinClientConnection.java index 65221df..7d12ca3 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/debug/client/MixinClientConnection.java +++ b/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 . */ -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; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/debug/client/MixinClientConnectionAccessor.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/debug/client/MixinClientConnectionAccessor.java similarity index 94% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/debug/client/MixinClientConnectionAccessor.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/debug/client/MixinClientConnectionAccessor.java index bc1f834..7cd97aa 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/debug/client/MixinClientConnectionAccessor.java +++ b/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 . */ -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; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/debug/client/MixinDebugHud.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/debug/client/MixinDebugHud.java similarity index 97% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/debug/client/MixinDebugHud.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/debug/client/MixinDebugHud.java index d77e5e0..2ffb446 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/debug/client/MixinDebugHud.java +++ b/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 . */ -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; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/gui/client/MixinMultiplayerScreen.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/gui/client/MixinMultiplayerScreen.java similarity index 93% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/gui/client/MixinMultiplayerScreen.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/gui/client/MixinMultiplayerScreen.java index a6263bc..b84b30f 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/gui/client/MixinMultiplayerScreen.java +++ b/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 . */ -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; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/gui/client/MixinMultiplayerServerListPingerListener.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/gui/client/MixinMultiplayerServerListPingerListener.java similarity index 94% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/gui/client/MixinMultiplayerServerListPingerListener.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/gui/client/MixinMultiplayerServerListPingerListener.java index 0e276c7..669986d 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/gui/client/MixinMultiplayerServerListPingerListener.java +++ b/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 . */ -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; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/gui/client/MixinServerEntry.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/gui/client/MixinServerEntry.java similarity index 98% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/gui/client/MixinServerEntry.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/gui/client/MixinServerEntry.java index 6cdf845..9f153f3 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/gui/client/MixinServerEntry.java +++ b/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 . */ -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; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/gui/client/MixinServerInfo.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/gui/client/MixinServerInfo.java similarity index 96% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/gui/client/MixinServerInfo.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/gui/client/MixinServerInfo.java index 1e7b09e..6078a95 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/gui/client/MixinServerInfo.java +++ b/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 . */ -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; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/pipeline/MixinClientConnection.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/pipeline/MixinClientConnection.java similarity index 96% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/pipeline/MixinClientConnection.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/pipeline/MixinClientConnection.java index 7accd8f..96dc941 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/pipeline/MixinClientConnection.java +++ b/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 . */ -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; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/pipeline/MixinServerNetworkIoChInit.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/pipeline/MixinServerNetworkIoChInit.java similarity index 97% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/pipeline/MixinServerNetworkIoChInit.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/pipeline/MixinServerNetworkIoChInit.java index 656a8ac..4b8ed5f 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/pipeline/MixinServerNetworkIoChInit.java +++ b/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 . */ -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; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/pipeline/client/MixinClientConnection.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/pipeline/client/MixinClientConnection.java similarity index 91% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/pipeline/client/MixinClientConnection.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/pipeline/client/MixinClientConnection.java index 90b1334..64950ac 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/pipeline/client/MixinClientConnection.java +++ b/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 . */ -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; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/pipeline/client/MixinClientConnectionChInit.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/pipeline/client/MixinClientConnectionChInit.java similarity index 97% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/pipeline/client/MixinClientConnectionChInit.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/pipeline/client/MixinClientConnectionChInit.java index c26a7cb..f7138b1 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/pipeline/client/MixinClientConnectionChInit.java +++ b/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 . */ -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; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/platform/FabricNativeVersionProvider.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/platform/FabricNativeVersionProvider.java similarity index 95% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/platform/FabricNativeVersionProvider.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/platform/FabricNativeVersionProvider.java index 05e97b8..bf15f57 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/platform/FabricNativeVersionProvider.java +++ b/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 . */ -package com.viaversion.fabric.mc115.platform; +package com.viaversion.fabric.mc1144.platform; import com.viaversion.fabric.common.platform.NativeVersionProvider; import net.minecraft.SharedConstants; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/platform/FabricPlatform.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/platform/FabricPlatform.java similarity index 97% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/platform/FabricPlatform.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/platform/FabricPlatform.java index a4e67ac..2cddc1e 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/platform/FabricPlatform.java +++ b/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 . */ -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; + } } diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/platform/VFLoader.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/platform/VFLoader.java similarity index 88% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/platform/VFLoader.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/platform/VFLoader.java index 19e7f31..a8ac784 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/platform/VFLoader.java +++ b/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 . */ -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; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/providers/FabricVersionProvider.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/providers/FabricVersionProvider.java similarity index 90% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/providers/FabricVersionProvider.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/providers/FabricVersionProvider.java index 0f55630..ade5073 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/providers/FabricVersionProvider.java +++ b/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 . */ -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; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/providers/VFHandItemProvider.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/providers/VFHandItemProvider.java similarity index 96% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/providers/VFHandItemProvider.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/providers/VFHandItemProvider.java index 2b8f2a0..68abe54 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/providers/VFHandItemProvider.java +++ b/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 . */ -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; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/providers/VFPlayerLookTargetProvider.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/providers/VFPlayerLookTargetProvider.java similarity index 97% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/providers/VFPlayerLookTargetProvider.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/providers/VFPlayerLookTargetProvider.java index 8392267..68bcf03 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/providers/VFPlayerLookTargetProvider.java +++ b/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 . */ -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; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/service/ProtocolAutoDetector.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/service/ProtocolAutoDetector.java similarity index 98% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/service/ProtocolAutoDetector.java rename to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/service/ProtocolAutoDetector.java index f457a51..2a9be7e 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/service/ProtocolAutoDetector.java +++ b/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 . */ -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; diff --git a/viafabric-mc1144/src/main/resources/fabric.mod.json b/viafabric-mc1144/src/main/resources/fabric.mod.json index ce70ecd..a03f207 100644 --- a/viafabric-mc1144/src/main/resources/fabric.mod.json +++ b/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": { diff --git a/viafabric-mc1144/src/main/resources/mixins.viafabric114.address.json b/viafabric-mc1144/src/main/resources/mixins.viafabric1144.address.json similarity index 80% rename from viafabric-mc1144/src/main/resources/mixins.viafabric114.address.json rename to viafabric-mc1144/src/main/resources/mixins.viafabric1144.address.json index 8d4d014..8121604 100644 --- a/viafabric-mc1144/src/main/resources/mixins.viafabric114.address.json +++ b/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": [ diff --git a/viafabric-mc1165/src/main/resources/mixins.viafabric116.debug.json b/viafabric-mc1144/src/main/resources/mixins.viafabric1144.debug.json similarity index 81% rename from viafabric-mc1165/src/main/resources/mixins.viafabric116.debug.json rename to viafabric-mc1144/src/main/resources/mixins.viafabric1144.debug.json index 27c7410..c28e221 100644 --- a/viafabric-mc1165/src/main/resources/mixins.viafabric116.debug.json +++ b/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": [ diff --git a/viafabric-mc1152/src/main/resources/mixins.viafabric115.gui.json b/viafabric-mc1144/src/main/resources/mixins.viafabric1144.gui.json similarity index 84% rename from viafabric-mc1152/src/main/resources/mixins.viafabric115.gui.json rename to viafabric-mc1144/src/main/resources/mixins.viafabric1144.gui.json index f5209d1..4286541 100644 --- a/viafabric-mc1152/src/main/resources/mixins.viafabric115.gui.json +++ b/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" ], diff --git a/viafabric-mc1152/src/main/resources/mixins.viafabric115.pipeline.json b/viafabric-mc1144/src/main/resources/mixins.viafabric1144.pipeline.json similarity index 82% rename from viafabric-mc1152/src/main/resources/mixins.viafabric115.pipeline.json rename to viafabric-mc1144/src/main/resources/mixins.viafabric1144.pipeline.json index a949147..c659a2e 100644 --- a/viafabric-mc1152/src/main/resources/mixins.viafabric115.pipeline.json +++ b/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" diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/ViaFabric.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/ViaFabric.java similarity index 95% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/ViaFabric.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/ViaFabric.java index 158e815..4252848 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/ViaFabric.java +++ b/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 . */ -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; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/commands/NMSCommandSender.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/commands/NMSCommandSender.java similarity index 98% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/commands/NMSCommandSender.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/commands/NMSCommandSender.java index 9f25ce8..d51854e 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/commands/NMSCommandSender.java +++ b/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 . */ -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; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/commands/VFClientCommands.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/commands/VFClientCommands.java similarity index 92% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/commands/VFClientCommands.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/commands/VFClientCommands.java index 8e9b9c4..d914451 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/commands/VFClientCommands.java +++ b/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 . */ -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; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/commands/VFCommandHandler.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/commands/VFCommandHandler.java similarity index 98% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/commands/VFCommandHandler.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/commands/VFCommandHandler.java index ff878b0..5186e2e 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/commands/VFCommandHandler.java +++ b/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 . */ -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; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/gui/ModMenuConfig.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/gui/ModMenuConfig.java similarity index 97% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/gui/ModMenuConfig.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/gui/ModMenuConfig.java index 18c99c5..5589470 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/gui/ModMenuConfig.java +++ b/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 . */ -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; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/gui/ViaConfigScreen.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/gui/ViaConfigScreen.java similarity index 98% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/gui/ViaConfigScreen.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/gui/ViaConfigScreen.java index e322a7d..4edbc63 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/gui/ViaConfigScreen.java +++ b/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 . */ -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; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/address/client/MixinConnectScreenThread.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinConnectScreenThread.java similarity index 96% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/address/client/MixinConnectScreenThread.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinConnectScreenThread.java index f14c4e7..bd3b78b 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/address/client/MixinConnectScreenThread.java +++ b/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 . */ -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; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/address/client/MixinServerAddress.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinServerAddress.java similarity index 96% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/address/client/MixinServerAddress.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinServerAddress.java index 7f179c1..fb5f683 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/address/client/MixinServerAddress.java +++ b/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 . */ -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; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/address/client/MixinServerPinger.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinServerPinger.java similarity index 96% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/address/client/MixinServerPinger.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinServerPinger.java index 348b1da..fb65bc1 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/address/client/MixinServerPinger.java +++ b/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 . */ -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; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/debug/client/MixinClientConnection.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/debug/client/MixinClientConnection.java similarity index 96% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/debug/client/MixinClientConnection.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/debug/client/MixinClientConnection.java index 97521e7..a38e9fe 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/debug/client/MixinClientConnection.java +++ b/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 . */ -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; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/debug/client/MixinClientConnectionAccessor.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/debug/client/MixinClientConnectionAccessor.java similarity index 94% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/debug/client/MixinClientConnectionAccessor.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/debug/client/MixinClientConnectionAccessor.java index 2e46bf4..9be0941 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/debug/client/MixinClientConnectionAccessor.java +++ b/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 . */ -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; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/debug/client/MixinDebugHud.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/debug/client/MixinDebugHud.java similarity index 97% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/debug/client/MixinDebugHud.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/debug/client/MixinDebugHud.java index dac32ae..206d742 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/debug/client/MixinDebugHud.java +++ b/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 . */ -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; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/gui/client/MixinMultiplayerScreen.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/gui/client/MixinMultiplayerScreen.java similarity index 93% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/gui/client/MixinMultiplayerScreen.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/gui/client/MixinMultiplayerScreen.java index 83599ba..7c5054b 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/gui/client/MixinMultiplayerScreen.java +++ b/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 . */ -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; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/gui/client/MixinMultiplayerServerListPingerListener.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/gui/client/MixinMultiplayerServerListPingerListener.java similarity index 94% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/gui/client/MixinMultiplayerServerListPingerListener.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/gui/client/MixinMultiplayerServerListPingerListener.java index b57ffe3..65a1dd6 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/gui/client/MixinMultiplayerServerListPingerListener.java +++ b/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 . */ -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; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/gui/client/MixinServerEntry.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/gui/client/MixinServerEntry.java similarity index 98% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/gui/client/MixinServerEntry.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/gui/client/MixinServerEntry.java index 42d5689..6af8d06 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/gui/client/MixinServerEntry.java +++ b/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 . */ -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; diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/gui/client/MixinServerInfo.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/gui/client/MixinServerInfo.java similarity index 96% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/gui/client/MixinServerInfo.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/gui/client/MixinServerInfo.java index 9429ce3..9d62507 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/gui/client/MixinServerInfo.java +++ b/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 . */ -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; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/pipeline/MixinClientConnection.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/pipeline/MixinClientConnection.java similarity index 96% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/pipeline/MixinClientConnection.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/pipeline/MixinClientConnection.java index f83376a..5b4a3f6 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/pipeline/MixinClientConnection.java +++ b/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 . */ -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; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/pipeline/MixinServerNetworkIoChInit.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/pipeline/MixinServerNetworkIoChInit.java similarity index 97% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/pipeline/MixinServerNetworkIoChInit.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/pipeline/MixinServerNetworkIoChInit.java index f184c5d..3e6bf5a 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/pipeline/MixinServerNetworkIoChInit.java +++ b/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 . */ -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; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/pipeline/client/MixinClientConnection.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/pipeline/client/MixinClientConnection.java similarity index 91% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/pipeline/client/MixinClientConnection.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/pipeline/client/MixinClientConnection.java index b6484c3..dbc8d0f 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/pipeline/client/MixinClientConnection.java +++ b/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 . */ -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; diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/pipeline/client/MixinClientConnectionChInit.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/pipeline/client/MixinClientConnectionChInit.java similarity index 97% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/pipeline/client/MixinClientConnectionChInit.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/pipeline/client/MixinClientConnectionChInit.java index f88e0e9..db83334 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/pipeline/client/MixinClientConnectionChInit.java +++ b/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 . */ -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; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/platform/FabricNativeVersionProvider.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/platform/FabricNativeVersionProvider.java similarity index 95% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/platform/FabricNativeVersionProvider.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/platform/FabricNativeVersionProvider.java index f0c3c7b..139ea5a 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/platform/FabricNativeVersionProvider.java +++ b/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 . */ -package com.viaversion.fabric.mc116.platform; +package com.viaversion.fabric.mc1152.platform; import com.viaversion.fabric.common.platform.NativeVersionProvider; import net.minecraft.SharedConstants; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/platform/FabricPlatform.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/platform/FabricPlatform.java similarity index 97% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/platform/FabricPlatform.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/platform/FabricPlatform.java index 45a6bc1..6a90e7a 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/platform/FabricPlatform.java +++ b/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 . */ -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; - } } diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/platform/VFLoader.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/platform/VFLoader.java similarity index 88% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/platform/VFLoader.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/platform/VFLoader.java index 7ceba36..0717cd1 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/platform/VFLoader.java +++ b/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 . */ -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; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/providers/FabricVersionProvider.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/providers/FabricVersionProvider.java similarity index 92% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/providers/FabricVersionProvider.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/providers/FabricVersionProvider.java index c082e4e..02224d6 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/providers/FabricVersionProvider.java +++ b/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 . */ -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; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/providers/VFHandItemProvider.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/providers/VFHandItemProvider.java similarity index 96% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/providers/VFHandItemProvider.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/providers/VFHandItemProvider.java index 33df7c4..a5da7e2 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/providers/VFHandItemProvider.java +++ b/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 . */ -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; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/providers/VFPlayerLookTargetProvider.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/providers/VFPlayerLookTargetProvider.java similarity index 97% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/providers/VFPlayerLookTargetProvider.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/providers/VFPlayerLookTargetProvider.java index 162f8b3..a00f2ee 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/providers/VFPlayerLookTargetProvider.java +++ b/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 . */ -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; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/service/ProtocolAutoDetector.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/service/ProtocolAutoDetector.java similarity index 98% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/service/ProtocolAutoDetector.java rename to viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/service/ProtocolAutoDetector.java index f18a850..8b340e6 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/service/ProtocolAutoDetector.java +++ b/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 . */ -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; diff --git a/viafabric-mc1152/src/main/resources/fabric.mod.json b/viafabric-mc1152/src/main/resources/fabric.mod.json index a1a3c34..19dd7a7 100644 --- a/viafabric-mc1152/src/main/resources/fabric.mod.json +++ b/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": { diff --git a/viafabric-mc1165/src/main/resources/mixins.viafabric116.address.json b/viafabric-mc1152/src/main/resources/mixins.viafabric1152.address.json similarity index 80% rename from viafabric-mc1165/src/main/resources/mixins.viafabric116.address.json rename to viafabric-mc1152/src/main/resources/mixins.viafabric1152.address.json index 79ed62e..c3124ef 100644 --- a/viafabric-mc1165/src/main/resources/mixins.viafabric116.address.json +++ b/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": [ diff --git a/viafabric-mc1144/src/main/resources/mixins.viafabric114.debug.json b/viafabric-mc1152/src/main/resources/mixins.viafabric1152.debug.json similarity index 81% rename from viafabric-mc1144/src/main/resources/mixins.viafabric114.debug.json rename to viafabric-mc1152/src/main/resources/mixins.viafabric1152.debug.json index 9d97f6c..feef4f0 100644 --- a/viafabric-mc1144/src/main/resources/mixins.viafabric114.debug.json +++ b/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": [ diff --git a/viafabric-mc1165/src/main/resources/mixins.viafabric116.gui.json b/viafabric-mc1152/src/main/resources/mixins.viafabric1152.gui.json similarity index 84% rename from viafabric-mc1165/src/main/resources/mixins.viafabric116.gui.json rename to viafabric-mc1152/src/main/resources/mixins.viafabric1152.gui.json index f5aa56d..dacb3b3 100644 --- a/viafabric-mc1165/src/main/resources/mixins.viafabric116.gui.json +++ b/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" ], diff --git a/viafabric-mc1165/src/main/resources/mixins.viafabric116.pipeline.json b/viafabric-mc1152/src/main/resources/mixins.viafabric1152.pipeline.json similarity index 82% rename from viafabric-mc1165/src/main/resources/mixins.viafabric116.pipeline.json rename to viafabric-mc1152/src/main/resources/mixins.viafabric1152.pipeline.json index e395193..a1a7387 100644 --- a/viafabric-mc1165/src/main/resources/mixins.viafabric116.pipeline.json +++ b/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" diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/ViaFabric.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/ViaFabric.java similarity index 95% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/ViaFabric.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/ViaFabric.java index 207f70d..cf680ea 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/ViaFabric.java +++ b/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 . */ -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; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/commands/NMSCommandSender.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/commands/NMSCommandSender.java similarity index 98% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/commands/NMSCommandSender.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/commands/NMSCommandSender.java index cb680c4..9aace15 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/commands/NMSCommandSender.java +++ b/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 . */ -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; diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/commands/VFCommandHandler.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/commands/VFCommandHandler.java similarity index 98% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/commands/VFCommandHandler.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/commands/VFCommandHandler.java index 04c305a..14f45e5 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/commands/VFCommandHandler.java +++ b/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 . */ -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; diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/gui/ModMenuConfig.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/gui/ModMenuConfig.java similarity index 96% rename from viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/gui/ModMenuConfig.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/gui/ModMenuConfig.java index 3b40906..5431fe8 100644 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/gui/ModMenuConfig.java +++ b/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 . */ -package com.viaversion.fabric.mc118.gui; +package com.viaversion.fabric.mc1165.gui; import com.google.common.collect.ImmutableMap; import com.terraformersmc.modmenu.api.ConfigScreenFactory; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/gui/ViaConfigScreen.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/gui/ViaConfigScreen.java similarity index 98% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/gui/ViaConfigScreen.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/gui/ViaConfigScreen.java index 77ce35a..a70cff2 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/gui/ViaConfigScreen.java +++ b/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 . */ -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; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/address/client/MixinConnectScreenThread.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinConnectScreenThread.java similarity index 96% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/address/client/MixinConnectScreenThread.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinConnectScreenThread.java index ef0c7f3..f13ca63 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/address/client/MixinConnectScreenThread.java +++ b/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 . */ -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; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/address/client/MixinServerAddress.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinServerAddress.java similarity index 96% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/address/client/MixinServerAddress.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinServerAddress.java index f27c36d..4cb9ac1 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/address/client/MixinServerAddress.java +++ b/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 . */ -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; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/address/client/MixinServerPinger.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinServerPinger.java similarity index 96% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/address/client/MixinServerPinger.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinServerPinger.java index ed9de15..7601388 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/address/client/MixinServerPinger.java +++ b/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 . */ -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; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/debug/client/MixinClientConnection.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/debug/client/MixinClientConnection.java similarity index 96% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/debug/client/MixinClientConnection.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/debug/client/MixinClientConnection.java index b9aeca3..9db312f 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/debug/client/MixinClientConnection.java +++ b/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 . */ -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; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/debug/client/MixinClientConnectionAccessor.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/debug/client/MixinClientConnectionAccessor.java similarity index 94% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/debug/client/MixinClientConnectionAccessor.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/debug/client/MixinClientConnectionAccessor.java index b03ebc6..5017d5f 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/debug/client/MixinClientConnectionAccessor.java +++ b/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 . */ -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; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/debug/client/MixinDebugHud.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/debug/client/MixinDebugHud.java similarity index 97% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/debug/client/MixinDebugHud.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/debug/client/MixinDebugHud.java index e9d4462..878c98b 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/debug/client/MixinDebugHud.java +++ b/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 . */ -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; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/gui/client/MixinMultiplayerScreen.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/gui/client/MixinMultiplayerScreen.java similarity index 93% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/gui/client/MixinMultiplayerScreen.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/gui/client/MixinMultiplayerScreen.java index eedb5e6..ac43ebf 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/gui/client/MixinMultiplayerScreen.java +++ b/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 . */ -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; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/gui/client/MixinMultiplayerServerListPingerListener.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/gui/client/MixinMultiplayerServerListPingerListener.java similarity index 94% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/gui/client/MixinMultiplayerServerListPingerListener.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/gui/client/MixinMultiplayerServerListPingerListener.java index bec4193..664cf4b 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/gui/client/MixinMultiplayerServerListPingerListener.java +++ b/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 . */ -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; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/gui/client/MixinServerEntry.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/gui/client/MixinServerEntry.java similarity index 98% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/gui/client/MixinServerEntry.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/gui/client/MixinServerEntry.java index f1ccf54..ff58087 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/gui/client/MixinServerEntry.java +++ b/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 . */ -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; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/gui/client/MixinServerInfo.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/gui/client/MixinServerInfo.java similarity index 96% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/gui/client/MixinServerInfo.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/gui/client/MixinServerInfo.java index 8ab1c73..0201035 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/gui/client/MixinServerInfo.java +++ b/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 . */ -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; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/pipeline/MixinClientConnection.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/pipeline/MixinClientConnection.java similarity index 96% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/pipeline/MixinClientConnection.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/pipeline/MixinClientConnection.java index d2f4711..0f51054 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/pipeline/MixinClientConnection.java +++ b/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 . */ -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; diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/pipeline/MixinServerNetworkIoChInit.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/pipeline/MixinServerNetworkIoChInit.java similarity index 97% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/pipeline/MixinServerNetworkIoChInit.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/pipeline/MixinServerNetworkIoChInit.java index f43a638..ecd98e2 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/pipeline/MixinServerNetworkIoChInit.java +++ b/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 . */ -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; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/pipeline/client/MixinClientConnection.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/pipeline/client/MixinClientConnection.java similarity index 91% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/pipeline/client/MixinClientConnection.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/pipeline/client/MixinClientConnection.java index ea2111d..cff42f9 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/pipeline/client/MixinClientConnection.java +++ b/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 . */ -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; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/pipeline/client/MixinClientConnectionChInit.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/pipeline/client/MixinClientConnectionChInit.java similarity index 97% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/pipeline/client/MixinClientConnectionChInit.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/pipeline/client/MixinClientConnectionChInit.java index 5e58284..0f76e38 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/mixin/pipeline/client/MixinClientConnectionChInit.java +++ b/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 . */ -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; diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/platform/FabricNativeVersionProvider.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/platform/FabricNativeVersionProvider.java similarity index 95% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/platform/FabricNativeVersionProvider.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/platform/FabricNativeVersionProvider.java index cb33679..9056bbb 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/platform/FabricNativeVersionProvider.java +++ b/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 . */ -package com.viaversion.fabric.mc117.platform; +package com.viaversion.fabric.mc1165.platform; import com.viaversion.fabric.common.platform.NativeVersionProvider; import net.minecraft.SharedConstants; diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/platform/FabricPlatform.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/platform/FabricPlatform.java similarity index 96% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/platform/FabricPlatform.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/platform/FabricPlatform.java index ea1ad62..08047dd 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/platform/FabricPlatform.java +++ b/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 . */ -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; - } } diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/platform/VFLoader.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/platform/VFLoader.java similarity index 87% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/platform/VFLoader.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/platform/VFLoader.java index 5052bcf..91291a2 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/platform/VFLoader.java +++ b/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 . */ -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; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/providers/FabricVersionProvider.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/providers/FabricVersionProvider.java similarity index 92% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/providers/FabricVersionProvider.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/providers/FabricVersionProvider.java index 1c8e3c9..bb09760 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/providers/FabricVersionProvider.java +++ b/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 . */ -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; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/providers/VFHandItemProvider.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/providers/VFHandItemProvider.java similarity index 96% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/providers/VFHandItemProvider.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/providers/VFHandItemProvider.java index 606b588..261dfd9 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/providers/VFHandItemProvider.java +++ b/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 . */ -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; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/providers/VFPlayerAbilitiesProvider.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/providers/VFPlayerAbilitiesProvider.java similarity index 97% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/providers/VFPlayerAbilitiesProvider.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/providers/VFPlayerAbilitiesProvider.java index 7719956..3b43020 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/providers/VFPlayerAbilitiesProvider.java +++ b/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 . */ -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; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/providers/VFPlayerLookTargetProvider.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/providers/VFPlayerLookTargetProvider.java similarity index 97% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/providers/VFPlayerLookTargetProvider.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/providers/VFPlayerLookTargetProvider.java index 2fa0ada..e3b91df 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/providers/VFPlayerLookTargetProvider.java +++ b/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 . */ -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; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/service/ProtocolAutoDetector.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/service/ProtocolAutoDetector.java similarity index 98% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/service/ProtocolAutoDetector.java rename to viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/service/ProtocolAutoDetector.java index 3f4e595..fcd2532 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/service/ProtocolAutoDetector.java +++ b/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 . */ -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; diff --git a/viafabric-mc1165/src/main/resources/fabric.mod.json b/viafabric-mc1165/src/main/resources/fabric.mod.json index 0cad435..2940781 100644 --- a/viafabric-mc1165/src/main/resources/fabric.mod.json +++ b/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": { diff --git a/viafabric-mc1152/src/main/resources/mixins.viafabric115.address.json b/viafabric-mc1165/src/main/resources/mixins.viafabric1165.address.json similarity index 80% rename from viafabric-mc1152/src/main/resources/mixins.viafabric115.address.json rename to viafabric-mc1165/src/main/resources/mixins.viafabric1165.address.json index 6fc6ebb..8aa7c69 100644 --- a/viafabric-mc1152/src/main/resources/mixins.viafabric115.address.json +++ b/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": [ diff --git a/viafabric-mc1152/src/main/resources/mixins.viafabric115.debug.json b/viafabric-mc1165/src/main/resources/mixins.viafabric1165.debug.json similarity index 81% rename from viafabric-mc1152/src/main/resources/mixins.viafabric115.debug.json rename to viafabric-mc1165/src/main/resources/mixins.viafabric1165.debug.json index b1ff950..6ea6685 100644 --- a/viafabric-mc1152/src/main/resources/mixins.viafabric115.debug.json +++ b/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": [ diff --git a/viafabric-mc1144/src/main/resources/mixins.viafabric114.gui.json b/viafabric-mc1165/src/main/resources/mixins.viafabric1165.gui.json similarity index 84% rename from viafabric-mc1144/src/main/resources/mixins.viafabric114.gui.json rename to viafabric-mc1165/src/main/resources/mixins.viafabric1165.gui.json index cf20d91..529d59d 100644 --- a/viafabric-mc1144/src/main/resources/mixins.viafabric114.gui.json +++ b/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" ], diff --git a/viafabric-mc1144/src/main/resources/mixins.viafabric114.pipeline.json b/viafabric-mc1165/src/main/resources/mixins.viafabric1165.pipeline.json similarity index 82% rename from viafabric-mc1144/src/main/resources/mixins.viafabric114.pipeline.json rename to viafabric-mc1165/src/main/resources/mixins.viafabric1165.pipeline.json index 7580fda..5bde040 100644 --- a/viafabric-mc1144/src/main/resources/mixins.viafabric114.pipeline.json +++ b/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" diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/ViaFabric.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/ViaFabric.java similarity index 95% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/ViaFabric.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/ViaFabric.java index e4b9573..cea0a69 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/ViaFabric.java +++ b/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 . */ -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; diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/ViaFabricClient.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/ViaFabricClient.java similarity index 96% rename from viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/ViaFabricClient.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/ViaFabricClient.java index 66e213f..40a2ac0 100644 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/ViaFabricClient.java +++ b/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 . */ -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; diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/commands/NMSCommandSender.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/commands/NMSCommandSender.java similarity index 98% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/commands/NMSCommandSender.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/commands/NMSCommandSender.java index 835d1d6..7913cc1 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/commands/NMSCommandSender.java +++ b/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 . */ -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; diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/commands/VFCommandHandler.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/commands/VFCommandHandler.java similarity index 98% rename from viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/commands/VFCommandHandler.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/commands/VFCommandHandler.java index eb10ffb..a09fe54 100644 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/commands/VFCommandHandler.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/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.mc118.commands; +package com.viaversion.fabric.mc1171.commands; import com.viaversion.fabric.common.commands.subs.LeakDetectSubCommand; import com.mojang.brigadier.arguments.StringArgumentType; diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/gui/ModMenuConfig.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/gui/ModMenuConfig.java similarity index 96% rename from viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/gui/ModMenuConfig.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/gui/ModMenuConfig.java index bb0c025..3394bdc 100644 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/gui/ModMenuConfig.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/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.mc119.gui; +package com.viaversion.fabric.mc1171.gui; import com.google.common.collect.ImmutableMap; import com.terraformersmc.modmenu.api.ConfigScreenFactory; diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/gui/ViaConfigScreen.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/gui/ViaConfigScreen.java similarity index 98% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/gui/ViaConfigScreen.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/gui/ViaConfigScreen.java index 4daeb77..86a48bc 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/gui/ViaConfigScreen.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/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.mc117.gui; +package com.viaversion.fabric.mc1171.gui; import com.viaversion.fabric.common.config.AbstractViaConfigScreen; -import com.viaversion.fabric.mc117.ViaFabric; +import com.viaversion.fabric.mc1171.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-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/address/client/MixinAllowedAddressResolver.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/address/client/MixinAllowedAddressResolver.java similarity index 97% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/address/client/MixinAllowedAddressResolver.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/address/client/MixinAllowedAddressResolver.java index c9443d5..5415c0c 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/address/client/MixinAllowedAddressResolver.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/address/client/MixinAllowedAddressResolver.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.mc117.mixin.address.client; +package com.viaversion.fabric.mc1171.mixin.address.client; import com.viaversion.fabric.common.AddressParser; import net.minecraft.client.network.Address; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/debug/client/MixinClientConnection.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/debug/client/MixinClientConnection.java similarity index 96% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/debug/client/MixinClientConnection.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/debug/client/MixinClientConnection.java index 46bd924..a0a2930 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/debug/client/MixinClientConnection.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/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.mc116.mixin.debug.client; +package com.viaversion.fabric.mc1171.mixin.debug.client; import io.netty.channel.ChannelHandlerContext; import net.minecraft.network.ClientConnection; diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/debug/client/MixinClientConnectionAccessor.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/debug/client/MixinClientConnectionAccessor.java similarity index 94% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/debug/client/MixinClientConnectionAccessor.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/debug/client/MixinClientConnectionAccessor.java index cf7988d..4318904 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/debug/client/MixinClientConnectionAccessor.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/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.mc117.mixin.debug.client; +package com.viaversion.fabric.mc1171.mixin.debug.client; import io.netty.channel.Channel; import net.minecraft.network.ClientConnection; diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/debug/client/MixinDebugHud.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/debug/client/MixinDebugHud.java similarity index 97% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/debug/client/MixinDebugHud.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/debug/client/MixinDebugHud.java index e854126..3f86909 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/debug/client/MixinDebugHud.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/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.mc117.mixin.debug.client; +package com.viaversion.fabric.mc1171.mixin.debug.client; import com.viaversion.fabric.common.handler.CommonTransformer; import com.viaversion.fabric.common.handler.FabricDecodeHandler; diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/gui/client/MixinMultiplayerServerListPingerListener.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/gui/client/MixinMultiplayerServerListPingerListener.java similarity index 94% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/gui/client/MixinMultiplayerServerListPingerListener.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/gui/client/MixinMultiplayerServerListPingerListener.java index ba3d833..d1e81cb 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/gui/client/MixinMultiplayerServerListPingerListener.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/gui/client/MixinMultiplayerServerListPingerListener.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.mc117.mixin.gui.client; +package com.viaversion.fabric.mc1171.mixin.gui.client; import com.viaversion.fabric.common.gui.ViaServerInfo; import com.viaversion.fabric.common.handler.FabricDecodeHandler; -import com.viaversion.fabric.mc117.mixin.debug.client.MixinClientConnectionAccessor; +import com.viaversion.fabric.mc1171.mixin.debug.client.MixinClientConnectionAccessor; import net.minecraft.client.network.ServerInfo; import net.minecraft.network.listener.ClientQueryPacketListener; import net.minecraft.network.packet.s2c.query.QueryResponseS2CPacket; diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/gui/client/MixinServerEntry.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/gui/client/MixinServerEntry.java similarity index 98% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/gui/client/MixinServerEntry.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/gui/client/MixinServerEntry.java index d8f4544..fd7b434 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/gui/client/MixinServerEntry.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/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 . */ -package com.viaversion.fabric.mc117.mixin.gui.client; +package com.viaversion.fabric.mc1171.mixin.gui.client; import com.mojang.blaze3d.systems.RenderSystem; import com.viaversion.fabric.common.gui.ViaServerInfo; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/gui/client/MixinServerInfo.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/gui/client/MixinServerInfo.java similarity index 96% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/gui/client/MixinServerInfo.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/gui/client/MixinServerInfo.java index e0a6653..a09e367 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/mixin/gui/client/MixinServerInfo.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/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 . */ -package com.viaversion.fabric.mc116.mixin.gui.client; +package com.viaversion.fabric.mc1171.mixin.gui.client; import com.viaversion.fabric.common.gui.ViaServerInfo; import net.minecraft.client.network.ServerInfo; diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/pipeline/MixinClientConnection.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/pipeline/MixinClientConnection.java similarity index 96% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/pipeline/MixinClientConnection.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/pipeline/MixinClientConnection.java index 6755e4d..ca0575a 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/pipeline/MixinClientConnection.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/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.mc117.mixin.pipeline; +package com.viaversion.fabric.mc1171.mixin.pipeline; import com.viaversion.fabric.common.handler.PipelineReorderEvent; import io.netty.channel.Channel; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/pipeline/MixinServerNetworkIoChInit.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/pipeline/MixinServerNetworkIoChInit.java similarity index 97% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/pipeline/MixinServerNetworkIoChInit.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/pipeline/MixinServerNetworkIoChInit.java index 758f87a..26d154b 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/pipeline/MixinServerNetworkIoChInit.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/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.mc115.mixin.pipeline; +package com.viaversion.fabric.mc1171.mixin.pipeline; import com.viaversion.fabric.common.handler.CommonTransformer; import com.viaversion.fabric.common.handler.FabricDecodeHandler; diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/pipeline/client/MixinClientConnection.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/pipeline/client/MixinClientConnection.java similarity index 90% rename from viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/pipeline/client/MixinClientConnection.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/pipeline/client/MixinClientConnection.java index a5428ba..357d87a 100644 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/pipeline/client/MixinClientConnection.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/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.mc118.mixin.pipeline.client; +package com.viaversion.fabric.mc1171.mixin.pipeline.client; -import com.viaversion.fabric.mc118.ViaFabric; -import com.viaversion.fabric.mc118.service.ProtocolAutoDetector; +import com.viaversion.fabric.mc1171.ViaFabric; +import com.viaversion.fabric.mc1171.service.ProtocolAutoDetector; import net.minecraft.network.ClientConnection; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/pipeline/client/MixinClientConnectionChInit.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/pipeline/client/MixinClientConnectionChInit.java similarity index 97% rename from viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/pipeline/client/MixinClientConnectionChInit.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/pipeline/client/MixinClientConnectionChInit.java index 7e2f919..9ee772b 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc115/mixin/pipeline/client/MixinClientConnectionChInit.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/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.mc115.mixin.pipeline.client; +package com.viaversion.fabric.mc1171.mixin.pipeline.client; import com.viaversion.fabric.common.handler.FabricDecodeHandler; import com.viaversion.fabric.common.handler.FabricEncodeHandler; diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/platform/FabricNativeVersionProvider.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/platform/FabricNativeVersionProvider.java similarity index 95% rename from viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/platform/FabricNativeVersionProvider.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/platform/FabricNativeVersionProvider.java index eade4c5..29e1368 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc114/platform/FabricNativeVersionProvider.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/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.mc114.platform; +package com.viaversion.fabric.mc1171.platform; import com.viaversion.fabric.common.platform.NativeVersionProvider; import net.minecraft.SharedConstants; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/platform/FabricPlatform.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/platform/FabricPlatform.java similarity index 96% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/platform/FabricPlatform.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/platform/FabricPlatform.java index ab49142..b3d1610 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/platform/FabricPlatform.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/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.mc116.platform; +package com.viaversion.fabric.mc1171.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.mc116.ViaFabric; -import com.viaversion.fabric.mc116.commands.NMSCommandSender; +import com.viaversion.fabric.mc1171.ViaFabric; +import com.viaversion.fabric.mc1171.commands.NMSCommandSender; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.command.ViaCommandSender; import io.netty.channel.EventLoop; @@ -53,21 +53,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) { @@ -137,4 +122,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; + } } diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/platform/VFLoader.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/platform/VFLoader.java similarity index 87% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/platform/VFLoader.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/platform/VFLoader.java index 637e396..0926a0a 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/platform/VFLoader.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/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 . */ -package com.viaversion.fabric.mc117.platform; +package com.viaversion.fabric.mc1171.platform; -import com.viaversion.fabric.mc117.providers.VFHandItemProvider; -import com.viaversion.fabric.mc117.providers.FabricVersionProvider; -import com.viaversion.fabric.mc117.providers.VFPlayerAbilitiesProvider; -import com.viaversion.fabric.mc117.providers.VFPlayerLookTargetProvider; +import com.viaversion.fabric.mc1171.providers.VFHandItemProvider; +import com.viaversion.fabric.mc1171.providers.FabricVersionProvider; +import com.viaversion.fabric.mc1171.providers.VFPlayerAbilitiesProvider; +import com.viaversion.fabric.mc1171.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; diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/providers/FabricVersionProvider.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/providers/FabricVersionProvider.java similarity index 92% rename from viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/providers/FabricVersionProvider.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/providers/FabricVersionProvider.java index 64608e7..801d152 100644 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/providers/FabricVersionProvider.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/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.mc118.providers; +package com.viaversion.fabric.mc1171.providers; import com.viaversion.fabric.common.config.VFConfig; import com.viaversion.fabric.common.provider.AbstractFabricVersionProvider; -import com.viaversion.fabric.mc118.ViaFabric; -import com.viaversion.fabric.mc118.service.ProtocolAutoDetector; +import com.viaversion.fabric.mc1171.ViaFabric; +import com.viaversion.fabric.mc1171.service.ProtocolAutoDetector; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.channel.ChannelPipeline; import net.minecraft.network.ClientConnection; diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/providers/VFHandItemProvider.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/providers/VFHandItemProvider.java similarity index 96% rename from viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/providers/VFHandItemProvider.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/providers/VFHandItemProvider.java index ed56080..f59e283 100644 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/providers/VFHandItemProvider.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/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 . */ -package com.viaversion.fabric.mc118.providers; +package com.viaversion.fabric.mc1171.providers; import com.viaversion.fabric.common.util.RemappingUtil; -import com.viaversion.fabric.mc118.ViaFabric; +import com.viaversion.fabric.mc1171.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-mc1204/src/main/java/com/viaversion/fabric/mc120/providers/VFPlayerAbilitiesProvider.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/providers/VFPlayerAbilitiesProvider.java similarity index 97% rename from viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/providers/VFPlayerAbilitiesProvider.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/providers/VFPlayerAbilitiesProvider.java index 51264de..cb4e632 100644 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/providers/VFPlayerAbilitiesProvider.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/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 . */ -package com.viaversion.fabric.mc120.providers; +package com.viaversion.fabric.mc1171.providers; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.provider.PlayerAbilitiesProvider; diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/providers/VFPlayerLookTargetProvider.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/providers/VFPlayerLookTargetProvider.java similarity index 97% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/providers/VFPlayerLookTargetProvider.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/providers/VFPlayerLookTargetProvider.java index 6c3ce01..7c8fab2 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/providers/VFPlayerLookTargetProvider.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/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 . */ -package com.viaversion.fabric.mc117.providers; +package com.viaversion.fabric.mc1171.providers; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.Position; diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/service/ProtocolAutoDetector.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/service/ProtocolAutoDetector.java similarity index 98% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/service/ProtocolAutoDetector.java rename to viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/service/ProtocolAutoDetector.java index c2c2208..c38b2e6 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/service/ProtocolAutoDetector.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/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 . */ -package com.viaversion.fabric.mc117.service; +package com.viaversion.fabric.mc1171.service; import com.viaversion.fabric.common.AddressParser; -import com.viaversion.fabric.mc117.ViaFabric; +import com.viaversion.fabric.mc1171.ViaFabric; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; diff --git a/viafabric-mc1171/src/main/resources/fabric.mod.json b/viafabric-mc1171/src/main/resources/fabric.mod.json index e722e56..8650860 100644 --- a/viafabric-mc1171/src/main/resources/fabric.mod.json +++ b/viafabric-mc1171/src/main/resources/fabric.mod.json @@ -1,6 +1,6 @@ { "schemaVersion": 1, - "id": "viafabric-mc117", + "id": "viafabric-mc1171", "name": "ViaFabric for 1.17", "version": "${version}", "description": "${description}", @@ -47,13 +47,13 @@ ], "entrypoints": { "main": [ - "com.viaversion.fabric.mc117.ViaFabric" + "com.viaversion.fabric.mc1171.ViaFabric" ], "client": [ - "com.viaversion.fabric.mc117.ViaFabricClient" + "com.viaversion.fabric.mc1171.ViaFabricClient" ], "modmenu": [ - "com.viaversion.fabric.mc117.gui.ModMenuConfig" + "com.viaversion.fabric.mc1171.gui.ModMenuConfig" ] }, "depends": { @@ -65,10 +65,10 @@ "fabric-command-api-v1": "*" }, "mixins": [ - "mixins.viafabric117.address.json", - "mixins.viafabric117.gui.json", - "mixins.viafabric117.debug.json", - "mixins.viafabric117.pipeline.json" + "mixins.viafabric1171.address.json", + "mixins.viafabric1171.gui.json", + "mixins.viafabric1171.debug.json", + "mixins.viafabric1171.pipeline.json" ], "custom": { "modmenu": { diff --git a/viafabric-mc1171/src/main/resources/mixins.viafabric117.address.json b/viafabric-mc1171/src/main/resources/mixins.viafabric1171.address.json similarity index 75% rename from viafabric-mc1171/src/main/resources/mixins.viafabric117.address.json rename to viafabric-mc1171/src/main/resources/mixins.viafabric1171.address.json index ca96bc6..92b0281 100644 --- a/viafabric-mc1171/src/main/resources/mixins.viafabric117.address.json +++ b/viafabric-mc1171/src/main/resources/mixins.viafabric1171.address.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_16", - "package": "com.viaversion.fabric.mc117.mixin.address", + "package": "com.viaversion.fabric.mc1171.mixin.address", "mixins": [ ], "client": [ diff --git a/viafabric-mc1171/src/main/resources/mixins.viafabric117.debug.json b/viafabric-mc1171/src/main/resources/mixins.viafabric1171.debug.json similarity index 81% rename from viafabric-mc1171/src/main/resources/mixins.viafabric117.debug.json rename to viafabric-mc1171/src/main/resources/mixins.viafabric1171.debug.json index b1380f2..38252ed 100644 --- a/viafabric-mc1171/src/main/resources/mixins.viafabric117.debug.json +++ b/viafabric-mc1171/src/main/resources/mixins.viafabric1171.debug.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_16", - "package": "com.viaversion.fabric.mc117.mixin.debug", + "package": "com.viaversion.fabric.mc1171.mixin.debug", "mixins": [ ], "client": [ diff --git a/viafabric-mc1171/src/main/resources/mixins.viafabric117.gui.json b/viafabric-mc1171/src/main/resources/mixins.viafabric1171.gui.json similarity index 82% rename from viafabric-mc1171/src/main/resources/mixins.viafabric117.gui.json rename to viafabric-mc1171/src/main/resources/mixins.viafabric1171.gui.json index 185b211..b1ca68a 100644 --- a/viafabric-mc1171/src/main/resources/mixins.viafabric117.gui.json +++ b/viafabric-mc1171/src/main/resources/mixins.viafabric1171.gui.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_16", - "package": "com.viaversion.fabric.mc117.mixin.gui", + "package": "com.viaversion.fabric.mc1171.mixin.gui", "mixins": [ ], "client": [ diff --git a/viafabric-mc1171/src/main/resources/mixins.viafabric117.pipeline.json b/viafabric-mc1171/src/main/resources/mixins.viafabric1171.pipeline.json similarity index 82% rename from viafabric-mc1171/src/main/resources/mixins.viafabric117.pipeline.json rename to viafabric-mc1171/src/main/resources/mixins.viafabric1171.pipeline.json index 54ccd08..d3ddc95 100644 --- a/viafabric-mc1171/src/main/resources/mixins.viafabric117.pipeline.json +++ b/viafabric-mc1171/src/main/resources/mixins.viafabric1171.pipeline.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_16", - "package": "com.viaversion.fabric.mc117.mixin.pipeline", + "package": "com.viaversion.fabric.mc1171.mixin.pipeline", "mixins": [ "MixinClientConnection", "MixinServerNetworkIoChInit" diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/debug/client/MixinClientConnectionAccessor.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/debug/client/MixinClientConnectionAccessor.java deleted file mode 100644 index 9787819..0000000 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/debug/client/MixinClientConnectionAccessor.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric - * Copyright (C) 2018-2024 ViaVersion and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.viaversion.fabric.mc118.mixin.debug.client; - -import io.netty.channel.Channel; -import net.minecraft.network.ClientConnection; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(ClientConnection.class) -public interface MixinClientConnectionAccessor { - @Accessor - Channel getChannel(); -} diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/debug/client/MixinDebugHud.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/debug/client/MixinDebugHud.java deleted file mode 100644 index d9ddd18..0000000 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/debug/client/MixinDebugHud.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric - * Copyright (C) 2018-2024 ViaVersion and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.viaversion.fabric.mc118.mixin.debug.client; - -import com.viaversion.fabric.common.handler.CommonTransformer; -import com.viaversion.fabric.common.handler.FabricDecodeHandler; -import com.viaversion.viaversion.api.connection.ProtocolInfo; -import io.netty.channel.ChannelHandler; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.hud.DebugHud; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.viaversion.viaversion.api.Via; -import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; - -import java.util.List; - -@Mixin(DebugHud.class) -public class MixinDebugHud { - @Inject(at = @At("RETURN"), method = "getLeftText") - protected void getLeftText(CallbackInfoReturnable> info) { - String line = "[ViaFabric] I: " + Via.getManager().getConnectionManager().getConnections().size() + " (F: " - + Via.getManager().getConnectionManager().getConnectedClients().size() + ")"; - @SuppressWarnings("ConstantConditions") ChannelHandler viaDecoder = ((MixinClientConnectionAccessor) MinecraftClient.getInstance().getNetworkHandler() - .getConnection()).getChannel().pipeline().get(CommonTransformer.HANDLER_DECODER_NAME); - if (viaDecoder instanceof FabricDecodeHandler) { - ProtocolInfo protocol = ((FabricDecodeHandler) viaDecoder).getInfo().getProtocolInfo(); - if (protocol != null) { - ProtocolVersion serverVer = ProtocolVersion.getProtocol(protocol.getServerProtocolVersion()); - ProtocolVersion clientVer = ProtocolVersion.getProtocol(protocol.getProtocolVersion()); - line += " / C: " + clientVer + " S: " + serverVer + " A: " + protocol.getUser().isActive(); - } - } - - info.getReturnValue().add(line); - } -} diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/gui/client/MixinServerInfo.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/gui/client/MixinServerInfo.java deleted file mode 100644 index 3b35a54..0000000 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/gui/client/MixinServerInfo.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric - * Copyright (C) 2018-2024 ViaVersion and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.viaversion.fabric.mc118.mixin.gui.client; - -import com.viaversion.fabric.common.gui.ViaServerInfo; -import net.minecraft.client.network.ServerInfo; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Unique; - -@Mixin(ServerInfo.class) -public class MixinServerInfo implements ViaServerInfo { - @Unique - private boolean viaFabric$translating; - - @Unique - private int viaFabric$serverVer; - - @Override - public int viaFabric$getServerVer() { - return viaFabric$serverVer; - } - - @Override - public void viaFabric$setServerVer(int ver) { - this.viaFabric$serverVer = ver; - } - - @Override - public boolean viaFabric$translating() { - return viaFabric$translating; - } - - @Override - public void viaFabric$setTranslating(boolean via) { - this.viaFabric$translating = via; - } -} diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/pipeline/MixinServerNetworkIoChInit.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/pipeline/MixinServerNetworkIoChInit.java deleted file mode 100644 index 01ec673..0000000 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/pipeline/MixinServerNetworkIoChInit.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric - * Copyright (C) 2018-2024 ViaVersion and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.viaversion.fabric.mc118.mixin.pipeline; - -import com.viaversion.fabric.common.handler.CommonTransformer; -import com.viaversion.fabric.common.handler.FabricDecodeHandler; -import com.viaversion.fabric.common.handler.FabricEncodeHandler; -import com.viaversion.viaversion.connection.UserConnectionImpl; -import com.viaversion.viaversion.protocol.ProtocolPipelineImpl; -import io.netty.channel.Channel; -import io.netty.channel.socket.SocketChannel; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.viaversion.viaversion.api.connection.UserConnection; - -@Mixin(targets = "net.minecraft.server.ServerNetworkIo$1") -public class MixinServerNetworkIoChInit { - @Inject(method = "initChannel", at = @At(value = "TAIL"), remap = false) - private void onInitChannel(Channel channel, CallbackInfo ci) { - if (channel instanceof SocketChannel) { - UserConnection user = new UserConnectionImpl(channel); - new ProtocolPipelineImpl(user); - - channel.pipeline().addBefore("encoder", CommonTransformer.HANDLER_ENCODER_NAME, new FabricEncodeHandler(user)); - channel.pipeline().addBefore("decoder", CommonTransformer.HANDLER_DECODER_NAME, new FabricDecodeHandler(user)); - } - } -} diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/pipeline/client/MixinClientConnectionChInit.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/pipeline/client/MixinClientConnectionChInit.java deleted file mode 100644 index c3b106b..0000000 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/pipeline/client/MixinClientConnectionChInit.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric - * Copyright (C) 2018-2024 ViaVersion and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.viaversion.fabric.mc118.mixin.pipeline.client; - -import com.viaversion.fabric.common.handler.FabricDecodeHandler; -import com.viaversion.fabric.common.handler.FabricEncodeHandler; -import com.viaversion.fabric.common.handler.CommonTransformer; -import com.viaversion.fabric.common.protocol.HostnameParserProtocol; -import com.viaversion.viaversion.connection.UserConnectionImpl; -import com.viaversion.viaversion.protocol.ProtocolPipelineImpl; -import io.netty.channel.Channel; -import io.netty.channel.socket.SocketChannel; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.viaversion.viaversion.api.connection.UserConnection; - -@Mixin(targets = "net.minecraft.network.ClientConnection$1") -public class MixinClientConnectionChInit { - @Inject(method = "initChannel", at = @At(value = "TAIL"), remap = false) - private void onInitChannel(Channel channel, CallbackInfo ci) { - if (channel instanceof SocketChannel) { - UserConnection user = new UserConnectionImpl(channel, true); - new ProtocolPipelineImpl(user).add(HostnameParserProtocol.INSTANCE); - - channel.pipeline() - .addBefore("encoder", CommonTransformer.HANDLER_ENCODER_NAME, new FabricEncodeHandler(user)) - .addBefore("decoder", CommonTransformer.HANDLER_DECODER_NAME, new FabricDecodeHandler(user)); - } - } -} diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/platform/FabricNativeVersionProvider.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/platform/FabricNativeVersionProvider.java deleted file mode 100644 index 72cfee7..0000000 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/platform/FabricNativeVersionProvider.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric - * Copyright (C) 2018-2024 ViaVersion and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.viaversion.fabric.mc118.platform; - -import com.viaversion.fabric.common.platform.NativeVersionProvider; -import net.minecraft.SharedConstants; - -public class FabricNativeVersionProvider implements NativeVersionProvider { - @Override - public int getNativeServerVersion() { - return SharedConstants.getGameVersion().getProtocolVersion(); - } -} diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/providers/VFPlayerLookTargetProvider.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/providers/VFPlayerLookTargetProvider.java deleted file mode 100644 index 28ca881..0000000 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/providers/VFPlayerLookTargetProvider.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric - * Copyright (C) 2018-2024 ViaVersion and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.viaversion.fabric.mc118.providers; - -import com.viaversion.viaversion.api.connection.UserConnection; -import com.viaversion.viaversion.api.minecraft.Position; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.PlayerLookTargetProvider; -import net.minecraft.client.MinecraftClient; -import net.minecraft.util.hit.BlockHitResult; -import net.minecraft.util.hit.HitResult; -import net.minecraft.util.math.BlockPos; - -public class VFPlayerLookTargetProvider extends PlayerLookTargetProvider { - - @Override - public Position getPlayerLookTarget(UserConnection info) { - if (!info.isClientSide()) return null; - - final HitResult crosshairTarget = MinecraftClient.getInstance().crosshairTarget; - if (crosshairTarget instanceof BlockHitResult) { - final BlockPos pos = ((BlockHitResult) crosshairTarget).getBlockPos(); - return new Position(pos.getX(), pos.getY(), pos.getZ()); - } - return null; - } -} diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/ViaFabric.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/ViaFabric.java similarity index 95% rename from viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/ViaFabric.java rename to viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/ViaFabric.java index cad3d6d..0bfa080 100644 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/ViaFabric.java +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/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 . */ -package com.viaversion.fabric.mc118; +package com.viaversion.fabric.mc1182; -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.mc118.commands.VFCommandHandler; -import com.viaversion.fabric.mc118.platform.FabricPlatform; -import com.viaversion.fabric.mc118.platform.VFLoader; +import com.viaversion.fabric.mc1182.commands.VFCommandHandler; +import com.viaversion.fabric.mc1182.platform.FabricPlatform; +import com.viaversion.fabric.mc1182.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-mc1171/src/main/java/com/viaversion/fabric/mc117/ViaFabricClient.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/ViaFabricClient.java similarity index 96% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/ViaFabricClient.java rename to viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/ViaFabricClient.java index d2a88f0..c000691 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/ViaFabricClient.java +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/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 . */ -package com.viaversion.fabric.mc117; +package com.viaversion.fabric.mc1182; -import com.viaversion.fabric.mc117.gui.ViaConfigScreen; +import com.viaversion.fabric.mc1182.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; diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/commands/NMSCommandSender.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/commands/NMSCommandSender.java similarity index 98% rename from viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/commands/NMSCommandSender.java rename to viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/commands/NMSCommandSender.java index af4debd..906b2fe 100644 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/commands/NMSCommandSender.java +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/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.mc118.commands; +package com.viaversion.fabric.mc1182.commands; import com.viaversion.viaversion.util.ComponentUtil; import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/commands/VFCommandHandler.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/commands/VFCommandHandler.java similarity index 98% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/commands/VFCommandHandler.java rename to viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/commands/VFCommandHandler.java index 4e6e09a..15ffc8d 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/commands/VFCommandHandler.java +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/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.mc116.commands; +package com.viaversion.fabric.mc1182.commands; import com.viaversion.fabric.common.commands.subs.LeakDetectSubCommand; import com.mojang.brigadier.arguments.StringArgumentType; diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/gui/ModMenuConfig.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/gui/ModMenuConfig.java similarity index 96% rename from viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/gui/ModMenuConfig.java rename to viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/gui/ModMenuConfig.java index 1d64b8b..e0f1edd 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc116/gui/ModMenuConfig.java +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/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.mc116.gui; +package com.viaversion.fabric.mc1182.gui; import com.google.common.collect.ImmutableMap; import com.terraformersmc.modmenu.api.ConfigScreenFactory; diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/gui/ViaConfigScreen.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/gui/ViaConfigScreen.java similarity index 98% rename from viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/gui/ViaConfigScreen.java rename to viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/gui/ViaConfigScreen.java index db89e35..84a72bb 100644 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/gui/ViaConfigScreen.java +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/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.mc118.gui; +package com.viaversion.fabric.mc1182.gui; import com.viaversion.fabric.common.config.AbstractViaConfigScreen; -import com.viaversion.fabric.mc118.ViaFabric; +import com.viaversion.fabric.mc1182.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-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/address/client/MixinAllowedAddressResolver.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/address/client/MixinAllowedAddressResolver.java similarity index 97% rename from viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/address/client/MixinAllowedAddressResolver.java rename to viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/address/client/MixinAllowedAddressResolver.java index 3211a89..e43b732 100644 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/address/client/MixinAllowedAddressResolver.java +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/address/client/MixinAllowedAddressResolver.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.mc118.mixin.address.client; +package com.viaversion.fabric.mc1182.mixin.address.client; import com.viaversion.fabric.common.AddressParser; import net.minecraft.client.network.Address; diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/debug/client/MixinClientConnection.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/debug/client/MixinClientConnection.java similarity index 96% rename from viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/debug/client/MixinClientConnection.java rename to viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/debug/client/MixinClientConnection.java index 44c4b24..86700c7 100644 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/debug/client/MixinClientConnection.java +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/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.mc118.mixin.debug.client; +package com.viaversion.fabric.mc1182.mixin.debug.client; import io.netty.channel.ChannelHandlerContext; import net.minecraft.network.ClientConnection; diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/debug/client/MixinClientConnectionAccessor.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/debug/client/MixinClientConnectionAccessor.java new file mode 100644 index 0000000..e20984a --- /dev/null +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/debug/client/MixinClientConnectionAccessor.java @@ -0,0 +1,29 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1182.mixin.debug.client; + +import io.netty.channel.Channel; +import net.minecraft.network.ClientConnection; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(ClientConnection.class) +public interface MixinClientConnectionAccessor { + @Accessor + Channel getChannel(); +} diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/debug/client/MixinDebugHud.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/debug/client/MixinDebugHud.java new file mode 100644 index 0000000..699cf17 --- /dev/null +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/debug/client/MixinDebugHud.java @@ -0,0 +1,54 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1182.mixin.debug.client; + +import com.viaversion.fabric.common.handler.CommonTransformer; +import com.viaversion.fabric.common.handler.FabricDecodeHandler; +import com.viaversion.viaversion.api.connection.ProtocolInfo; +import io.netty.channel.ChannelHandler; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.hud.DebugHud; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; + +import java.util.List; + +@Mixin(DebugHud.class) +public class MixinDebugHud { + @Inject(at = @At("RETURN"), method = "getLeftText") + protected void getLeftText(CallbackInfoReturnable> info) { + String line = "[ViaFabric] I: " + Via.getManager().getConnectionManager().getConnections().size() + " (F: " + + Via.getManager().getConnectionManager().getConnectedClients().size() + ")"; + @SuppressWarnings("ConstantConditions") ChannelHandler viaDecoder = ((MixinClientConnectionAccessor) MinecraftClient.getInstance().getNetworkHandler() + .getConnection()).getChannel().pipeline().get(CommonTransformer.HANDLER_DECODER_NAME); + if (viaDecoder instanceof FabricDecodeHandler) { + ProtocolInfo protocol = ((FabricDecodeHandler) viaDecoder).getInfo().getProtocolInfo(); + if (protocol != null) { + ProtocolVersion serverVer = ProtocolVersion.getProtocol(protocol.getServerProtocolVersion()); + ProtocolVersion clientVer = ProtocolVersion.getProtocol(protocol.getProtocolVersion()); + line += " / C: " + clientVer + " S: " + serverVer + " A: " + protocol.getUser().isActive(); + } + } + + info.getReturnValue().add(line); + } +} diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/gui/client/MixinMultiplayerServerListPingerListener.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/gui/client/MixinMultiplayerServerListPingerListener.java similarity index 94% rename from viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/gui/client/MixinMultiplayerServerListPingerListener.java rename to viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/gui/client/MixinMultiplayerServerListPingerListener.java index e7a2514..7496bc1 100644 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/gui/client/MixinMultiplayerServerListPingerListener.java +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/gui/client/MixinMultiplayerServerListPingerListener.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.mc118.mixin.gui.client; +package com.viaversion.fabric.mc1182.mixin.gui.client; import com.viaversion.fabric.common.gui.ViaServerInfo; import com.viaversion.fabric.common.handler.FabricDecodeHandler; -import com.viaversion.fabric.mc118.mixin.debug.client.MixinClientConnectionAccessor; +import com.viaversion.fabric.mc1182.mixin.debug.client.MixinClientConnectionAccessor; import net.minecraft.client.network.ServerInfo; import net.minecraft.network.listener.ClientQueryPacketListener; import net.minecraft.network.packet.s2c.query.QueryResponseS2CPacket; diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/gui/client/MixinServerEntry.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/gui/client/MixinServerEntry.java similarity index 98% rename from viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/gui/client/MixinServerEntry.java rename to viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/gui/client/MixinServerEntry.java index 65cf576..9274808 100644 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/gui/client/MixinServerEntry.java +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/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 . */ -package com.viaversion.fabric.mc118.mixin.gui.client; +package com.viaversion.fabric.mc1182.mixin.gui.client; import com.mojang.blaze3d.systems.RenderSystem; import com.viaversion.fabric.common.gui.ViaServerInfo; diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/gui/client/MixinServerInfo.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/gui/client/MixinServerInfo.java new file mode 100644 index 0000000..8734bd1 --- /dev/null +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/gui/client/MixinServerInfo.java @@ -0,0 +1,52 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1182.mixin.gui.client; + +import com.viaversion.fabric.common.gui.ViaServerInfo; +import net.minecraft.client.network.ServerInfo; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; + +@Mixin(ServerInfo.class) +public class MixinServerInfo implements ViaServerInfo { + @Unique + private boolean viaFabric$translating; + + @Unique + private int viaFabric$serverVer; + + @Override + public int viaFabric$getServerVer() { + return viaFabric$serverVer; + } + + @Override + public void viaFabric$setServerVer(int ver) { + this.viaFabric$serverVer = ver; + } + + @Override + public boolean viaFabric$translating() { + return viaFabric$translating; + } + + @Override + public void viaFabric$setTranslating(boolean via) { + this.viaFabric$translating = via; + } +} diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/pipeline/MixinClientConnection.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/pipeline/MixinClientConnection.java similarity index 96% rename from viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/pipeline/MixinClientConnection.java rename to viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/pipeline/MixinClientConnection.java index 047ccf4..ccaf32d 100644 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/mixin/pipeline/MixinClientConnection.java +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/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.mc118.mixin.pipeline; +package com.viaversion.fabric.mc1182.mixin.pipeline; import com.viaversion.fabric.common.handler.PipelineReorderEvent; import io.netty.channel.Channel; diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/pipeline/MixinServerNetworkIoChInit.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/pipeline/MixinServerNetworkIoChInit.java new file mode 100644 index 0000000..9d1b3c8 --- /dev/null +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/pipeline/MixinServerNetworkIoChInit.java @@ -0,0 +1,45 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1182.mixin.pipeline; + +import com.viaversion.fabric.common.handler.CommonTransformer; +import com.viaversion.fabric.common.handler.FabricDecodeHandler; +import com.viaversion.fabric.common.handler.FabricEncodeHandler; +import com.viaversion.viaversion.connection.UserConnectionImpl; +import com.viaversion.viaversion.protocol.ProtocolPipelineImpl; +import io.netty.channel.Channel; +import io.netty.channel.socket.SocketChannel; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import com.viaversion.viaversion.api.connection.UserConnection; + +@Mixin(targets = "net.minecraft.server.ServerNetworkIo$1") +public class MixinServerNetworkIoChInit { + @Inject(method = "initChannel", at = @At(value = "TAIL"), remap = false) + private void onInitChannel(Channel channel, CallbackInfo ci) { + if (channel instanceof SocketChannel) { + UserConnection user = new UserConnectionImpl(channel); + new ProtocolPipelineImpl(user); + + channel.pipeline().addBefore("encoder", CommonTransformer.HANDLER_ENCODER_NAME, new FabricEncodeHandler(user)); + channel.pipeline().addBefore("decoder", CommonTransformer.HANDLER_DECODER_NAME, new FabricDecodeHandler(user)); + } + } +} diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/pipeline/client/MixinClientConnection.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/pipeline/client/MixinClientConnection.java similarity index 90% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/pipeline/client/MixinClientConnection.java rename to viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/pipeline/client/MixinClientConnection.java index 1a02e71..df6059b 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/mixin/pipeline/client/MixinClientConnection.java +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/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.mc117.mixin.pipeline.client; +package com.viaversion.fabric.mc1182.mixin.pipeline.client; -import com.viaversion.fabric.mc117.ViaFabric; -import com.viaversion.fabric.mc117.service.ProtocolAutoDetector; +import com.viaversion.fabric.mc1182.ViaFabric; +import com.viaversion.fabric.mc1182.service.ProtocolAutoDetector; import net.minecraft.network.ClientConnection; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/pipeline/client/MixinClientConnectionChInit.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/pipeline/client/MixinClientConnectionChInit.java new file mode 100644 index 0000000..a62e0bf --- /dev/null +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/pipeline/client/MixinClientConnectionChInit.java @@ -0,0 +1,47 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1182.mixin.pipeline.client; + +import com.viaversion.fabric.common.handler.FabricDecodeHandler; +import com.viaversion.fabric.common.handler.FabricEncodeHandler; +import com.viaversion.fabric.common.handler.CommonTransformer; +import com.viaversion.fabric.common.protocol.HostnameParserProtocol; +import com.viaversion.viaversion.connection.UserConnectionImpl; +import com.viaversion.viaversion.protocol.ProtocolPipelineImpl; +import io.netty.channel.Channel; +import io.netty.channel.socket.SocketChannel; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import com.viaversion.viaversion.api.connection.UserConnection; + +@Mixin(targets = "net.minecraft.network.ClientConnection$1") +public class MixinClientConnectionChInit { + @Inject(method = "initChannel", at = @At(value = "TAIL"), remap = false) + private void onInitChannel(Channel channel, CallbackInfo ci) { + if (channel instanceof SocketChannel) { + UserConnection user = new UserConnectionImpl(channel, true); + new ProtocolPipelineImpl(user).add(HostnameParserProtocol.INSTANCE); + + channel.pipeline() + .addBefore("encoder", CommonTransformer.HANDLER_ENCODER_NAME, new FabricEncodeHandler(user)) + .addBefore("decoder", CommonTransformer.HANDLER_DECODER_NAME, new FabricDecodeHandler(user)); + } + } +} diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/platform/FabricNativeVersionProvider.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/platform/FabricNativeVersionProvider.java new file mode 100644 index 0000000..b445e47 --- /dev/null +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/platform/FabricNativeVersionProvider.java @@ -0,0 +1,28 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1182.platform; + +import com.viaversion.fabric.common.platform.NativeVersionProvider; +import net.minecraft.SharedConstants; + +public class FabricNativeVersionProvider implements NativeVersionProvider { + @Override + public int getNativeServerVersion() { + return SharedConstants.getGameVersion().getProtocolVersion(); + } +} diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/platform/FabricPlatform.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/platform/FabricPlatform.java similarity index 96% rename from viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/platform/FabricPlatform.java rename to viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/platform/FabricPlatform.java index 1cda584..47baed5 100644 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/platform/FabricPlatform.java +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/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.mc118.platform; +package com.viaversion.fabric.mc1182.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.mc118.ViaFabric; -import com.viaversion.fabric.mc118.commands.NMSCommandSender; +import com.viaversion.fabric.mc1182.ViaFabric; +import com.viaversion.fabric.mc1182.commands.NMSCommandSender; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.command.ViaCommandSender; import io.netty.channel.EventLoop; diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/platform/VFLoader.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/platform/VFLoader.java similarity index 87% rename from viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/platform/VFLoader.java rename to viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/platform/VFLoader.java index 29d74fd..dd9e87a 100644 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/platform/VFLoader.java +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/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 . */ -package com.viaversion.fabric.mc118.platform; +package com.viaversion.fabric.mc1182.platform; -import com.viaversion.fabric.mc118.providers.VFHandItemProvider; -import com.viaversion.fabric.mc118.providers.FabricVersionProvider; -import com.viaversion.fabric.mc118.providers.VFPlayerAbilitiesProvider; -import com.viaversion.fabric.mc118.providers.VFPlayerLookTargetProvider; +import com.viaversion.fabric.mc1182.providers.VFHandItemProvider; +import com.viaversion.fabric.mc1182.providers.FabricVersionProvider; +import com.viaversion.fabric.mc1182.providers.VFPlayerAbilitiesProvider; +import com.viaversion.fabric.mc1182.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; diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/providers/FabricVersionProvider.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/providers/FabricVersionProvider.java similarity index 92% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/providers/FabricVersionProvider.java rename to viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/providers/FabricVersionProvider.java index f70cf62..b9f8157 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/providers/FabricVersionProvider.java +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/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.mc117.providers; +package com.viaversion.fabric.mc1182.providers; import com.viaversion.fabric.common.config.VFConfig; import com.viaversion.fabric.common.provider.AbstractFabricVersionProvider; -import com.viaversion.fabric.mc117.ViaFabric; -import com.viaversion.fabric.mc117.service.ProtocolAutoDetector; +import com.viaversion.fabric.mc1182.ViaFabric; +import com.viaversion.fabric.mc1182.service.ProtocolAutoDetector; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.channel.ChannelPipeline; import net.minecraft.network.ClientConnection; diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/providers/VFHandItemProvider.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/providers/VFHandItemProvider.java similarity index 96% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/providers/VFHandItemProvider.java rename to viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/providers/VFHandItemProvider.java index a623533..126d628 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/providers/VFHandItemProvider.java +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/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 . */ -package com.viaversion.fabric.mc117.providers; +package com.viaversion.fabric.mc1182.providers; import com.viaversion.fabric.common.util.RemappingUtil; -import com.viaversion.fabric.mc117.ViaFabric; +import com.viaversion.fabric.mc1182.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-mc1171/src/main/java/com/viaversion/fabric/mc117/providers/VFPlayerAbilitiesProvider.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/providers/VFPlayerAbilitiesProvider.java similarity index 97% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/providers/VFPlayerAbilitiesProvider.java rename to viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/providers/VFPlayerAbilitiesProvider.java index 9ed9d7d..9d867d6 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/providers/VFPlayerAbilitiesProvider.java +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/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 . */ -package com.viaversion.fabric.mc117.providers; +package com.viaversion.fabric.mc1182.providers; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.provider.PlayerAbilitiesProvider; diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/providers/VFPlayerLookTargetProvider.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/providers/VFPlayerLookTargetProvider.java new file mode 100644 index 0000000..33766b2 --- /dev/null +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/providers/VFPlayerLookTargetProvider.java @@ -0,0 +1,41 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1182.providers; + +import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.minecraft.Position; +import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.PlayerLookTargetProvider; +import net.minecraft.client.MinecraftClient; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.hit.HitResult; +import net.minecraft.util.math.BlockPos; + +public class VFPlayerLookTargetProvider extends PlayerLookTargetProvider { + + @Override + public Position getPlayerLookTarget(UserConnection info) { + if (!info.isClientSide()) return null; + + final HitResult crosshairTarget = MinecraftClient.getInstance().crosshairTarget; + if (crosshairTarget instanceof BlockHitResult) { + final BlockPos pos = ((BlockHitResult) crosshairTarget).getBlockPos(); + return new Position(pos.getX(), pos.getY(), pos.getZ()); + } + return null; + } +} diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/service/ProtocolAutoDetector.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/service/ProtocolAutoDetector.java similarity index 98% rename from viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/service/ProtocolAutoDetector.java rename to viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/service/ProtocolAutoDetector.java index 69357b4..9d56a44 100644 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/service/ProtocolAutoDetector.java +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/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 . */ -package com.viaversion.fabric.mc118.service; +package com.viaversion.fabric.mc1182.service; import com.viaversion.fabric.common.AddressParser; -import com.viaversion.fabric.mc118.ViaFabric; +import com.viaversion.fabric.mc1182.ViaFabric; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; diff --git a/viafabric-mc1182/src/main/resources/fabric.mod.json b/viafabric-mc1182/src/main/resources/fabric.mod.json index f2a3ed3..454665e 100644 --- a/viafabric-mc1182/src/main/resources/fabric.mod.json +++ b/viafabric-mc1182/src/main/resources/fabric.mod.json @@ -1,6 +1,6 @@ { "schemaVersion": 1, - "id": "viafabric-mc118", + "id": "viafabric-mc1182", "name": "ViaFabric for 1.18", "version": "${version}", "description": "${description}", @@ -47,13 +47,13 @@ ], "entrypoints": { "main": [ - "com.viaversion.fabric.mc118.ViaFabric" + "com.viaversion.fabric.mc1182.ViaFabric" ], "client": [ - "com.viaversion.fabric.mc118.ViaFabricClient" + "com.viaversion.fabric.mc1182.ViaFabricClient" ], "modmenu": [ - "com.viaversion.fabric.mc118.gui.ModMenuConfig" + "com.viaversion.fabric.mc1182.gui.ModMenuConfig" ] }, "depends": { @@ -65,10 +65,10 @@ "fabric-command-api-v1": "*" }, "mixins": [ - "mixins.viafabric118.address.json", - "mixins.viafabric118.gui.json", - "mixins.viafabric118.debug.json", - "mixins.viafabric118.pipeline.json" + "mixins.viafabric1182.address.json", + "mixins.viafabric1182.gui.json", + "mixins.viafabric1182.debug.json", + "mixins.viafabric1182.pipeline.json" ], "custom": { "modmenu": { diff --git a/viafabric-mc1182/src/main/resources/mixins.viafabric118.address.json b/viafabric-mc1182/src/main/resources/mixins.viafabric1182.address.json similarity index 75% rename from viafabric-mc1182/src/main/resources/mixins.viafabric118.address.json rename to viafabric-mc1182/src/main/resources/mixins.viafabric1182.address.json index 4d30c23..74b2148 100644 --- a/viafabric-mc1182/src/main/resources/mixins.viafabric118.address.json +++ b/viafabric-mc1182/src/main/resources/mixins.viafabric1182.address.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_17", - "package": "com.viaversion.fabric.mc118.mixin.address", + "package": "com.viaversion.fabric.mc1182.mixin.address", "mixins": [ ], "client": [ diff --git a/viafabric-mc1182/src/main/resources/mixins.viafabric118.debug.json b/viafabric-mc1182/src/main/resources/mixins.viafabric1182.debug.json similarity index 81% rename from viafabric-mc1182/src/main/resources/mixins.viafabric118.debug.json rename to viafabric-mc1182/src/main/resources/mixins.viafabric1182.debug.json index a08c985..f82eb18 100644 --- a/viafabric-mc1182/src/main/resources/mixins.viafabric118.debug.json +++ b/viafabric-mc1182/src/main/resources/mixins.viafabric1182.debug.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_17", - "package": "com.viaversion.fabric.mc118.mixin.debug", + "package": "com.viaversion.fabric.mc1182.mixin.debug", "mixins": [ ], "client": [ diff --git a/viafabric-mc1182/src/main/resources/mixins.viafabric118.gui.json b/viafabric-mc1182/src/main/resources/mixins.viafabric1182.gui.json similarity index 82% rename from viafabric-mc1182/src/main/resources/mixins.viafabric118.gui.json rename to viafabric-mc1182/src/main/resources/mixins.viafabric1182.gui.json index 36deb9c..ac549c9 100644 --- a/viafabric-mc1182/src/main/resources/mixins.viafabric118.gui.json +++ b/viafabric-mc1182/src/main/resources/mixins.viafabric1182.gui.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_17", - "package": "com.viaversion.fabric.mc118.mixin.gui", + "package": "com.viaversion.fabric.mc1182.mixin.gui", "mixins": [ ], "client": [ diff --git a/viafabric-mc1182/src/main/resources/mixins.viafabric118.pipeline.json b/viafabric-mc1182/src/main/resources/mixins.viafabric1182.pipeline.json similarity index 82% rename from viafabric-mc1182/src/main/resources/mixins.viafabric118.pipeline.json rename to viafabric-mc1182/src/main/resources/mixins.viafabric1182.pipeline.json index 6a57f78..7512108 100644 --- a/viafabric-mc1182/src/main/resources/mixins.viafabric118.pipeline.json +++ b/viafabric-mc1182/src/main/resources/mixins.viafabric1182.pipeline.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_17", - "package": "com.viaversion.fabric.mc118.mixin.pipeline", + "package": "com.viaversion.fabric.mc1182.mixin.pipeline", "mixins": [ "MixinClientConnection", "MixinServerNetworkIoChInit" diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/debug/client/MixinClientConnectionAccessor.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/debug/client/MixinClientConnectionAccessor.java deleted file mode 100644 index dba0d29..0000000 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/debug/client/MixinClientConnectionAccessor.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric - * Copyright (C) 2018-2024 ViaVersion and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.viaversion.fabric.mc119.mixin.debug.client; - -import io.netty.channel.Channel; -import net.minecraft.network.ClientConnection; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(ClientConnection.class) -public interface MixinClientConnectionAccessor { - @Accessor - Channel getChannel(); -} diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/debug/client/MixinDebugHud.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/debug/client/MixinDebugHud.java deleted file mode 100644 index f9d20ca..0000000 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/debug/client/MixinDebugHud.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric - * Copyright (C) 2018-2024 ViaVersion and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.viaversion.fabric.mc119.mixin.debug.client; - -import com.viaversion.fabric.common.handler.CommonTransformer; -import com.viaversion.fabric.common.handler.FabricDecodeHandler; -import com.viaversion.viaversion.api.connection.ProtocolInfo; -import io.netty.channel.ChannelHandler; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.hud.DebugHud; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.viaversion.viaversion.api.Via; -import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; - -import java.util.List; - -@Mixin(DebugHud.class) -public class MixinDebugHud { - @Inject(at = @At("RETURN"), method = "getLeftText") - protected void getLeftText(CallbackInfoReturnable> info) { - String line = "[ViaFabric] I: " + Via.getManager().getConnectionManager().getConnections().size() + " (F: " - + Via.getManager().getConnectionManager().getConnectedClients().size() + ")"; - @SuppressWarnings("ConstantConditions") ChannelHandler viaDecoder = ((MixinClientConnectionAccessor) MinecraftClient.getInstance().getNetworkHandler() - .getConnection()).getChannel().pipeline().get(CommonTransformer.HANDLER_DECODER_NAME); - if (viaDecoder instanceof FabricDecodeHandler) { - ProtocolInfo protocol = ((FabricDecodeHandler) viaDecoder).getInfo().getProtocolInfo(); - if (protocol != null) { - ProtocolVersion serverVer = ProtocolVersion.getProtocol(protocol.getServerProtocolVersion()); - ProtocolVersion clientVer = ProtocolVersion.getProtocol(protocol.getProtocolVersion()); - line += " / C: " + clientVer + " S: " + serverVer + " A: " + protocol.getUser().isActive(); - } - } - - info.getReturnValue().add(line); - } -} diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/gui/client/MixinServerInfo.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/gui/client/MixinServerInfo.java deleted file mode 100644 index 367598a..0000000 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/gui/client/MixinServerInfo.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric - * Copyright (C) 2018-2024 ViaVersion and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.viaversion.fabric.mc119.mixin.gui.client; - -import com.viaversion.fabric.common.gui.ViaServerInfo; -import net.minecraft.client.network.ServerInfo; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Unique; - -@Mixin(ServerInfo.class) -public class MixinServerInfo implements ViaServerInfo { - @Unique - private boolean viaFabric$translating; - - @Unique - private int viaFabric$serverVer; - - @Override - public int viaFabric$getServerVer() { - return viaFabric$serverVer; - } - - @Override - public void viaFabric$setServerVer(int ver) { - this.viaFabric$serverVer = ver; - } - - @Override - public boolean viaFabric$translating() { - return viaFabric$translating; - } - - @Override - public void viaFabric$setTranslating(boolean via) { - this.viaFabric$translating = via; - } -} diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/pipeline/MixinServerNetworkIoChInit.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/pipeline/MixinServerNetworkIoChInit.java deleted file mode 100644 index dd7a36a..0000000 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/pipeline/MixinServerNetworkIoChInit.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric - * Copyright (C) 2018-2024 ViaVersion and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.viaversion.fabric.mc119.mixin.pipeline; - -import com.viaversion.fabric.common.handler.CommonTransformer; -import com.viaversion.fabric.common.handler.FabricDecodeHandler; -import com.viaversion.fabric.common.handler.FabricEncodeHandler; -import com.viaversion.viaversion.connection.UserConnectionImpl; -import com.viaversion.viaversion.protocol.ProtocolPipelineImpl; -import io.netty.channel.Channel; -import io.netty.channel.socket.SocketChannel; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.viaversion.viaversion.api.connection.UserConnection; - -@Mixin(targets = "net.minecraft.server.ServerNetworkIo$1") -public class MixinServerNetworkIoChInit { - @Inject(method = "initChannel", at = @At(value = "TAIL"), remap = false) - private void onInitChannel(Channel channel, CallbackInfo ci) { - if (channel instanceof SocketChannel) { - UserConnection user = new UserConnectionImpl(channel); - new ProtocolPipelineImpl(user); - - channel.pipeline().addBefore("encoder", CommonTransformer.HANDLER_ENCODER_NAME, new FabricEncodeHandler(user)); - channel.pipeline().addBefore("decoder", CommonTransformer.HANDLER_DECODER_NAME, new FabricDecodeHandler(user)); - } - } -} diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/pipeline/client/MixinClientConnectionChInit.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/pipeline/client/MixinClientConnectionChInit.java deleted file mode 100644 index 71f5020..0000000 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/pipeline/client/MixinClientConnectionChInit.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric - * Copyright (C) 2018-2024 ViaVersion and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.viaversion.fabric.mc119.mixin.pipeline.client; - -import com.viaversion.fabric.common.handler.FabricDecodeHandler; -import com.viaversion.fabric.common.handler.FabricEncodeHandler; -import com.viaversion.fabric.common.handler.CommonTransformer; -import com.viaversion.fabric.common.protocol.HostnameParserProtocol; -import com.viaversion.viaversion.connection.UserConnectionImpl; -import com.viaversion.viaversion.protocol.ProtocolPipelineImpl; -import io.netty.channel.Channel; -import io.netty.channel.socket.SocketChannel; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.viaversion.viaversion.api.connection.UserConnection; - -@Mixin(targets = "net.minecraft.network.ClientConnection$1") -public class MixinClientConnectionChInit { - @Inject(method = "initChannel", at = @At(value = "TAIL"), remap = false) - private void onInitChannel(Channel channel, CallbackInfo ci) { - if (channel instanceof SocketChannel) { - UserConnection user = new UserConnectionImpl(channel, true); - new ProtocolPipelineImpl(user).add(HostnameParserProtocol.INSTANCE); - - channel.pipeline() - .addBefore("encoder", CommonTransformer.HANDLER_ENCODER_NAME, new FabricEncodeHandler(user)) - .addBefore("decoder", CommonTransformer.HANDLER_DECODER_NAME, new FabricDecodeHandler(user)); - } - } -} diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/platform/FabricNativeVersionProvider.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/platform/FabricNativeVersionProvider.java deleted file mode 100644 index c423905..0000000 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/platform/FabricNativeVersionProvider.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric - * Copyright (C) 2018-2024 ViaVersion and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.viaversion.fabric.mc119.platform; - -import com.viaversion.fabric.common.platform.NativeVersionProvider; -import net.minecraft.SharedConstants; - -public class FabricNativeVersionProvider implements NativeVersionProvider { - @Override - public int getNativeServerVersion() { - return SharedConstants.getGameVersion().getProtocolVersion(); - } -} diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/ViaFabric.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/ViaFabric.java similarity index 95% rename from viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/ViaFabric.java rename to viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/ViaFabric.java index dbdcb1c..d469afd 100644 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/ViaFabric.java +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/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 . */ -package com.viaversion.fabric.mc120; +package com.viaversion.fabric.mc1194; -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.mc120.commands.VFCommandHandler; -import com.viaversion.fabric.mc120.platform.FabricPlatform; -import com.viaversion.fabric.mc120.platform.VFLoader; +import com.viaversion.fabric.mc1194.commands.VFCommandHandler; +import com.viaversion.fabric.mc1194.platform.FabricPlatform; +import com.viaversion.fabric.mc1194.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-mc1194/src/main/java/com/viaversion/fabric/mc119/ViaFabricClient.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/ViaFabricClient.java similarity index 96% rename from viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/ViaFabricClient.java rename to viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/ViaFabricClient.java index e2310a8..8524e7a 100644 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/ViaFabricClient.java +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/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 . */ -package com.viaversion.fabric.mc119; +package com.viaversion.fabric.mc1194; -import com.viaversion.fabric.mc119.gui.ViaConfigScreen; +import com.viaversion.fabric.mc1194.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; diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/commands/NMSCommandSender.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/commands/NMSCommandSender.java similarity index 98% rename from viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/commands/NMSCommandSender.java rename to viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/commands/NMSCommandSender.java index 838ab57..da0ceff 100644 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/commands/NMSCommandSender.java +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/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.mc119.commands; +package com.viaversion.fabric.mc1194.commands; import com.viaversion.viaversion.util.ComponentUtil; import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/commands/VFCommandHandler.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/commands/VFCommandHandler.java similarity index 98% rename from viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/commands/VFCommandHandler.java rename to viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/commands/VFCommandHandler.java index d0f900f..6573b4f 100644 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/commands/VFCommandHandler.java +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/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.mc119.commands; +package com.viaversion.fabric.mc1194.commands; import com.viaversion.fabric.common.commands.subs.LeakDetectSubCommand; import com.mojang.brigadier.arguments.StringArgumentType; diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/gui/ModMenuConfig.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/gui/ModMenuConfig.java similarity index 96% rename from viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/gui/ModMenuConfig.java rename to viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/gui/ModMenuConfig.java index c184f53..28097ea 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc117/gui/ModMenuConfig.java +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/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.mc117.gui; +package com.viaversion.fabric.mc1194.gui; import com.google.common.collect.ImmutableMap; import com.terraformersmc.modmenu.api.ConfigScreenFactory; diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/gui/ViaConfigScreen.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/gui/ViaConfigScreen.java similarity index 98% rename from viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/gui/ViaConfigScreen.java rename to viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/gui/ViaConfigScreen.java index 2e553c2..b644369 100644 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/gui/ViaConfigScreen.java +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/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.mc119.gui; +package com.viaversion.fabric.mc1194.gui; import com.viaversion.fabric.common.config.AbstractViaConfigScreen; -import com.viaversion.fabric.mc119.ViaFabric; +import com.viaversion.fabric.mc1194.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-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/address/client/MixinAllowedAddressResolver.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/address/client/MixinAllowedAddressResolver.java similarity index 97% rename from viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/address/client/MixinAllowedAddressResolver.java rename to viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/address/client/MixinAllowedAddressResolver.java index 39aada6..8d9d37d 100644 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/address/client/MixinAllowedAddressResolver.java +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/address/client/MixinAllowedAddressResolver.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.mc120.mixin.address.client; +package com.viaversion.fabric.mc1194.mixin.address.client; import com.viaversion.fabric.common.AddressParser; import net.minecraft.client.network.Address; diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/debug/client/MixinClientConnection.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/debug/client/MixinClientConnection.java similarity index 96% rename from viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/debug/client/MixinClientConnection.java rename to viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/debug/client/MixinClientConnection.java index a3a174d..e1329fa 100644 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/debug/client/MixinClientConnection.java +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/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.mc119.mixin.debug.client; +package com.viaversion.fabric.mc1194.mixin.debug.client; import io.netty.channel.ChannelHandlerContext; import net.minecraft.network.ClientConnection; diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/debug/client/MixinClientConnectionAccessor.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/debug/client/MixinClientConnectionAccessor.java new file mode 100644 index 0000000..1680d48 --- /dev/null +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/debug/client/MixinClientConnectionAccessor.java @@ -0,0 +1,29 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1194.mixin.debug.client; + +import io.netty.channel.Channel; +import net.minecraft.network.ClientConnection; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(ClientConnection.class) +public interface MixinClientConnectionAccessor { + @Accessor + Channel getChannel(); +} diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/debug/client/MixinDebugHud.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/debug/client/MixinDebugHud.java new file mode 100644 index 0000000..3a2277e --- /dev/null +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/debug/client/MixinDebugHud.java @@ -0,0 +1,54 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1194.mixin.debug.client; + +import com.viaversion.fabric.common.handler.CommonTransformer; +import com.viaversion.fabric.common.handler.FabricDecodeHandler; +import com.viaversion.viaversion.api.connection.ProtocolInfo; +import io.netty.channel.ChannelHandler; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.hud.DebugHud; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; + +import java.util.List; + +@Mixin(DebugHud.class) +public class MixinDebugHud { + @Inject(at = @At("RETURN"), method = "getLeftText") + protected void getLeftText(CallbackInfoReturnable> info) { + String line = "[ViaFabric] I: " + Via.getManager().getConnectionManager().getConnections().size() + " (F: " + + Via.getManager().getConnectionManager().getConnectedClients().size() + ")"; + @SuppressWarnings("ConstantConditions") ChannelHandler viaDecoder = ((MixinClientConnectionAccessor) MinecraftClient.getInstance().getNetworkHandler() + .getConnection()).getChannel().pipeline().get(CommonTransformer.HANDLER_DECODER_NAME); + if (viaDecoder instanceof FabricDecodeHandler) { + ProtocolInfo protocol = ((FabricDecodeHandler) viaDecoder).getInfo().getProtocolInfo(); + if (protocol != null) { + ProtocolVersion serverVer = ProtocolVersion.getProtocol(protocol.getServerProtocolVersion()); + ProtocolVersion clientVer = ProtocolVersion.getProtocol(protocol.getProtocolVersion()); + line += " / C: " + clientVer + " S: " + serverVer + " A: " + protocol.getUser().isActive(); + } + } + + info.getReturnValue().add(line); + } +} diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/gui/client/MixinMultiplayerServerListPingerListener.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/gui/client/MixinMultiplayerServerListPingerListener.java similarity index 94% rename from viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/gui/client/MixinMultiplayerServerListPingerListener.java rename to viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/gui/client/MixinMultiplayerServerListPingerListener.java index 778c9f4..f5c1a7d 100644 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/gui/client/MixinMultiplayerServerListPingerListener.java +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/gui/client/MixinMultiplayerServerListPingerListener.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.mc120.mixin.gui.client; +package com.viaversion.fabric.mc1194.mixin.gui.client; import com.viaversion.fabric.common.gui.ViaServerInfo; import com.viaversion.fabric.common.handler.FabricDecodeHandler; -import com.viaversion.fabric.mc120.mixin.debug.client.MixinClientConnectionAccessor; +import com.viaversion.fabric.mc1194.mixin.debug.client.MixinClientConnectionAccessor; import net.minecraft.client.network.ServerInfo; import net.minecraft.network.ClientConnection; import net.minecraft.network.listener.ClientQueryPacketListener; diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/gui/client/MixinServerEntry.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/gui/client/MixinServerEntry.java similarity index 98% rename from viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/gui/client/MixinServerEntry.java rename to viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/gui/client/MixinServerEntry.java index db6914b..efd9b12 100644 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/gui/client/MixinServerEntry.java +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/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 . */ -package com.viaversion.fabric.mc119.mixin.gui.client; +package com.viaversion.fabric.mc1194.mixin.gui.client; import com.mojang.blaze3d.systems.RenderSystem; import com.viaversion.fabric.common.gui.ViaServerInfo; diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/gui/client/MixinServerInfo.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/gui/client/MixinServerInfo.java new file mode 100644 index 0000000..b59dd7a --- /dev/null +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/gui/client/MixinServerInfo.java @@ -0,0 +1,52 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1194.mixin.gui.client; + +import com.viaversion.fabric.common.gui.ViaServerInfo; +import net.minecraft.client.network.ServerInfo; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; + +@Mixin(ServerInfo.class) +public class MixinServerInfo implements ViaServerInfo { + @Unique + private boolean viaFabric$translating; + + @Unique + private int viaFabric$serverVer; + + @Override + public int viaFabric$getServerVer() { + return viaFabric$serverVer; + } + + @Override + public void viaFabric$setServerVer(int ver) { + this.viaFabric$serverVer = ver; + } + + @Override + public boolean viaFabric$translating() { + return viaFabric$translating; + } + + @Override + public void viaFabric$setTranslating(boolean via) { + this.viaFabric$translating = via; + } +} diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/pipeline/MixinClientConnection.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/pipeline/MixinClientConnection.java similarity index 96% rename from viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/pipeline/MixinClientConnection.java rename to viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/pipeline/MixinClientConnection.java index a121594..ff66d3b 100644 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/pipeline/MixinClientConnection.java +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/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.mc119.mixin.pipeline; +package com.viaversion.fabric.mc1194.mixin.pipeline; import com.viaversion.fabric.common.handler.PipelineReorderEvent; import io.netty.channel.Channel; diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/pipeline/MixinServerNetworkIoChInit.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/pipeline/MixinServerNetworkIoChInit.java new file mode 100644 index 0000000..120d792 --- /dev/null +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/pipeline/MixinServerNetworkIoChInit.java @@ -0,0 +1,45 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1194.mixin.pipeline; + +import com.viaversion.fabric.common.handler.CommonTransformer; +import com.viaversion.fabric.common.handler.FabricDecodeHandler; +import com.viaversion.fabric.common.handler.FabricEncodeHandler; +import com.viaversion.viaversion.connection.UserConnectionImpl; +import com.viaversion.viaversion.protocol.ProtocolPipelineImpl; +import io.netty.channel.Channel; +import io.netty.channel.socket.SocketChannel; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import com.viaversion.viaversion.api.connection.UserConnection; + +@Mixin(targets = "net.minecraft.server.ServerNetworkIo$1") +public class MixinServerNetworkIoChInit { + @Inject(method = "initChannel", at = @At(value = "TAIL"), remap = false) + private void onInitChannel(Channel channel, CallbackInfo ci) { + if (channel instanceof SocketChannel) { + UserConnection user = new UserConnectionImpl(channel); + new ProtocolPipelineImpl(user); + + channel.pipeline().addBefore("encoder", CommonTransformer.HANDLER_ENCODER_NAME, new FabricEncodeHandler(user)); + channel.pipeline().addBefore("decoder", CommonTransformer.HANDLER_DECODER_NAME, new FabricDecodeHandler(user)); + } + } +} diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/pipeline/client/MixinClientConnection.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/pipeline/client/MixinClientConnection.java similarity index 90% rename from viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/pipeline/client/MixinClientConnection.java rename to viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/pipeline/client/MixinClientConnection.java index ae292fc..6fc7705 100644 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/pipeline/client/MixinClientConnection.java +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/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.mc119.mixin.pipeline.client; +package com.viaversion.fabric.mc1194.mixin.pipeline.client; -import com.viaversion.fabric.mc119.ViaFabric; -import com.viaversion.fabric.mc119.service.ProtocolAutoDetector; +import com.viaversion.fabric.mc1194.ViaFabric; +import com.viaversion.fabric.mc1194.service.ProtocolAutoDetector; import net.minecraft.network.ClientConnection; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/pipeline/client/MixinClientConnectionChInit.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/pipeline/client/MixinClientConnectionChInit.java new file mode 100644 index 0000000..72a35dd --- /dev/null +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/pipeline/client/MixinClientConnectionChInit.java @@ -0,0 +1,47 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1194.mixin.pipeline.client; + +import com.viaversion.fabric.common.handler.FabricDecodeHandler; +import com.viaversion.fabric.common.handler.FabricEncodeHandler; +import com.viaversion.fabric.common.handler.CommonTransformer; +import com.viaversion.fabric.common.protocol.HostnameParserProtocol; +import com.viaversion.viaversion.connection.UserConnectionImpl; +import com.viaversion.viaversion.protocol.ProtocolPipelineImpl; +import io.netty.channel.Channel; +import io.netty.channel.socket.SocketChannel; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import com.viaversion.viaversion.api.connection.UserConnection; + +@Mixin(targets = "net.minecraft.network.ClientConnection$1") +public class MixinClientConnectionChInit { + @Inject(method = "initChannel", at = @At(value = "TAIL"), remap = false) + private void onInitChannel(Channel channel, CallbackInfo ci) { + if (channel instanceof SocketChannel) { + UserConnection user = new UserConnectionImpl(channel, true); + new ProtocolPipelineImpl(user).add(HostnameParserProtocol.INSTANCE); + + channel.pipeline() + .addBefore("encoder", CommonTransformer.HANDLER_ENCODER_NAME, new FabricEncodeHandler(user)) + .addBefore("decoder", CommonTransformer.HANDLER_DECODER_NAME, new FabricDecodeHandler(user)); + } + } +} diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/platform/FabricNativeVersionProvider.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/platform/FabricNativeVersionProvider.java new file mode 100644 index 0000000..02e22ac --- /dev/null +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/platform/FabricNativeVersionProvider.java @@ -0,0 +1,28 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1194.platform; + +import com.viaversion.fabric.common.platform.NativeVersionProvider; +import net.minecraft.SharedConstants; + +public class FabricNativeVersionProvider implements NativeVersionProvider { + @Override + public int getNativeServerVersion() { + return SharedConstants.getGameVersion().getProtocolVersion(); + } +} diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/platform/FabricPlatform.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/platform/FabricPlatform.java similarity index 96% rename from viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/platform/FabricPlatform.java rename to viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/platform/FabricPlatform.java index 6a2922d..a91d001 100644 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/platform/FabricPlatform.java +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/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.mc119.platform; +package com.viaversion.fabric.mc1194.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.mc119.ViaFabric; -import com.viaversion.fabric.mc119.commands.NMSCommandSender; +import com.viaversion.fabric.mc1194.ViaFabric; +import com.viaversion.fabric.mc1194.commands.NMSCommandSender; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.command.ViaCommandSender; import io.netty.channel.EventLoop; diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/platform/VFLoader.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/platform/VFLoader.java similarity index 87% rename from viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/platform/VFLoader.java rename to viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/platform/VFLoader.java index eb1c8cd..407db88 100644 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/platform/VFLoader.java +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/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 . */ -package com.viaversion.fabric.mc119.platform; +package com.viaversion.fabric.mc1194.platform; -import com.viaversion.fabric.mc119.providers.VFHandItemProvider; -import com.viaversion.fabric.mc119.providers.FabricVersionProvider; -import com.viaversion.fabric.mc119.providers.VFPlayerAbilitiesProvider; -import com.viaversion.fabric.mc119.providers.VFPlayerLookTargetProvider; +import com.viaversion.fabric.mc1194.providers.VFHandItemProvider; +import com.viaversion.fabric.mc1194.providers.FabricVersionProvider; +import com.viaversion.fabric.mc1194.providers.VFPlayerAbilitiesProvider; +import com.viaversion.fabric.mc1194.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; diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/providers/FabricVersionProvider.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/providers/FabricVersionProvider.java similarity index 91% rename from viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/providers/FabricVersionProvider.java rename to viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/providers/FabricVersionProvider.java index 79ed76d..bf743ad 100644 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/providers/FabricVersionProvider.java +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/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.mc119.providers; +package com.viaversion.fabric.mc1194.providers; import com.viaversion.fabric.common.config.VFConfig; import com.viaversion.fabric.common.provider.AbstractFabricVersionProvider; -import com.viaversion.fabric.mc119.ViaFabric; -import com.viaversion.fabric.mc119.service.ProtocolAutoDetector; +import com.viaversion.fabric.mc1194.ViaFabric; +import com.viaversion.fabric.mc1194.service.ProtocolAutoDetector; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.channel.ChannelPipeline; import net.minecraft.network.ClientConnection; diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/providers/VFHandItemProvider.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/providers/VFHandItemProvider.java similarity index 96% rename from viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/providers/VFHandItemProvider.java rename to viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/providers/VFHandItemProvider.java index 57b0e34..83e6e6d 100644 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/providers/VFHandItemProvider.java +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/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 . */ -package com.viaversion.fabric.mc119.providers; +package com.viaversion.fabric.mc1194.providers; import com.viaversion.fabric.common.util.RemappingUtil; -import com.viaversion.fabric.mc119.ViaFabric; +import com.viaversion.fabric.mc1194.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-mc1182/src/main/java/com/viaversion/fabric/mc118/providers/VFPlayerAbilitiesProvider.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/providers/VFPlayerAbilitiesProvider.java similarity index 97% rename from viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/providers/VFPlayerAbilitiesProvider.java rename to viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/providers/VFPlayerAbilitiesProvider.java index e1769f5..900b6f5 100644 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc118/providers/VFPlayerAbilitiesProvider.java +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/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 . */ -package com.viaversion.fabric.mc118.providers; +package com.viaversion.fabric.mc1194.providers; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.provider.PlayerAbilitiesProvider; diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/providers/VFPlayerLookTargetProvider.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/providers/VFPlayerLookTargetProvider.java similarity index 97% rename from viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/providers/VFPlayerLookTargetProvider.java rename to viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/providers/VFPlayerLookTargetProvider.java index 6ff7467..71cee27 100644 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/providers/VFPlayerLookTargetProvider.java +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/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 . */ -package com.viaversion.fabric.mc119.providers; +package com.viaversion.fabric.mc1194.providers; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.Position; diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/service/ProtocolAutoDetector.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/service/ProtocolAutoDetector.java similarity index 98% rename from viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/service/ProtocolAutoDetector.java rename to viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/service/ProtocolAutoDetector.java index 2acf735..2f47ecc 100644 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/service/ProtocolAutoDetector.java +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/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 . */ -package com.viaversion.fabric.mc119.service; +package com.viaversion.fabric.mc1194.service; import com.viaversion.fabric.common.AddressParser; -import com.viaversion.fabric.mc119.ViaFabric; +import com.viaversion.fabric.mc1194.ViaFabric; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; diff --git a/viafabric-mc1194/src/main/resources/fabric.mod.json b/viafabric-mc1194/src/main/resources/fabric.mod.json index 25fa3ba..e758363 100644 --- a/viafabric-mc1194/src/main/resources/fabric.mod.json +++ b/viafabric-mc1194/src/main/resources/fabric.mod.json @@ -1,6 +1,6 @@ { "schemaVersion": 1, - "id": "viafabric-mc119", + "id": "viafabric-mc1194", "name": "ViaFabric for 1.19", "version": "${version}", "description": "${description}", @@ -47,13 +47,13 @@ ], "entrypoints": { "main": [ - "com.viaversion.fabric.mc119.ViaFabric" + "com.viaversion.fabric.mc1194.ViaFabric" ], "client": [ - "com.viaversion.fabric.mc119.ViaFabricClient" + "com.viaversion.fabric.mc1194.ViaFabricClient" ], "modmenu": [ - "com.viaversion.fabric.mc119.gui.ModMenuConfig" + "com.viaversion.fabric.mc1194.gui.ModMenuConfig" ] }, "depends": { @@ -65,10 +65,10 @@ "fabric-command-api-v2": "*" }, "mixins": [ - "mixins.viafabric119.address.json", - "mixins.viafabric119.gui.json", - "mixins.viafabric119.debug.json", - "mixins.viafabric119.pipeline.json" + "mixins.viafabric1194.address.json", + "mixins.viafabric1194.gui.json", + "mixins.viafabric1194.debug.json", + "mixins.viafabric1194.pipeline.json" ], "custom": { "modmenu": { diff --git a/viafabric-mc1204/src/main/resources/mixins.viafabric120.address.json b/viafabric-mc1194/src/main/resources/mixins.viafabric1194.address.json similarity index 75% rename from viafabric-mc1204/src/main/resources/mixins.viafabric120.address.json rename to viafabric-mc1194/src/main/resources/mixins.viafabric1194.address.json index 88608a8..a883164 100644 --- a/viafabric-mc1204/src/main/resources/mixins.viafabric120.address.json +++ b/viafabric-mc1194/src/main/resources/mixins.viafabric1194.address.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_17", - "package": "com.viaversion.fabric.mc120.mixin.address", + "package": "com.viaversion.fabric.mc1194.mixin.address", "mixins": [ ], "client": [ diff --git a/viafabric-mc1194/src/main/resources/mixins.viafabric119.debug.json b/viafabric-mc1194/src/main/resources/mixins.viafabric1194.debug.json similarity index 81% rename from viafabric-mc1194/src/main/resources/mixins.viafabric119.debug.json rename to viafabric-mc1194/src/main/resources/mixins.viafabric1194.debug.json index 76d7d71..f66a407 100644 --- a/viafabric-mc1194/src/main/resources/mixins.viafabric119.debug.json +++ b/viafabric-mc1194/src/main/resources/mixins.viafabric1194.debug.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_17", - "package": "com.viaversion.fabric.mc119.mixin.debug", + "package": "com.viaversion.fabric.mc1194.mixin.debug", "mixins": [ ], "client": [ diff --git a/viafabric-mc1194/src/main/resources/mixins.viafabric119.gui.json b/viafabric-mc1194/src/main/resources/mixins.viafabric1194.gui.json similarity index 82% rename from viafabric-mc1194/src/main/resources/mixins.viafabric119.gui.json rename to viafabric-mc1194/src/main/resources/mixins.viafabric1194.gui.json index f924975..590726e 100644 --- a/viafabric-mc1194/src/main/resources/mixins.viafabric119.gui.json +++ b/viafabric-mc1194/src/main/resources/mixins.viafabric1194.gui.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_17", - "package": "com.viaversion.fabric.mc119.mixin.gui", + "package": "com.viaversion.fabric.mc1194.mixin.gui", "mixins": [ ], "client": [ diff --git a/viafabric-mc1194/src/main/resources/mixins.viafabric119.pipeline.json b/viafabric-mc1194/src/main/resources/mixins.viafabric1194.pipeline.json similarity index 82% rename from viafabric-mc1194/src/main/resources/mixins.viafabric119.pipeline.json rename to viafabric-mc1194/src/main/resources/mixins.viafabric1194.pipeline.json index c845fc9..766e6ed 100644 --- a/viafabric-mc1194/src/main/resources/mixins.viafabric119.pipeline.json +++ b/viafabric-mc1194/src/main/resources/mixins.viafabric1194.pipeline.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_17", - "package": "com.viaversion.fabric.mc119.mixin.pipeline", + "package": "com.viaversion.fabric.mc1194.mixin.pipeline", "mixins": [ "MixinClientConnection", "MixinServerNetworkIoChInit" diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/commands/VFCommandHandler.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/commands/VFCommandHandler.java deleted file mode 100644 index 78aa498..0000000 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/commands/VFCommandHandler.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric - * Copyright (C) 2018-2024 ViaVersion and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.viaversion.fabric.mc120.commands; - -import com.viaversion.fabric.common.commands.subs.LeakDetectSubCommand; -import com.mojang.brigadier.arguments.StringArgumentType; -import com.mojang.brigadier.context.CommandContext; -import com.mojang.brigadier.suggestion.Suggestions; -import com.mojang.brigadier.suggestion.SuggestionsBuilder; -import net.minecraft.command.CommandSource; -import com.viaversion.viaversion.commands.ViaCommandHandler; - -import java.util.concurrent.CompletableFuture; - -public class VFCommandHandler extends ViaCommandHandler { - { - try { - registerSubCommand(new LeakDetectSubCommand()); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public int execute(CommandContext ctx) { - String[] args = new String[0]; - try { - args = StringArgumentType.getString(ctx, "args").split(" "); - } catch (IllegalArgumentException ignored) { - } - onCommand( - new NMSCommandSender(ctx.getSource()), - args - ); - return 1; - } - - public CompletableFuture suggestion(CommandContext ctx, SuggestionsBuilder builder) { - String[] args; - try { - args = StringArgumentType.getString(ctx, "args").split(" ", -1); - } catch (IllegalArgumentException ignored) { - args = new String[]{""}; - } - String[] pref = args.clone(); - pref[pref.length - 1] = ""; - String prefix = String.join(" ", pref); - onTabComplete(new NMSCommandSender(ctx.getSource()), args) - .stream() - .map(it -> { - SuggestionsBuilder b = new SuggestionsBuilder(builder.getInput(), prefix.length() + builder.getStart()); - b.suggest(it); - return b; - }) - .forEach(builder::add); - return builder.buildFuture(); - } -} diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/gui/ModMenuConfig.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/gui/ModMenuConfig.java deleted file mode 100644 index 76f1e4a..0000000 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/gui/ModMenuConfig.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric - * Copyright (C) 2018-2024 ViaVersion and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.viaversion.fabric.mc120.gui; - -import com.google.common.collect.ImmutableMap; -import com.terraformersmc.modmenu.api.ConfigScreenFactory; -import com.terraformersmc.modmenu.api.ModMenuApi; - -import java.util.Map; - -public class ModMenuConfig implements ModMenuApi { - @Override - public ConfigScreenFactory getModConfigScreenFactory() { - return ViaConfigScreen::new; - } - - @Override - public Map> getProvidedConfigScreenFactories() { - return ImmutableMap.of("viafabric", getModConfigScreenFactory()); - } -} \ No newline at end of file diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/debug/client/MixinClientConnectionAccessor.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/debug/client/MixinClientConnectionAccessor.java deleted file mode 100644 index 309aefc..0000000 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/debug/client/MixinClientConnectionAccessor.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric - * Copyright (C) 2018-2024 ViaVersion and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.viaversion.fabric.mc120.mixin.debug.client; - -import io.netty.channel.Channel; -import net.minecraft.network.ClientConnection; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(ClientConnection.class) -public interface MixinClientConnectionAccessor { - @Accessor - Channel getChannel(); -} diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/debug/client/MixinDebugHud.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/debug/client/MixinDebugHud.java deleted file mode 100644 index 944fbda..0000000 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/debug/client/MixinDebugHud.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric - * Copyright (C) 2018-2024 ViaVersion and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.viaversion.fabric.mc120.mixin.debug.client; - -import com.viaversion.fabric.common.handler.CommonTransformer; -import com.viaversion.fabric.common.handler.FabricDecodeHandler; -import com.viaversion.viaversion.api.connection.ProtocolInfo; -import io.netty.channel.ChannelHandler; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.hud.DebugHud; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.viaversion.viaversion.api.Via; -import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; - -import java.util.List; - -@Mixin(DebugHud.class) -public class MixinDebugHud { - @Inject(at = @At("RETURN"), method = "getLeftText") - protected void getLeftText(CallbackInfoReturnable> info) { - String line = "[ViaFabric] I: " + Via.getManager().getConnectionManager().getConnections().size() + " (F: " - + Via.getManager().getConnectionManager().getConnectedClients().size() + ")"; - @SuppressWarnings("ConstantConditions") ChannelHandler viaDecoder = ((MixinClientConnectionAccessor) MinecraftClient.getInstance().getNetworkHandler() - .getConnection()).getChannel().pipeline().get(CommonTransformer.HANDLER_DECODER_NAME); - if (viaDecoder instanceof FabricDecodeHandler) { - ProtocolInfo protocol = ((FabricDecodeHandler) viaDecoder).getInfo().getProtocolInfo(); - if (protocol != null) { - ProtocolVersion serverVer = ProtocolVersion.getProtocol(protocol.getServerProtocolVersion()); - ProtocolVersion clientVer = ProtocolVersion.getProtocol(protocol.getProtocolVersion()); - line += " / C: " + clientVer + " S: " + serverVer + " A: " + protocol.getUser().isActive(); - } - } - - info.getReturnValue().add(line); - } -} diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/gui/client/MixinServerInfo.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/gui/client/MixinServerInfo.java deleted file mode 100644 index a9271ca..0000000 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/gui/client/MixinServerInfo.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric - * Copyright (C) 2018-2024 ViaVersion and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.viaversion.fabric.mc120.mixin.gui.client; - -import com.viaversion.fabric.common.gui.ViaServerInfo; -import net.minecraft.client.network.ServerInfo; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Unique; - -@Mixin(ServerInfo.class) -public class MixinServerInfo implements ViaServerInfo { - @Unique - private boolean viaFabric$translating; - - @Unique - private int viaFabric$serverVer; - - @Override - public int viaFabric$getServerVer() { - return viaFabric$serverVer; - } - - @Override - public void viaFabric$setServerVer(int ver) { - this.viaFabric$serverVer = ver; - } - - @Override - public boolean viaFabric$translating() { - return viaFabric$translating; - } - - @Override - public void viaFabric$setTranslating(boolean via) { - this.viaFabric$translating = via; - } -} diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/platform/FabricNativeVersionProvider.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/platform/FabricNativeVersionProvider.java deleted file mode 100644 index 0225900..0000000 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/platform/FabricNativeVersionProvider.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric - * Copyright (C) 2018-2024 ViaVersion and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.viaversion.fabric.mc120.platform; - -import com.viaversion.fabric.common.platform.NativeVersionProvider; -import net.minecraft.SharedConstants; - -public class FabricNativeVersionProvider implements NativeVersionProvider { - @Override - public int getNativeServerVersion() { - return SharedConstants.getGameVersion().getProtocolVersion(); - } -} diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/platform/FabricPlatform.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/platform/FabricPlatform.java deleted file mode 100644 index 9f598df..0000000 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/platform/FabricPlatform.java +++ /dev/null @@ -1,140 +0,0 @@ -/* - * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric - * Copyright (C) 2018-2024 ViaVersion and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.viaversion.fabric.mc120.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.mc120.ViaFabric; -import com.viaversion.fabric.mc120.commands.NMSCommandSender; -import com.viaversion.viaversion.api.Via; -import com.viaversion.viaversion.api.command.ViaCommandSender; -import io.netty.channel.EventLoop; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.client.MinecraftClient; -import net.minecraft.entity.Entity; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.network.ServerPlayerEntity; - -import java.util.UUID; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutorService; -import java.util.function.Supplier; -import java.util.logging.Level; - -public class FabricPlatform extends AbstractFabricPlatform { - public static MinecraftServer getServer() { - if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) { - return getIntegratedServer(); - } - return (MinecraftServer) FabricLoader.getInstance().getGameInstance(); - } - - @Environment(EnvType.CLIENT) - private static MinecraftServer getIntegratedServer() { - return MinecraftClient.getInstance().getServer(); - } - - @Override - public FutureTaskId runSync(Runnable runnable) { - if (getServer() != null) { - return runServerSync(runnable); - } else { - return runEventLoop(runnable); - } - } - - private FutureTaskId runServerSync(Runnable runnable) { - // Kick task needs to be on main thread, it does already have error logger - return new FutureTaskId(CompletableFuture.runAsync(runnable, getServer())); - } - - @Override - public ViaCommandSender[] getOnlinePlayers() { - MinecraftServer server = getServer(); - if (server != null && server.isOnThread()) { - return getServerPlayers(); - } - return Via.getManager().getConnectionManager().getConnectedClients().values().stream() - .map(UserCommandSender::new) - .toArray(ViaCommandSender[]::new); - } - - private ViaCommandSender[] getServerPlayers() { - return getServer().getPlayerManager().getPlayerList().stream() - .map(Entity::getCommandSource) - .map(NMSCommandSender::new) - .toArray(ViaCommandSender[]::new); - } - - @Override - public void sendMessage(UUID uuid, String s) { - sendMessageServer(uuid, s); - } - - private void sendMessageServer(UUID uuid, String s) { - MinecraftServer server = getServer(); - if (server == null) return; - runServerSync(() -> { - ServerPlayerEntity player = server.getPlayerManager().getPlayer(uuid); - if (player == null) return; - player.sendMessage(NMSCommandSender.fromLegacy(s), false); - }); - } - - @Override - public boolean kickPlayer(UUID uuid, String s) { - return kickServer(uuid, s); - } - - private boolean kickServer(UUID uuid, String s) { - MinecraftServer server = getServer(); - if (server == null) return false; - Supplier kickTask = () -> { - ServerPlayerEntity player = server.getPlayerManager().getPlayer(uuid); - if (player == null) return false; - player.networkHandler.disconnect(NMSCommandSender.fromLegacy(s)); - return true; - }; - if (server.isOnThread()) { - return kickTask.get(); - } else { - ViaFabric.JLOGGER.log(Level.WARNING, "Weird!? Player kicking was called off-thread", new Throwable()); - runServerSync(kickTask::get); - } - 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; - } -} diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/platform/VFLoader.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/platform/VFLoader.java deleted file mode 100644 index 4de9fd6..0000000 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/platform/VFLoader.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric - * Copyright (C) 2018-2024 ViaVersion and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.viaversion.fabric.mc120.platform; - -import com.viaversion.fabric.mc120.providers.VFHandItemProvider; -import com.viaversion.fabric.mc120.providers.FabricVersionProvider; -import com.viaversion.fabric.mc120.providers.VFPlayerAbilitiesProvider; -import com.viaversion.fabric.mc120.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; -import net.fabricmc.loader.api.FabricLoader; -import com.viaversion.viaversion.api.Via; -import com.viaversion.viaversion.api.platform.ViaPlatformLoader; -import com.viaversion.viaversion.api.protocol.version.VersionProvider; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.HandItemProvider; - -public class VFLoader implements ViaPlatformLoader { - @Override - public void load() { - Via.getManager().getProviders().use(VersionProvider.class, new FabricVersionProvider()); - - if (Via.getPlatform().getConf().isItemCache()) { - VFHandItemProvider handProvider = new VFHandItemProvider(); - if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) { - handProvider.registerClientTick(); - } - Via.getManager().getProviders().use(HandItemProvider.class, handProvider); - } - - Via.getManager().getProviders().use(PlayerAbilitiesProvider.class, new VFPlayerAbilitiesProvider()); - Via.getManager().getProviders().use(PlayerLookTargetProvider.class, new VFPlayerLookTargetProvider()); - } - - @Override - public void unload() { - // Nothing to do - } -} diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/ViaFabric.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/ViaFabric.java similarity index 95% rename from viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/ViaFabric.java rename to viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/ViaFabric.java index 17b7880..193551c 100644 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/ViaFabric.java +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/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 . */ -package com.viaversion.fabric.mc119; +package com.viaversion.fabric.mc1204; -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.mc119.commands.VFCommandHandler; -import com.viaversion.fabric.mc119.platform.FabricPlatform; -import com.viaversion.fabric.mc119.platform.VFLoader; +import com.viaversion.fabric.mc1204.commands.VFCommandHandler; +import com.viaversion.fabric.mc1204.platform.FabricPlatform; +import com.viaversion.fabric.mc1204.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-mc1204/src/main/java/com/viaversion/fabric/mc120/ViaFabricClient.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/ViaFabricClient.java similarity index 96% rename from viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/ViaFabricClient.java rename to viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/ViaFabricClient.java index b4817e7..97eb0bd 100644 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/ViaFabricClient.java +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/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 . */ -package com.viaversion.fabric.mc120; +package com.viaversion.fabric.mc1204; -import com.viaversion.fabric.mc120.gui.ViaConfigScreen; +import com.viaversion.fabric.mc1204.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; diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/commands/NMSCommandSender.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/commands/NMSCommandSender.java similarity index 98% rename from viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/commands/NMSCommandSender.java rename to viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/commands/NMSCommandSender.java index 2cb7a42..4f164ae 100644 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/commands/NMSCommandSender.java +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/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.mc120.commands; +package com.viaversion.fabric.mc1204.commands; import com.viaversion.viaversion.util.ComponentUtil; import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/commands/VFCommandHandler.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/commands/VFCommandHandler.java new file mode 100644 index 0000000..2c20946 --- /dev/null +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/commands/VFCommandHandler.java @@ -0,0 +1,72 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1204.commands; + +import com.viaversion.fabric.common.commands.subs.LeakDetectSubCommand; +import com.mojang.brigadier.arguments.StringArgumentType; +import com.mojang.brigadier.context.CommandContext; +import com.mojang.brigadier.suggestion.Suggestions; +import com.mojang.brigadier.suggestion.SuggestionsBuilder; +import net.minecraft.command.CommandSource; +import com.viaversion.viaversion.commands.ViaCommandHandler; + +import java.util.concurrent.CompletableFuture; + +public class VFCommandHandler extends ViaCommandHandler { + { + try { + registerSubCommand(new LeakDetectSubCommand()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public int execute(CommandContext ctx) { + String[] args = new String[0]; + try { + args = StringArgumentType.getString(ctx, "args").split(" "); + } catch (IllegalArgumentException ignored) { + } + onCommand( + new NMSCommandSender(ctx.getSource()), + args + ); + return 1; + } + + public CompletableFuture suggestion(CommandContext ctx, SuggestionsBuilder builder) { + String[] args; + try { + args = StringArgumentType.getString(ctx, "args").split(" ", -1); + } catch (IllegalArgumentException ignored) { + args = new String[]{""}; + } + String[] pref = args.clone(); + pref[pref.length - 1] = ""; + String prefix = String.join(" ", pref); + onTabComplete(new NMSCommandSender(ctx.getSource()), args) + .stream() + .map(it -> { + SuggestionsBuilder b = new SuggestionsBuilder(builder.getInput(), prefix.length() + builder.getStart()); + b.suggest(it); + return b; + }) + .forEach(builder::add); + return builder.buildFuture(); + } +} diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/gui/ModMenuConfig.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/gui/ModMenuConfig.java new file mode 100644 index 0000000..bcefcbe --- /dev/null +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/gui/ModMenuConfig.java @@ -0,0 +1,36 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1204.gui; + +import com.google.common.collect.ImmutableMap; +import com.terraformersmc.modmenu.api.ConfigScreenFactory; +import com.terraformersmc.modmenu.api.ModMenuApi; + +import java.util.Map; + +public class ModMenuConfig implements ModMenuApi { + @Override + public ConfigScreenFactory getModConfigScreenFactory() { + return ViaConfigScreen::new; + } + + @Override + public Map> getProvidedConfigScreenFactories() { + return ImmutableMap.of("viafabric", getModConfigScreenFactory()); + } +} \ No newline at end of file diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/gui/ViaConfigScreen.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/gui/ViaConfigScreen.java similarity index 98% rename from viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/gui/ViaConfigScreen.java rename to viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/gui/ViaConfigScreen.java index 3f6fc6b..a1ccbfa 100644 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/gui/ViaConfigScreen.java +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/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.mc120.gui; +package com.viaversion.fabric.mc1204.gui; import com.viaversion.fabric.common.config.AbstractViaConfigScreen; -import com.viaversion.fabric.mc120.ViaFabric; +import com.viaversion.fabric.mc1204.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-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/address/client/MixinAllowedAddressResolver.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/address/client/MixinAllowedAddressResolver.java similarity index 97% rename from viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/address/client/MixinAllowedAddressResolver.java rename to viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/address/client/MixinAllowedAddressResolver.java index f394ada..19a7861 100644 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/address/client/MixinAllowedAddressResolver.java +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/address/client/MixinAllowedAddressResolver.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.mc119.mixin.address.client; +package com.viaversion.fabric.mc1204.mixin.address.client; import com.viaversion.fabric.common.AddressParser; import net.minecraft.client.network.Address; diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/debug/client/MixinClientConnection.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/debug/client/MixinClientConnection.java similarity index 96% rename from viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/debug/client/MixinClientConnection.java rename to viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/debug/client/MixinClientConnection.java index 470e42d..2ab3217 100644 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/debug/client/MixinClientConnection.java +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/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.mc120.mixin.debug.client; +package com.viaversion.fabric.mc1204.mixin.debug.client; import io.netty.channel.ChannelHandlerContext; import net.minecraft.network.ClientConnection; diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/debug/client/MixinClientConnectionAccessor.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/debug/client/MixinClientConnectionAccessor.java new file mode 100644 index 0000000..798f310 --- /dev/null +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/debug/client/MixinClientConnectionAccessor.java @@ -0,0 +1,29 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1204.mixin.debug.client; + +import io.netty.channel.Channel; +import net.minecraft.network.ClientConnection; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(ClientConnection.class) +public interface MixinClientConnectionAccessor { + @Accessor + Channel getChannel(); +} diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/debug/client/MixinDebugHud.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/debug/client/MixinDebugHud.java new file mode 100644 index 0000000..6d7ee19 --- /dev/null +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/debug/client/MixinDebugHud.java @@ -0,0 +1,54 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1204.mixin.debug.client; + +import com.viaversion.fabric.common.handler.CommonTransformer; +import com.viaversion.fabric.common.handler.FabricDecodeHandler; +import com.viaversion.viaversion.api.connection.ProtocolInfo; +import io.netty.channel.ChannelHandler; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.hud.DebugHud; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; + +import java.util.List; + +@Mixin(DebugHud.class) +public class MixinDebugHud { + @Inject(at = @At("RETURN"), method = "getLeftText") + protected void getLeftText(CallbackInfoReturnable> info) { + String line = "[ViaFabric] I: " + Via.getManager().getConnectionManager().getConnections().size() + " (F: " + + Via.getManager().getConnectionManager().getConnectedClients().size() + ")"; + @SuppressWarnings("ConstantConditions") ChannelHandler viaDecoder = ((MixinClientConnectionAccessor) MinecraftClient.getInstance().getNetworkHandler() + .getConnection()).getChannel().pipeline().get(CommonTransformer.HANDLER_DECODER_NAME); + if (viaDecoder instanceof FabricDecodeHandler) { + ProtocolInfo protocol = ((FabricDecodeHandler) viaDecoder).getInfo().getProtocolInfo(); + if (protocol != null) { + ProtocolVersion serverVer = ProtocolVersion.getProtocol(protocol.getServerProtocolVersion()); + ProtocolVersion clientVer = ProtocolVersion.getProtocol(protocol.getProtocolVersion()); + line += " / C: " + clientVer + " S: " + serverVer + " A: " + protocol.getUser().isActive(); + } + } + + info.getReturnValue().add(line); + } +} diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/gui/client/MixinMultiplayerServerListPingerListener.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/gui/client/MixinMultiplayerServerListPingerListener.java similarity index 94% rename from viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/gui/client/MixinMultiplayerServerListPingerListener.java rename to viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/gui/client/MixinMultiplayerServerListPingerListener.java index 0d3becf..26d5549 100644 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/mixin/gui/client/MixinMultiplayerServerListPingerListener.java +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/gui/client/MixinMultiplayerServerListPingerListener.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.mc119.mixin.gui.client; +package com.viaversion.fabric.mc1204.mixin.gui.client; import com.viaversion.fabric.common.gui.ViaServerInfo; import com.viaversion.fabric.common.handler.FabricDecodeHandler; -import com.viaversion.fabric.mc119.mixin.debug.client.MixinClientConnectionAccessor; +import com.viaversion.fabric.mc1204.mixin.debug.client.MixinClientConnectionAccessor; import net.minecraft.client.network.ServerInfo; import net.minecraft.network.ClientConnection; import net.minecraft.network.listener.ClientQueryPacketListener; diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/gui/client/MixinServerEntry.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/gui/client/MixinServerEntry.java similarity index 98% rename from viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/gui/client/MixinServerEntry.java rename to viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/gui/client/MixinServerEntry.java index 211df6a..46a3f30 100644 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/gui/client/MixinServerEntry.java +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/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 . */ -package com.viaversion.fabric.mc120.mixin.gui.client; +package com.viaversion.fabric.mc1204.mixin.gui.client; import com.viaversion.fabric.common.gui.ViaServerInfo; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/gui/client/MixinServerInfo.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/gui/client/MixinServerInfo.java new file mode 100644 index 0000000..4f520fd --- /dev/null +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/gui/client/MixinServerInfo.java @@ -0,0 +1,52 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1204.mixin.gui.client; + +import com.viaversion.fabric.common.gui.ViaServerInfo; +import net.minecraft.client.network.ServerInfo; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; + +@Mixin(ServerInfo.class) +public class MixinServerInfo implements ViaServerInfo { + @Unique + private boolean viaFabric$translating; + + @Unique + private int viaFabric$serverVer; + + @Override + public int viaFabric$getServerVer() { + return viaFabric$serverVer; + } + + @Override + public void viaFabric$setServerVer(int ver) { + this.viaFabric$serverVer = ver; + } + + @Override + public boolean viaFabric$translating() { + return viaFabric$translating; + } + + @Override + public void viaFabric$setTranslating(boolean via) { + this.viaFabric$translating = via; + } +} diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/pipeline/MixinClientConnection.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/pipeline/MixinClientConnection.java similarity index 98% rename from viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/pipeline/MixinClientConnection.java rename to viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/pipeline/MixinClientConnection.java index c562366..a80556e 100644 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/pipeline/MixinClientConnection.java +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/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.mc120.mixin.pipeline; +package com.viaversion.fabric.mc1204.mixin.pipeline; import com.viaversion.fabric.common.handler.CommonTransformer; import com.viaversion.fabric.common.handler.FabricDecodeHandler; diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/pipeline/client/MixinClientConnection.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/pipeline/client/MixinClientConnection.java similarity index 91% rename from viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/pipeline/client/MixinClientConnection.java rename to viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/pipeline/client/MixinClientConnection.java index 83c6cff..c63da17 100644 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/mixin/pipeline/client/MixinClientConnection.java +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/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.mc120.mixin.pipeline.client; +package com.viaversion.fabric.mc1204.mixin.pipeline.client; -import com.viaversion.fabric.mc120.ViaFabric; -import com.viaversion.fabric.mc120.service.ProtocolAutoDetector; +import com.viaversion.fabric.mc1204.ViaFabric; +import com.viaversion.fabric.mc1204.service.ProtocolAutoDetector; import io.netty.channel.ChannelFuture; import net.minecraft.network.ClientConnection; import org.spongepowered.asm.mixin.Mixin; diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/platform/FabricNativeVersionProvider.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/platform/FabricNativeVersionProvider.java new file mode 100644 index 0000000..1575b35 --- /dev/null +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/platform/FabricNativeVersionProvider.java @@ -0,0 +1,28 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1204.platform; + +import com.viaversion.fabric.common.platform.NativeVersionProvider; +import net.minecraft.SharedConstants; + +public class FabricNativeVersionProvider implements NativeVersionProvider { + @Override + public int getNativeServerVersion() { + return SharedConstants.getGameVersion().getProtocolVersion(); + } +} diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/platform/FabricPlatform.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/platform/FabricPlatform.java new file mode 100644 index 0000000..ac165fa --- /dev/null +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/platform/FabricPlatform.java @@ -0,0 +1,140 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1204.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.mc1204.ViaFabric; +import com.viaversion.fabric.mc1204.commands.NMSCommandSender; +import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.api.command.ViaCommandSender; +import io.netty.channel.EventLoop; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.client.MinecraftClient; +import net.minecraft.entity.Entity; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.network.ServerPlayerEntity; + +import java.util.UUID; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutorService; +import java.util.function.Supplier; +import java.util.logging.Level; + +public class FabricPlatform extends AbstractFabricPlatform { + public static MinecraftServer getServer() { + if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) { + return getIntegratedServer(); + } + return (MinecraftServer) FabricLoader.getInstance().getGameInstance(); + } + + @Environment(EnvType.CLIENT) + private static MinecraftServer getIntegratedServer() { + return MinecraftClient.getInstance().getServer(); + } + + @Override + public FutureTaskId runSync(Runnable runnable) { + if (getServer() != null) { + return runServerSync(runnable); + } else { + return runEventLoop(runnable); + } + } + + private FutureTaskId runServerSync(Runnable runnable) { + // Kick task needs to be on main thread, it does already have error logger + return new FutureTaskId(CompletableFuture.runAsync(runnable, getServer())); + } + + @Override + public ViaCommandSender[] getOnlinePlayers() { + MinecraftServer server = getServer(); + if (server != null && server.isOnThread()) { + return getServerPlayers(); + } + return Via.getManager().getConnectionManager().getConnectedClients().values().stream() + .map(UserCommandSender::new) + .toArray(ViaCommandSender[]::new); + } + + private ViaCommandSender[] getServerPlayers() { + return getServer().getPlayerManager().getPlayerList().stream() + .map(Entity::getCommandSource) + .map(NMSCommandSender::new) + .toArray(ViaCommandSender[]::new); + } + + @Override + public void sendMessage(UUID uuid, String s) { + sendMessageServer(uuid, s); + } + + private void sendMessageServer(UUID uuid, String s) { + MinecraftServer server = getServer(); + if (server == null) return; + runServerSync(() -> { + ServerPlayerEntity player = server.getPlayerManager().getPlayer(uuid); + if (player == null) return; + player.sendMessage(NMSCommandSender.fromLegacy(s), false); + }); + } + + @Override + public boolean kickPlayer(UUID uuid, String s) { + return kickServer(uuid, s); + } + + private boolean kickServer(UUID uuid, String s) { + MinecraftServer server = getServer(); + if (server == null) return false; + Supplier kickTask = () -> { + ServerPlayerEntity player = server.getPlayerManager().getPlayer(uuid); + if (player == null) return false; + player.networkHandler.disconnect(NMSCommandSender.fromLegacy(s)); + return true; + }; + if (server.isOnThread()) { + return kickTask.get(); + } else { + ViaFabric.JLOGGER.log(Level.WARNING, "Weird!? Player kicking was called off-thread", new Throwable()); + runServerSync(kickTask::get); + } + 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; + } +} diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/platform/VFLoader.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/platform/VFLoader.java new file mode 100644 index 0000000..84baec1 --- /dev/null +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/platform/VFLoader.java @@ -0,0 +1,54 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1204.platform; + +import com.viaversion.fabric.mc1204.providers.VFHandItemProvider; +import com.viaversion.fabric.mc1204.providers.FabricVersionProvider; +import com.viaversion.fabric.mc1204.providers.VFPlayerAbilitiesProvider; +import com.viaversion.fabric.mc1204.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; +import net.fabricmc.loader.api.FabricLoader; +import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.api.platform.ViaPlatformLoader; +import com.viaversion.viaversion.api.protocol.version.VersionProvider; +import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.HandItemProvider; + +public class VFLoader implements ViaPlatformLoader { + @Override + public void load() { + Via.getManager().getProviders().use(VersionProvider.class, new FabricVersionProvider()); + + if (Via.getPlatform().getConf().isItemCache()) { + VFHandItemProvider handProvider = new VFHandItemProvider(); + if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) { + handProvider.registerClientTick(); + } + Via.getManager().getProviders().use(HandItemProvider.class, handProvider); + } + + Via.getManager().getProviders().use(PlayerAbilitiesProvider.class, new VFPlayerAbilitiesProvider()); + Via.getManager().getProviders().use(PlayerLookTargetProvider.class, new VFPlayerLookTargetProvider()); + } + + @Override + public void unload() { + // Nothing to do + } +} diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/providers/FabricVersionProvider.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/providers/FabricVersionProvider.java similarity index 91% rename from viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/providers/FabricVersionProvider.java rename to viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/providers/FabricVersionProvider.java index 04aa931..fe1e852 100644 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/providers/FabricVersionProvider.java +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/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.mc120.providers; +package com.viaversion.fabric.mc1204.providers; import com.viaversion.fabric.common.config.VFConfig; import com.viaversion.fabric.common.provider.AbstractFabricVersionProvider; -import com.viaversion.fabric.mc120.ViaFabric; -import com.viaversion.fabric.mc120.service.ProtocolAutoDetector; +import com.viaversion.fabric.mc1204.ViaFabric; +import com.viaversion.fabric.mc1204.service.ProtocolAutoDetector; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.channel.ChannelPipeline; import net.minecraft.network.ClientConnection; diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/providers/VFHandItemProvider.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/providers/VFHandItemProvider.java similarity index 96% rename from viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/providers/VFHandItemProvider.java rename to viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/providers/VFHandItemProvider.java index 794609f..8ce9990 100644 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/providers/VFHandItemProvider.java +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/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 . */ -package com.viaversion.fabric.mc120.providers; +package com.viaversion.fabric.mc1204.providers; import com.viaversion.fabric.common.util.RemappingUtil; -import com.viaversion.fabric.mc120.ViaFabric; +import com.viaversion.fabric.mc1204.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-mc1194/src/main/java/com/viaversion/fabric/mc119/providers/VFPlayerAbilitiesProvider.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/providers/VFPlayerAbilitiesProvider.java similarity index 97% rename from viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/providers/VFPlayerAbilitiesProvider.java rename to viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/providers/VFPlayerAbilitiesProvider.java index 35aa9f0..605daec 100644 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc119/providers/VFPlayerAbilitiesProvider.java +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/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 . */ -package com.viaversion.fabric.mc119.providers; +package com.viaversion.fabric.mc1204.providers; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.provider.PlayerAbilitiesProvider; diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/providers/VFPlayerLookTargetProvider.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/providers/VFPlayerLookTargetProvider.java similarity index 97% rename from viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/providers/VFPlayerLookTargetProvider.java rename to viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/providers/VFPlayerLookTargetProvider.java index 131f40b..c654eef 100644 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/providers/VFPlayerLookTargetProvider.java +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/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 . */ -package com.viaversion.fabric.mc120.providers; +package com.viaversion.fabric.mc1204.providers; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.Position; diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/service/ProtocolAutoDetector.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/service/ProtocolAutoDetector.java similarity index 98% rename from viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/service/ProtocolAutoDetector.java rename to viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/service/ProtocolAutoDetector.java index 1a1d1b1..5d51973 100644 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc120/service/ProtocolAutoDetector.java +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/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 . */ -package com.viaversion.fabric.mc120.service; +package com.viaversion.fabric.mc1204.service; import com.viaversion.fabric.common.AddressParser; -import com.viaversion.fabric.mc120.ViaFabric; +import com.viaversion.fabric.mc1204.ViaFabric; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; diff --git a/viafabric-mc1204/src/main/resources/fabric.mod.json b/viafabric-mc1204/src/main/resources/fabric.mod.json index 2c917c4..d22b6cf 100644 --- a/viafabric-mc1204/src/main/resources/fabric.mod.json +++ b/viafabric-mc1204/src/main/resources/fabric.mod.json @@ -1,6 +1,6 @@ { "schemaVersion": 1, - "id": "viafabric-mc120", + "id": "viafabric-mc1204", "name": "ViaFabric for 1.20", "version": "${version}", "description": "${description}", @@ -47,13 +47,13 @@ ], "entrypoints": { "main": [ - "com.viaversion.fabric.mc120.ViaFabric" + "com.viaversion.fabric.mc1204.ViaFabric" ], "client": [ - "com.viaversion.fabric.mc120.ViaFabricClient" + "com.viaversion.fabric.mc1204.ViaFabricClient" ], "modmenu": [ - "com.viaversion.fabric.mc120.gui.ModMenuConfig" + "com.viaversion.fabric.mc1204.gui.ModMenuConfig" ] }, "depends": { @@ -65,10 +65,10 @@ "fabric-command-api-v2": "*" }, "mixins": [ - "mixins.viafabric120.address.json", - "mixins.viafabric120.gui.json", - "mixins.viafabric120.debug.json", - "mixins.viafabric120.pipeline.json" + "mixins.viafabric1204.address.json", + "mixins.viafabric1204.gui.json", + "mixins.viafabric1204.debug.json", + "mixins.viafabric1204.pipeline.json" ], "custom": { "modmenu": { diff --git a/viafabric-mc1194/src/main/resources/mixins.viafabric119.address.json b/viafabric-mc1204/src/main/resources/mixins.viafabric1204.address.json similarity index 75% rename from viafabric-mc1194/src/main/resources/mixins.viafabric119.address.json rename to viafabric-mc1204/src/main/resources/mixins.viafabric1204.address.json index d834e6d..ed1ac7a 100644 --- a/viafabric-mc1194/src/main/resources/mixins.viafabric119.address.json +++ b/viafabric-mc1204/src/main/resources/mixins.viafabric1204.address.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_17", - "package": "com.viaversion.fabric.mc119.mixin.address", + "package": "com.viaversion.fabric.mc1204.mixin.address", "mixins": [ ], "client": [ diff --git a/viafabric-mc1204/src/main/resources/mixins.viafabric120.debug.json b/viafabric-mc1204/src/main/resources/mixins.viafabric1204.debug.json similarity index 81% rename from viafabric-mc1204/src/main/resources/mixins.viafabric120.debug.json rename to viafabric-mc1204/src/main/resources/mixins.viafabric1204.debug.json index 12b0784..d2eaf77 100644 --- a/viafabric-mc1204/src/main/resources/mixins.viafabric120.debug.json +++ b/viafabric-mc1204/src/main/resources/mixins.viafabric1204.debug.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_17", - "package": "com.viaversion.fabric.mc120.mixin.debug", + "package": "com.viaversion.fabric.mc1204.mixin.debug", "mixins": [ ], "client": [ diff --git a/viafabric-mc1204/src/main/resources/mixins.viafabric120.gui.json b/viafabric-mc1204/src/main/resources/mixins.viafabric1204.gui.json similarity index 82% rename from viafabric-mc1204/src/main/resources/mixins.viafabric120.gui.json rename to viafabric-mc1204/src/main/resources/mixins.viafabric1204.gui.json index 8e21b98..18a7a3c 100644 --- a/viafabric-mc1204/src/main/resources/mixins.viafabric120.gui.json +++ b/viafabric-mc1204/src/main/resources/mixins.viafabric1204.gui.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_17", - "package": "com.viaversion.fabric.mc120.mixin.gui", + "package": "com.viaversion.fabric.mc1204.mixin.gui", "mixins": [ ], "client": [ diff --git a/viafabric-mc1204/src/main/resources/mixins.viafabric120.pipeline.json b/viafabric-mc1204/src/main/resources/mixins.viafabric1204.pipeline.json similarity index 77% rename from viafabric-mc1204/src/main/resources/mixins.viafabric120.pipeline.json rename to viafabric-mc1204/src/main/resources/mixins.viafabric1204.pipeline.json index e1ed3a0..b8723fb 100644 --- a/viafabric-mc1204/src/main/resources/mixins.viafabric120.pipeline.json +++ b/viafabric-mc1204/src/main/resources/mixins.viafabric1204.pipeline.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_17", - "package": "com.viaversion.fabric.mc120.mixin.pipeline", + "package": "com.viaversion.fabric.mc1204.mixin.pipeline", "mixins": [ "MixinClientConnection" ], diff --git a/viafabric-mc189/src/main/resources/fabric.mod.json b/viafabric-mc189/src/main/resources/fabric.mod.json index 824e9b2..671b45a 100644 --- a/viafabric-mc189/src/main/resources/fabric.mod.json +++ b/viafabric-mc189/src/main/resources/fabric.mod.json @@ -1,6 +1,6 @@ { "schemaVersion": 1, - "id": "viafabric-mc18", + "id": "viafabric-mc189", "name": "ViaFabric for 1.8", "version": "${version}", "description": "${description}",