diff --git a/README.md b/README.md index 1088254..c43d229 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Allows the connection to/from different Minecraft versions on your Minecraft client/server (LAN worlds too) -This mod can be installed on 1.14.4, 1.15.2, 1.16.5, 1.17.1, 1.18.2, 1.19.4, 1.20.1, 1.20.4, 1.20.6, 1.21.1 with Fabric Loader. +This mod can be installed on 1.14.4, 1.15.2, 1.16.5, 1.17.1, 1.18.2, 1.19.4, 1.20.1, 1.20.4, 1.20.6, 1.21.2 with Fabric Loader. The `legacy` branch also supports Legacy Fabric 1.8.9 and 1.12.2 versions. @@ -55,7 +55,7 @@ registry synchronization (fabric-registry-sync mod). | | 1.8.x | 1.9.x | 1.10-1.20.x | 1.21.x | |-----------------------|-------|-------|-------------|--------| | 1.14.4-1.20.6 clients | ✓ | ✓ | ✓ | ⟲ | ⟲ ⟲ | ⟲ | ⟲ | ⟲ | ⟲ | -| 1.21.1 client | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | +| 1.21.2 client | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ = [ViaVersion](https://viaversion.com) ⟲ = [ViaBackwards](https://viaversion.com/backwards) ⏪ = [ViaRewind](https://viaversion.com/rewind) diff --git a/settings.gradle.kts b/settings.gradle.kts index 15d9a8d..ad1a5f1 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,7 +17,7 @@ include("viafabric-mc1194") include("viafabric-mc1201") include("viafabric-mc1204") include("viafabric-mc1206") -include("viafabric-mc1211") +include("viafabric-mc1212") plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 84261fe..44b02a8 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -12,7 +12,7 @@ "discord": "https://discord.gg/viaversion" }, "depends": { - "minecraft": ["1.14.4", "1.15.2", "1.16.4", "1.16.5", "1.17.1", "1.18.2", "1.19.4", "1.20", "1.20.1", "1.20.3", "1.20.4", "1.20.5", "1.20.6", "1.21", "1.21.1"], + "minecraft": ["1.14.4", "1.15.2", "1.16.4", "1.16.5", "1.17.1", "1.18.2", "1.19.4", "1.20", "1.20.1", "1.20.3", "1.20.4", "1.20.5", "1.20.6", "1.21.2-rc.1"], "viaversion": ">=5.0.0" }, "breaks": { diff --git a/viafabric-mc1211/build.gradle.kts b/viafabric-mc1211/build.gradle.kts deleted file mode 100644 index 9bca82c..0000000 --- a/viafabric-mc1211/build.gradle.kts +++ /dev/null @@ -1,11 +0,0 @@ -dependencies { - minecraft("com.mojang:minecraft:1.21") - mappings("net.fabricmc:yarn:1.21+build.2:v2") - - modImplementation("net.fabricmc.fabric-api:fabric-api:0.100.1+1.21") - modImplementation("com.terraformersmc:modmenu:11.0.0-rc.4") -} - -tasks.compileJava { - options.release.set(21) -} diff --git a/viafabric-mc1212/build.gradle.kts b/viafabric-mc1212/build.gradle.kts new file mode 100644 index 0000000..fb24c6b --- /dev/null +++ b/viafabric-mc1212/build.gradle.kts @@ -0,0 +1,11 @@ +dependencies { + minecraft("com.mojang:minecraft:1.21.2-rc1") + mappings("net.fabricmc:yarn:1.21.2-rc1+build.1:v2") + + modImplementation("net.fabricmc.fabric-api:fabric-api:0.106.0+1.21.2") + modImplementation("com.terraformersmc:modmenu:12.0.0-beta.1") +} + +tasks.compileJava { + options.release.set(21) +} diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/ViaFabric.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/ViaFabric.java similarity index 96% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/ViaFabric.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/ViaFabric.java index 6c02ade..c598064 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/ViaFabric.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/ViaFabric.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.mc1211; +package com.viaversion.fabric.mc1212; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.mojang.brigadier.arguments.StringArgumentType; @@ -25,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.mc1211.commands.VFCommandHandler; -import com.viaversion.fabric.mc1211.platform.FabricPlatform; -import com.viaversion.fabric.mc1211.platform.VFLoader; +import com.viaversion.fabric.mc1212.commands.VFCommandHandler; +import com.viaversion.fabric.mc1212.platform.FabricPlatform; +import com.viaversion.fabric.mc1212.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-mc1211/src/main/java/com/viaversion/fabric/mc1211/ViaFabricClient.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/ViaFabricClient.java similarity index 96% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/ViaFabricClient.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/ViaFabricClient.java index 47cb752..7e7254d 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/ViaFabricClient.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/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.mc1211; +package com.viaversion.fabric.mc1212; -import com.viaversion.fabric.mc1211.gui.ViaConfigScreen; +import com.viaversion.fabric.mc1212.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-mc1211/src/main/java/com/viaversion/fabric/mc1211/commands/NMSCommandSender.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/commands/NMSCommandSender.java similarity index 98% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/commands/NMSCommandSender.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/commands/NMSCommandSender.java index c7f0c21..970c5f9 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/commands/NMSCommandSender.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/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.mc1211.commands; +package com.viaversion.fabric.mc1212.commands; import com.viaversion.viaversion.api.command.ViaCommandSender; import com.viaversion.viaversion.util.ComponentUtil; diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/commands/VFCommandHandler.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/commands/VFCommandHandler.java similarity index 98% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/commands/VFCommandHandler.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/commands/VFCommandHandler.java index 1f3eef5..5c91b54 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/commands/VFCommandHandler.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/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.mc1211.commands; +package com.viaversion.fabric.mc1212.commands; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.context.CommandContext; diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/gui/ModMenuConfig.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/gui/ModMenuConfig.java similarity index 96% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/gui/ModMenuConfig.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/gui/ModMenuConfig.java index 52bae2d..47dd063 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/gui/ModMenuConfig.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/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.mc1211.gui; +package com.viaversion.fabric.mc1212.gui; import com.google.common.collect.ImmutableMap; import com.terraformersmc.modmenu.api.ConfigScreenFactory; diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/gui/ViaConfigScreen.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/gui/ViaConfigScreen.java similarity index 98% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/gui/ViaConfigScreen.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/gui/ViaConfigScreen.java index f61df6a..35ed29e 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/gui/ViaConfigScreen.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/gui/ViaConfigScreen.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.mc1211.gui; +package com.viaversion.fabric.mc1212.gui; import com.viaversion.fabric.common.config.AbstractViaConfigScreen; import com.viaversion.fabric.common.util.ProtocolUtils; -import com.viaversion.fabric.mc1211.ViaFabric; +import com.viaversion.fabric.mc1212.ViaFabric; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/address/client/MixinAllowedAddressResolver.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/address/client/MixinAllowedAddressResolver.java similarity index 97% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/address/client/MixinAllowedAddressResolver.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/address/client/MixinAllowedAddressResolver.java index e53ee76..3988c9d 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/address/client/MixinAllowedAddressResolver.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/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.mc1211.mixin.address.client; +package com.viaversion.fabric.mc1212.mixin.address.client; import com.viaversion.fabric.common.AddressParser; import net.minecraft.client.network.Address; diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/debug/MixinRegistrySyncManager.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/MixinRegistrySyncManager.java similarity index 94% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/debug/MixinRegistrySyncManager.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/MixinRegistrySyncManager.java index fc2201f..a30ce7c 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/debug/MixinRegistrySyncManager.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/MixinRegistrySyncManager.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.mc1211.mixin.debug; +package com.viaversion.fabric.mc1212.mixin.debug; -import com.viaversion.fabric.mc1211.ViaFabric; +import com.viaversion.fabric.mc1212.ViaFabric; import net.fabricmc.fabric.impl.registry.sync.RegistrySyncManager; import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.ServerConfigurationNetworkHandler; diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/debug/client/MixinClientConnection.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/client/MixinClientConnection.java similarity index 96% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/debug/client/MixinClientConnection.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/client/MixinClientConnection.java index 6dde0e8..30db297 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/debug/client/MixinClientConnection.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/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.mc1211.mixin.debug.client; +package com.viaversion.fabric.mc1212.mixin.debug.client; import io.netty.channel.ChannelHandlerContext; import net.minecraft.network.ClientConnection; diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/debug/client/MixinClientConnectionAccessor.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/client/MixinClientConnectionAccessor.java similarity index 94% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/debug/client/MixinClientConnectionAccessor.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/client/MixinClientConnectionAccessor.java index 1071857..04fef76 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/debug/client/MixinClientConnectionAccessor.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/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.mc1211.mixin.debug.client; +package com.viaversion.fabric.mc1212.mixin.debug.client; import io.netty.channel.Channel; import net.minecraft.network.ClientConnection; diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/debug/client/MixinDebugHud.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/client/MixinDebugHud.java similarity index 97% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/debug/client/MixinDebugHud.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/client/MixinDebugHud.java index 1717e67..1d5dc2b 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/debug/client/MixinDebugHud.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/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.mc1211.mixin.debug.client; +package com.viaversion.fabric.mc1212.mixin.debug.client; import com.viaversion.fabric.common.handler.CommonTransformer; import com.viaversion.fabric.common.handler.FabricDecodeHandler; diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/debug/client/MixinRegistrySyncManager.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/client/MixinRegistrySyncManager.java similarity index 94% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/debug/client/MixinRegistrySyncManager.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/client/MixinRegistrySyncManager.java index f4f5b89..a34d15c 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/debug/client/MixinRegistrySyncManager.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/client/MixinRegistrySyncManager.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.mc1211.mixin.debug.client; +package com.viaversion.fabric.mc1212.mixin.debug.client; -import com.viaversion.fabric.mc1211.ViaFabric; +import com.viaversion.fabric.mc1212.ViaFabric; import it.unimi.dsi.fastutil.objects.Object2IntMap; import net.fabricmc.fabric.impl.registry.sync.RegistrySyncManager; import net.minecraft.util.Identifier; diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/gui/client/MixinMultiplayerServerListPingerListener.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/gui/client/MixinMultiplayerServerListPingerListener.java similarity index 95% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/gui/client/MixinMultiplayerServerListPingerListener.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/gui/client/MixinMultiplayerServerListPingerListener.java index a9bb186..b00f480 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/gui/client/MixinMultiplayerServerListPingerListener.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/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.mc1211.mixin.gui.client; +package com.viaversion.fabric.mc1212.mixin.gui.client; import com.viaversion.fabric.common.gui.ViaServerInfo; import com.viaversion.fabric.common.handler.FabricDecodeHandler; -import com.viaversion.fabric.mc1211.mixin.debug.client.MixinClientConnectionAccessor; +import com.viaversion.fabric.mc1212.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-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/gui/client/MixinServerEntry.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/gui/client/MixinServerEntry.java similarity index 98% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/gui/client/MixinServerEntry.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/gui/client/MixinServerEntry.java index bd8edbe..50c8b50 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/gui/client/MixinServerEntry.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/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.mc1211.mixin.gui.client; +package com.viaversion.fabric.mc1212.mixin.gui.client; import com.google.common.collect.Lists; import com.viaversion.fabric.common.gui.ViaServerInfo; diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/gui/client/MixinServerInfo.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/gui/client/MixinServerInfo.java similarity index 96% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/gui/client/MixinServerInfo.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/gui/client/MixinServerInfo.java index 19bc627..3f5d15f 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/gui/client/MixinServerInfo.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/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.mc1211.mixin.gui.client; +package com.viaversion.fabric.mc1212.mixin.gui.client; import com.viaversion.fabric.common.gui.ViaServerInfo; import net.minecraft.client.network.ServerInfo; diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/pipeline/MixinClientConnection.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/pipeline/MixinClientConnection.java similarity index 98% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/pipeline/MixinClientConnection.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/pipeline/MixinClientConnection.java index 2850a24..80d51f3 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/pipeline/MixinClientConnection.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/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.mc1211.mixin.pipeline; +package com.viaversion.fabric.mc1212.mixin.pipeline; import com.viaversion.fabric.common.handler.CommonTransformer; import com.viaversion.fabric.common.handler.FabricDecodeHandler; diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/pipeline/client/MixinClientConnectionThread.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/pipeline/client/MixinClientConnectionThread.java similarity index 91% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/pipeline/client/MixinClientConnectionThread.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/pipeline/client/MixinClientConnectionThread.java index 5947647..3dba377 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/pipeline/client/MixinClientConnectionThread.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/pipeline/client/MixinClientConnectionThread.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.mc1211.mixin.pipeline.client; +package com.viaversion.fabric.mc1212.mixin.pipeline.client; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; -import com.viaversion.fabric.mc1211.ViaFabric; -import com.viaversion.fabric.mc1211.service.ProtocolAutoDetector; +import com.viaversion.fabric.mc1212.ViaFabric; +import com.viaversion.fabric.mc1212.service.ProtocolAutoDetector; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/shutdown/server/MixinMinecraftServer.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/shutdown/server/MixinMinecraftServer.java similarity index 95% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/shutdown/server/MixinMinecraftServer.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/shutdown/server/MixinMinecraftServer.java index 21084fe..ddc3819 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/shutdown/server/MixinMinecraftServer.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/shutdown/server/MixinMinecraftServer.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.mc1211.mixin.shutdown.server; +package com.viaversion.fabric.mc1212.mixin.shutdown.server; import com.viaversion.viaversion.ViaManagerImpl; import com.viaversion.viaversion.api.Via; diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/platform/FabricNativeVersionProvider.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/platform/FabricNativeVersionProvider.java similarity index 95% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/platform/FabricNativeVersionProvider.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/platform/FabricNativeVersionProvider.java index 3ae7259..79ce339 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/platform/FabricNativeVersionProvider.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/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.mc1211.platform; +package com.viaversion.fabric.mc1212.platform; import com.viaversion.fabric.common.platform.NativeVersionProvider; import net.minecraft.SharedConstants; diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/platform/FabricPlatform.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/platform/FabricPlatform.java similarity index 95% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/platform/FabricPlatform.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/platform/FabricPlatform.java index 1260010..b3a558b 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/platform/FabricPlatform.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/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.mc1211.platform; +package com.viaversion.fabric.mc1212.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.mc1211.ViaFabric; -import com.viaversion.fabric.mc1211.commands.NMSCommandSender; +import com.viaversion.fabric.mc1212.ViaFabric; +import com.viaversion.fabric.mc1212.commands.NMSCommandSender; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.command.ViaCommandSender; import io.netty.channel.EventLoop; @@ -80,7 +80,7 @@ public class FabricPlatform extends AbstractFabricPlatform { private ViaCommandSender[] getServerPlayers() { return getServer().getPlayerManager().getPlayerList().stream() - .map(Entity::getCommandSource) + .map(e-> e.getCommandSource(e.getServerWorld())) .map(NMSCommandSender::new) .toArray(ViaCommandSender[]::new); } diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/platform/VFLoader.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/platform/VFLoader.java similarity index 87% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/platform/VFLoader.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/platform/VFLoader.java index bee67f8..2c006b2 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/platform/VFLoader.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/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.mc1211.platform; +package com.viaversion.fabric.mc1212.platform; -import com.viaversion.fabric.mc1211.providers.FabricVersionProvider; -import com.viaversion.fabric.mc1211.providers.VFHandItemProvider; -import com.viaversion.fabric.mc1211.providers.VFPlayerAbilitiesProvider; -import com.viaversion.fabric.mc1211.providers.VFPlayerLookTargetProvider; +import com.viaversion.fabric.mc1212.providers.FabricVersionProvider; +import com.viaversion.fabric.mc1212.providers.VFHandItemProvider; +import com.viaversion.fabric.mc1212.providers.VFPlayerAbilitiesProvider; +import com.viaversion.fabric.mc1212.providers.VFPlayerLookTargetProvider; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.platform.ViaPlatformLoader; import com.viaversion.viaversion.api.protocol.version.VersionProvider; diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/providers/FabricVersionProvider.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/providers/FabricVersionProvider.java similarity index 92% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/providers/FabricVersionProvider.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/providers/FabricVersionProvider.java index 7f8302e..6b141bd 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/providers/FabricVersionProvider.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/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.mc1211.providers; +package com.viaversion.fabric.mc1212.providers; import com.viaversion.fabric.common.config.VFConfig; import com.viaversion.fabric.common.provider.AbstractFabricVersionProvider; -import com.viaversion.fabric.mc1211.ViaFabric; -import com.viaversion.fabric.mc1211.service.ProtocolAutoDetector; +import com.viaversion.fabric.mc1212.ViaFabric; +import com.viaversion.fabric.mc1212.service.ProtocolAutoDetector; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.channel.ChannelPipeline; import net.minecraft.network.ClientConnection; diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/providers/VFHandItemProvider.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/providers/VFHandItemProvider.java similarity index 96% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/providers/VFHandItemProvider.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/providers/VFHandItemProvider.java index 40b4092..91c5253 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/providers/VFHandItemProvider.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/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.mc1211.providers; +package com.viaversion.fabric.mc1212.providers; import com.viaversion.fabric.common.util.RemappingUtil; -import com.viaversion.fabric.mc1211.ViaFabric; +import com.viaversion.fabric.mc1212.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-mc1211/src/main/java/com/viaversion/fabric/mc1211/providers/VFPlayerAbilitiesProvider.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/providers/VFPlayerAbilitiesProvider.java similarity index 97% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/providers/VFPlayerAbilitiesProvider.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/providers/VFPlayerAbilitiesProvider.java index cdf996b..5f86e7d 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/providers/VFPlayerAbilitiesProvider.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/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.mc1211.providers; +package com.viaversion.fabric.mc1212.providers; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.protocols.v1_15_2to1_16.provider.PlayerAbilitiesProvider; diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/providers/VFPlayerLookTargetProvider.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/providers/VFPlayerLookTargetProvider.java similarity index 97% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/providers/VFPlayerLookTargetProvider.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/providers/VFPlayerLookTargetProvider.java index f2ff7bf..23a5ada 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/providers/VFPlayerLookTargetProvider.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/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.mc1211.providers; +package com.viaversion.fabric.mc1212.providers; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.BlockPosition; diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/service/ProtocolAutoDetector.java b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/service/ProtocolAutoDetector.java similarity index 98% rename from viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/service/ProtocolAutoDetector.java rename to viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/service/ProtocolAutoDetector.java index 717bcec..5aa8652 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/service/ProtocolAutoDetector.java +++ b/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/service/ProtocolAutoDetector.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.fabric.mc1211.service; +package com.viaversion.fabric.mc1212.service; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.viaversion.fabric.common.AddressParser; -import com.viaversion.fabric.mc1211.ViaFabric; +import com.viaversion.fabric.mc1212.ViaFabric; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.bootstrap.Bootstrap; import io.netty.channel.*; diff --git a/viafabric-mc1211/src/main/resources/fabric.mod.json b/viafabric-mc1212/src/main/resources/fabric.mod.json similarity index 75% rename from viafabric-mc1211/src/main/resources/fabric.mod.json rename to viafabric-mc1212/src/main/resources/fabric.mod.json index b9f6b6d..ca96070 100644 --- a/viafabric-mc1211/src/main/resources/fabric.mod.json +++ b/viafabric-mc1212/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, - "id": "viafabric-mc1211", - "name": "ViaFabric for 1.21.1", + "id": "viafabric-mc1212", + "name": "ViaFabric for 1.21.2", "version": "${version}", "description": "${description}", "license": "GPL-3.0", @@ -47,18 +47,18 @@ ], "entrypoints": { "main": [ - "com.viaversion.fabric.mc1211.ViaFabric" + "com.viaversion.fabric.mc1212.ViaFabric" ], "client": [ - "com.viaversion.fabric.mc1211.ViaFabricClient" + "com.viaversion.fabric.mc1212.ViaFabricClient" ], "modmenu": [ - "com.viaversion.fabric.mc1211.gui.ModMenuConfig" + "com.viaversion.fabric.mc1212.gui.ModMenuConfig" ] }, "depends": { "fabric-resource-loader-v0": "*", - "minecraft": ["1.21", "1.21.1"], + "minecraft": ["1.21.2-rc.1"], "viafabric": "*" }, "recommends": { @@ -68,11 +68,11 @@ "replaymod": "<=1.21-2.6.15" }, "mixins": [ - "mixins.viafabric1211.address.json", - "mixins.viafabric1211.gui.json", - "mixins.viafabric1211.debug.json", - "mixins.viafabric1211.pipeline.json", - "mixins.viafabric1211.shutdown.json" + "mixins.viafabric1212.address.json", + "mixins.viafabric1212.gui.json", + "mixins.viafabric1212.debug.json", + "mixins.viafabric1212.pipeline.json", + "mixins.viafabric1212.shutdown.json" ], "custom": { "modmenu": { diff --git a/viafabric-mc1211/src/main/resources/mixins.viafabric1211.address.json b/viafabric-mc1212/src/main/resources/mixins.viafabric1212.address.json similarity index 75% rename from viafabric-mc1211/src/main/resources/mixins.viafabric1211.address.json rename to viafabric-mc1212/src/main/resources/mixins.viafabric1212.address.json index 36e5195..2dddec3 100644 --- a/viafabric-mc1211/src/main/resources/mixins.viafabric1211.address.json +++ b/viafabric-mc1212/src/main/resources/mixins.viafabric1212.address.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_21", - "package": "com.viaversion.fabric.mc1211.mixin.address", + "package": "com.viaversion.fabric.mc1212.mixin.address", "mixins": [ ], "client": [ diff --git a/viafabric-mc1211/src/main/resources/mixins.viafabric1211.debug.json b/viafabric-mc1212/src/main/resources/mixins.viafabric1212.debug.json similarity index 84% rename from viafabric-mc1211/src/main/resources/mixins.viafabric1211.debug.json rename to viafabric-mc1212/src/main/resources/mixins.viafabric1212.debug.json index cf6a479..f900d58 100644 --- a/viafabric-mc1211/src/main/resources/mixins.viafabric1211.debug.json +++ b/viafabric-mc1212/src/main/resources/mixins.viafabric1212.debug.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_21", - "package": "com.viaversion.fabric.mc1211.mixin.debug", + "package": "com.viaversion.fabric.mc1212.mixin.debug", "mixins": [ "MixinRegistrySyncManager" ], diff --git a/viafabric-mc1211/src/main/resources/mixins.viafabric1211.gui.json b/viafabric-mc1212/src/main/resources/mixins.viafabric1212.gui.json similarity index 82% rename from viafabric-mc1211/src/main/resources/mixins.viafabric1211.gui.json rename to viafabric-mc1212/src/main/resources/mixins.viafabric1212.gui.json index 6aa6190..53ed4b9 100644 --- a/viafabric-mc1211/src/main/resources/mixins.viafabric1211.gui.json +++ b/viafabric-mc1212/src/main/resources/mixins.viafabric1212.gui.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_21", - "package": "com.viaversion.fabric.mc1211.mixin.gui", + "package": "com.viaversion.fabric.mc1212.mixin.gui", "mixins": [ ], "client": [ diff --git a/viafabric-mc1211/src/main/resources/mixins.viafabric1211.pipeline.json b/viafabric-mc1212/src/main/resources/mixins.viafabric1212.pipeline.json similarity index 77% rename from viafabric-mc1211/src/main/resources/mixins.viafabric1211.pipeline.json rename to viafabric-mc1212/src/main/resources/mixins.viafabric1212.pipeline.json index b2bfd85..524a7e0 100644 --- a/viafabric-mc1211/src/main/resources/mixins.viafabric1211.pipeline.json +++ b/viafabric-mc1212/src/main/resources/mixins.viafabric1212.pipeline.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_21", - "package": "com.viaversion.fabric.mc1211.mixin.pipeline", + "package": "com.viaversion.fabric.mc1212.mixin.pipeline", "mixins": [ "MixinClientConnection" ], diff --git a/viafabric-mc1211/src/main/resources/mixins.viafabric1211.shutdown.json b/viafabric-mc1212/src/main/resources/mixins.viafabric1212.shutdown.json similarity index 74% rename from viafabric-mc1211/src/main/resources/mixins.viafabric1211.shutdown.json rename to viafabric-mc1212/src/main/resources/mixins.viafabric1212.shutdown.json index c7890e0..df664d6 100644 --- a/viafabric-mc1211/src/main/resources/mixins.viafabric1211.shutdown.json +++ b/viafabric-mc1212/src/main/resources/mixins.viafabric1212.shutdown.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_21", - "package": "com.viaversion.fabric.mc1211.mixin.shutdown", + "package": "com.viaversion.fabric.mc1212.mixin.shutdown", "mixins": [ ], "server": [