From 2640b59e1409e1936be36ebbececfd8798e023fc Mon Sep 17 00:00:00 2001 From: TexTrue <3140846162@qq.com> Date: Sun, 18 Aug 2024 19:07:06 +0800 Subject: [PATCH] update to 1.21.1 --- CHANGELOG.md | 2 +- .../thinkingstudio/obsidianui/util/RenderUtil.java | 2 ++ fabric/CHANGELOG.md | 2 +- gradle.properties | 12 ++++++------ neoforge/CHANGELOG.md | 2 +- .../obsidianui/neoforge/ObsidianUINeoForge.java | 5 ++--- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fef80c..b17cac8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,2 @@ ## Changelog -- fix HUD part +- update to 1.21.1 diff --git a/common/src/main/java/org/thinkingstudio/obsidianui/util/RenderUtil.java b/common/src/main/java/org/thinkingstudio/obsidianui/util/RenderUtil.java index 8535798..16f6229 100644 --- a/common/src/main/java/org/thinkingstudio/obsidianui/util/RenderUtil.java +++ b/common/src/main/java/org/thinkingstudio/obsidianui/util/RenderUtil.java @@ -96,6 +96,7 @@ public static Identifier getListBackgroundTexture() { * @param vOffset the v offset * @see #renderDirtBackgroundTexture(int, int, int, int, float, int, int, int, int) */ + @Deprecated(since = "1.20.5") public static void renderDirtBackgroundTexture(int x, int y, int width, int height, float vOffset) { renderDirtBackgroundTexture(x, y, width, height, vOffset, 64, 64, 64, 255); } @@ -113,6 +114,7 @@ public static void renderDirtBackgroundTexture(int x, int y, int width, int heig * @param blue the blue-component color value * @param alpha the alpha-component alpha value */ + @Deprecated(since = "1.20.5") public static void renderDirtBackgroundTexture(int x, int y, int width, int height, float vOffset, int red, int green, int blue, int alpha) { var tessellator = Tessellator.getInstance(); diff --git a/fabric/CHANGELOG.md b/fabric/CHANGELOG.md index 2fef80c..b17cac8 100644 --- a/fabric/CHANGELOG.md +++ b/fabric/CHANGELOG.md @@ -1,2 +1,2 @@ ## Changelog -- fix HUD part +- update to 1.21.1 diff --git a/gradle.properties b/gradle.properties index 65e9630..806a12b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,18 +1,18 @@ org.gradle.jvmargs=-Xmx2G -minecraft_version=1.21 +minecraft_version=1.21.1 enabled_platforms=fabric,neoforge -yarn_mappings=1.21+build.2 +yarn_mappings=1.21.1+build.3 mappings_patch=1.21+build.4 archives_base_name=ObsidianUI -mod_version=0.2.7 +mod_version=0.2.8 maven_group=org.thinkingstudio.obsidianui -fabric_loader_version=0.15.11 -fabric_api_version=0.100.1+1.21 +fabric_loader_version=0.16.2 +fabric_api_version=0.102.1+1.21.1 -neoforge_version=21.0.2-beta +neoforge_version=21.1.18 modrinth_id=E0L8mfJZ curseforge_id=684718 diff --git a/neoforge/CHANGELOG.md b/neoforge/CHANGELOG.md index 2fef80c..b17cac8 100644 --- a/neoforge/CHANGELOG.md +++ b/neoforge/CHANGELOG.md @@ -1,2 +1,2 @@ ## Changelog -- fix HUD part +- update to 1.21.1 diff --git a/neoforge/src/main/java/org/thinkingstudio/obsidianui/neoforge/ObsidianUINeoForge.java b/neoforge/src/main/java/org/thinkingstudio/obsidianui/neoforge/ObsidianUINeoForge.java index 628cf2b..3b536c0 100644 --- a/neoforge/src/main/java/org/thinkingstudio/obsidianui/neoforge/ObsidianUINeoForge.java +++ b/neoforge/src/main/java/org/thinkingstudio/obsidianui/neoforge/ObsidianUINeoForge.java @@ -11,8 +11,7 @@ package org.thinkingstudio.obsidianui.neoforge; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.render.RenderTickCounter; +import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.EventPriority; import net.neoforged.bus.api.IEventBus; import net.neoforged.fml.common.Mod; @@ -25,7 +24,7 @@ import org.thinkingstudio.obsidianui.neoforge.event.OpenScreenCallbackEvent; import org.thinkingstudio.obsidianui.neoforge.event.ResolutionChangeCallbackEvent; -@Mod(ObsidianUI.MODID) +@Mod(value = ObsidianUI.MODID, dist = Dist.CLIENT) public class ObsidianUINeoForge { public ObsidianUINeoForge() { IEventBus forgeEventBus = NeoForge.EVENT_BUS;