Fixed experimental screen batching on NeoForge and (Lex)Forge

Author: RaphiMC

common/src/main/resources/immediatelyfast-common.mixins.json

@@ -31,7 +31,6 @@
     "map_atlas_generation.MixinMapRenderState",
     "map_atlas_generation.MixinMapTextureManager",
     "map_atlas_generation.MixinMapTextureManager_MapTexture",
-    "screen_batching.MixinGameRenderer",
     "screen_batching.MixinHandledScreen",
     "screen_batching.compat.MixinChatScreen",
     "sign_text_buffering.MixinAbstractSignBlockEntityRenderer",

…s/screen_batching/MixinGameRenderer.java …s/screen_batching/MixinGameRenderer.javacommon/src/main/java/net/raphimc/immediatelyfast/injection/mixins/screen_batching/MixinGameRenderer.java renamed to fabric/src/main/java/net/raphimc/immediatelyfast/fabric/injection/mixins/screen_batching/MixinGameRenderer.java common/src/main/java/net/raphimc/immediatelyfast/injection/mixins/screen_batching/MixinGameRenderer.java renamed to fabric/src/main/java/net/raphimc/immediatelyfast/fabric/injection/mixins/screen_batching/MixinGameRenderer.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.raphimc.immediatelyfast.injection.mixins.screen_batching;
+package net.raphimc.immediatelyfast.fabric.injection.mixins.screen_batching;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;

fabric/src/main/resources/immediatelyfast-fabric.mixins.json

@@ -5,7 +5,8 @@
   "compatibilityLevel": "JAVA_21",
   "plugin": "net.raphimc.immediatelyfast.injection.ImmediatelyFastMixinPlugin",
   "client": [
-    "hud_batching.compat.appleskin.MixinAppleSkin_HUDOverlayHandler"
+    "hud_batching.compat.appleskin.MixinAppleSkin_HUDOverlayHandler",
+    "screen_batching.MixinGameRenderer"
   ],
   "injectors": {
     "defaultRequire": 1

forge/src/main/java/net/raphimc/immediatelyfast/forge/injection/mixins/screen_batching/MixinForgeHooksClient.java

@@ -0,0 +1,46 @@
+/*
+ * This file is part of ImmediatelyFast - https://github.com/RaphiMC/ImmediatelyFast
+ * Copyright (C) 2023-2025 RK_01/RaphiMC and contributors
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.raphimc.immediatelyfast.forge.injection.mixins.screen_batching;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.screen.ChatScreen;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraftforge.client.ForgeHooksClient;
+import net.raphimc.immediatelyfast.ImmediatelyFast;
+import net.raphimc.immediatelyfast.feature.batching.BatchingBuffers;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@SuppressWarnings("UnstableApiUsage")
+@Mixin(ForgeHooksClient.class)
+public abstract class MixinForgeHooksClient {
+
+    @WrapOperation(method = "drawScreen", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/client/ForgeHooksClient;drawScreenInternal(Lnet/minecraft/client/gui/screen/Screen;Lnet/minecraft/client/gui/DrawContext;IIF)V"))
+    private static void screenBatching(Screen screen, DrawContext guiGraphics, int mouseX, int mouseY, float partialTick, Operation<Void> original) {
+        final boolean batchScreen = screen instanceof ChatScreen;
+
+        if (ImmediatelyFast.runtimeConfig.experimental_screen_batching && batchScreen) {
+            BatchingBuffers.runBatched(guiGraphics, () -> original.call(screen, guiGraphics, mouseX, mouseY, partialTick));
+        } else {
+            original.call(screen, guiGraphics, mouseX, mouseY, partialTick);
+        }
+    }
+
+}

forge/src/main/resources/immediatelyfast-forge.mixins.json

@@ -5,7 +5,8 @@
   "compatibilityLevel": "JAVA_17",
   "plugin": "net.raphimc.immediatelyfast.injection.ImmediatelyFastMixinPlugin",
   "client": [
-    "core.MixinForgeRenderTypes"
+    "core.MixinForgeRenderTypes",
+    "screen_batching.MixinForgeHooksClient"
   ],
   "injectors": {
     "defaultRequire": 1

neoforge/src/main/java/net/raphimc/immediatelyfast/neoforge/injection/mixins/screen_batching/MixinClientHooks.java

@@ -0,0 +1,45 @@
+/*
+ * This file is part of ImmediatelyFast - https://github.com/RaphiMC/ImmediatelyFast
+ * Copyright (C) 2023-2025 RK_01/RaphiMC and contributors
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.raphimc.immediatelyfast.neoforge.injection.mixins.screen_batching;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.screen.ChatScreen;
+import net.minecraft.client.gui.screen.Screen;
+import net.neoforged.neoforge.client.ClientHooks;
+import net.raphimc.immediatelyfast.ImmediatelyFast;
+import net.raphimc.immediatelyfast.feature.batching.BatchingBuffers;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(ClientHooks.class)
+public abstract class MixinClientHooks {
+
+    @WrapOperation(method = {"drawScreen", "lambda$drawScreen$1"}, at = @At(value = "INVOKE", target = "Lnet/neoforged/neoforge/client/ClientHooks;drawScreenInternal(Lnet/minecraft/client/gui/screen/Screen;Lnet/minecraft/client/gui/DrawContext;IIF)V"))
+    private static void screenBatching(Screen screen, DrawContext guiGraphics, int mouseX, int mouseY, float partialTick, Operation<Void> original) {
+        final boolean batchScreen = screen instanceof ChatScreen;
+
+        if (ImmediatelyFast.runtimeConfig.experimental_screen_batching && batchScreen) {
+            BatchingBuffers.runBatched(guiGraphics, () -> original.call(screen, guiGraphics, mouseX, mouseY, partialTick));
+        } else {
+            original.call(screen, guiGraphics, mouseX, mouseY, partialTick);
+        }
+    }
+
+}

neoforge/src/main/resources/immediatelyfast-neoforge.mixins.json

@@ -7,7 +7,8 @@
   "client": [
     "core.MixinNeoForgeRenderTypes",
     "hud_batching.MixinGuiLayerManager",
-    "hud_batching.compat.appleskin.MixinAppleSkin_HUDOverlayHandler"
+    "hud_batching.compat.appleskin.MixinAppleSkin_HUDOverlayHandler",
+    "screen_batching.MixinClientHooks"
   ],
   "injectors": {
     "defaultRequire": 1