1.21.2-rc.1

This commit is contained in:
FlorianMichael 2024-10-19 15:46:48 +02:00
parent 2738d2dc89
commit ce49d130df
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
37 changed files with 78 additions and 78 deletions

View File

@ -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)

View File

@ -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"

View File

@ -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": {

View File

@ -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)
}

View File

@ -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)
}

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

View File

@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.viaversion.fabric.mc1211.commands;
package com.viaversion.fabric.mc1212.commands;
import com.mojang.brigadier.arguments.StringArgumentType;
import com.mojang.brigadier.context.CommandContext;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.viaversion.fabric.mc1211.gui;
package com.viaversion.fabric.mc1212.gui;
import com.google.common.collect.ImmutableMap;
import com.terraformersmc.modmenu.api.ConfigScreenFactory;

View File

@ -15,11 +15,11 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

View File

@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

View File

@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

View File

@ -15,11 +15,11 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

View File

@ -15,12 +15,12 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.viaversion.fabric.mc1211.platform;
package com.viaversion.fabric.mc1212.platform;
import com.viaversion.fabric.common.platform.NativeVersionProvider;
import net.minecraft.SharedConstants;

View File

@ -15,14 +15,14 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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);
}

View File

@ -15,12 +15,12 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

View File

@ -15,12 +15,12 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

View File

@ -15,10 +15,10 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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;

View File

@ -15,13 +15,13 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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.*;

View File

@ -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": {

View File

@ -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": [

View File

@ -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"
],

View File

@ -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": [

View File

@ -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"
],

View File

@ -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": [