From 960d9cf372d0b5988d6731b3447322bb60b9f958 Mon Sep 17 00:00:00 2001 From: creeper123123321 <7974274+creeper123123321@users.noreply.github.com> Date: Sun, 22 May 2022 12:04:22 -0300 Subject: [PATCH] 1.19-pre1 --- gradle.properties | 7 +++---- viafabric-mc119/build.gradle.kts | 8 ++++---- .../java/com/viaversion/fabric/mc119/ViaFabric.java | 10 +++++----- .../fabric/mc119/commands/NMSCommandSender.java | 2 +- .../viaversion/fabric/mc119/gui/ViaConfigScreen.java | 2 +- viafabric-mc119/src/main/resources/fabric.mod.json | 2 +- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6c224d9..2e67c0a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,8 @@ # suppress inspection "UnusedProperty" for whole file # rip my ram -org.gradle.jvmargs=-Xms32M -Xmx4G -org.gradle.workers.max=4 +org.gradle.jvmargs=-Xms32M -Xmx4G -XX:+UseG1GC -XX:+UseStringDeduplication org.gradle.parallel=true -loader_version=0.13.3 -viaver_version=4.3.0-22w18a-SNAPSHOT +loader_version=0.14.6 +viaver_version=4.3.0-1.19-pre1-SNAPSHOT yaml_version=1.30 diff --git a/viafabric-mc119/build.gradle.kts b/viafabric-mc119/build.gradle.kts index 1d755a9..d2302f6 100644 --- a/viafabric-mc119/build.gradle.kts +++ b/viafabric-mc119/build.gradle.kts @@ -1,7 +1,7 @@ dependencies { - minecraft("com.mojang:minecraft:22w18a") - mappings("net.fabricmc:yarn:22w18a+build.6:v2") + minecraft("com.mojang:minecraft:1.19-pre1") + mappings("net.fabricmc:yarn:1.19-pre1+build.7:v2") - modImplementation("net.fabricmc.fabric-api:fabric-api:0.51.2+1.19") - modImplementation("com.terraformersmc:modmenu:3.0.0") + modImplementation("net.fabricmc.fabric-api:fabric-api:0.53.1+1.19") + modImplementation("com.terraformersmc:modmenu:4.0.0-beta.4") } diff --git a/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/ViaFabric.java b/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/ViaFabric.java index 2be921e..20fc93f 100644 --- a/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/ViaFabric.java +++ b/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/ViaFabric.java @@ -20,8 +20,8 @@ import io.netty.channel.DefaultEventLoop; import io.netty.channel.EventLoop; import net.fabricmc.api.EnvType; import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.client.command.v1.ClientCommandManager; -import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback; +import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; +import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.command.CommandSource; import org.apache.logging.log4j.LogManager; @@ -89,9 +89,9 @@ public class ViaFabric implements ModInitializer { private void registerCommandsV1() { try { - CommandRegistrationCallback.EVENT.register((dispatcher, dedicated) -> dispatcher.register(command("viaversion"))); - CommandRegistrationCallback.EVENT.register((dispatcher, dedicated) -> dispatcher.register(command("viaver"))); - CommandRegistrationCallback.EVENT.register((dispatcher, dedicated) -> dispatcher.register(command("vvfabric"))); + CommandRegistrationCallback.EVENT.register((dispatcher, dedicated, env) -> dispatcher.register(command("viaversion"))); + CommandRegistrationCallback.EVENT.register((dispatcher, dedicated, env) -> dispatcher.register(command("viaver"))); + CommandRegistrationCallback.EVENT.register((dispatcher, dedicated, env) -> dispatcher.register(command("vvfabric"))); if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) { ClientCommandManager.DISPATCHER.register(command("viafabricclient")); } diff --git a/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/commands/NMSCommandSender.java b/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/commands/NMSCommandSender.java index 2859ad6..00d5084 100644 --- a/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/commands/NMSCommandSender.java +++ b/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/commands/NMSCommandSender.java @@ -1,7 +1,7 @@ package com.viaversion.fabric.mc119.commands; import com.viaversion.fabric.common.util.RemappingUtil; -import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource; +import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; import net.minecraft.command.CommandSource; import net.minecraft.entity.Entity; import net.minecraft.server.command.ServerCommandSource; diff --git a/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/gui/ViaConfigScreen.java b/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/gui/ViaConfigScreen.java index db4c727..1819acb 100644 --- a/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/gui/ViaConfigScreen.java +++ b/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/gui/ViaConfigScreen.java @@ -8,10 +8,10 @@ import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.ConfirmScreen; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.ScreenTexts; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.screen.ScreenTexts; import net.minecraft.text.Text; import java.util.concurrent.CompletableFuture; diff --git a/viafabric-mc119/src/main/resources/fabric.mod.json b/viafabric-mc119/src/main/resources/fabric.mod.json index 7f9da15..8d4e607 100644 --- a/viafabric-mc119/src/main/resources/fabric.mod.json +++ b/viafabric-mc119/src/main/resources/fabric.mod.json @@ -44,7 +44,7 @@ "viafabric": "*" }, "recommends": { - "fabric-command-api-v1": "*" + "fabric-command-api-v2": "*" }, "mixins": [ "mixins.viafabric119.address.json",