iOS-style release trigger and pressed state for ButtonWidgets

src/main/java/restudio/reglass/extensions/PressableWidgetExtension.java

@@ -0,0 +1,10 @@
+package restudio.reglass.extensions;
+
+import org.spongepowered.asm.mixin.Unique;
+
+public interface PressableWidgetExtension {
+    @Unique
+    boolean reglass$isDragging();
+    @Unique
+    void reglass$setIsDragging(boolean isDragging);
+}

src/main/java/restudio/reglass/mixin/widgets/ClickableWidgetMixin.java

@@ -0,0 +1,52 @@
+package restudio.reglass.mixin.widgets;
+
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.widget.ClickableWidget;
+import net.minecraft.client.gui.widget.PressableWidget;
+import net.minecraft.client.sound.SoundManager;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import restudio.reglass.extensions.PressableWidgetExtension;
+
+@Mixin(ClickableWidget.class)
+public abstract class ClickableWidgetMixin {
+    @Shadow
+    public abstract void playDownSound(SoundManager soundManager);
+
+    @Shadow
+    public abstract void onClick(double mouseX, double mouseY);
+
+    @Redirect(method = "mouseClicked", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/ClickableWidget;playDownSound(Lnet/minecraft/client/sound/SoundManager;)V"))
+    private void redirectPlayDownSound(ClickableWidget instance, SoundManager soundManager) {
+        if ((Object) this instanceof PressableWidget) {
+            // Just play nothing.
+            return;
+        }
+        playDownSound(soundManager);
+    }
+
+    @Redirect(method = "mouseClicked", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/ClickableWidget;onClick(DD)V"))
+    private void redirectOnClick(ClickableWidget instance, double mouseX, double mouseY) {
+        if ((Object) this instanceof PressableWidget) {
+            ((PressableWidgetExtension) this).reglass$setIsDragging(true);
+            // Just play nothing.
+            return;
+        }
+        onClick(mouseX, mouseY);
+    }
+
+    @Inject(method = "mouseReleased", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/ClickableWidget;onRelease(DD)V"))
+    private void modifyOnRelease(double mouseX, double mouseY, int button, CallbackInfoReturnable<Boolean> cir) {
+        if ((Object) this instanceof PressableWidget pressableWidget) {
+            if (pressableWidget.isMouseOver(mouseX, mouseY)) {
+                pressableWidget.playDownSound(MinecraftClient.getInstance().getSoundManager());
+                pressableWidget.onClick(mouseX, mouseY);
+            }
+            ((PressableWidgetExtension) pressableWidget).reglass$setIsDragging(false);
+        }
+    }
+}

src/main/java/restudio/reglass/mixin/widgets/PressableWidgetMixin.java

@@ -0,0 +1,68 @@
+package restudio.reglass.mixin.widgets;
+
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.widget.PressableWidget;
+import net.minecraft.util.math.ColorHelper;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import restudio.reglass.client.LiquidGlassUniforms;
+import restudio.reglass.client.api.ReGlassApi;
+import restudio.reglass.client.api.ReGlassConfig;
+import restudio.reglass.client.api.WidgetStyle;
+import restudio.reglass.extensions.PressableWidgetExtension;
+
+@Mixin(PressableWidget.class)
+public abstract class PressableWidgetMixin implements PressableWidgetExtension {
+    @Unique
+    private boolean reglass$isDragging;
+    @Shadow
+    public abstract void drawMessage(DrawContext context, TextRenderer textRenderer, int color);
+
+    @Inject(method = "renderWidget", at = @At("HEAD"), cancellable = true)
+    private void modifyRenderWidget(DrawContext context, int mouseX, int mouseY, float deltaTicks, CallbackInfo ci) {
+        if ((Object) this instanceof PressableWidget pressableWidget) {
+            if (!ReGlassConfig.INSTANCE.features.enableRedesign || !ReGlassConfig.INSTANCE.features.buttons) {
+                return;
+            }
+
+            boolean isDisabled = !pressableWidget.active;
+            boolean isHighlighted = pressableWidget.isHovered();
+            boolean isFocused = isHighlighted && reglass$isDragging;
+
+            if (ReGlassConfig.INSTANCE.features.enableRedesign && ReGlassConfig.INSTANCE.features.buttons) {
+                ReGlassApi.create(context)
+                        .position(pressableWidget.getX(), pressableWidget.getY())
+                        .size(pressableWidget.getWidth(), pressableWidget.getHeight())
+                        .hover(isHighlighted ? 1f : 0f)
+                        .focus(isFocused ? 1.0f : 0.0f)
+                        .style(WidgetStyle.create().tint(isDisabled ? 0xFF000000 : 0xFFFFFFFF, isDisabled ? 0.4f : 0f))
+                        .render();
+
+                LiquidGlassUniforms.get().tryApplyBlur(context);
+
+                TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
+                int i = ColorHelper.withAlpha(1.0f, pressableWidget.active ? -1 : -6250336);
+                drawMessage(context, textRenderer, i);
+                // context.drawCenteredTextWithShadow(textRenderer, buttonWidget.getMessage(), buttonWidget.getX() + buttonWidget.getWidth() / 2, buttonWidget.getY() + (buttonWidget.getHeight() - 8) / 2, finalColor);
+
+                ci.cancel();
+            }
+        }
+    }
+
+    @Override
+    public void reglass$setIsDragging(boolean isDragging) {
+        this.reglass$isDragging = isDragging;
+    }
+
+    @Override
+    public boolean reglass$isDragging() {
+        return reglass$isDragging;
+    }
+}

src/main/resources/reglass.mixins.json

@@ -24,6 +24,7 @@
     "client.ScreenMixin",
     "client.TitleScreenMixin",
     "logical.GameRendererMixin",
-    "widgets.DrawContextMixin"
+    "widgets.ClickableWidgetMixin",
+    "widgets.PressableWidgetMixin"
   ]
 }