From ab0b4e428baeffc736822450cdf26993826eec2e Mon Sep 17 00:00:00 2001 From: "James (Jamalam)" Date: Tue, 20 Jun 2023 19:06:02 +0100 Subject: [PATCH] feat: 1.19.3 port --- CHANGELOG.md | 8 +------- gradle.properties | 6 +++--- .../github/jamalam360/tutorial/lib/TutorialLib.java | 2 +- .../tutorial/lib/mixin/GameOptionsMixin.java | 3 +-- .../jamalam360/tutorial/lib/stage/DelayedStage.java | 11 +---------- .../tutorial/lib/testmod/TutorialLibTestMod.java | 4 ++-- versions.toml | 8 ++++---- 7 files changed, 13 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b019b84..21a81fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,3 @@ ## Changelog -### Features - -### Fixes - -Closed issues: None. - -[Full Changelog](https://github.com/JamCoreModding/tutorial-lib/compare/...) +- Port to 1.19.3 diff --git a/gradle.properties b/gradle.properties index b18dafa..a717375 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,9 @@ org.gradle.parallel=true # Name of your built jar archive_base_name=tutorial-lib -mod_version=1.1.0+1.19.2 -release_name=V1.1.0 [1.19.2] -supported_versions=1.19.2 +mod_version=1.1.0+1.19.3 +release_name=V1.1.0 [1.19.3] +supported_versions=1.19.3 # Used for releasing GitHub releases github_user=JamCoreModding diff --git a/src/main/java/io/github/jamalam360/tutorial/lib/TutorialLib.java b/src/main/java/io/github/jamalam360/tutorial/lib/TutorialLib.java index 687f78a..8b8e507 100644 --- a/src/main/java/io/github/jamalam360/tutorial/lib/TutorialLib.java +++ b/src/main/java/io/github/jamalam360/tutorial/lib/TutorialLib.java @@ -32,7 +32,7 @@ import net.fabricmc.fabric.api.event.registry.FabricRegistryBuilder; import net.minecraft.client.MinecraftClient; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; +import net.minecraft.registry.Registry; import org.jetbrains.annotations.ApiStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/io/github/jamalam360/tutorial/lib/mixin/GameOptionsMixin.java b/src/main/java/io/github/jamalam360/tutorial/lib/mixin/GameOptionsMixin.java index d95449e..97d8900 100644 --- a/src/main/java/io/github/jamalam360/tutorial/lib/mixin/GameOptionsMixin.java +++ b/src/main/java/io/github/jamalam360/tutorial/lib/mixin/GameOptionsMixin.java @@ -27,9 +27,8 @@ import io.github.jamalam360.tutorial.lib.Tutorial; import io.github.jamalam360.tutorial.lib.TutorialLib; import io.github.jamalam360.tutorial.lib.stage.DelayedStage; -import net.minecraft.client.MinecraftClient; import net.minecraft.client.option.GameOptions; -import net.minecraft.util.registry.RegistryKey; +import net.minecraft.registry.RegistryKey; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/main/java/io/github/jamalam360/tutorial/lib/stage/DelayedStage.java b/src/main/java/io/github/jamalam360/tutorial/lib/stage/DelayedStage.java index 43ef7f5..e87a206 100644 --- a/src/main/java/io/github/jamalam360/tutorial/lib/stage/DelayedStage.java +++ b/src/main/java/io/github/jamalam360/tutorial/lib/stage/DelayedStage.java @@ -12,20 +12,11 @@ public class DelayedStage extends Stage { private final int delay; private long startTime; - /** - * @deprecated Use the other constructors - */ - @Deprecated(forRemoval = true) - - public DelayedStage(TutorialToast toast, int delay) { - this(delay, toast); - } - public DelayedStage(int delay, TutorialToast toast) { super(toast); this.delay = delay; } -it in + public DelayedStage(TutorialToast toast, int delay, int toastDisplayTicks) { super(toast, toastDisplayTicks); this.delay = delay; diff --git a/src/testmod/java/io/github/jamalam360/tutorial/lib/testmod/TutorialLibTestMod.java b/src/testmod/java/io/github/jamalam360/tutorial/lib/testmod/TutorialLibTestMod.java index ebc91cf..e1ef2f1 100644 --- a/src/testmod/java/io/github/jamalam360/tutorial/lib/testmod/TutorialLibTestMod.java +++ b/src/testmod/java/io/github/jamalam360/tutorial/lib/testmod/TutorialLibTestMod.java @@ -38,7 +38,7 @@ import net.minecraft.item.Items; import net.minecraft.text.Text; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; +import net.minecraft.registry.Registry; public class TutorialLibTestMod implements ClientModInitializer { @@ -69,7 +69,7 @@ public class TutorialLibTestMod implements ClientModInitializer { // Text.literal("Tutorial Complete") // .styled(s -> s.withItalic(true)))), - new DelayedStage(new CustomTutorialToast(TEX, 100, 0, Text.literal("Delayed by 10 seconds!"), Text.literal("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"), true), 200)); + new DelayedStage(200, new CustomTutorialToast(TEX, 100, 0, Text.literal("Delayed by 10 seconds!"), Text.literal("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"), true))); public static Identifier idOf(String path) { return new Identifier(MOD_ID, path); diff --git a/versions.toml b/versions.toml index b6872ad..5e5607b 100644 --- a/versions.toml +++ b/versions.toml @@ -1,9 +1,9 @@ [versions] -minecraft = "1.19.2" -quilt-mappings = "1.19.2+build.22" +minecraft = "1.19.3" +quilt-mappings = "1.19.3+build.28" fabric-loader = "0.14.11" -fabric-api = "0.76.0+1.19.2" -mod-menu = "4.2.0-beta.2" +fabric-api = "0.76.1+1.19.3" +mod-menu = "5.1.0-beta.4" lazy-dfu = "0.1.3" [libraries]