Fix leaking framebuffer

Author: IMS212

src/client/java/net/irisshaders/imgui/ImGuiMC.java

@@ -141,14 +141,15 @@ public void draw() {
         drawing = false;
 
         glAccessor.renderDrawData(ImGui.getDrawData());
+        GlStateManager._glBindFramebuffer(GlConst.GL_FRAMEBUFFER, 0);
 
         ImGui.updatePlatformWindows();
         ImGui.renderPlatformWindowsDefault();
         //? if >1.21.8 {
-        /*GLFW.glfwMakeContextCurrent(Minecraft.getInstance().getWindow().handle());
-        *///?} else {
-        GLFW.glfwMakeContextCurrent(Minecraft.getInstance().getWindow().getWindow());
-        //?}
+        GLFW.glfwMakeContextCurrent(Minecraft.getInstance().getWindow().handle());
+        //?} else {
+        /*GLFW.glfwMakeContextCurrent(Minecraft.getInstance().getWindow().getWindow());
+        *///?}
     }
 
     private static boolean isGone;

src/client/java/net/irisshaders/imgui/mixin/DrawMixin.java

@@ -20,10 +20,10 @@ public class DrawMixin {
             boolean bl, CallbackInfo ci
     ) {
         //? if >1.21.8 {
-        /*ImGuiMC.getInstance().afterPollEvents(this.window.handle());
-        *///?} else {
-        ImGuiMC.getInstance().afterPollEvents(this.window.getWindow());
-        //?}
+        ImGuiMC.getInstance().afterPollEvents(this.window.handle());
+        //?} else {
+        /*ImGuiMC.getInstance().afterPollEvents(this.window.getWindow());
+        *///?}
     }
 
     @Inject(method = "runTick", at = @At(value = "INVOKE", target = /*? if >= 1.21.5 {*/"Lcom/mojang/blaze3d/platform/Window;isMinimized()Z"/*?} else {*//*"Lcom/mojang/blaze3d/pipeline/RenderTarget;unbindWrite()V"*//*?}*/))

src/client/java/net/irisshaders/imgui/mixin/KeyboardHandlingMixin.java

@@ -3,9 +3,9 @@
 import net.irisshaders.imgui.ImGuiMC;
 import net.minecraft.client.KeyboardHandler;
 //? if >1.21.8 {
-/*import net.minecraft.client.input.CharacterEvent;
+import net.minecraft.client.input.CharacterEvent;
 import net.minecraft.client.input.KeyEvent;
-*///?}
+//?}
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -14,7 +14,7 @@
 @Mixin(KeyboardHandler.class)
 public class KeyboardHandlingMixin {
     //? if >1.21.8 {
-    /*@Inject(method = "keyPress", at = @At("HEAD"))
+    @Inject(method = "keyPress", at = @At("HEAD"))
     private void imgui$keyPress(long window, int action, KeyEvent keyEvent, CallbackInfo ci) {
         ImGuiMC.getInstance().onKeyPress(window, keyEvent.key(), keyEvent.scancode(), action, keyEvent.modifiers());
     }
@@ -23,8 +23,8 @@ public class KeyboardHandlingMixin {
     private void imgui$charTyped(long l, CharacterEvent characterEvent, CallbackInfo ci) {
         ImGuiMC.getInstance().onCharTyped(l, characterEvent.codepoint(), characterEvent.modifiers());
     }
-    *///?} else {
-    @Inject(method = "keyPress", at = @At("HEAD"))
+    //?} else {
+    /*@Inject(method = "keyPress", at = @At("HEAD"))
     private void imgui$keyPress(long l, int i, int j, int k, int m, CallbackInfo ci) {
         ImGuiMC.getInstance().onKeyPress(l, i, j, k, m);
     }
@@ -33,5 +33,5 @@ public class KeyboardHandlingMixin {
     private void imgui$charTyped(long l, int i, int j, CallbackInfo ci) {
         ImGuiMC.getInstance().onCharTyped(l, i, j);
     }
-    //?}
+    *///?}
 }

src/client/java/net/irisshaders/imgui/mixin/MouseHandlingMixin.java

@@ -3,8 +3,8 @@
 import net.irisshaders.imgui.ImGuiMC;
 import net.minecraft.client.MouseHandler;
 //? if >1.21.8 {
-/*import net.minecraft.client.input.MouseButtonInfo;
-*///?}
+import net.minecraft.client.input.MouseButtonInfo;
+//?}
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -23,14 +23,14 @@ public class MouseHandlingMixin {
     }
 
     //? if >1.21.8 {
-    /*@Inject(method = "onButton", at = @At("HEAD"))
+    @Inject(method = "onButton", at = @At("HEAD"))
     private void imgui$onScroll(long window, MouseButtonInfo button, int action, CallbackInfo ci) {
         ImGuiMC.getInstance().onMouseButton(window, button.button(), action, button.modifiers());
     }
-    *///?} else {
-    @Inject(method = "onPress", at = @At("HEAD"))
+    //?} else {
+    /*@Inject(method = "onPress", at = @At("HEAD"))
     private void imgui$onScroll(long window, int button, int action, int mods, CallbackInfo ci) {
         ImGuiMC.getInstance().onMouseButton(window, button, action, mods);
     }
-    //?}
+    *///?}
 }

stonecutter.gradle.kts

@@ -4,7 +4,7 @@ plugins {
     //id("dev.kikugie.j52j") version "1.0.2" apply false // Enables asset processing by writing json5 files
     //id("me.modmuss50.mod-publish-plugin") version "0.7.+" apply false // Publishes builds to hosting websites
 }
-stonecutter active "1.21.5" /* [SC] DO NOT EDIT */
+stonecutter active "1.21.10" /* [SC] DO NOT EDIT */
 
 
 /*