This commit is contained in:
FlorianMichael 2024-04-29 17:55:47 +02:00
parent 35642a468b
commit 3d0980953b
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
32 changed files with 68 additions and 68 deletions

View File

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

View File

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

View File

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

View File

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

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.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;

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.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;

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.mc1205.commands;
package com.viaversion.fabric.mc1206.commands;
import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
import net.minecraft.command.CommandSource;

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.mc1205.commands;
package com.viaversion.fabric.mc1206.commands;
import com.viaversion.fabric.common.commands.subs.LeakDetectSubCommand;
import com.mojang.brigadier.arguments.StringArgumentType;

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.mc1205.gui;
package com.viaversion.fabric.mc1206.gui;
import com.google.common.collect.ImmutableMap;
import com.terraformersmc.modmenu.api.ConfigScreenFactory;

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.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;

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.mc1205.mixin.address.client;
package com.viaversion.fabric.mc1206.mixin.address.client;
import com.viaversion.fabric.common.AddressParser;
import net.minecraft.client.network.Address;

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.mc1205.mixin.debug.client;
package com.viaversion.fabric.mc1206.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.mc1205.mixin.debug.client;
package com.viaversion.fabric.mc1206.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.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;

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.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;

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.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;

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.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;

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.mc1205.mixin.pipeline;
package com.viaversion.fabric.mc1206.mixin.pipeline;
import com.viaversion.fabric.common.handler.CommonTransformer;
import com.viaversion.fabric.common.handler.FabricDecodeHandler;

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.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;

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.mc1205.platform;
package com.viaversion.fabric.mc1206.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.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;

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.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;

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.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;

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.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;

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.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;

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.mc1205.providers;
package com.viaversion.fabric.mc1206.providers;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.Position;

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.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;

View File

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

View File

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

View File

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

View File

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

View File

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