From c0f26cab080c130b11693ea707220a4d20a735fc Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Thu, 16 Jun 2022 17:10:26 +0300 Subject: Update to 1.19 and bump version to 6.0.0 --- .../io/github/cottonmc/test/client/LibGuiTestClient.java | 6 +++--- build.gradle | 4 ++-- gradle.properties | 12 ++++++------ .../cottonmc/cotton/gui/client/CottonClientScreen.java | 2 +- .../cottonmc/cotton/gui/client/CottonInventoryScreen.java | 2 +- .../github/cottonmc/cotton/gui/impl/modmenu/ConfigGui.java | 2 +- src/main/resources/fabric.mod.json | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/GuiTest/src/main/java/io/github/cottonmc/test/client/LibGuiTestClient.java b/GuiTest/src/main/java/io/github/cottonmc/test/client/LibGuiTestClient.java index c396a7f..2d6c5b7 100644 --- a/GuiTest/src/main/java/io/github/cottonmc/test/client/LibGuiTestClient.java +++ b/GuiTest/src/main/java/io/github/cottonmc/test/client/LibGuiTestClient.java @@ -2,7 +2,7 @@ package io.github.cottonmc.test.client; import com.mojang.brigadier.Command; import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; +import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.ingame.HandledScreens; @@ -39,14 +39,14 @@ public class LibGuiTestClient implements ClientModInitializer { CottonHud.add(new WHudTest(), 10, -20, 10, 10); CottonHud.add(new WLabel(Text.literal("Test label")), 10, -30, 10, 10); - ClientCommandManager.DISPATCHER.register( + ClientCommandRegistrationCallback.EVENT.register((dispatcher, commandRegistryAccess) -> dispatcher.register( literal("libgui") .then(literal("config").executes(openScreen(client -> new ConfigGui(client.currentScreen)))) .then(literal("tab").executes(openScreen(client -> new TabTestGui()))) .then(literal("scrolling").executes(openScreen(client -> new ScrollingTestGui()))) .then(literal("insets").executes(openScreen(client -> new InsetsTestGui()))) .then(literal("textfield").executes(openScreen(client -> new TextFieldTestGui()))) - ); + )); } private static Command openScreen(Function screenFactory) { diff --git a/build.gradle b/build.gradle index a63469f..0c38833 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'fabric-loom' version '0.11-SNAPSHOT' - id 'io.github.juuxel.loom-quiltflower' version '1.7.0' + id 'fabric-loom' version '0.12-SNAPSHOT' + id 'io.github.juuxel.loom-quiltflower' version '1.7.2' id 'maven-publish' id 'checkstyle' } diff --git a/gradle.properties b/gradle.properties index e265817..f3c8f7d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,17 +3,17 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.19-pre1 - yarn_mappings=1.19-pre1+build.1 - loader_version=0.14.5 + minecraft_version=1.19 + yarn_mappings=1.19+build.4 + loader_version=0.14.8 # Mod Properties - mod_version = 6.0.0-beta.5 + mod_version = 6.0.0 maven_group = io.github.cottonmc archives_base_name = LibGui # Dependencies - fabric_version=0.53.0+1.19 + fabric_version=0.56.0+1.19 jankson_version=4.1.1+j1.2.1 - modmenu_version=3.1.1 + modmenu_version=4.0.0 libninepatch_version=1.1.0 diff --git a/src/main/java/io/github/cottonmc/cotton/gui/client/CottonClientScreen.java b/src/main/java/io/github/cottonmc/cotton/gui/client/CottonClientScreen.java index 0ae199e..c82c1e6 100644 --- a/src/main/java/io/github/cottonmc/cotton/gui/client/CottonClientScreen.java +++ b/src/main/java/io/github/cottonmc/cotton/gui/client/CottonClientScreen.java @@ -1,9 +1,9 @@ package io.github.cottonmc.cotton.gui.client; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.ScreenTexts; import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder; import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.screen.ScreenTexts; import net.minecraft.text.Style; import net.minecraft.text.Text; diff --git a/src/main/java/io/github/cottonmc/cotton/gui/client/CottonInventoryScreen.java b/src/main/java/io/github/cottonmc/cotton/gui/client/CottonInventoryScreen.java index e8a2b51..8714ad2 100644 --- a/src/main/java/io/github/cottonmc/cotton/gui/client/CottonInventoryScreen.java +++ b/src/main/java/io/github/cottonmc/cotton/gui/client/CottonInventoryScreen.java @@ -1,12 +1,12 @@ package io.github.cottonmc.cotton.gui.client; -import net.minecraft.client.gui.screen.ScreenTexts; import net.minecraft.client.gui.screen.ingame.HandledScreen; import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder; import net.minecraft.client.render.DiffuseLighting; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.screen.ScreenTexts; import net.minecraft.text.Style; import net.minecraft.text.Text; diff --git a/src/main/java/io/github/cottonmc/cotton/gui/impl/modmenu/ConfigGui.java b/src/main/java/io/github/cottonmc/cotton/gui/impl/modmenu/ConfigGui.java index 2931d46..1832313 100644 --- a/src/main/java/io/github/cottonmc/cotton/gui/impl/modmenu/ConfigGui.java +++ b/src/main/java/io/github/cottonmc/cotton/gui/impl/modmenu/ConfigGui.java @@ -2,7 +2,7 @@ package io.github.cottonmc.cotton.gui.impl.modmenu; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.ScreenTexts; +import net.minecraft.screen.ScreenTexts; import net.minecraft.text.Text; import io.github.cottonmc.cotton.gui.client.BackgroundPainter; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index b3597f3..2e88dba 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -29,7 +29,7 @@ "fabric-lifecycle-events-v1": "^2.0.2", "fabric-networking-api-v1": "^1.0.21", "fabric-rendering-v1": "^1.10.7", - "minecraft": ">=1.19-beta.1", + "minecraft": ">=1.19", "jankson": "^4.0.0", "libninepatch": "^1.1.0" }, -- cgit