From a154072f032987d2fac0628ce9c7ad29bdb1f9c5 Mon Sep 17 00:00:00 2001 From: "Jill \"oatmealine\" Monoids" Date: Thu, 10 Nov 2022 14:22:53 +0300 Subject: [PATCH] quick 1.19.2 port --- build.gradle | 3 +- gradle.properties | 18 ++++++------ .../screen/CustomTitleScreen.java | 29 +++++++++---------- src/main/resources/fabric.mod.json | 2 +- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/build.gradle b/build.gradle index 408a754..2809496 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,8 @@ dependencies { modLocalRuntime("maven.modrinth:lazydfu:0.1.2") // lazydfu - improves start times //modLocalRuntime("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") { exclude(group: "net.fabricmc.fabric-api") } // required for suggestion tweaker - modLocalRuntime("maven.modrinth:suggestion-tweaker:${project.suggestion_tweaker_version}") // suggestion tweaker - dev QOL, improves command suggestions + // does not function on 1.19.2 + //modLocalRuntime("maven.modrinth:suggestion-tweaker:${project.suggestion_tweaker_version}") // suggestion tweaker - dev QOL, improves command suggestions modApi("com.terraformersmc:modmenu:${project.modmenu_version}") diff --git a/gradle.properties b/gradle.properties index 8af2535..555c85b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,24 +3,24 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version=1.18.2 - accepted_minecraft_version=1.18,1.18.1,1.18.2 - yarn_mappings=1.18.2+build.4 + minecraft_version=1.19.2 + accepted_minecraft_version=1.19,1.19.1,1.19.2 + yarn_mappings=1.19.2+build.28 loader_version=0.14.10 # Mod Properties - mod_version = 1.0+1.18 - mod_version_friendly = 1.0 for 1.18.2 + mod_version = 1.0+1.19 + mod_version_friendly = 1.0 for 1.19.2 maven_group = zone.oat archives_base_name = gmod-title-screen # Dependencies - fabric_version=0.66.0+1.18.2 + fabric_version=0.66.0+1.19.2 # https://modrinth.com/mod/modmenu - modmenu_version=3.2.3 + modmenu_version=4.1.0 # Dev environment # https://modrinth.com/mod/suggestion-tweaker - suggestion_tweaker_version = 1.18.x-1.2.0 + #suggestion_tweaker_version = 1.19.1-1.3.1 # https://modrinth.com/mod/cloth-config - cloth_config_version = 6.3.81 + cloth_config_version = 8.2.88 diff --git a/src/main/java/zone/oat/gmodtitlescreen/screen/CustomTitleScreen.java b/src/main/java/zone/oat/gmodtitlescreen/screen/CustomTitleScreen.java index f36d2e4..9146892 100644 --- a/src/main/java/zone/oat/gmodtitlescreen/screen/CustomTitleScreen.java +++ b/src/main/java/zone/oat/gmodtitlescreen/screen/CustomTitleScreen.java @@ -22,7 +22,6 @@ import net.minecraft.client.render.GameRenderer; import net.minecraft.client.texture.TextureManager; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; import net.minecraft.util.Util; @@ -41,7 +40,7 @@ import java.util.function.Consumer; @Environment(EnvType.CLIENT) public class CustomTitleScreen extends Screen { - public static final Text VERSION_TEXT = new TranslatableText("menu.gmod-title-screen.version", SharedConstants.getGameVersion().getName(), FabricLoader.getInstance().getModContainer("gmod-title-screen").get().getMetadata().getVersion().getFriendlyString()); + public static final Text VERSION_TEXT = Text.translatable("menu.gmod-title-screen.version", SharedConstants.getGameVersion().getName(), FabricLoader.getInstance().getModContainer("gmod-title-screen").get().getMetadata().getVersion().getFriendlyString()); private static final Identifier ACCESSIBILITY_ICON_TEXTURE = new Identifier("textures/gui/accessibility.png"); private final boolean isMinceraft; @Nullable @@ -112,7 +111,7 @@ public class CustomTitleScreen extends Screen { } private void openLink(String url) { - this.client.setScreen(new ConfirmChatLinkScreen(openInBrowser -> { + this.client.setScreen(new ConfirmLinkScreen(openInBrowser -> { if (openInBrowser) { Util.getOperatingSystem().open(url); } @@ -122,7 +121,7 @@ public class CustomTitleScreen extends Screen { } public CustomTitleScreen() { - super(new TranslatableText("narrator.screen.title")); + super(Text.translatable("narrator.screen.title")); this.isMinceraft = (double)new Random().nextFloat() < 1.0E-4; } @@ -193,7 +192,7 @@ public class CustomTitleScreen extends Screen { buttonsY, 130, buttonHeight, - new TranslatableText("menu.gmod-title-screen.singleplayer"), + Text.translatable("menu.gmod-title-screen.singleplayer"), button -> this.client.setScreen(new SelectWorldScreen(this)), this.textRenderer )); @@ -203,7 +202,7 @@ public class CustomTitleScreen extends Screen { buttonsY + buttonSpacing * 1, 130, buttonHeight, - new TranslatableText("menu.gmod-title-screen.multiplayer"), + Text.translatable("menu.gmod-title-screen.multiplayer"), button -> { this.client.setScreen(new MultiplayerScreen(this)); }, @@ -216,10 +215,10 @@ public class CustomTitleScreen extends Screen { buttonsY + buttonSpacing * 2 + buttonSectionSpacing, 98, buttonHeight, - new TranslatableText("menu.gmod-title-screen.modmenu").formatted(modsButtonActive ? Formatting.RESET : Formatting.GRAY), + Text.translatable("menu.gmod-title-screen.modmenu").formatted(modsButtonActive ? Formatting.RESET : Formatting.GRAY), button -> this.client.setScreen(new ModsScreen(this)), textRenderer, - new DisabledTooltipSupplier(new TranslatableText("menu.gmod-title-screen.modmenu.not-installed")) + new DisabledTooltipSupplier(Text.translatable("menu.gmod-title-screen.modmenu.not-installed")) )); modsButton.active = modsButtonActive; @@ -228,7 +227,7 @@ public class CustomTitleScreen extends Screen { buttonsY + buttonSpacing * 3 + buttonSectionSpacing, 98, buttonHeight, - new TranslatableText("menu.gmod-title-screen.dupes").formatted(Formatting.GRAY), + Text.translatable("menu.gmod-title-screen.dupes").formatted(Formatting.GRAY), button -> {}, textRenderer )).active = false; @@ -237,7 +236,7 @@ public class CustomTitleScreen extends Screen { buttonsY + buttonSpacing * 4 + buttonSectionSpacing, 98, buttonHeight, - new TranslatableText("menu.gmod-title-screen.demos").formatted(Formatting.GRAY), + Text.translatable("menu.gmod-title-screen.demos").formatted(Formatting.GRAY), button -> {}, textRenderer )).active = false; @@ -246,7 +245,7 @@ public class CustomTitleScreen extends Screen { buttonsY + buttonSpacing * 5 + buttonSectionSpacing, 98, buttonHeight, - new TranslatableText("menu.gmod-title-screen.saves").formatted(Formatting.GRAY), + Text.translatable("menu.gmod-title-screen.saves").formatted(Formatting.GRAY), button -> {}, textRenderer )).active = false; @@ -256,7 +255,7 @@ public class CustomTitleScreen extends Screen { buttonsY + buttonSpacing * 6 + buttonSectionSpacing * 2, 98, buttonHeight, - new TranslatableText("menu.gmod-title-screen.options"), + Text.translatable("menu.gmod-title-screen.options"), button -> this.client.setScreen(new OptionsScreen(this, this.client.options)), textRenderer )); @@ -266,7 +265,7 @@ public class CustomTitleScreen extends Screen { buttonsY + buttonSpacing * 7 + buttonSectionSpacing * 3, 98, buttonHeight, - new TranslatableText("menu.gmod-title-screen.quit"), + Text.translatable("menu.gmod-title-screen.quit"), button -> this.client.scheduleStop(), textRenderer )); @@ -284,7 +283,7 @@ public class CustomTitleScreen extends Screen { 256, 256, button -> this.client.setScreen(new LanguageOptionsScreen(this, this.client.options, this.client.getLanguageManager())), - new TranslatableText("narrator.button.language") + Text.translatable("narrator.button.language") ) ); this.addDrawableChild(new TexturedButtonWidget( @@ -299,7 +298,7 @@ public class CustomTitleScreen extends Screen { 32, 64, button -> this.client.setScreen(new AccessibilityOptionsScreen(this, this.client.options)), - new TranslatableText("narrator.button.accessibility") + Text.translatable("narrator.button.accessibility") )); version = this.addDrawableChild( diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 3cb68f3..e17033f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -32,7 +32,7 @@ "depends": { "fabricloader": ">=0.14.6", "fabric": "*", - "minecraft": "~1.18.2", + "minecraft": ["1.19","1.19.1","1.19.2"], "java": ">=17", "cloth-config": ">=6.0.0" },