refactor render code to be easier to port

brachy84 · brachy84 · commit 2f2ee0a4941a · 2025-05-18T13:37:18.000+02:00
diff --git a/.editorconfig b/.editorconfig
@@ -73,7 +73,7 @@ ij_java_case_statement_on_separate_line = true
 ij_java_catch_on_new_line = false
 ij_java_class_annotation_wrap = split_into_lines
 ij_java_class_brace_style = end_of_line
-ij_java_class_count_to_use_import_on_demand = 5
+ij_java_class_count_to_use_import_on_demand = 500
 ij_java_class_names_in_javadoc = 1
 ij_java_deconstruction_list_wrap = normal
 ij_java_do_not_indent_top_level_class_members = false
@@ -148,7 +148,7 @@ ij_java_method_parameters_right_paren_on_new_line = false
 ij_java_method_parameters_wrap = off
 ij_java_modifier_list_wrap = false
 ij_java_multi_catch_types_wrap = normal
-ij_java_names_count_to_use_import_on_demand = 3
+ij_java_names_count_to_use_import_on_demand = 300
 ij_java_new_line_after_lparen_in_annotation = false
 ij_java_new_line_after_lparen_in_deconstruction_pattern = true
 ij_java_new_line_after_lparen_in_record_header = false
diff --git a/src/main/java/com/cleanroommc/modularui/api/IMuiScreen.java b/src/main/java/com/cleanroommc/modularui/api/IMuiScreen.java
@@ -3,12 +3,12 @@
 import com.cleanroommc.modularui.core.mixin.GuiContainerAccessor;
 import com.cleanroommc.modularui.screen.ClientScreenHandler;
 import com.cleanroommc.modularui.screen.ModularScreen;
-
 import com.cleanroommc.modularui.screen.viewport.ModularGuiContext;
+import com.cleanroommc.modularui.utils.Platform;
+
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.inventory.Slot;
-
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@@ -60,6 +60,10 @@ default void handleDrawBackground(int tint, IntConsumer drawFunction) {
             drawFunction.accept(tint);
         }
         ClientScreenHandler.drawDarkBackground(getGuiScreen(), tint);
+        // after this JEI will draw itself
+        // for some reason JEI is too stupid to set up opengl properly
+        // without this (enableTexture2D() specifically) every item in JEI will be texture less (white)
+        Platform.setupDrawTex();
     }
 
     /**
diff --git a/src/main/java/com/cleanroommc/modularui/drawable/GuiDraw.java b/src/main/java/com/cleanroommc/modularui/drawable/GuiDraw.java
diff --git a/src/main/java/com/cleanroommc/modularui/drawable/Stencil.java b/src/main/java/com/cleanroommc/modularui/drawable/Stencil.java
@@ -2,12 +2,10 @@
 
 import com.cleanroommc.modularui.api.layout.IViewportStack;
 import com.cleanroommc.modularui.screen.viewport.GuiContext;
+import com.cleanroommc.modularui.utils.Platform;
 import com.cleanroommc.modularui.widget.sizer.Area;
 
-import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import org.jetbrains.annotations.Nullable;
@@ -118,21 +116,14 @@ private static void setStencilValue(Runnable stencilShape, int stencilValue, boo
     }
 
     private static void drawRectangleStencilShape(int x, int y, int w, int h) {
-        GlStateManager.disableTexture2D();
-        GlStateManager.disableAlpha();
-        GlStateManager.enableBlend();
-        Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder bufferbuilder = tessellator.getBuffer();
-        float x0 = x, x1 = x + w, y0 = y, y1 = y + h;
-        bufferbuilder.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION);
-        bufferbuilder.pos(x0, y0, 0.0f).endVertex();
-        bufferbuilder.pos(x0, y1, 0.0f).endVertex();
-        bufferbuilder.pos(x1, y1, 0.0f).endVertex();
-        bufferbuilder.pos(x1, y0, 0.0f).endVertex();
-        tessellator.draw();
-        GlStateManager.disableBlend();
-        GlStateManager.enableAlpha();
-        GlStateManager.enableTexture2D();
+        Platform.setupDrawColor();
+        Platform.startDrawing(Platform.DrawMode.QUADS, Platform.VertexFormat.POS, bufferBuilder -> {
+            float x0 = x, x1 = x + w, y0 = y, y1 = y + h;
+            bufferBuilder.pos(x0, y0, 0.0f).endVertex();
+            bufferBuilder.pos(x0, y1, 0.0f).endVertex();
+            bufferBuilder.pos(x1, y1, 0.0f).endVertex();
+            bufferBuilder.pos(x1, y0, 0.0f).endVertex();
+        });
     }
 
     /**
diff --git a/src/main/java/com/cleanroommc/modularui/drawable/text/ComposedLine.java b/src/main/java/com/cleanroommc/modularui/drawable/text/ComposedLine.java
@@ -5,6 +5,7 @@
 import com.cleanroommc.modularui.api.drawable.IIcon;
 import com.cleanroommc.modularui.api.drawable.ITextLine;
 import com.cleanroommc.modularui.screen.viewport.GuiContext;
+import com.cleanroommc.modularui.utils.Platform;
 
 import net.minecraft.client.gui.FontRenderer;
 
@@ -41,6 +42,7 @@ public void draw(GuiContext context, FontRenderer fr, float x, float y, int colo
         for (Object o : this.elements) {
             if (o instanceof String s) {
                 float drawY = getHeight(fr) / 2f - fr.FONT_HEIGHT / 2f;
+                Platform.setupDrawFont();
                 fr.drawString(s, x, (int) (y + drawY), color, shadow);
                 x += fr.getStringWidth(s);
             } else if (o instanceof IIcon icon) {
diff --git a/src/main/java/com/cleanroommc/modularui/drawable/text/TextLine.java b/src/main/java/com/cleanroommc/modularui/drawable/text/TextLine.java
@@ -2,6 +2,7 @@
 
 import com.cleanroommc.modularui.api.drawable.ITextLine;
 import com.cleanroommc.modularui.screen.viewport.GuiContext;
+import com.cleanroommc.modularui.utils.Platform;
 
 import net.minecraft.client.gui.FontRenderer;
 
@@ -29,6 +30,7 @@ public int getHeight(FontRenderer fr) {
 
     @Override
     public void draw(GuiContext context, FontRenderer fr, float x, float y, int color, boolean shadow) {
+        Platform.setupDrawFont();
         fr.drawString(this.text, x, y, color, shadow);
         this.lastX = x;
         this.lastY = y;
diff --git a/src/main/java/com/cleanroommc/modularui/drawable/text/TextRenderer.java b/src/main/java/com/cleanroommc/modularui/drawable/text/TextRenderer.java
@@ -4,6 +4,7 @@
 import com.cleanroommc.modularui.drawable.Stencil;
 import com.cleanroommc.modularui.screen.viewport.GuiContext;
 import com.cleanroommc.modularui.utils.Alignment;
+import com.cleanroommc.modularui.utils.Platform;
 import com.cleanroommc.modularui.widget.sizer.Area;
 
 import net.minecraft.client.Minecraft;
@@ -237,12 +238,11 @@ protected int getStartX(float maxWidth, float lineWidth) {
 
     protected void draw(String text, float x, float y) {
         if (this.simulate) return;
-        GlStateManager.disableBlend();
+        Platform.setupDrawFont();
         GlStateManager.pushMatrix();
         GlStateManager.scale(this.scale, this.scale, 0f);
         getFontRenderer().drawString(text, x / this.scale, y / this.scale, this.color, this.shadow);
         GlStateManager.popMatrix();
-        GlStateManager.enableBlend();
     }
 
     public int getColor() {
diff --git a/src/main/java/com/cleanroommc/modularui/overlay/OverlayStack.java b/src/main/java/com/cleanroommc/modularui/overlay/OverlayStack.java
@@ -5,7 +5,6 @@
 import com.cleanroommc.modularui.screen.ModularScreen;
 
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.RenderHelper;
 
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
@@ -65,10 +64,6 @@ public static void draw(int mouseX, int mouseY, float partialTicks) {
             fallback = screen;
         }
         ClientScreenHandler.drawDebugScreen(hovered, fallback);
-        GlStateManager.enableLighting();
-        GlStateManager.enableDepth();
-        GlStateManager.enableRescaleNormal();
-        RenderHelper.enableStandardItemLighting();
     }
 
     public static void open(ModularScreen screen) {
diff --git a/src/main/java/com/cleanroommc/modularui/screen/ClientScreenHandler.java b/src/main/java/com/cleanroommc/modularui/screen/ClientScreenHandler.java
@@ -19,6 +19,7 @@
 import com.cleanroommc.modularui.utils.Animator;
 import com.cleanroommc.modularui.utils.Color;
 import com.cleanroommc.modularui.utils.FpsCounter;
+import com.cleanroommc.modularui.utils.Platform;
 import com.cleanroommc.modularui.widget.sizer.Area;
 import com.cleanroommc.modularui.widgets.RichTextWidget;
 import com.cleanroommc.modularui.widgets.slot.ItemSlot;
@@ -159,7 +160,7 @@ public static void onGuiDraw(GuiScreenEvent.DrawScreenEvent.Pre event) {
         }
     }
 
-    @SubscribeEvent
+    @SubscribeEvent(priority = EventPriority.HIGH)
     public static void onGuiDraw(GuiScreenEvent.DrawScreenEvent.Post event) {
         OverlayStack.draw(event.getMouseX(), event.getMouseY(), event.getRenderPartialTicks());
     }
@@ -344,6 +345,11 @@ public static void drawScreen(ModularScreen muiScreen, GuiScreen mcScreen, int m
     public static void drawScreenInternal(ModularScreen muiScreen, GuiScreen mcScreen, int mouseX, int mouseY, float partialTicks) {
         Stencil.reset();
         Stencil.apply(muiScreen.getScreenArea(), null);
+        Platform.setupDrawTex();
+        GlStateManager.enableLighting();
+        GlStateManager.enableDepth();
+        GlStateManager.enableRescaleNormal();
+        RenderHelper.enableStandardItemLighting();
         muiScreen.drawScreen();
         GlStateManager.disableLighting();
         GlStateManager.disableDepth();
@@ -365,6 +371,7 @@ public static void drawContainer(ModularScreen muiScreen, GuiContainer mcScreen,
 
         Stencil.reset();
         Stencil.apply(muiScreen.getScreenArea(), null);
+        Platform.setupDrawTex();
         mcScreen.drawDefaultBackground();
         int x = mcScreen.getGuiLeft();
         int y = mcScreen.getGuiTop();
diff --git a/src/main/java/com/cleanroommc/modularui/test/TestTile.java b/src/main/java/com/cleanroommc/modularui/test/TestTile.java
@@ -369,6 +369,8 @@ public ModularPanel openSecondWindow(PanelSyncManager syncManager, IPanelHandler
                 .setDraggable(true)
                 .size(100, 100);
         SlotGroup slotGroup = new SlotGroup("small_inv", 2);
+        IntSyncValue timeSync = new IntSyncValue(() -> (int)java.lang.System.currentTimeMillis(), val -> {java.lang.System.out.println(val);});
+        syncManager.syncValue(123456,timeSync);
         syncManager.registerSlotGroup(slotGroup);
         AtomicInteger number = new AtomicInteger(0);
         syncManager.syncValue("int_value", new IntSyncValue(number::get, number::set));
diff --git a/src/main/java/com/cleanroommc/modularui/utils/Platform.java b/src/main/java/com/cleanroommc/modularui/utils/Platform.java
@@ -1,6 +1,17 @@
 package com.cleanroommc.modularui.utils;
 
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+
+import org.lwjgl.opengl.GL11;
+
+import java.util.function.Consumer;
 
 /**
  * Version specific code is supposed to go here.
@@ -17,4 +28,99 @@ public static boolean isStackEmpty(ItemStack stack) {
     public static ItemStack copyStack(ItemStack stack) {
         return isStackEmpty(stack) ? EMPTY_STACK : stack.copy();
     }
+
+    public static void startDrawing(DrawMode drawMode, VertexFormat format, Consumer<BufferBuilder> bufferBuilder) {
+        Tessellator tessellator = Tessellator.getInstance();
+        BufferBuilder buffer = tessellator.getBuffer();
+        buffer.begin(drawMode.mode, format.format);
+        bufferBuilder.accept(buffer);
+        tessellator.draw();
+    }
+
+    public static void setupDrawColor() {
+        GlStateManager.disableTexture2D();
+        GlStateManager.enableBlend();
+        GlStateManager.disableAlpha();
+    }
+
+    public static void setupDrawTex(ResourceLocation texture) {
+        setupDrawTex();
+        Minecraft.getMinecraft().renderEngine.bindTexture(texture);
+    }
+
+    public static void setupDrawTex(int textureId) {
+        setupDrawTex();
+        GlStateManager.bindTexture(textureId);
+    }
+
+    public static void setupDrawTex() {
+        GlStateManager.enableTexture2D();
+        GlStateManager.enableAlpha();
+        GlStateManager.disableBlend();
+    }
+
+    public static void setupDrawGradient() {
+        setupDrawGradient(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
+    }
+
+    public static void setupDrawGradient(GlStateManager.SourceFactor srcFactor, GlStateManager.DestFactor destFactor, GlStateManager.SourceFactor srcFactorAlpha, GlStateManager.DestFactor destFactorAlpha) {
+        GlStateManager.tryBlendFuncSeparate(srcFactor, destFactor, srcFactorAlpha, destFactorAlpha);
+        GlStateManager.shadeModel(GL11.GL_SMOOTH);
+    }
+
+    public static void endDrawGradient() {
+        GlStateManager.shadeModel(GL11.GL_FLAT);
+    }
+
+    public static void setupDrawItem() {
+        RenderHelper.enableGUIStandardItemLighting();
+        GlStateManager.enableDepth();
+    }
+
+    public static void endDrawItem() {
+        RenderHelper.disableStandardItemLighting();
+        GlStateManager.disableDepth();
+    }
+
+    public static void setupDrawFont() {
+        setupDrawTex();
+    }
+
+    /**
+     * <a href="https://i.sstatic.net/sfQdh.jpg">Reference</a>
+     */
+    public enum DrawMode {
+        QUADS(GL11.GL_QUADS),
+        POINTS(GL11.GL_POINTS),
+        LINES(GL11.GL_LINES),
+        LINE_STRIP(GL11.GL_LINE_STRIP),
+        LINE_LOOP(GL11.GL_LINE_LOOP),
+        TRIANGLES(GL11.GL_TRIANGLES),
+        TRIANGLE_STRIP(GL11.GL_TRIANGLE_STRIP),
+        TRIANGLE_FAN(GL11.GL_TRIANGLES),;
+
+        public final int mode;
+
+        DrawMode(int mode) {
+            this.mode = mode;
+        }
+    }
+
+    public enum VertexFormat {
+
+        POS(DefaultVertexFormats.POSITION),
+        POS_TEX(DefaultVertexFormats.POSITION_TEX),
+        POS_COLOR(DefaultVertexFormats.POSITION_COLOR),
+        POS_TEX_COLOR(DefaultVertexFormats.POSITION_TEX_COLOR),
+        POS_NORMAL(DefaultVertexFormats.POSITION_NORMAL),
+        POS_TEX_NORMAL(DefaultVertexFormats.POSITION_TEX_NORMAL),
+        POS_TEX_COLOR_NORMAL(DefaultVertexFormats.POSITION_TEX_COLOR_NORMAL),
+        POS_TEX_LMAP_COLOR(DefaultVertexFormats.POSITION_TEX_LMAP_COLOR);
+
+        public final net.minecraft.client.renderer.vertex.VertexFormat format;
+
+        VertexFormat(net.minecraft.client.renderer.vertex.VertexFormat format) {
+            this.format = format;
+        }
+    }
 }
