Cleaned up ImGui implementation

Ocelot5836 · Ocelot5836 · commit 5d9152929506 · 2025-11-15T14:49:21.000-07:00
diff --git a/common/src/main/java/foundry/veil/api/client/render/VeilRenderSystem.java b/common/src/main/java/foundry/veil/api/client/render/VeilRenderSystem.java
@@ -31,6 +31,7 @@
 import foundry.veil.ext.LevelRendererExtension;
 import foundry.veil.ext.TextureManagerExtension;
 import foundry.veil.ext.VertexBufferExtension;
+import foundry.veil.impl.client.imgui.AdvancedFboImGuiAreaImpl;
 import foundry.veil.impl.client.imgui.VeilImGuiImpl;
 import foundry.veil.impl.client.necromancer.render.NecromancerRenderDispatcher;
 import foundry.veil.impl.client.render.dynamicbuffer.VanillaShaderCompiler;
@@ -1176,6 +1177,7 @@ public static void beginFrame() {
 
     @ApiStatus.Internal
     public static void endFrame() {
+        AdvancedFboImGuiAreaImpl.end();
         VeilImGuiImpl.get().endFrame();
 
         if (Veil.platform().hasErrors()) {
diff --git a/common/src/main/java/foundry/veil/impl/client/editor/ShaderInspector.java b/common/src/main/java/foundry/veil/impl/client/editor/ShaderInspector.java
@@ -771,7 +771,6 @@ public void addShaders(ObjIntConsumer<ResourceLocation> registry) {
                 for (ShaderProgram shader : shaders.values()) {
                     registry.accept(shader.getName(), shader.getProgram());
                 }
-                VeilImGuiImpl.get().addImguiShaders(registry);
             }
         },
         IRIS(Component.translatable("inspector.veil.shader.source.iris"), () -> IrisCompat.INSTANCE != null) {
diff --git a/common/src/main/java/foundry/veil/impl/client/imgui/InactiveVeilImGuiImpl.java b/common/src/main/java/foundry/veil/impl/client/imgui/InactiveVeilImGuiImpl.java
@@ -24,15 +24,7 @@ public void beginFrame() {
     public void endFrame() {
     }
 
-    @Override
-    public void toggle() {
-    }
-
     @Override
     public void updateFonts() {
     }
-
-    @Override
-    public void addImguiShaders(ObjIntConsumer<ResourceLocation> registry) {
-    }
 }
diff --git a/common/src/main/java/foundry/veil/impl/client/imgui/VeilImGui.java b/common/src/main/java/foundry/veil/impl/client/imgui/VeilImGui.java
@@ -1,10 +1,7 @@
 package foundry.veil.impl.client.imgui;
 
-import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.ApiStatus;
 
-import java.util.function.ObjIntConsumer;
-
 /**
  * Manages the internal ImGui state.
  *
@@ -21,9 +18,5 @@ public interface VeilImGui {
 
     void endFrame();
 
-    void toggle();
-
     void updateFonts();
-
-    void addImguiShaders(ObjIntConsumer<ResourceLocation> registry);
 }
diff --git a/common/src/main/java/foundry/veil/impl/client/imgui/VeilImGuiImpl.java b/common/src/main/java/foundry/veil/impl/client/imgui/VeilImGuiImpl.java
@@ -9,14 +9,10 @@
 import imgui.flag.ImGuiConfigFlags;
 import imgui.gl3.ImGuiImplGl3;
 import imgui.internal.ImGuiContext;
-import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.ApiStatus;
 import org.lwjgl.system.NativeResource;
 
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.ObjIntConsumer;
 
 import static org.lwjgl.glfw.GLFW.glfwGetCurrentContext;
 import static org.lwjgl.glfw.GLFW.glfwMakeContextCurrent;
@@ -27,30 +23,6 @@
 @ApiStatus.Internal
 public class VeilImGuiImpl implements VeilImGui, NativeResource {
 
-    private static final MethodHandle DATA_GETTER;
-    private static final MethodHandle SHADER_GETTER;
-
-    static {
-        MethodHandle dataGetter;
-        MethodHandle shaderGetter;
-
-        try {
-            Class<?> dataClass = Class.forName("imgui.gl3.ImGuiImplGl3$Data");
-            MethodHandles.Lookup dataLookup = MethodHandles.privateLookupIn(ImGuiImplGl3.class, MethodHandles.lookup());
-            dataGetter = dataLookup.findGetter(ImGuiImplGl3.class, "data", dataClass);
-
-            MethodHandles.Lookup shaderLookup = MethodHandles.privateLookupIn(dataClass, dataLookup);
-            shaderGetter = shaderLookup.findGetter(dataClass, "shaderHandle", int.class);
-        } catch (Throwable t) {
-            Veil.LOGGER.error("Failed to get ImGui shader handle: {}", t.getMessage());
-            dataGetter = null;
-            shaderGetter = null;
-        }
-
-        DATA_GETTER = dataGetter;
-        SHADER_GETTER = shaderGetter;
-    }
-
     private static VeilImGui instance = new InactiveVeilImGuiImpl();
 
     private final VeilImGuiImplGlfw implGlfw;
@@ -59,7 +31,7 @@ public class VeilImGuiImpl implements VeilImGui, NativeResource {
     private final ImPlotContext imPlotContext;
     private final AtomicBoolean active;
 
-    private VeilImGuiImpl(long window) throws Throwable {
+    private VeilImGuiImpl(long window) {
         this.implGlfw = new VeilImGuiImplGlfw(this);
         this.implGl3 = new ImGuiImplGl3();
 
@@ -135,8 +107,6 @@ public void beginFrame() {
 
     @Override
     public void endFrame() {
-        AdvancedFboImGuiAreaImpl.end();
-
         try {
             if (!this.active.get()) {
                 Veil.LOGGER.error("ImGui state de-synced");
@@ -161,11 +131,6 @@ public void endFrame() {
         }
     }
 
-    @Override
-    public void toggle() {
-        VeilRenderSystem.renderer().getEditorManager().toggle();
-    }
-
     @Override
     public void updateFonts() {
         this.implGl3.destroyFontsTexture();
@@ -174,18 +139,6 @@ public void updateFonts() {
         }
     }
 
-    @Override
-    public void addImguiShaders(ObjIntConsumer<ResourceLocation> registry) {
-        if (DATA_GETTER != null && SHADER_GETTER != null) {
-            try {
-                int handle = (int) SHADER_GETTER.invoke(DATA_GETTER.invoke(this.implGl3));
-                registry.accept(ResourceLocation.fromNamespaceAndPath("imgui", "blit"), handle);
-            } catch (Throwable t) {
-                Veil.LOGGER.warn("Failed to add ImGui shader", t);
-            }
-        }
-    }
-
     @Override
     public void free() {
         try {
diff --git a/fabric/src/main/java/foundry/veil/fabric/mixin/client/KeyboardHandlerMixin.java b/fabric/src/main/java/foundry/veil/fabric/mixin/client/KeyboardHandlerMixin.java
@@ -1,6 +1,7 @@
 package foundry.veil.fabric.mixin.client;
 
 import foundry.veil.VeilClient;
+import foundry.veil.api.client.render.VeilRenderSystem;
 import foundry.veil.impl.client.imgui.VeilImGuiImpl;
 import net.minecraft.client.KeyboardHandler;
 import net.minecraft.client.Minecraft;
@@ -23,7 +24,7 @@ public class KeyboardHandlerMixin {
     @Inject(method = "keyPress", at = @At("TAIL"))
     public void keyPress(long window, int key, int scancode, int action, int mods, CallbackInfo ci) {
         if (window == this.minecraft.getWindow().getWindow() && action == GLFW_PRESS && VeilClient.EDITOR_KEY.matches(key, scancode)) {
-            VeilImGuiImpl.get().toggle();
+            VeilRenderSystem.renderer().getEditorManager().toggle();
         }
     }
 }
diff --git a/fabric/src/main/java/foundry/veil/fabric/mixin/client/MouseHandlerMixin.java b/fabric/src/main/java/foundry/veil/fabric/mixin/client/MouseHandlerMixin.java
@@ -1,6 +1,7 @@
 package foundry.veil.fabric.mixin.client;
 
 import foundry.veil.VeilClient;
+import foundry.veil.api.client.render.VeilRenderSystem;
 import foundry.veil.impl.client.imgui.VeilImGuiImpl;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.MouseHandler;
@@ -23,7 +24,7 @@ public class MouseHandlerMixin {
     @Inject(method = "onPress", at = @At("HEAD"))
     public void keyPress(long window, int button, int action, int mods, CallbackInfo ci) {
         if (window == this.minecraft.getWindow().getWindow() && action == GLFW_PRESS && VeilClient.EDITOR_KEY.matchesMouse(button)) {
-            VeilImGuiImpl.get().toggle();
+            VeilRenderSystem.renderer().getEditorManager().toggle();
         }
     }
 }
diff --git a/neoforge/src/main/java/foundry/veil/forge/VeilForgeClientEvents.java b/neoforge/src/main/java/foundry/veil/forge/VeilForgeClientEvents.java
@@ -47,7 +47,7 @@ public static void clientDisconnected(ClientPlayerNetworkEvent.LoggingOut event)
     @SubscribeEvent
     public static void keyPressed(InputEvent.Key event) {
         if (event.getAction() == GLFW_PRESS && VeilClient.EDITOR_KEY.matches(event.getKey(), event.getScanCode())) {
-            VeilImGuiImpl.get().toggle();
+            VeilRenderSystem.renderer().getEditorManager().toggle();
         }
     }
 
@@ -114,7 +114,7 @@ public static void registerClientCommands(RegisterClientCommandsEvent event) {
     @SubscribeEvent
     public static void mousePressed(InputEvent.MouseButton.Pre event) {
         if (event.getAction() == GLFW_PRESS && VeilClient.EDITOR_KEY.matchesMouse(event.getButton())) {
-            VeilImGuiImpl.get().toggle();
+            VeilRenderSystem.renderer().getEditorManager().toggle();
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -771,7 +771,6 @@ public void addShaders(ObjIntConsumer<ResourceLocation> registry) {`
`771`	`771`	`for (ShaderProgram shader : shaders.values()) {`
`772`	`772`	`registry.accept(shader.getName(), shader.getProgram());`
`773`	`773`	`}`
`774`		`- VeilImGuiImpl.get().addImguiShaders(registry);`
`775`	`774`	`}`
`776`	`775`	`},`
`777`	`776`	`IRIS(Component.translatable("inspector.veil.shader.source.iris"), () -> IrisCompat.INSTANCE != null) {`
Original file line number	Diff line number	Diff line change
`@@ -24,15 +24,7 @@ public void beginFrame() {`
`24`	`24`	`public void endFrame() {`
`25`	`25`	`}`
`26`	`26`
`27`		`- @Override`
`28`		`- public void toggle() {`
`29`		`- }`
`30`		`-`
`31`	`27`	`@Override`
`32`	`28`	`public void updateFonts() {`
`33`	`29`	`}`
`34`		`-`
`35`		`- @Override`
`36`		`- public void addImguiShaders(ObjIntConsumer<ResourceLocation> registry) {`
`37`		`- }`
`38`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package foundry.veil.fabric.mixin.client;`
`2`	`2`
`3`	`3`	`import foundry.veil.VeilClient;`
	`4`	`+import foundry.veil.api.client.render.VeilRenderSystem;`
`4`	`5`	`import foundry.veil.impl.client.imgui.VeilImGuiImpl;`
`5`	`6`	`import net.minecraft.client.KeyboardHandler;`
`6`	`7`	`import net.minecraft.client.Minecraft;`
`@@ -23,7 +24,7 @@ public class KeyboardHandlerMixin {`
`23`	`24`	`@Inject(method = "keyPress", at = @At("TAIL"))`
`24`	`25`	`public void keyPress(long window, int key, int scancode, int action, int mods, CallbackInfo ci) {`
`25`	`26`	`if (window == this.minecraft.getWindow().getWindow() && action == GLFW_PRESS && VeilClient.EDITOR_KEY.matches(key, scancode)) {`
`26`		`- VeilImGuiImpl.get().toggle();`
	`27`	`+ VeilRenderSystem.renderer().getEditorManager().toggle();`
`27`	`28`	`}`
`28`	`29`	`}`
`29`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public static void clientDisconnected(ClientPlayerNetworkEvent.LoggingOut event)`
`47`	`47`	`@SubscribeEvent`
`48`	`48`	`public static void keyPressed(InputEvent.Key event) {`
`49`	`49`	`if (event.getAction() == GLFW_PRESS && VeilClient.EDITOR_KEY.matches(event.getKey(), event.getScanCode())) {`
`50`		`- VeilImGuiImpl.get().toggle();`
	`50`	`+ VeilRenderSystem.renderer().getEditorManager().toggle();`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`@@ -114,7 +114,7 @@ public static void registerClientCommands(RegisterClientCommandsEvent event) {`
`114`	`114`	`@SubscribeEvent`
`115`	`115`	`public static void mousePressed(InputEvent.MouseButton.Pre event) {`
`116`	`116`	`if (event.getAction() == GLFW_PRESS && VeilClient.EDITOR_KEY.matchesMouse(event.getButton())) {`
`117`		`- VeilImGuiImpl.get().toggle();`
	`117`	`+ VeilRenderSystem.renderer().getEditorManager().toggle();`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`