Add draggable list to 1.21

NotEnoughUpdates · Oct 20, 2024 · df7ca08 · df7ca08
1 parent 71c8ba6
commit df7ca08
Show file tree

Hide file tree

Showing 8 changed files with 478 additions and 5 deletions.
diff --git a/common/src/main/java/io/github/notenoughupdates/moulconfig/gui/GuiOptionEditor.java b/common/src/main/java/io/github/notenoughupdates/moulconfig/gui/GuiOptionEditor.java
@@ -62,7 +62,7 @@ public void render(RenderContext context, int x, int y, int width) {
 
         context.drawDarkRect(x, y, width, height, true);
         context.drawStringCenteredScaledMaxWidth(option.getName(),
-            fr, x + width / 6, y + 13, true, width / 3 - 10, 0xc0c0c0
+                                                 fr, x + width / 6, y + 13, true, width / 3 - 10, 0xc0c0c0
         );
 
         float scale = 1;
@@ -115,7 +115,14 @@ public boolean mouseInputOverlay(int x, int y, int width, int mouseX, int mouseY
         return false;
     }
 
-    // TODO: add RenderContext
+    public void renderOverlay(RenderContext renderContext, int x, int y, int width) {
+        this.renderOverlay(x, y, width);
+    }
+
+    /**
+     * Use {@link #renderOverlay(RenderContext, int, int, int)} instead.
+     */
+    @Deprecated
     public void renderOverlay(int x, int y, int width) {
     }
 

diff --git a/common/src/main/java/io/github/notenoughupdates/moulconfig/gui/MoulConfigEditor.java b/common/src/main/java/io/github/notenoughupdates/moulconfig/gui/MoulConfigEditor.java
@@ -614,6 +614,7 @@ public void render() {
                     int finalOptionWidth = optionWidth;
                     ContextAware.wrapErrorWithContext(editor, () -> {
                         editor.renderOverlay(
+                            context,
                             finalX,
                             finalY,
                             finalOptionWidth

diff --git a/common/src/main/java/io/github/notenoughupdates/moulconfig/gui/editors/ComponentEditor.java b/common/src/main/java/io/github/notenoughupdates/moulconfig/gui/editors/ComponentEditor.java
@@ -209,13 +209,13 @@ public final boolean mouseInputOverlay(int x, int y, int width, int mouseX, int
     }
 
     @Override
-    public final void renderOverlay(int x, int y, int width) {
+    public final void renderOverlay(RenderContext context, int x, int y, int width) {
         if (overlay == null) return;
         overlay.foldRecursive((Void) null, (comp, _void) -> {
             comp.setContext(getDelegate().getContext());
             return _void;
         });
-        val ctx = getImmContext(overlayX, overlayY, overlay.getWidth(), overlay.getHeight(), IMinecraft.instance.provideTopLevelRenderContext());
+        val ctx = getImmContext(overlayX, overlayY, overlay.getWidth(), overlay.getHeight(), context);
         ctx.getRenderContext().translate(overlayX, overlayY, 0);
         overlay.render(ctx);
     }