From 3d0980953b2b92e66f30f47c7d81da711d079f03 Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Mon, 29 Apr 2024 17:55:47 +0200 Subject: [PATCH] 1.20.6 --- settings.gradle.kts | 2 +- src/main/resources/fabric.mod.json | 2 +- viafabric-mc1205/build.gradle.kts | 11 ---------- viafabric-mc1206/build.gradle.kts | 11 ++++++++++ .../viaversion/fabric/mc1206}/ViaFabric.java | 8 ++++---- .../fabric/mc1206}/ViaFabricClient.java | 4 ++-- .../mc1206}/commands/NMSCommandSender.java | 2 +- .../mc1206}/commands/VFCommandHandler.java | 2 +- .../fabric/mc1206}/gui/ModMenuConfig.java | 2 +- .../fabric/mc1206}/gui/ViaConfigScreen.java | 4 ++-- .../client/MixinAllowedAddressResolver.java | 2 +- .../debug/client/MixinClientConnection.java | 2 +- .../client/MixinClientConnectionAccessor.java | 2 +- .../mixin/debug/client/MixinDebugHud.java | 2 +- ...inMultiplayerServerListPingerListener.java | 4 ++-- .../mixin/gui/client/MixinServerEntry.java | 2 +- .../mixin/gui/client/MixinServerInfo.java | 2 +- .../mixin/pipeline/MixinClientConnection.java | 2 +- .../client/MixinClientConnection.java | 6 +++--- .../platform/FabricNativeVersionProvider.java | 2 +- .../mc1206}/platform/FabricPlatform.java | 6 +++--- .../fabric/mc1206}/platform/VFLoader.java | 10 +++++----- .../providers/FabricVersionProvider.java | 6 +++--- .../mc1206}/providers/VFHandItemProvider.java | 4 ++-- .../providers/VFPlayerAbilitiesProvider.java | 2 +- .../providers/VFPlayerLookTargetProvider.java | 2 +- .../mc1206}/service/ProtocolAutoDetector.java | 4 ++-- .../src/main/resources/fabric.mod.json | 20 +++++++++---------- .../mixins.viafabric1206.address.json | 2 +- .../resources/mixins.viafabric1206.debug.json | 2 +- .../resources/mixins.viafabric1206.gui.json | 2 +- .../mixins.viafabric1206.pipeline.json | 2 +- 32 files changed, 68 insertions(+), 68 deletions(-) delete mode 100644 viafabric-mc1205/build.gradle.kts create mode 100644 viafabric-mc1206/build.gradle.kts rename {viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205 => viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206}/ViaFabric.java (96%) rename {viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205 => viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206}/ViaFabricClient.java (96%) rename {viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205 => viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206}/commands/NMSCommandSender.java (98%) rename {viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205 => viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206}/commands/VFCommandHandler.java (98%) rename {viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205 => viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206}/gui/ModMenuConfig.java (96%) rename {viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205 => viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206}/gui/ViaConfigScreen.java (98%) rename {viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205 => viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206}/mixin/address/client/MixinAllowedAddressResolver.java (97%) rename {viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205 => viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206}/mixin/debug/client/MixinClientConnection.java (96%) rename {viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205 => viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206}/mixin/debug/client/MixinClientConnectionAccessor.java (94%) rename {viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205 => viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206}/mixin/debug/client/MixinDebugHud.java (97%) rename {viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205 => viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206}/mixin/gui/client/MixinMultiplayerServerListPingerListener.java (95%) rename {viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205 => viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206}/mixin/gui/client/MixinServerEntry.java (98%) rename {viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205 => viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206}/mixin/gui/client/MixinServerInfo.java (96%) rename {viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205 => viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206}/mixin/pipeline/MixinClientConnection.java (98%) rename {viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205 => viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206}/mixin/pipeline/client/MixinClientConnection.java (91%) rename {viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205 => viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206}/platform/FabricNativeVersionProvider.java (95%) rename {viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205 => viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206}/platform/FabricPlatform.java (96%) rename {viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205 => viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206}/platform/VFLoader.java (88%) rename {viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205 => viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206}/providers/FabricVersionProvider.java (92%) rename {viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205 => viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206}/providers/VFHandItemProvider.java (96%) rename {viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205 => viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206}/providers/VFPlayerAbilitiesProvider.java (97%) rename {viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205 => viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206}/providers/VFPlayerLookTargetProvider.java (97%) rename {viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205 => viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206}/service/ProtocolAutoDetector.java (98%) rename {viafabric-mc1205 => viafabric-mc1206}/src/main/resources/fabric.mod.json (76%) rename viafabric-mc1205/src/main/resources/mixins.viafabric1205.address.json => viafabric-mc1206/src/main/resources/mixins.viafabric1206.address.json (75%) rename viafabric-mc1205/src/main/resources/mixins.viafabric1205.debug.json => viafabric-mc1206/src/main/resources/mixins.viafabric1206.debug.json (81%) rename viafabric-mc1205/src/main/resources/mixins.viafabric1205.gui.json => viafabric-mc1206/src/main/resources/mixins.viafabric1206.gui.json (82%) rename viafabric-mc1205/src/main/resources/mixins.viafabric1205.pipeline.json => viafabric-mc1206/src/main/resources/mixins.viafabric1206.pipeline.json (77%) diff --git a/settings.gradle.kts b/settings.gradle.kts index c8daab4..6ef1206 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,7 +17,7 @@ include("viafabric-mc1182") include("viafabric-mc1194") include("viafabric-mc1201") include("viafabric-mc1204") -include("viafabric-mc1205") +include("viafabric-mc1206") 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 b9649e6..7fe6860 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -13,7 +13,7 @@ }, "depends": { "fabricloader": ">=0.14.0", - "minecraft": ["1.8.9", "1.12.2", "1.14.4", "1.15.2", "1.16.5", "1.17.1", "1.18.2", "1.19.4", "1.20.1", "1.20.3", "1.20.4", "1.20.5"], + "minecraft": ["1.8.9", "1.12.2", "1.14.4", "1.15.2", "1.16.5", "1.17.1", "1.18.2", "1.19.4", "1.20.1", "1.20.3", "1.20.4", "1.20.5", "1.20.6"], "viaversion": ">=4.10.0" }, "breaks": { diff --git a/viafabric-mc1205/build.gradle.kts b/viafabric-mc1205/build.gradle.kts deleted file mode 100644 index c5dc5f8..0000000 --- a/viafabric-mc1205/build.gradle.kts +++ /dev/null @@ -1,11 +0,0 @@ -dependencies { - minecraft("com.mojang:minecraft:1.20.5-rc2") - mappings("net.fabricmc:yarn:1.20.5-rc2+build.2:v2") - - modImplementation("net.fabricmc.fabric-api:fabric-api:0.97.4+1.20.5") - modImplementation("com.terraformersmc:modmenu:9.0.0") -} - -tasks.compileJava { - options.release.set(21) -} diff --git a/viafabric-mc1206/build.gradle.kts b/viafabric-mc1206/build.gradle.kts new file mode 100644 index 0000000..308ccbb --- /dev/null +++ b/viafabric-mc1206/build.gradle.kts @@ -0,0 +1,11 @@ +dependencies { + minecraft("com.mojang:minecraft:1.20.6") + mappings("net.fabricmc:yarn:1.20.6+build.1:v2") + + modImplementation("net.fabricmc.fabric-api:fabric-api:0.97.8+1.20.6") + modImplementation("com.terraformersmc:modmenu:10.0.0-beta.1") +} + +tasks.compileJava { + options.release.set(21) +} diff --git a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/ViaFabric.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/ViaFabric.java similarity index 96% rename from viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/ViaFabric.java rename to viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/ViaFabric.java index c553691..3e67936 100644 --- a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/ViaFabric.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/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.mc1205; +package com.viaversion.fabric.mc1206; 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.mc1205.commands.VFCommandHandler; -import com.viaversion.fabric.mc1205.platform.FabricPlatform; -import com.viaversion.fabric.mc1205.platform.VFLoader; +import com.viaversion.fabric.mc1206.commands.VFCommandHandler; +import com.viaversion.fabric.mc1206.platform.FabricPlatform; +import com.viaversion.fabric.mc1206.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-mc1205/src/main/java/com/viaversion/fabric/mc1205/ViaFabricClient.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/ViaFabricClient.java similarity index 96% rename from viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/ViaFabricClient.java rename to viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/ViaFabricClient.java index 8245cc8..70651ad 100644 --- a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/ViaFabricClient.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/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.mc1205; +package com.viaversion.fabric.mc1206; -import com.viaversion.fabric.mc1205.gui.ViaConfigScreen; +import com.viaversion.fabric.mc1206.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-mc1205/src/main/java/com/viaversion/fabric/mc1205/commands/NMSCommandSender.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/commands/NMSCommandSender.java similarity index 98% rename from viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/commands/NMSCommandSender.java rename to viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/commands/NMSCommandSender.java index a4dacac..d6adb40 100644 --- a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/commands/NMSCommandSender.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/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.mc1205.commands; +package com.viaversion.fabric.mc1206.commands; import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; import net.minecraft.command.CommandSource; diff --git a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/commands/VFCommandHandler.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/commands/VFCommandHandler.java similarity index 98% rename from viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/commands/VFCommandHandler.java rename to viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/commands/VFCommandHandler.java index d5e329a..fcd896d 100644 --- a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/commands/VFCommandHandler.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/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.mc1205.commands; +package com.viaversion.fabric.mc1206.commands; import com.viaversion.fabric.common.commands.subs.LeakDetectSubCommand; import com.mojang.brigadier.arguments.StringArgumentType; diff --git a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/gui/ModMenuConfig.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/gui/ModMenuConfig.java similarity index 96% rename from viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/gui/ModMenuConfig.java rename to viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/gui/ModMenuConfig.java index 2e7266f..d0800bc 100644 --- a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/gui/ModMenuConfig.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/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.mc1205.gui; +package com.viaversion.fabric.mc1206.gui; import com.google.common.collect.ImmutableMap; import com.terraformersmc.modmenu.api.ConfigScreenFactory; diff --git a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/gui/ViaConfigScreen.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/gui/ViaConfigScreen.java similarity index 98% rename from viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/gui/ViaConfigScreen.java rename to viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/gui/ViaConfigScreen.java index a236541..7fe1e6e 100644 --- a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/gui/ViaConfigScreen.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/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.mc1205.gui; +package com.viaversion.fabric.mc1206.gui; import com.viaversion.fabric.common.config.AbstractViaConfigScreen; -import com.viaversion.fabric.mc1205.ViaFabric; +import com.viaversion.fabric.mc1206.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-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/address/client/MixinAllowedAddressResolver.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/address/client/MixinAllowedAddressResolver.java similarity index 97% rename from viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/address/client/MixinAllowedAddressResolver.java rename to viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/address/client/MixinAllowedAddressResolver.java index 8a5fe58..2b7927f 100644 --- a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/address/client/MixinAllowedAddressResolver.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/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.mc1205.mixin.address.client; +package com.viaversion.fabric.mc1206.mixin.address.client; import com.viaversion.fabric.common.AddressParser; import net.minecraft.client.network.Address; diff --git a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/debug/client/MixinClientConnection.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/debug/client/MixinClientConnection.java similarity index 96% rename from viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/debug/client/MixinClientConnection.java rename to viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/debug/client/MixinClientConnection.java index 1cf70ec..0aef5c2 100644 --- a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/debug/client/MixinClientConnection.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/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.mc1205.mixin.debug.client; +package com.viaversion.fabric.mc1206.mixin.debug.client; import io.netty.channel.ChannelHandlerContext; import net.minecraft.network.ClientConnection; diff --git a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/debug/client/MixinClientConnectionAccessor.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/debug/client/MixinClientConnectionAccessor.java similarity index 94% rename from viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/debug/client/MixinClientConnectionAccessor.java rename to viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/debug/client/MixinClientConnectionAccessor.java index 4f1d5c0..9bd1486 100644 --- a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/debug/client/MixinClientConnectionAccessor.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/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.mc1205.mixin.debug.client; +package com.viaversion.fabric.mc1206.mixin.debug.client; import io.netty.channel.Channel; import net.minecraft.network.ClientConnection; diff --git a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/debug/client/MixinDebugHud.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/debug/client/MixinDebugHud.java similarity index 97% rename from viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/debug/client/MixinDebugHud.java rename to viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/debug/client/MixinDebugHud.java index b8e2f58..85ef5ef 100644 --- a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/debug/client/MixinDebugHud.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/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.mc1205.mixin.debug.client; +package com.viaversion.fabric.mc1206.mixin.debug.client; import com.viaversion.fabric.common.handler.CommonTransformer; import com.viaversion.fabric.common.handler.FabricDecodeHandler; diff --git a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/gui/client/MixinMultiplayerServerListPingerListener.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/gui/client/MixinMultiplayerServerListPingerListener.java similarity index 95% rename from viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/gui/client/MixinMultiplayerServerListPingerListener.java rename to viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/gui/client/MixinMultiplayerServerListPingerListener.java index a47ddc6..dcbc69d 100644 --- a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/gui/client/MixinMultiplayerServerListPingerListener.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/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.mc1205.mixin.gui.client; +package com.viaversion.fabric.mc1206.mixin.gui.client; import com.viaversion.fabric.common.gui.ViaServerInfo; import com.viaversion.fabric.common.handler.FabricDecodeHandler; -import com.viaversion.fabric.mc1205.mixin.debug.client.MixinClientConnectionAccessor; +import com.viaversion.fabric.mc1206.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-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/gui/client/MixinServerEntry.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/gui/client/MixinServerEntry.java similarity index 98% rename from viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/gui/client/MixinServerEntry.java rename to viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/gui/client/MixinServerEntry.java index add8efc..72acbeb 100644 --- a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/gui/client/MixinServerEntry.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/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.mc1205.mixin.gui.client; +package com.viaversion.fabric.mc1206.mixin.gui.client; import com.google.common.collect.Lists; import com.viaversion.fabric.common.gui.ViaServerInfo; diff --git a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/gui/client/MixinServerInfo.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/gui/client/MixinServerInfo.java similarity index 96% rename from viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/gui/client/MixinServerInfo.java rename to viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/gui/client/MixinServerInfo.java index d8cf387..f8ea952 100644 --- a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/gui/client/MixinServerInfo.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/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.mc1205.mixin.gui.client; +package com.viaversion.fabric.mc1206.mixin.gui.client; import com.viaversion.fabric.common.gui.ViaServerInfo; import net.minecraft.client.network.ServerInfo; diff --git a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/pipeline/MixinClientConnection.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/pipeline/MixinClientConnection.java similarity index 98% rename from viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/pipeline/MixinClientConnection.java rename to viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/pipeline/MixinClientConnection.java index 425ae9d..e1e3ec0 100644 --- a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/pipeline/MixinClientConnection.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/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.mc1205.mixin.pipeline; +package com.viaversion.fabric.mc1206.mixin.pipeline; import com.viaversion.fabric.common.handler.CommonTransformer; import com.viaversion.fabric.common.handler.FabricDecodeHandler; diff --git a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/pipeline/client/MixinClientConnection.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/pipeline/client/MixinClientConnection.java similarity index 91% rename from viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/pipeline/client/MixinClientConnection.java rename to viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/pipeline/client/MixinClientConnection.java index 9b56bf8..f174235 100644 --- a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/mixin/pipeline/client/MixinClientConnection.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/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.mc1205.mixin.pipeline.client; +package com.viaversion.fabric.mc1206.mixin.pipeline.client; -import com.viaversion.fabric.mc1205.ViaFabric; -import com.viaversion.fabric.mc1205.service.ProtocolAutoDetector; +import com.viaversion.fabric.mc1206.ViaFabric; +import com.viaversion.fabric.mc1206.service.ProtocolAutoDetector; import io.netty.channel.ChannelFuture; import net.minecraft.network.ClientConnection; import org.spongepowered.asm.mixin.Mixin; diff --git a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/platform/FabricNativeVersionProvider.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/platform/FabricNativeVersionProvider.java similarity index 95% rename from viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/platform/FabricNativeVersionProvider.java rename to viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/platform/FabricNativeVersionProvider.java index 3c5ed76..bc191a3 100644 --- a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/platform/FabricNativeVersionProvider.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/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.mc1205.platform; +package com.viaversion.fabric.mc1206.platform; import com.viaversion.fabric.common.platform.NativeVersionProvider; import net.minecraft.SharedConstants; diff --git a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/platform/FabricPlatform.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/platform/FabricPlatform.java similarity index 96% rename from viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/platform/FabricPlatform.java rename to viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/platform/FabricPlatform.java index 825e1fe..6f2937e 100644 --- a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/platform/FabricPlatform.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/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.mc1205.platform; +package com.viaversion.fabric.mc1206.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.mc1205.ViaFabric; -import com.viaversion.fabric.mc1205.commands.NMSCommandSender; +import com.viaversion.fabric.mc1206.ViaFabric; +import com.viaversion.fabric.mc1206.commands.NMSCommandSender; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.command.ViaCommandSender; import io.netty.channel.EventLoop; diff --git a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/platform/VFLoader.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/platform/VFLoader.java similarity index 88% rename from viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/platform/VFLoader.java rename to viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/platform/VFLoader.java index 872cdf9..49ba66c 100644 --- a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/platform/VFLoader.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/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.mc1205.platform; +package com.viaversion.fabric.mc1206.platform; -import com.viaversion.fabric.mc1205.providers.VFHandItemProvider; -import com.viaversion.fabric.mc1205.providers.FabricVersionProvider; -import com.viaversion.fabric.mc1205.providers.VFPlayerAbilitiesProvider; -import com.viaversion.fabric.mc1205.providers.VFPlayerLookTargetProvider; +import com.viaversion.fabric.mc1206.providers.VFHandItemProvider; +import com.viaversion.fabric.mc1206.providers.FabricVersionProvider; +import com.viaversion.fabric.mc1206.providers.VFPlayerAbilitiesProvider; +import com.viaversion.fabric.mc1206.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-mc1205/src/main/java/com/viaversion/fabric/mc1205/providers/FabricVersionProvider.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/providers/FabricVersionProvider.java similarity index 92% rename from viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/providers/FabricVersionProvider.java rename to viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/providers/FabricVersionProvider.java index e93cafa..16778ca 100644 --- a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/providers/FabricVersionProvider.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/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.mc1205.providers; +package com.viaversion.fabric.mc1206.providers; import com.viaversion.fabric.common.config.VFConfig; import com.viaversion.fabric.common.provider.AbstractFabricVersionProvider; -import com.viaversion.fabric.mc1205.ViaFabric; -import com.viaversion.fabric.mc1205.service.ProtocolAutoDetector; +import com.viaversion.fabric.mc1206.ViaFabric; +import com.viaversion.fabric.mc1206.service.ProtocolAutoDetector; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.channel.ChannelPipeline; import net.minecraft.network.ClientConnection; diff --git a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/providers/VFHandItemProvider.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/providers/VFHandItemProvider.java similarity index 96% rename from viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/providers/VFHandItemProvider.java rename to viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/providers/VFHandItemProvider.java index d4e3405..4f2a210 100644 --- a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/providers/VFHandItemProvider.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/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.mc1205.providers; +package com.viaversion.fabric.mc1206.providers; import com.viaversion.fabric.common.util.RemappingUtil; -import com.viaversion.fabric.mc1205.ViaFabric; +import com.viaversion.fabric.mc1206.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-mc1205/src/main/java/com/viaversion/fabric/mc1205/providers/VFPlayerAbilitiesProvider.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/providers/VFPlayerAbilitiesProvider.java similarity index 97% rename from viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/providers/VFPlayerAbilitiesProvider.java rename to viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/providers/VFPlayerAbilitiesProvider.java index 7e4d006..0c6465a 100644 --- a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/providers/VFPlayerAbilitiesProvider.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/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.mc1205.providers; +package com.viaversion.fabric.mc1206.providers; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.provider.PlayerAbilitiesProvider; diff --git a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/providers/VFPlayerLookTargetProvider.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/providers/VFPlayerLookTargetProvider.java similarity index 97% rename from viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/providers/VFPlayerLookTargetProvider.java rename to viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/providers/VFPlayerLookTargetProvider.java index ac6baf6..9bb0c81 100644 --- a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/providers/VFPlayerLookTargetProvider.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/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.mc1205.providers; +package com.viaversion.fabric.mc1206.providers; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.Position; diff --git a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/service/ProtocolAutoDetector.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/service/ProtocolAutoDetector.java similarity index 98% rename from viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/service/ProtocolAutoDetector.java rename to viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/service/ProtocolAutoDetector.java index 3f4b68a..c004bbe 100644 --- a/viafabric-mc1205/src/main/java/com/viaversion/fabric/mc1205/service/ProtocolAutoDetector.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/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.mc1205.service; +package com.viaversion.fabric.mc1206.service; import com.viaversion.fabric.common.AddressParser; -import com.viaversion.fabric.mc1205.ViaFabric; +import com.viaversion.fabric.mc1206.ViaFabric; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; diff --git a/viafabric-mc1205/src/main/resources/fabric.mod.json b/viafabric-mc1206/src/main/resources/fabric.mod.json similarity index 76% rename from viafabric-mc1205/src/main/resources/fabric.mod.json rename to viafabric-mc1206/src/main/resources/fabric.mod.json index 8329a3c..36a935a 100644 --- a/viafabric-mc1205/src/main/resources/fabric.mod.json +++ b/viafabric-mc1206/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, - "id": "viafabric-mc1205", - "name": "ViaFabric for 1.20.5", + "id": "viafabric-mc1206", + "name": "ViaFabric for 1.20.5/6", "version": "${version}", "description": "${description}", "license": "GPL-3.0", @@ -47,28 +47,28 @@ ], "entrypoints": { "main": [ - "com.viaversion.fabric.mc1205.ViaFabric" + "com.viaversion.fabric.mc1206.ViaFabric" ], "client": [ - "com.viaversion.fabric.mc1205.ViaFabricClient" + "com.viaversion.fabric.mc1206.ViaFabricClient" ], "modmenu": [ - "com.viaversion.fabric.mc1205.gui.ModMenuConfig" + "com.viaversion.fabric.mc1206.gui.ModMenuConfig" ] }, "depends": { "fabric-resource-loader-v0": "*", - "minecraft": ["1.20.5"], + "minecraft": ["1.20.5", "1.20.6"], "viafabric": "*" }, "recommends": { "fabric-command-api-v2": "*" }, "mixins": [ - "mixins.viafabric1205.address.json", - "mixins.viafabric1205.gui.json", - "mixins.viafabric1205.debug.json", - "mixins.viafabric1205.pipeline.json" + "mixins.viafabric1206.address.json", + "mixins.viafabric1206.gui.json", + "mixins.viafabric1206.debug.json", + "mixins.viafabric1206.pipeline.json" ], "custom": { "modmenu": { diff --git a/viafabric-mc1205/src/main/resources/mixins.viafabric1205.address.json b/viafabric-mc1206/src/main/resources/mixins.viafabric1206.address.json similarity index 75% rename from viafabric-mc1205/src/main/resources/mixins.viafabric1205.address.json rename to viafabric-mc1206/src/main/resources/mixins.viafabric1206.address.json index bfadfa2..8eb4e18 100644 --- a/viafabric-mc1205/src/main/resources/mixins.viafabric1205.address.json +++ b/viafabric-mc1206/src/main/resources/mixins.viafabric1206.address.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_17", - "package": "com.viaversion.fabric.mc1205.mixin.address", + "package": "com.viaversion.fabric.mc1206.mixin.address", "mixins": [ ], "client": [ diff --git a/viafabric-mc1205/src/main/resources/mixins.viafabric1205.debug.json b/viafabric-mc1206/src/main/resources/mixins.viafabric1206.debug.json similarity index 81% rename from viafabric-mc1205/src/main/resources/mixins.viafabric1205.debug.json rename to viafabric-mc1206/src/main/resources/mixins.viafabric1206.debug.json index 57b4788..31972d8 100644 --- a/viafabric-mc1205/src/main/resources/mixins.viafabric1205.debug.json +++ b/viafabric-mc1206/src/main/resources/mixins.viafabric1206.debug.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_17", - "package": "com.viaversion.fabric.mc1205.mixin.debug", + "package": "com.viaversion.fabric.mc1206.mixin.debug", "mixins": [ ], "client": [ diff --git a/viafabric-mc1205/src/main/resources/mixins.viafabric1205.gui.json b/viafabric-mc1206/src/main/resources/mixins.viafabric1206.gui.json similarity index 82% rename from viafabric-mc1205/src/main/resources/mixins.viafabric1205.gui.json rename to viafabric-mc1206/src/main/resources/mixins.viafabric1206.gui.json index 9716364..c5c2b69 100644 --- a/viafabric-mc1205/src/main/resources/mixins.viafabric1205.gui.json +++ b/viafabric-mc1206/src/main/resources/mixins.viafabric1206.gui.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_17", - "package": "com.viaversion.fabric.mc1205.mixin.gui", + "package": "com.viaversion.fabric.mc1206.mixin.gui", "mixins": [ ], "client": [ diff --git a/viafabric-mc1205/src/main/resources/mixins.viafabric1205.pipeline.json b/viafabric-mc1206/src/main/resources/mixins.viafabric1206.pipeline.json similarity index 77% rename from viafabric-mc1205/src/main/resources/mixins.viafabric1205.pipeline.json rename to viafabric-mc1206/src/main/resources/mixins.viafabric1206.pipeline.json index 1ae9cdb..789e2ae 100644 --- a/viafabric-mc1205/src/main/resources/mixins.viafabric1205.pipeline.json +++ b/viafabric-mc1206/src/main/resources/mixins.viafabric1206.pipeline.json @@ -1,7 +1,7 @@ { "required": true, "compatibilityLevel": "JAVA_17", - "package": "com.viaversion.fabric.mc1205.mixin.pipeline", + "package": "com.viaversion.fabric.mc1206.mixin.pipeline", "mixins": [ "MixinClientConnection" ],