fix: get 1.21.11 support working again

Author: Motschen

src/main/java/eu/midnightdust/midnightcontrols/client/controller/InputHandlers.java

@@ -231,8 +231,7 @@ else if (client.screen instanceof AbstractContainerScreen && client.player != nu
     public static boolean handleScreenshot(@NotNull Minecraft client, @NotNull ButtonBinding binding, float value, @NotNull ButtonState action) {
         if (action == ButtonState.RELEASE)
             //~ if >=26.1 '.addMessage' -> '.addClientSystemMessage'
-            Screenshot.grab(client.gameDirectory, client.getMainRenderTarget(),
-                    text -> client.execute(() -> client.gui.getChat().addClientSystemMessage(text)));
+            Screenshot.grab(client.gameDirectory, client.getMainRenderTarget(), text -> client.execute(() -> client.gui.getChat().addClientSystemMessage(text)));
         return true;
     }
 

src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsHud.java

@@ -34,6 +34,7 @@
  * @version 1.7.0
  * @since 1.0.0
  */
+//~ if >= 26.1 'GuiGraphics' -> 'GuiGraphicsExtractor' {
 public class MidnightControlsHud {
     private Minecraft client = Minecraft.getInstance();
     private int attackWidth = 0;
@@ -74,6 +75,7 @@ public void init() {
     /**
      * Renders the MidnightControls HUD.
      */
+    //~ if >= 26.1 'GuiGraphics' -> 'GuiGraphicsExtractor'
     public void extractRenderState(GuiGraphicsExtractor context, DeltaTracker tickCounter) {
         if (this.client == null) this.client = Minecraft.getInstance();
         if (!isVisible) return;
@@ -293,3 +295,4 @@ private void drawTip(GuiGraphicsExtractor context, int x, int y, @NotNull String
         context.text(this.client.font, translatedAction, x, (y + textY), 0xFFFFFFFF, false);
     }
 }
+//~}

src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsRenderer.java

@@ -28,6 +28,7 @@
  * @version 1.7.0
  * @since 1.2.0
  */
+//~ if >= 26.1 'GuiGraphics' -> 'GuiGraphicsExtractor' {
 public class MidnightControlsRenderer {
     public static final int ICON_SIZE = 20;
     private static final int BUTTON_SIZE = 15;
@@ -191,3 +192,4 @@ private static int getButtonTipWidth(@NotNull String action, @NotNull Font textR
     public record ButtonSize(int length, int height) {
     }
 }
+//~}

src/main/java/eu/midnightdust/midnightcontrols/client/gui/RingScreen.java

@@ -48,6 +48,7 @@ public boolean isPauseScreen() {
     }
 
     @Override
+        //~ if >= 26.1 'GuiGraphics' -> 'GuiGraphicsExtractor'
     public void extractRenderState(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta) {
         super.extractRenderState(context, mouseX, mouseY, delta);
 

src/main/java/eu/midnightdust/midnightcontrols/client/gui/config/ControllerBindingButton.java

@@ -118,6 +118,7 @@ public void extractDefaultLabel(ActiveTextCollector consumer) {
     //~}
 
     @Override
+    //~ if >= 26.1 'GuiGraphics' -> 'GuiGraphicsExtractor' {
     protected void extractContents(GuiGraphicsExtractor context, int mouseX, int mouseY, float deltaTicks) {
         //~ if >=26.1 'renderDefault' -> 'extractDefault' {
         this.extractDefaultSprite(context);
@@ -130,6 +131,7 @@ protected void extractContents(GuiGraphicsExtractor context, int mouseX, int mou
         var size = MidnightControlsRenderer.drawButton(context, x, this.getY(), this.binding, Minecraft.getInstance());
         iconWidth = size.length();
     }
+    //~}
 
     @Override
     public void finishBindingEdit(int... buttons) {

src/main/java/eu/midnightdust/midnightcontrols/client/gui/cursor/CursorRenderer.java

@@ -15,8 +15,10 @@
 public abstract class CursorRenderer {
     public static CursorType currentCursorStyle = CursorType.DEFAULT;
 
+    //~ if >= 26.1 'GuiGraphics' -> 'GuiGraphicsExtractor'
     public abstract void renderCursor(@NotNull GuiGraphicsExtractor context, @NotNull Minecraft client);
 
+    //~ if >= 26.1 'GuiGraphics' -> 'GuiGraphicsExtractor'
     public static void drawUnalignedTexturedQuad(RenderPipeline pipeline, Identifier texture, GuiGraphicsExtractor context, float x1, float x2, float y1, float y2, float u1, float u2, float v1, float v2) {
         DrawContextAccessor accessor = (DrawContextAccessor) context;
         var tex = client.getTextureManager().getTexture(texture);

src/main/java/eu/midnightdust/midnightcontrols/client/gui/cursor/VirtualCursorRenderer.java

@@ -21,6 +21,7 @@ public static VirtualCursorRenderer getInstance() {
         return INSTANCE;
     }
 
+    //~ if >= 26.1 'GuiGraphics' -> 'GuiGraphicsExtractor'
     public void renderCursor(@NotNull GuiGraphicsExtractor context, @NotNull Minecraft client) {
         if (!MidnightControlsConfig.virtualMouse || (client.screen == null
                 || MidnightInput.isScreenInteractive(client.screen)))

src/main/java/eu/midnightdust/midnightcontrols/client/gui/cursor/WaylandCursorRenderer.java

@@ -35,6 +35,7 @@ public static WaylandCursorRenderer getInstance() {
         return INSTANCE;
     }
 
+    //~ if >= 26.1 'GuiGraphics' -> 'GuiGraphicsExtractor'
     public void renderCursor(@NotNull GuiGraphicsExtractor context, @NotNull Minecraft client) {
         if (MidnightControlsConfig.virtualMouse || client.screen == null || MidnightControlsConfig.controlsMode != ControlsMode.CONTROLLER) return;
 

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/ChatScreenMixin.java

@@ -25,6 +25,7 @@ protected ChatScreenMixin(Component title) {
         if (MidnightControlsConfig.moveChat) input.setY(4);
     }
     //~ if >= 26.1 'render' -> 'extractRenderState' {
+    //~ if >= 26.1 'GuiGraphics' -> 'GuiGraphicsExtractor' {
     @Inject(method = "extractRenderState", at = @At("HEAD"))
     private void midnightcontrols$moveInputFieldBackground(GuiGraphicsExtractor context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
         if (MidnightControlsConfig.moveChat) context.pose().translate(0f, -this.height + 16);
@@ -34,4 +35,5 @@ protected ChatScreenMixin(Component title) {
         if (MidnightControlsConfig.moveChat) context.pose().translate(0f, this.height - 16);
     }
     //~}
+    //~}
 }

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/DrawContextAccessor.java

@@ -14,11 +14,15 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
+//~ if >= 26.1 'GuiGraphics' -> 'GuiGraphicsExtractor'
 @Mixin(GuiGraphicsExtractor.class)
 public interface DrawContextAccessor {
     @Accessor("guiRenderState")
     GuiRenderState getState();
 
+    //? if fabric {
     @Accessor("scissorStack")
+    //~ if >= 26.1 'GuiGraphics' -> 'GuiGraphicsExtractor'
     GuiGraphicsExtractor.ScissorStack getScissorStack();
+    //?}
 }