From 07bfff580640cd9bc2bf22064101181ca97cd374 Mon Sep 17 00:00:00 2001 From: tehbeard Date: Wed, 4 Dec 2024 22:20:18 +0000 Subject: [PATCH 1/3] Updating build script for 1.21.3 --- build.gradle | 2 +- gradle.properties | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 87a54ec..abea5ad 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.6-SNAPSHOT' + id 'fabric-loom' version '1.9-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index e90aa16..9427b57 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,12 +4,12 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21 -yarn_mappings=1.21+build.2 -loader_version=0.15.11 +minecraft_version=1.21.3 +yarn_mappings=1.21.3+build.2 +loader_version=0.16.9 # Fabric API -fabric_version=0.100.3+1.21 +fabric_version=0.110.0+1.21.3 # Mod Properties mod_version=1.2.4 @@ -17,4 +17,4 @@ maven_group=xyz.imcodist.quickmenu archives_base_name=quick-menu # owo-lib -owo_version=0.12.10+1.21 \ No newline at end of file +owo_version=0.12.18+1.21.2 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 20db9ad..21d5e09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 80de4d0589ef400f8fe26275e54b4713ef18f4ac Mon Sep 17 00:00:00 2001 From: tehbeard Date: Wed, 4 Dec 2024 22:22:43 +0000 Subject: [PATCH 2/3] Fix `OwoUIDrawContext.drawTexture(...)` call to match method signature. Added needed function parameter to select the GUI overlay and correctly render the background. --- .../xyz/imcodist/quickmenu/ui/surfaces/SwitcherSurface.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/xyz/imcodist/quickmenu/ui/surfaces/SwitcherSurface.java b/src/main/java/xyz/imcodist/quickmenu/ui/surfaces/SwitcherSurface.java index 26c6ff0..8b2a2db 100644 --- a/src/main/java/xyz/imcodist/quickmenu/ui/surfaces/SwitcherSurface.java +++ b/src/main/java/xyz/imcodist/quickmenu/ui/surfaces/SwitcherSurface.java @@ -4,6 +4,7 @@ import io.wispforest.owo.ui.core.OwoUIDrawContext; import io.wispforest.owo.ui.core.ParentComponent; import io.wispforest.owo.ui.core.Surface; +import net.minecraft.client.render.RenderLayer; import net.minecraft.util.Identifier; public class SwitcherSurface implements Surface { @@ -58,7 +59,7 @@ public void drawNineSlicedTexture(OwoUIDrawContext context, int x, int y, int wi } public void drawTexture(OwoUIDrawContext context, int x, int y, int sourceX, int sourceY, int sourceWidth, int sourceHeight, int textureWidth, int textureHeight) { - context.drawTexture(Identifier.of("quickmenu", "textures/switcher_textures.png"), x, y, sourceX, sourceY, sourceWidth, sourceHeight, textureWidth, textureHeight); + context.drawTexture(RenderLayer::getGuiTexturedOverlay, Identifier.of("quickmenu", "textures/switcher_textures.png"), x, y, sourceX, sourceY, sourceWidth, sourceHeight, textureWidth, textureHeight); } public void drawRepeatingTexture(OwoUIDrawContext context, int x, int y, int sourceX, int sourceY, int sourceWidth, int sourceHeight, int textureWidth, int textureHeight, int width, int height) { From a75c1c9a01a5a6cee2ff3ca87ec3900a09843056 Mon Sep 17 00:00:00 2001 From: tehbeard Date: Fri, 6 Dec 2024 18:05:13 +0000 Subject: [PATCH 3/3] Bump version number --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9427b57..5dc5624 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ loader_version=0.16.9 fabric_version=0.110.0+1.21.3 # Mod Properties -mod_version=1.2.4 +mod_version=1.2.5 maven_group=xyz.imcodist.quickmenu archives_base_name=quick-menu