From 833fab8c94bd15da7e20cff6a1a21931ae1ca4bf Mon Sep 17 00:00:00 2001 From: glisco Date: Fri, 5 Jan 2024 19:34:18 +0100 Subject: [PATCH] 1.20.4 --- build.gradle | 2 +- gradle.properties | 14 +++++++------- .../glisco/deathlog/mixin/TitleScreenMixin.java | 4 ++-- .../deathlog/storage/BaseDeathLogStorage.java | 4 ++-- src/main/resources/fabric.mod.json | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 454fc41..3df12dd 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ repositories { maven { url = "https://maven.terraformersmc.com/" } maven { url = "https://maven.ladysnake.org/releases" } maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } - maven { url "https://maven.wispforest.io/" } + maven { url "https://maven.wispforest.io/releases" } } dependencies { diff --git a/gradle.properties b/gradle.properties index 5494ee7..0bd5fd4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,16 +2,16 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_base_version=1.20.2 -minecraft_version=1.20.2 -yarn_mappings=1.20.2+build.2 -loader_version=0.14.22 +minecraft_base_version=1.20.3 +minecraft_version=1.20.4 +yarn_mappings=1.20.4+build.3 +loader_version=0.15.3 # Mod Properties mod_version=0.3.2 maven_group=com.glisco archives_base_name=deathlog # Dependencies -fabric_version=0.89.3+1.20.2 +fabric_version=0.92.0+1.20.4 # https://github.com/emilyploszaj/trinkets/releases trinkets_version=3.8.0 @@ -20,8 +20,8 @@ trinkets_version=3.8.0 cca_version=5.4.0 # https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu -modmenu_version=8.0.0 +modmenu_version=9.0.0 # https://maven.wispforest.io/io/wispforest/owo-lib/ -owo_version=0.11.3+1.20.2 +owo_version=0.12.0+1.20.3 diff --git a/src/main/java/com/glisco/deathlog/mixin/TitleScreenMixin.java b/src/main/java/com/glisco/deathlog/mixin/TitleScreenMixin.java index 4f23cc8..b5b8c61 100644 --- a/src/main/java/com/glisco/deathlog/mixin/TitleScreenMixin.java +++ b/src/main/java/com/glisco/deathlog/mixin/TitleScreenMixin.java @@ -27,8 +27,8 @@ private void onFirstRender(DrawContext context, int mouseX, int mouseY, float de final var storage = DeathLogClient.getClientStorage(); if (!storage.isErrored()) return; - MinecraftClient.getInstance().getToastManager().add(new DeathLogToast(SystemToast.Type.TUTORIAL_HINT, Text.of("DeathLog Database Error"), Text.of(storage.getErrorCondition()))); - MinecraftClient.getInstance().getToastManager().add(new DeathLogToast(SystemToast.Type.TUTORIAL_HINT, Text.of("DeathLog Problem"), Text.of("Check your log for details"))); + MinecraftClient.getInstance().getToastManager().add(new DeathLogToast(SystemToast.Type.PACK_LOAD_FAILURE, Text.of("DeathLog Database Error"), Text.of(storage.getErrorCondition()))); + MinecraftClient.getInstance().getToastManager().add(new DeathLogToast(SystemToast.Type.PACK_LOAD_FAILURE, Text.of("DeathLog Problem"), Text.of("Check your log for details"))); } } diff --git a/src/main/java/com/glisco/deathlog/storage/BaseDeathLogStorage.java b/src/main/java/com/glisco/deathlog/storage/BaseDeathLogStorage.java index 4ba9cea..c6b3adc 100644 --- a/src/main/java/com/glisco/deathlog/storage/BaseDeathLogStorage.java +++ b/src/main/java/com/glisco/deathlog/storage/BaseDeathLogStorage.java @@ -37,7 +37,7 @@ protected CompletableFuture> load(File file) { if (file.exists()) { try { - deathNbt = NbtIo.read(file); + deathNbt = NbtIo.read(file.toPath()); if (deathNbt.getInt("FormatRevision") != FORMAT_REVISION) { raiseError("Incompatible format"); @@ -89,7 +89,7 @@ protected void save(File file, List listIn) { deathNbt.putInt("FormatRevision", FORMAT_REVISION); try { - NbtIo.write(deathNbt, file); + NbtIo.write(deathNbt, file.toPath()); } catch (IOException e) { e.printStackTrace(); LOGGER.error("Failed to save DeathLog database"); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 7570376..bc40d50 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -32,7 +32,7 @@ "depends": { "fabricloader": "*", "fabric": "*", - "minecraft": ">=1.19.3", + "minecraft": ">=1.20.3", "owo-lib": ">=0.9.3" }, "suggests": {