Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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-snapshot-4
minecraft_version=26.1
loader_version=0.18.4
loom_version=1.14-SNAPSHOT

# Fabric API
fabric_version=0.142.1+26.1
fabric_version=0.144.3+26.1
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<? extends GuiEventListener> children() {
return List.of(volumeSlider, playSoundButton, resetButton);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ private Component replaceSubtitleText(WeighedSoundEvents instance, Operation<Com
}

@WrapOperation(
method = "render",
method = "extractRenderState",
at = @At(value = "INVOKE",
target = "Lnet/minecraft/client/OptionInstance;get()Ljava/lang/Object;",
ordinal = 0) // Targets the first getShowSubtitles().getValue() call
Expand All @@ -29,7 +29,7 @@ private Object modifyFirstShowSubtitlesCheck(OptionInstance instance, Operation<
}

@WrapOperation(
method = "render",
method = "extractRenderState",
at = @At(value = "INVOKE",
target = "Lnet/minecraft/client/OptionInstance;get()Ljava/lang/Object;",
ordinal = 1) // Targets the first getShowSubtitles().getValue() call
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
],
"depends": {
"fabricloader": ">=0.16.0",
"minecraft": ">=26.1-alpha.4",
"minecraft": ">=26.1",
"java": ">=25",
"fabric-api": "*"
},
Expand Down
Loading