Merge branch 'main' of github.com:IrisShaders/imgui-mc into multiloader

# Conflicts:
#	src/main/java/net/irisshaders/imgui/mixin/ScreenMixin.java

Author: BluSpring

.github/workflows/build.yml

@@ -12,9 +12,7 @@ jobs:
       matrix:
         # Use these Java versions
         java: [21]
-        # and run on both Linux and Windows
-        os: [ubuntu-22.04, windows-2022]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-22.04
     steps:
       - name: checkout repository
         uses: actions/checkout@v4
@@ -26,12 +24,11 @@ jobs:
           java-version: ${{ matrix.java }}
           distribution: 'microsoft'
       - name: make gradle wrapper executable
-        if: ${{ runner.os != 'Windows' }}
         run: chmod +x ./gradlew
       - name: build
         run: ./gradlew chiseledBuild
       - name: capture build artifacts
-        if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS
+        if: ${{ matrix.java == '21' }} # Only upload artifacts built from latest java on one OS
         uses: actions/upload-artifact@v4
         with:
           name: Artifacts

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

@@ -25,13 +25,33 @@ public class ImGuiMC {
     private static final ImGuiMC INSTANCE = new ImGuiMC();
     private static final boolean DEBUG = false;
     private ImGuiContext context;
+    private ImGuiImplGl3 glAccessor;
+    private ImGuiImplGlfw glWindow;
+    private boolean drawing;
 
     public static ImGuiMC getInstance() {
         return INSTANCE;
     }
 
-    private ImGuiImplGl3 glAccessor;
-    private ImGuiImplGlfw glWindow;
+    /**
+     * Force sets the context. Usually, you want {@link #startDrawing()} instead.
+     */
+    public static void setContext() {
+        ImGui.setCurrentContext(getInstance().context);
+    }
+
+    /**
+     * If ready to draw, sets the current context.
+     *
+     * @return If drawing is allowed currently
+     */
+    public static boolean startDrawing() {
+        if (getInstance().context == null) return false;
+
+        ImGui.setCurrentContext(getInstance().context);
+
+        return getInstance().drawing;
+    }
 
     private String tryLoadFromClasspath(final String fullLibName) {
         if (DEBUG) {
@@ -96,14 +116,19 @@ public void onRendererInit(long window) {
         this.glWindow = new ImGuiImplGlfw();
         this.glAccessor.init();
         this.glWindow.init(window, false);
-
-        afterPollEvents(window);
     }
 
     public void afterPollEvents(long l) {
+        if (drawing) {
+            // The last frame never correctly finished. The level may have changed.
+            return;
+        }
+
         glAccessor.newFrame();
         glWindow.newFrame();
         ImGui.newFrame();
+
+        drawing = true;
     }
 
     public void draw() {
@@ -113,48 +138,84 @@ public void draw() {
         /*Minecraft.getInstance().getMainRenderTarget().bindWrite(true);
         *///?}
         ImGui.render();
+        drawing = false;
+
         glAccessor.renderDrawData(ImGui.getDrawData());
 
         ImGui.updatePlatformWindows();
         ImGui.renderPlatformWindowsDefault();
         GLFW.glfwMakeContextCurrent(Minecraft.getInstance().getWindow().getWindow());
     }
 
+    private static boolean isGone;
+
     public void shutdown() {
+        if (isGone) {
+            throw new IllegalStateException("Cannot shutdown twice!");
+        }
+        isGone = true;
+        setContext();
         glAccessor.shutdown();
         glWindow.shutdown();
         ImGui.destroyContext();
+        context = null;
     }
 
     public void onMouseMove(long window, double mouseX, double mouseY) {
+        if (isGone) return;
+
+        setContext();
         glWindow.cursorPosCallback(window, mouseX, mouseY);
     }
 
     public void onMouseScroll(long window, double scrollX, double scrollY) {
+        if (isGone) return;
+
+        setContext();
         glWindow.scrollCallback(window, scrollX, scrollY);
     }
 
     public void onMouseButton(long window, int button, int action, int mods) {
+        if (isGone) return;
+
+        setContext();
         glWindow.mouseButtonCallback(window, button, action, mods);
     }
 
     public void monitorCallback(long window, int event) {
+        if (isGone) return;
+
+        setContext();
         glWindow.monitorCallback(window, event);
     }
 
     public void cursorEnterCallback(long window, boolean entered) {
+        if (isGone) return;
+
+        setContext();
         glWindow.cursorEnterCallback(window, entered);
     }
 
     public void windowFocusCallback(long window, boolean focused) {
+        if (isGone) return;
+
+        setContext();
         glWindow.windowFocusCallback(window, focused);
     }
 
     public void onKeyPress(long window, int keycode, int scancode, int action, int mods) {
+        if (isGone) return;
+
+        setContext();
         glWindow.keyCallback(window, keycode, scancode, action, mods);
     }
 
+    public void recreateFonts() {
+        glAccessor.destroyFontsTexture();
+        glAccessor.createFontsTexture();
+    }
+
     public void onCharTyped(long window, int chara, int j) {
         glWindow.charCallback(window, chara);
     }
-}
+}

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

@@ -1,18 +1,37 @@
 package net.irisshaders.imgui.mixin;
 
+import com.mojang.blaze3d.platform.Window;
 import imgui.ImGui;
 import net.irisshaders.imgui.ImGuiMC;
 import net.minecraft.client.Minecraft;
+import org.spongepowered.asm.mixin.Final;
 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.callback.CallbackInfo;
 
 @Mixin(Minecraft.class)
 public class DrawMixin {
-    @Inject(method = "runTick", at = @At(value = "INVOKE", target = /*? if >= 1.21 {*/"Lnet/minecraft/client/renderer/GameRenderer;render(Lnet/minecraft/client/DeltaTracker;Z)V"/*?} else {*//*"Lnet/minecraft/client/renderer/GameRenderer;render(FJZ)V"*//*?}*/, shift = At.Shift.AFTER))
+    @Shadow @Final private Window window;
+
+    @Inject(at = @At("HEAD"), method = "runTick", remap = false)
+    private void imgui$newFrame(
+            boolean bl, CallbackInfo ci
+    ) {
+        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"*//*?}*/))
     private void imgui$draw(boolean bl, CallbackInfo ci) {
-        ImGui.showDemoWindow();
-        ImGuiMC.getInstance().draw();
+        if (ImGuiMC.startDrawing()) {
+            ImGui.showDemoWindow();
+            ImGuiMC.getInstance().draw();
+        }
+    }
+
+    @Inject(method = "stop", at = @At("HEAD"))
+    private void imgui$shutdown(CallbackInfo ci) {
+        ImGuiMC.getInstance().shutdown();
     }
 }

src/main/java/net/irisshaders/imgui/mixin/RendererInitMixin.java

@@ -29,15 +29,4 @@ public class RendererInitMixin {
 		ImGuiMC.getInstance().onRendererInit(Minecraft.getInstance().getWindow().getWindow());
 	}
 	*///?}
-
-	@Inject(at = @At("RETURN"), method = "flipFrame", remap = false)
-	private static void imgui$newFrame(
-		long l,
-		//? if >= 1.21.5
-		TracyFrameCapture tracyFrameCapture,
-		CallbackInfo ci
-	) {
-		ImGuiMC.getInstance().afterPollEvents(l);
-	}
-
 }

src/main/java/net/irisshaders/imgui/mixin/ScreenMixin.java

@@ -0,0 +1,16 @@
+package net.irisshaders.imgui.mixin;
+
+import com.mojang.blaze3d.platform.ScreenManager;
+import net.irisshaders.imgui.ImGuiMC;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(ScreenManager.class)
+public class ScreenMixin {
+    @Inject(method = "onMonitorChange", at = @At("HEAD"))
+    private void imgui$onMonitorChange(long window, int event, CallbackInfo ci) {
+        ImGuiMC.getInstance().monitorCallback(window, event);
+    }
+}

src/main/java/net/irisshaders/imgui/window/ImGuiImplGlfw.java

@@ -884,7 +884,7 @@ public void shutdown() {
         }
 
         for (int cursorN = 0; cursorN < ImGuiMouseCursor.COUNT; cursorN++) {
-            glfwDestroyCursor(data.mouseCursors[cursorN]);
+            if (data.mouseCursors[cursorN] != 0) glfwDestroyCursor(data.mouseCursors[cursorN]);
         }
 
         io.setBackendPlatformName(null);

src/main/resources/imgui-for-mc.client.mixins.json

@@ -7,6 +7,7 @@
 		"MouseHandlingMixin",
 		"DrawMixin",
 		"KeyboardHandlingMixin",
+		"ScreenMixin",
 		"WindowMixin"
 	],
 	"injectors": {