Fix triangles on modern versions

Author: lineargraph

modern/src/main/kotlin/io/github/notenoughupdates/moulconfig/platform/ModernRenderContext.kt

@@ -39,7 +39,7 @@ class ModernRenderContext(val drawContext: DrawContext) : RenderContext {
                 .colorLogic(RenderPhase.OR_REVERSE)
                 .build(false)
         )
-        val COLORED_TRIANGLES = Util.memoize { it: Identifier ->
+        val COLORED_TRIANGLES =
             RenderLayer.of(
                 "mc_triangles",
                 VertexFormats.POSITION_COLOR,
@@ -49,13 +49,11 @@ class ModernRenderContext(val drawContext: DrawContext) : RenderContext {
                 false,
                 RenderLayer.MultiPhaseParameters.builder()
                     // TODO: import mipmap settings
-                    .texture(RenderPhase.Texture(it, TriState.DEFAULT, false))
-                    .program(RenderPhase.ShaderProgram(ShaderProgramKeys.POSITION_TEX_COLOR))
+                    .program(RenderPhase.ShaderProgram(ShaderProgramKeys.POSITION_COLOR))
                     .transparency(RenderPhase.TRANSLUCENT_TRANSPARENCY)
                     .depthTest(RenderPhase.LEQUAL_DEPTH_TEST)
                     .build(false)
             )
-        }
     }
 
     val mouse = MinecraftClient.getInstance().mouse
@@ -148,7 +146,7 @@ class ModernRenderContext(val drawContext: DrawContext) : RenderContext {
         require(coordinates.size % 6 == 0)
         RenderSystem.enableBlend()
         drawContext.draw {
-            val buf = it.getBuffer(COLORED_TRIANGLES.apply(ModernMinecraft.boundTexture))
+            val buf = it.getBuffer(COLORED_TRIANGLES)
             val matrix = drawContext.matrices.peek().positionMatrix
 
             for (i in 0 until (coordinates.size / 2)) {

modern/src/main/kotlin/io/github/notenoughupdates/moulconfig/test/TestCategoryA.kt

@@ -1,10 +1,18 @@
 package io.github.notenoughupdates.moulconfig.test
 
 import com.google.gson.annotations.Expose
-import io.github.notenoughupdates.moulconfig.annotations.*
+import io.github.notenoughupdates.moulconfig.annotations.Accordion
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorInfoText
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorKeybind
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorText
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption
 import io.github.notenoughupdates.moulconfig.observer.Property
 import org.lwjgl.glfw.GLFW
-import java.util.*
+import java.util.Arrays
 
 class TestCategoryA {
     @ConfigOption(name = "Test Option", desc = "Test toggle")
@@ -29,21 +37,29 @@ class TestCategoryA {
     }
 
 
-    @ConfigOption(name = "Number Dropdown", desc = "0, 1, 2, 3")
-    @ConfigEditorDropdown(values = ["0", "1", "2", "3"])
-    var numberDropdown: Int = 0
+    @Accordion
+    @ConfigOption(name = "Accordion", desc = "")
+    var accordion = AccordionClass()
 
+    class AccordionClass() {
+
+        @ConfigOption(name = "Number Dropdown", desc = "0, 1, 2, 3")
+        @ConfigEditorDropdown(values = ["0", "1", "2", "3"])
+        var numberDropdown: Int = 0
 
-    @ConfigOption(name = "Enum Dropdown", desc = "1, 2, 3, 4")
-    @ConfigEditorDropdown
-    var enumDropdown: Property<DropdownEnum> = Property.of(DropdownEnum.FOUR)
+
+        @ConfigOption(name = "Enum Dropdown", desc = "1, 2, 3, 4")
+        @ConfigEditorDropdown
+        var enumDropdown: Property<DropdownEnum> = Property.of(DropdownEnum.FOUR)
+    }
 
     enum class DropdownEnum(private val label: String) {
         ONE("1"),
         TWO("2"),
         THREE("3"),
         FOUR("4"),
         ;
+
         override fun toString(): String {
             return label
         }
@@ -65,7 +81,7 @@ class TestCategoryA {
 
     @ConfigOption(name = "Draggable List", desc = "§eDrag text to change the order of the list.")
     @ConfigEditorDraggableList(
-        exampleText = ["abc", "dec", "blah","surel it works really cool and great :))"]
+        exampleText = ["abc", "dec", "blah", "surel it works really cool and great :))"]
     )
     var draggableList: List<Int> = ArrayList(mutableListOf(0, 1, 2, 3))