From 6aa053665f9b130578232f0a256b50919e9a3fa6 Mon Sep 17 00:00:00 2001 From: maloryware Date: Mon, 27 Jan 2025 09:11:43 +0000 Subject: [PATCH 1/2] Backported to 1.21(.1) --- .../midnightdust/core/mixin/MixinOptionsScreen.java | 5 ++++- .../eu/midnightdust/lib/config/MidnightConfig.java | 8 ++++---- gradle.properties | 12 ++++++------ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/core/mixin/MixinOptionsScreen.java b/common/src/main/java/eu/midnightdust/core/mixin/MixinOptionsScreen.java index 13203b7..be1cfd8 100644 --- a/common/src/main/java/eu/midnightdust/core/mixin/MixinOptionsScreen.java +++ b/common/src/main/java/eu/midnightdust/core/mixin/MixinOptionsScreen.java @@ -37,11 +37,14 @@ public abstract class MixinOptionsScreen extends Screen { } } - @Inject(at = @At("TAIL"), method = "refreshWidgetPositions") + + + @Inject(at = @At("TAIL"), method = "initTabNavigation") public void midnightlib$onResize(CallbackInfo ci) { if (shouldShowButton()) this.midnightlib$setButtonPos(); } + @Unique public void midnightlib$setButtonPos() { midnightlib$button.setPosition(layout.getWidth() / 2 + 158, layout.getY() + layout.getFooterHeight() - 4); diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index dd313f4..87dcbb1 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -251,9 +251,9 @@ public abstract class MidnightConfig { if (prevTab != null && prevTab != tabManager.getCurrentTab()) { prevTab = tabManager.getCurrentTab(); this.list.clear(); fillList(); - list.setScrollY(0); + list.setScrollAmount(0); } - scrollProgress = list.getScrollY(); + scrollProgress = list.getScrollAmount(); for (EntryInfo info : entries) try {info.field.set(null, info.value);} catch (IllegalAccessException ignored) {} updateButtons(); } @@ -395,7 +395,7 @@ public abstract class MidnightConfig { } this.list.addButton(widgets, name, info); } else this.list.addButton(List.of(), name, info); - } list.setScrollY(scrollProgress); + } list.setScrollAmount(scrollProgress); updateButtons(); } } @@ -423,7 +423,7 @@ public abstract class MidnightConfig { protected void drawHeaderAndFooterSeparators(DrawContext context) { if (renderHeaderSeparator) super.drawHeaderAndFooterSeparators(context); else { RenderSystem.enableBlend(); - context.drawTexture(RenderLayer::getGuiTextured, this.client.world == null ? Screen.FOOTER_SEPARATOR_TEXTURE : Screen.INWORLD_FOOTER_SEPARATOR_TEXTURE, this.getX(), this.getBottom(), 0.0F, 0.0F, this.getWidth(), 2, 32, 2); + context.drawTexture(this.client.world == null ? Screen.FOOTER_SEPARATOR_TEXTURE : Screen.INWORLD_FOOTER_SEPARATOR_TEXTURE, this.getX(), this.getBottom(), 0.0F, 0.0F, this.getWidth(), 2, 32, 2); RenderSystem.disableBlend(); } } public void addButton(List buttons, Text text, EntryInfo info) { this.addEntry(new ButtonEntry(buttons, text, info)); } diff --git a/gradle.properties b/gradle.properties index a4b1085..8a832a2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,21 +1,21 @@ org.gradle.jvmargs=-Xmx4096M -minecraft_version=1.21.4 +minecraft_version=1.21 supported_versions= -yarn_mappings=1.21.4+build.1 +yarn_mappings=1.21+build.1 enabled_platforms=fabric,neoforge archives_base_name=midnightlib -mod_version=1.6.6 +mod_version=1.6.7-1.21 maven_group=eu.midnightdust release_type=release curseforge_id=488090 modrinth_id=codAaoxh -fabric_loader_version=0.16.9 -fabric_api_version=0.110.5+1.21.4 +fabric_loader_version=0.16.10 +fabric_api_version=0.115.0+1.21.1 -neoforge_version=21.4.3-beta +neoforge_version=21.0.167 yarn_mappings_patch_neoforge_version = 1.21+build.4 quilt_loader_version=0.19.0-beta.18 From 81d2a6645177d74f487efd7c771223a0b44d1b19 Mon Sep 17 00:00:00 2001 From: maloryware Date: Mon, 27 Jan 2025 09:15:21 +0000 Subject: [PATCH 2/2] i should really stop pressing "commit and push" unconditionally but it's such an attractive button... --- .../src/main/java/eu/midnightdust/lib/config/MidnightConfig.java | 1 - 1 file changed, 1 deletion(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 87dcbb1..835978e 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -9,7 +9,6 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.Te import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.tab.GridScreenTab; import net.minecraft.client.gui.tab.Tab; import net.minecraft.client.gui.tab.TabManager; import net.minecraft.client.gui.tooltip.Tooltip; import net.minecraft.client.gui.widget.*; -import net.minecraft.client.render.RenderLayer; import net.minecraft.client.resource.language.I18n; import net.minecraft.registry.Registries; import net.minecraft.screen.ScreenTexts;