Fix supermartijn compat mixin on fabric

Author: NotRyken

common/src/main/resources/clientsort.mixins.json

@@ -14,7 +14,6 @@
     "client.accessor.AbstractContainerScreenAccessor",
     "client.accessor.ScreenAccessor",
     "client.compat.emi.ReloadWorkerMixin",
-    "client.compat.supermartijn642corelib.WidgetContainerScreenMixin",
     "client.slot.CreativeSlotMixin",
     "client.slot.SlotMixin"
   ],

fabric/src/main/java/dev/terminalmc/clientsort/mixin/client/compat/supermartijn642corelib/WidgetContainerScreenMixin.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2025 TerminalMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dev.terminalmc.clientsort.mixin.client.compat.supermartijn642corelib;
+
+import dev.terminalmc.clientsort.client.gui.widget.ControlButton;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+/**
+ * For reasons unknown, SuperMartijn642's {@link com.supermartijn642.core.gui.WidgetContainerScreen}
+ * implementation does not call the super render method, so the screen's children are never
+ * rendered.
+ * <p>
+ * This mixin works around that by injecting into the render method and manually rendering the
+ * ClientSort buttons.
+ */
+@Pseudo
+@Mixin(
+        targets = "com.supermartijn642.core.gui.WidgetContainerScreen"
+)
+@SuppressWarnings("JavadocReference")
+public class WidgetContainerScreenMixin extends Screen {
+
+    protected WidgetContainerScreenMixin(Component title) {
+        super(title);
+    }
+
+    @SuppressWarnings("UnresolvedMixinReference")
+    @Inject(
+            method = "method_25394",
+            at = @At("RETURN")
+    )
+    private void afterRender(
+            GuiGraphics graphics,
+            int mouseX,
+            int mouseY,
+            float partialTick,
+            CallbackInfo ci
+    ) {
+        this.children().forEach((child) -> {
+            if (child instanceof ControlButton button) {
+                button.render(graphics, mouseX, mouseY, partialTick);
+            }
+        });
+    }
+}

fabric/src/main/resources/clientsort.fabric.mixins.json

@@ -4,9 +4,11 @@
   "package": "dev.terminalmc.clientsort.mixin",
   "refmap": "${mod_id}.refmap.json",
   "compatibilityLevel": "JAVA_${java_version}",
+  "plugin": "dev.terminalmc.clientsort.util.MixinConfigPlugin",
   "mixins": [
   ],
   "client": [
+    "client.compat.supermartijn642corelib.WidgetContainerScreenMixin"
   ],
   "server": [
   ],

…2corelib/WidgetContainerScreenMixin.java …2corelib/WidgetContainerScreenMixin.javacommon/src/main/java/dev/terminalmc/clientsort/mixin/client/compat/supermartijn642corelib/WidgetContainerScreenMixin.java renamed to neoforge/src/main/java/dev/terminalmc/clientsort/mixin/client/compat/supermartijn642corelib/WidgetContainerScreenMixin.java common/src/main/java/dev/terminalmc/clientsort/mixin/client/compat/supermartijn642corelib/WidgetContainerScreenMixin.java renamed to neoforge/src/main/java/dev/terminalmc/clientsort/mixin/client/compat/supermartijn642corelib/WidgetContainerScreenMixin.java

@@ -4,9 +4,11 @@
   "package": "dev.terminalmc.clientsort.mixin",
   "refmap": "${mod_id}.refmap.json",
   "compatibilityLevel": "JAVA_${java_version}",
+  "plugin": "dev.terminalmc.clientsort.util.MixinConfigPlugin",
   "mixins": [
   ],
   "client": [
+    "client.compat.supermartijn642corelib.WidgetContainerScreenMixin"
   ],
   "server": [
   ],