diff --git a/gradle.properties b/gradle.properties index f6b495f..a3d952e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ # suppress inspection "UnusedProperty" for whole file org.gradle.jvmargs=-Xms32M -Xmx4G -XX:+UseG1GC -XX:+UseStringDeduplication -loader_version=0.16.7 -viaver_version=5.1.1 +loader_version=0.16.9 +viaver_version=5.1.2-SNAPSHOT publish_mc_versions=1.21.3, 1.21.2, 1.20.6, 1.20.4, 1.20.1, 1.19.4, 1.18.2, 1.17.1, 1.16.5, 1.15.2, 1.14.4 # example: 1.19.1-rc1. Can be a blank value diff --git a/settings.gradle.kts b/settings.gradle.kts index ad1a5f1..4c2357c 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-mc1212") +include("viafabric-mc1213") plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" diff --git a/viafabric-mc1212/build.gradle.kts b/viafabric-mc1212/build.gradle.kts deleted file mode 100644 index ee1493f..0000000 --- a/viafabric-mc1212/build.gradle.kts +++ /dev/null @@ -1,11 +0,0 @@ -dependencies { - minecraft("com.mojang:minecraft:1.21.2") - mappings("net.fabricmc:yarn:1.21.2+build.1:v2") - - modImplementation("net.fabricmc.fabric-api:fabric-api:0.106.1+1.21.2") - modImplementation("com.terraformersmc:modmenu:12.0.0-beta.1") -} - -tasks.compileJava { - options.release.set(21) -} diff --git a/viafabric-mc1213/build.gradle.kts b/viafabric-mc1213/build.gradle.kts new file mode 100644 index 0000000..5bc179e --- /dev/null +++ b/viafabric-mc1213/build.gradle.kts @@ -0,0 +1,11 @@ +dependencies { + minecraft("com.mojang:minecraft:1.21.3") + mappings("net.fabricmc:yarn:1.21.3+build.2:v2") + + modImplementation("net.fabricmc.fabric-api:fabric-api:0.107.0+1.21.3") + modImplementation("com.terraformersmc:modmenu:12.0.0-beta.1") +} + +tasks.compileJava { + options.release.set(21) +} diff --git a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/ViaFabric.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/ViaFabric.java similarity index 96% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/ViaFabric.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/ViaFabric.java index c598064..fd7439c 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/ViaFabric.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212; +package com.viaversion.fabric.mc1213; 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.mc1212.commands.VFCommandHandler; -import com.viaversion.fabric.mc1212.platform.FabricPlatform; -import com.viaversion.fabric.mc1212.platform.VFLoader; +import com.viaversion.fabric.mc1213.commands.VFCommandHandler; +import com.viaversion.fabric.mc1213.platform.FabricPlatform; +import com.viaversion.fabric.mc1213.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-mc1212/src/main/java/com/viaversion/fabric/mc1212/ViaFabricClient.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/ViaFabricClient.java similarity index 96% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/ViaFabricClient.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/ViaFabricClient.java index 7e7254d..4e66ca9 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/ViaFabricClient.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212; +package com.viaversion.fabric.mc1213; -import com.viaversion.fabric.mc1212.gui.ViaConfigScreen; +import com.viaversion.fabric.mc1213.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-mc1212/src/main/java/com/viaversion/fabric/mc1212/commands/NMSCommandSender.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/commands/NMSCommandSender.java similarity index 98% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/commands/NMSCommandSender.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/commands/NMSCommandSender.java index 970c5f9..3b97f2a 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/commands/NMSCommandSender.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212.commands; +package com.viaversion.fabric.mc1213.commands; import com.viaversion.viaversion.api.command.ViaCommandSender; import com.viaversion.viaversion.util.ComponentUtil; diff --git a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/commands/VFCommandHandler.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/commands/VFCommandHandler.java similarity index 98% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/commands/VFCommandHandler.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/commands/VFCommandHandler.java index 5c91b54..ecdc0ea 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/commands/VFCommandHandler.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212.commands; +package com.viaversion.fabric.mc1213.commands; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.context.CommandContext; diff --git a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/gui/ModMenuConfig.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/gui/ModMenuConfig.java similarity index 96% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/gui/ModMenuConfig.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/gui/ModMenuConfig.java index 47dd063..d060f50 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/gui/ModMenuConfig.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212.gui; +package com.viaversion.fabric.mc1213.gui; import com.google.common.collect.ImmutableMap; import com.terraformersmc.modmenu.api.ConfigScreenFactory; diff --git a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/gui/ViaConfigScreen.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/gui/ViaConfigScreen.java similarity index 98% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/gui/ViaConfigScreen.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/gui/ViaConfigScreen.java index 35ed29e..1fcc648 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/gui/ViaConfigScreen.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212.gui; +package com.viaversion.fabric.mc1213.gui; import com.viaversion.fabric.common.config.AbstractViaConfigScreen; import com.viaversion.fabric.common.util.ProtocolUtils; -import com.viaversion.fabric.mc1212.ViaFabric; +import com.viaversion.fabric.mc1213.ViaFabric; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/address/client/MixinAllowedAddressResolver.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/mixin/address/client/MixinAllowedAddressResolver.java similarity index 97% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/address/client/MixinAllowedAddressResolver.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/mixin/address/client/MixinAllowedAddressResolver.java index 3988c9d..f6eb0e0 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/address/client/MixinAllowedAddressResolver.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212.mixin.address.client; +package com.viaversion.fabric.mc1213.mixin.address.client; import com.viaversion.fabric.common.AddressParser; import net.minecraft.client.network.Address; diff --git a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/MixinRegistrySyncManager.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/mixin/debug/MixinRegistrySyncManager.java similarity index 94% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/MixinRegistrySyncManager.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/mixin/debug/MixinRegistrySyncManager.java index a30ce7c..edbc573 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/MixinRegistrySyncManager.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212.mixin.debug; +package com.viaversion.fabric.mc1213.mixin.debug; -import com.viaversion.fabric.mc1212.ViaFabric; +import com.viaversion.fabric.mc1213.ViaFabric; import net.fabricmc.fabric.impl.registry.sync.RegistrySyncManager; import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.ServerConfigurationNetworkHandler; diff --git a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/client/MixinClientConnection.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/mixin/debug/client/MixinClientConnection.java similarity index 96% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/client/MixinClientConnection.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/mixin/debug/client/MixinClientConnection.java index 30db297..725ca54 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/client/MixinClientConnection.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212.mixin.debug.client; +package com.viaversion.fabric.mc1213.mixin.debug.client; import io.netty.channel.ChannelHandlerContext; import net.minecraft.network.ClientConnection; diff --git a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/client/MixinClientConnectionAccessor.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/mixin/debug/client/MixinClientConnectionAccessor.java similarity index 94% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/client/MixinClientConnectionAccessor.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/mixin/debug/client/MixinClientConnectionAccessor.java index 04fef76..6675be9 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/client/MixinClientConnectionAccessor.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212.mixin.debug.client; +package com.viaversion.fabric.mc1213.mixin.debug.client; import io.netty.channel.Channel; import net.minecraft.network.ClientConnection; diff --git a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/client/MixinDebugHud.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/mixin/debug/client/MixinDebugHud.java similarity index 97% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/client/MixinDebugHud.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/mixin/debug/client/MixinDebugHud.java index 1d5dc2b..0692780 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/client/MixinDebugHud.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212.mixin.debug.client; +package com.viaversion.fabric.mc1213.mixin.debug.client; import com.viaversion.fabric.common.handler.CommonTransformer; import com.viaversion.fabric.common.handler.FabricDecodeHandler; diff --git a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/client/MixinRegistrySyncManager.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/mixin/debug/client/MixinRegistrySyncManager.java similarity index 94% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/client/MixinRegistrySyncManager.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/mixin/debug/client/MixinRegistrySyncManager.java index a34d15c..a14ae8a 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/debug/client/MixinRegistrySyncManager.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212.mixin.debug.client; +package com.viaversion.fabric.mc1213.mixin.debug.client; -import com.viaversion.fabric.mc1212.ViaFabric; +import com.viaversion.fabric.mc1213.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-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/gui/client/MixinMultiplayerServerListPingerListener.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/mixin/gui/client/MixinMultiplayerServerListPingerListener.java similarity index 95% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/gui/client/MixinMultiplayerServerListPingerListener.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/mixin/gui/client/MixinMultiplayerServerListPingerListener.java index b00f480..c5440bb 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/gui/client/MixinMultiplayerServerListPingerListener.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212.mixin.gui.client; +package com.viaversion.fabric.mc1213.mixin.gui.client; import com.viaversion.fabric.common.gui.ViaServerInfo; import com.viaversion.fabric.common.handler.FabricDecodeHandler; -import com.viaversion.fabric.mc1212.mixin.debug.client.MixinClientConnectionAccessor; +import com.viaversion.fabric.mc1213.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-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/gui/client/MixinServerEntry.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/mixin/gui/client/MixinServerEntry.java similarity index 98% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/gui/client/MixinServerEntry.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/mixin/gui/client/MixinServerEntry.java index 50c8b50..95f5d96 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/gui/client/MixinServerEntry.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212.mixin.gui.client; +package com.viaversion.fabric.mc1213.mixin.gui.client; import com.google.common.collect.Lists; import com.viaversion.fabric.common.gui.ViaServerInfo; diff --git a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/gui/client/MixinServerInfo.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/mixin/gui/client/MixinServerInfo.java similarity index 96% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/gui/client/MixinServerInfo.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/mixin/gui/client/MixinServerInfo.java index 3f5d15f..252ca98 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/gui/client/MixinServerInfo.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212.mixin.gui.client; +package com.viaversion.fabric.mc1213.mixin.gui.client; import com.viaversion.fabric.common.gui.ViaServerInfo; import net.minecraft.client.network.ServerInfo; diff --git a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/pipeline/MixinClientConnection.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/mixin/pipeline/MixinClientConnection.java similarity index 98% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/pipeline/MixinClientConnection.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/mixin/pipeline/MixinClientConnection.java index 80d51f3..d15b957 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/pipeline/MixinClientConnection.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212.mixin.pipeline; +package com.viaversion.fabric.mc1213.mixin.pipeline; import com.viaversion.fabric.common.handler.CommonTransformer; import com.viaversion.fabric.common.handler.FabricDecodeHandler; diff --git a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/pipeline/client/MixinClientConnectionThread.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/mixin/pipeline/client/MixinClientConnectionThread.java similarity index 91% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/pipeline/client/MixinClientConnectionThread.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/mixin/pipeline/client/MixinClientConnectionThread.java index 3dba377..219cc7d 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/pipeline/client/MixinClientConnectionThread.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212.mixin.pipeline.client; +package com.viaversion.fabric.mc1213.mixin.pipeline.client; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; -import com.viaversion.fabric.mc1212.ViaFabric; -import com.viaversion.fabric.mc1212.service.ProtocolAutoDetector; +import com.viaversion.fabric.mc1213.ViaFabric; +import com.viaversion.fabric.mc1213.service.ProtocolAutoDetector; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/shutdown/server/MixinMinecraftServer.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/mixin/shutdown/server/MixinMinecraftServer.java similarity index 95% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/shutdown/server/MixinMinecraftServer.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/mixin/shutdown/server/MixinMinecraftServer.java index ddc3819..6505335 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/mixin/shutdown/server/MixinMinecraftServer.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212.mixin.shutdown.server; +package com.viaversion.fabric.mc1213.mixin.shutdown.server; import com.viaversion.viaversion.ViaManagerImpl; import com.viaversion.viaversion.api.Via; diff --git a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/platform/FabricNativeVersionProvider.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/platform/FabricNativeVersionProvider.java similarity index 95% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/platform/FabricNativeVersionProvider.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/platform/FabricNativeVersionProvider.java index 79ce339..0986c95 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/platform/FabricNativeVersionProvider.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212.platform; +package com.viaversion.fabric.mc1213.platform; import com.viaversion.fabric.common.platform.NativeVersionProvider; import net.minecraft.SharedConstants; diff --git a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/platform/FabricPlatform.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/platform/FabricPlatform.java similarity index 96% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/platform/FabricPlatform.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/platform/FabricPlatform.java index b3a558b..c8f4e90 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/platform/FabricPlatform.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212.platform; +package com.viaversion.fabric.mc1213.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.mc1212.ViaFabric; -import com.viaversion.fabric.mc1212.commands.NMSCommandSender; +import com.viaversion.fabric.mc1213.ViaFabric; +import com.viaversion.fabric.mc1213.commands.NMSCommandSender; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.command.ViaCommandSender; import io.netty.channel.EventLoop; diff --git a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/platform/VFLoader.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/platform/VFLoader.java similarity index 87% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/platform/VFLoader.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/platform/VFLoader.java index 2c006b2..13691db 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/platform/VFLoader.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212.platform; +package com.viaversion.fabric.mc1213.platform; -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.fabric.mc1213.providers.FabricVersionProvider; +import com.viaversion.fabric.mc1213.providers.VFHandItemProvider; +import com.viaversion.fabric.mc1213.providers.VFPlayerAbilitiesProvider; +import com.viaversion.fabric.mc1213.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-mc1212/src/main/java/com/viaversion/fabric/mc1212/providers/FabricVersionProvider.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/providers/FabricVersionProvider.java similarity index 92% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/providers/FabricVersionProvider.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/providers/FabricVersionProvider.java index 6b141bd..320a8c6 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/providers/FabricVersionProvider.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212.providers; +package com.viaversion.fabric.mc1213.providers; import com.viaversion.fabric.common.config.VFConfig; import com.viaversion.fabric.common.provider.AbstractFabricVersionProvider; -import com.viaversion.fabric.mc1212.ViaFabric; -import com.viaversion.fabric.mc1212.service.ProtocolAutoDetector; +import com.viaversion.fabric.mc1213.ViaFabric; +import com.viaversion.fabric.mc1213.service.ProtocolAutoDetector; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.channel.ChannelPipeline; import net.minecraft.network.ClientConnection; diff --git a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/providers/VFHandItemProvider.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/providers/VFHandItemProvider.java similarity index 96% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/providers/VFHandItemProvider.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/providers/VFHandItemProvider.java index 91c5253..64147eb 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/providers/VFHandItemProvider.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212.providers; +package com.viaversion.fabric.mc1213.providers; import com.viaversion.fabric.common.util.RemappingUtil; -import com.viaversion.fabric.mc1212.ViaFabric; +import com.viaversion.fabric.mc1213.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-mc1212/src/main/java/com/viaversion/fabric/mc1212/providers/VFPlayerAbilitiesProvider.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/providers/VFPlayerAbilitiesProvider.java similarity index 97% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/providers/VFPlayerAbilitiesProvider.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/providers/VFPlayerAbilitiesProvider.java index 5f86e7d..717cbd5 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/providers/VFPlayerAbilitiesProvider.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212.providers; +package com.viaversion.fabric.mc1213.providers; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.protocols.v1_15_2to1_16.provider.PlayerAbilitiesProvider; diff --git a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/providers/VFPlayerLookTargetProvider.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/providers/VFPlayerLookTargetProvider.java similarity index 97% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/providers/VFPlayerLookTargetProvider.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/providers/VFPlayerLookTargetProvider.java index 23a5ada..111a047 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/providers/VFPlayerLookTargetProvider.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212.providers; +package com.viaversion.fabric.mc1213.providers; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.BlockPosition; diff --git a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/service/ProtocolAutoDetector.java b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/service/ProtocolAutoDetector.java similarity index 98% rename from viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/service/ProtocolAutoDetector.java rename to viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/service/ProtocolAutoDetector.java index 5aa8652..5f25574 100644 --- a/viafabric-mc1212/src/main/java/com/viaversion/fabric/mc1212/service/ProtocolAutoDetector.java +++ b/viafabric-mc1213/src/main/java/com/viaversion/fabric/mc1213/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.mc1212.service; +package com.viaversion.fabric.mc1213.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.mc1212.ViaFabric; +import com.viaversion.fabric.mc1213.ViaFabric; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.bootstrap.Bootstrap; import io.netty.channel.*; diff --git a/viafabric-mc1212/src/main/resources/fabric.mod.json b/viafabric-mc1213/src/main/resources/fabric.mod.json similarity index 77% rename from viafabric-mc1212/src/main/resources/fabric.mod.json rename to viafabric-mc1213/src/main/resources/fabric.mod.json index fadc93e..4fc7151 100644 --- a/viafabric-mc1212/src/main/resources/fabric.mod.json +++ b/viafabric-mc1213/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, - "id": "viafabric-mc1212", - "name": "ViaFabric for 1.21.2", + "id": "viafabric-mc1213", + "name": "ViaFabric for 1.21.3", "version": "${version}", "description": "${description}", "license": "GPL-3.0", @@ -47,13 +47,13 @@ ], "entrypoints": { "main": [ - "com.viaversion.fabric.mc1212.ViaFabric" + "com.viaversion.fabric.mc1213.ViaFabric" ], "client": [ - "com.viaversion.fabric.mc1212.ViaFabricClient" + "com.viaversion.fabric.mc1213.ViaFabricClient" ], "modmenu": [ - "com.viaversion.fabric.mc1212.gui.ModMenuConfig" + "com.viaversion.fabric.mc1213.gui.ModMenuConfig" ] }, "depends": { @@ -68,11 +68,11 @@ "replaymod": "<=1.21-2.6.15" }, "mixins": [ - "mixins.viafabric1212.address.json", - "mixins.viafabric1212.gui.json", - "mixins.viafabric1212.debug.json", - "mixins.viafabric1212.pipeline.json", - "mixins.viafabric1212.shutdown.json" + "mixins.viafabric1213.address.json", + "mixins.viafabric1213.gui.json", + "mixins.viafabric1213.debug.json", + "mixins.viafabric1213.pipeline.json", + "mixins.viafabric1213.shutdown.json" ], "custom": { "modmenu": { diff --git a/viafabric-mc1212/src/main/resources/mixins.viafabric1212.address.json b/viafabric-mc1213/src/main/resources/mixins.viafabric1213.address.json similarity index 75% rename from viafabric-mc1212/src/main/resources/mixins.viafabric1212.address.json rename to viafabric-mc1213/src/main/resources/mixins.viafabric1213.address.json index 2dddec3..c47dab4 100644 --- a/viafabric-mc1212/src/main/resources/mixins.viafabric1212.address.json +++ b/viafabric-mc1213/src/main/resources/mixins.viafabric1213.address.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_21", - "package": "com.viaversion.fabric.mc1212.mixin.address", + "package": "com.viaversion.fabric.mc1213.mixin.address", "mixins": [ ], "client": [ diff --git a/viafabric-mc1212/src/main/resources/mixins.viafabric1212.debug.json b/viafabric-mc1213/src/main/resources/mixins.viafabric1213.debug.json similarity index 84% rename from viafabric-mc1212/src/main/resources/mixins.viafabric1212.debug.json rename to viafabric-mc1213/src/main/resources/mixins.viafabric1213.debug.json index f900d58..f4b3255 100644 --- a/viafabric-mc1212/src/main/resources/mixins.viafabric1212.debug.json +++ b/viafabric-mc1213/src/main/resources/mixins.viafabric1213.debug.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_21", - "package": "com.viaversion.fabric.mc1212.mixin.debug", + "package": "com.viaversion.fabric.mc1213.mixin.debug", "mixins": [ "MixinRegistrySyncManager" ], diff --git a/viafabric-mc1212/src/main/resources/mixins.viafabric1212.gui.json b/viafabric-mc1213/src/main/resources/mixins.viafabric1213.gui.json similarity index 82% rename from viafabric-mc1212/src/main/resources/mixins.viafabric1212.gui.json rename to viafabric-mc1213/src/main/resources/mixins.viafabric1213.gui.json index 53ed4b9..6faf42b 100644 --- a/viafabric-mc1212/src/main/resources/mixins.viafabric1212.gui.json +++ b/viafabric-mc1213/src/main/resources/mixins.viafabric1213.gui.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_21", - "package": "com.viaversion.fabric.mc1212.mixin.gui", + "package": "com.viaversion.fabric.mc1213.mixin.gui", "mixins": [ ], "client": [ diff --git a/viafabric-mc1212/src/main/resources/mixins.viafabric1212.pipeline.json b/viafabric-mc1213/src/main/resources/mixins.viafabric1213.pipeline.json similarity index 77% rename from viafabric-mc1212/src/main/resources/mixins.viafabric1212.pipeline.json rename to viafabric-mc1213/src/main/resources/mixins.viafabric1213.pipeline.json index 524a7e0..347fc1a 100644 --- a/viafabric-mc1212/src/main/resources/mixins.viafabric1212.pipeline.json +++ b/viafabric-mc1213/src/main/resources/mixins.viafabric1213.pipeline.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_21", - "package": "com.viaversion.fabric.mc1212.mixin.pipeline", + "package": "com.viaversion.fabric.mc1213.mixin.pipeline", "mixins": [ "MixinClientConnection" ], diff --git a/viafabric-mc1212/src/main/resources/mixins.viafabric1212.shutdown.json b/viafabric-mc1213/src/main/resources/mixins.viafabric1213.shutdown.json similarity index 74% rename from viafabric-mc1212/src/main/resources/mixins.viafabric1212.shutdown.json rename to viafabric-mc1213/src/main/resources/mixins.viafabric1213.shutdown.json index df664d6..7df8c5a 100644 --- a/viafabric-mc1212/src/main/resources/mixins.viafabric1212.shutdown.json +++ b/viafabric-mc1213/src/main/resources/mixins.viafabric1213.shutdown.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_21", - "package": "com.viaversion.fabric.mc1212.mixin.shutdown", + "package": "com.viaversion.fabric.mc1213.mixin.shutdown", "mixins": [ ], "server": [