From 667a3271e4db0933bbd3365edccc5e173f52554a Mon Sep 17 00:00:00 2001 From: Magnus Date: Thu, 26 Mar 2026 11:26:10 +0000 Subject: [PATCH 1/2] fix for 26.1 rendering changes --- gradle.properties | 2 +- .../soundcontroller/gui/AllSoundOptionsScreen.java | 12 ++++++------ .../soundcontroller/gui/VolumeWidgetEntry.java | 12 ++++++------ .../gui/buttons/HoverableButtonWidget.java | 4 ++-- .../soundcontroller/mixin/SubtitleOverlayMixin.java | 4 ++-- src/main/resources/fabric.mod.json | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gradle.properties b/gradle.properties index 553d8c5..8834d8a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ archives_base_name = soundcontroller modmenu_version=18.0.0-alpha.5 -minecraft_version=26.1-snapshot-4 +minecraft_version=26.1 loader_version=0.18.4 loom_version=1.14-SNAPSHOT diff --git a/src/main/java/com/bvengo/soundcontroller/gui/AllSoundOptionsScreen.java b/src/main/java/com/bvengo/soundcontroller/gui/AllSoundOptionsScreen.java index 2f6cc49..b3cb8bd 100644 --- a/src/main/java/com/bvengo/soundcontroller/gui/AllSoundOptionsScreen.java +++ b/src/main/java/com/bvengo/soundcontroller/gui/AllSoundOptionsScreen.java @@ -3,7 +3,7 @@ import com.bvengo.soundcontroller.config.VolumeConfig; import com.bvengo.soundcontroller.gui.buttons.ToggleButtonWidget; import net.minecraft.client.Options; -import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.GuiGraphicsExtractor; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.gui.components.Tooltip; @@ -141,10 +141,10 @@ public void resize(int width, int height) { } @Override - public void render(GuiGraphics context, int mouseX, int mouseY, float delta) { - super.render(context, mouseX, mouseY, delta); - context.drawCenteredString(this.font, this.title, this.width / 2, 20, 0xFFFFFF); - context.drawString(this.font, SEARCH_FIELD_TITLE, 32, 40, 0xA0A0A0); - this.searchField.render(context, mouseX, mouseY, delta); + public void extractRenderState(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta) { + super.extractRenderState(context, mouseX, mouseY, delta); + context.centeredText(this.font, this.title, this.width / 2, 20, 0xFFFFFF); + context.text(this.font, SEARCH_FIELD_TITLE, 32, 40, 0xA0A0A0); + this.searchField.extractRenderState(context, mouseX, mouseY, delta); } } diff --git a/src/main/java/com/bvengo/soundcontroller/gui/VolumeWidgetEntry.java b/src/main/java/com/bvengo/soundcontroller/gui/VolumeWidgetEntry.java index 1d18cc7..a2eb054 100644 --- a/src/main/java/com/bvengo/soundcontroller/gui/VolumeWidgetEntry.java +++ b/src/main/java/com/bvengo/soundcontroller/gui/VolumeWidgetEntry.java @@ -9,7 +9,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.OptionInstance; import net.minecraft.client.Options; -import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.GuiGraphicsExtractor; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.ContainerObjectSelectionList.Entry; import net.minecraft.client.gui.components.Tooltip; @@ -121,19 +121,19 @@ private void init() { } @Override - public void renderContent(GuiGraphics context, int mouseX, int mouseY, boolean hovered, float tickDelta) { + public void extractContent(GuiGraphicsExtractor graphics, int mouseX, int mouseY, boolean hovered, float tickDelta) { int leftSide = (this.screen.width - totalWidth) / 2; this.volumeSlider.setPosition(leftSide, getY()); - this.volumeSlider.render(context, mouseX, mouseY, tickDelta); + this.volumeSlider.extractRenderState(graphics, mouseX, mouseY, tickDelta); this.playSoundButton.setPosition(volumeSlider.getRight() + paddingAfterSearch, getY()); - this.playSoundButton.render(context, mouseX, mouseY, tickDelta); + this.playSoundButton.extractRenderState(graphics, mouseX, mouseY, tickDelta); this.resetButton.setPosition(playSoundButton.getRight() + paddingBetweenButtons, getY()); - this.resetButton.render(context, mouseX, mouseY, tickDelta); - } + this.resetButton.extractRenderState(graphics, mouseX, mouseY, tickDelta); + } @Override public List children() { return List.of(volumeSlider, playSoundButton, resetButton); diff --git a/src/main/java/com/bvengo/soundcontroller/gui/buttons/HoverableButtonWidget.java b/src/main/java/com/bvengo/soundcontroller/gui/buttons/HoverableButtonWidget.java index 99f4d16..5a39e4b 100644 --- a/src/main/java/com/bvengo/soundcontroller/gui/buttons/HoverableButtonWidget.java +++ b/src/main/java/com/bvengo/soundcontroller/gui/buttons/HoverableButtonWidget.java @@ -3,7 +3,7 @@ import com.bvengo.soundcontroller.SoundController; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.GuiGraphicsExtractor; import net.minecraft.client.gui.components.Button; import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.CommonComponents; @@ -41,7 +41,7 @@ protected Identifier getTextureIdentifier() { } @Override - public void renderContents(GuiGraphics context, int mouseX, int mouseY, float delta) { + public void extractContents(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta) { Identifier texture = getTextureIdentifier(); context.blitSprite(RenderPipelines.GUI_TEXTURED, texture, getX(), getY(), width, height); } diff --git a/src/main/java/com/bvengo/soundcontroller/mixin/SubtitleOverlayMixin.java b/src/main/java/com/bvengo/soundcontroller/mixin/SubtitleOverlayMixin.java index f5fa6dc..4d98689 100644 --- a/src/main/java/com/bvengo/soundcontroller/mixin/SubtitleOverlayMixin.java +++ b/src/main/java/com/bvengo/soundcontroller/mixin/SubtitleOverlayMixin.java @@ -19,7 +19,7 @@ private Component replaceSubtitleText(WeighedSoundEvents instance, Operation=0.16.0", - "minecraft": ">=26.1-alpha.4", + "minecraft": ">=26.1", "java": ">=25", "fabric-api": "*" }, From 0642f0db8da64dd9bbe96bb6b8a8da8eee4025ae Mon Sep 17 00:00:00 2001 From: Magnus Date: Thu, 26 Mar 2026 11:30:04 +0000 Subject: [PATCH 2/2] versions --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8834d8a..774a762 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,11 +11,11 @@ archives_base_name = soundcontroller ## Fabric: https://fabricmc.net/develop ## ModMenu: https://maven.terraformersmc.com/com/terraformersmc/modmenu -modmenu_version=18.0.0-alpha.5 +modmenu_version=18.0.0-alpha.8 minecraft_version=26.1 loader_version=0.18.4 loom_version=1.14-SNAPSHOT # Fabric API -fabric_version=0.142.1+26.1 \ No newline at end of file +fabric_version=0.144.3+26.1 \ No newline at end of file