fix 1.8.9 compile

Author: lineargraph

legacy/src/main/java/io/github/notenoughupdates/moulconfig/gui/GuiComponentWrapper.java

@@ -79,7 +79,7 @@ public void handleKeyboardInput() throws IOException {
 
         if (Keyboard.getEventKeyState())
             context.getRoot().keyboardEvent(new KeyboardEvent.CharTyped(Keyboard.getEventCharacter()), createContext());
-        context.getRoot().keyboardEvent(new KeyboardEvent.KeyPressed(Keyboard.getEventKey(), Keyboard.getEventKeyState()), createContext());
+        context.getRoot().keyboardEvent(new KeyboardEvent.KeyPressed(Keyboard.getEventKey(), -1, Keyboard.getEventKeyState()), createContext());
     }
 
     @Override
@@ -88,7 +88,7 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) {
         ForgeRenderContext frc = new ForgeRenderContext();
         context.getRoot().render(new GuiImmediateContext(
             frc,
-            0, 0, width, height, mouseX, mouseY, mouseX, mouseY , mouseX, mouseY
+            0, 0, width, height, mouseX, mouseY, mouseX, mouseY, mouseX, mouseY
         ));
         frc.renderExtraLayers();
     }

legacy/src/main/java/io/github/notenoughupdates/moulconfig/gui/GuiScreenElementWrapper.java

@@ -57,7 +57,7 @@ public void handleMouseInput() throws IOException {
 
     @Override
     public void handleKeyboardInput() throws IOException {
-        if (element.keyboardInput(new KeyboardEvent.KeyPressed(Keyboard.getEventKey(), Keyboard.getEventKeyState())))
+        if (element.keyboardInput(new KeyboardEvent.KeyPressed(Keyboard.getEventKey(), -1, Keyboard.getEventKeyState())))
             return;
         if (Keyboard.getEventKeyState() && !Character.isISOControl(Keyboard.getEventCharacter()))
             if (element.keyboardInput(new KeyboardEvent.CharTyped(Keyboard.getEventCharacter()))) return;

legacy/src/main/java/io/github/notenoughupdates/moulconfig/internal/ForgeFontRenderer.kt

@@ -8,13 +8,15 @@ import java.util.regex.Pattern
 
 
 class ForgeFontRenderer(val font: FontRenderer) : IFontRenderer {
-    override val height: Int
-        get() = font.FONT_HEIGHT
 
     override fun getStringWidth(string: StructuredText): Int {
         return font.getStringWidth(StructuredTextImpl.unwrap(string).formattedText)
     }
 
+    override fun getHeight(): Int {
+        return font.FONT_HEIGHT
+    }
+
     override fun getStringWidth(string: String): Int {
         return font.getStringWidth(string)
     }

legacy/src/main/java/io/github/notenoughupdates/moulconfig/internal/ForgeMinecraft.kt

@@ -84,22 +84,26 @@ class ForgeMinecraft : IMinecraft {
         }
     }
 
-    override val isDevelopmentEnvironment: Boolean
-        get() = Launch.blackboard.get("fml.deobfuscatedEnvironment") as Boolean
+    override fun isDevelopmentEnvironment(): Boolean {
+        return Launch.blackboard.get("fml.deobfuscatedEnvironment") as Boolean
+    }
 
-    override val scaledWidth
-        get(): Int = ScaledResolution(Minecraft.getMinecraft()).scaledWidth
+    override fun getScaledWidth(): Int {
+        return ScaledResolution(Minecraft.getMinecraft()).scaledWidth
+    }
 
-    override val scaledHeight: Int
-        get() = ScaledResolution(Minecraft.getMinecraft()).scaledHeight
+    override fun getScaledHeight(): Int {
+        return ScaledResolution(Minecraft.getMinecraft()).scaledHeight
+    }
 
-    override val scaleFactor: Int
-        get() = ScaledResolution(Minecraft.getMinecraft()).scaleFactor
+    override fun getScaleFactor(): Int {
+        return ScaledResolution(Minecraft.getMinecraft()).scaleFactor
+    }
 
-    override fun sendClickableChatMessage(message: StructuredText, action: String, type: ClickType) {
+    override fun sendClickableChatMessage(message: StructuredText, action: String, type: ClickType?) {
         val component = StructuredTextImpl.unwrap(message)
-        component.setChatStyle(
-            component.chatStyle
+        if (type != null)
+            component.chatStyle = component.chatStyle
                 .setChatClickEvent(
                     ClickEvent(
                         when (type) {
@@ -108,7 +112,6 @@ class ForgeMinecraft : IMinecraft {
                         }, action
                     )
                 )
-        )
         Minecraft.getMinecraft().ingameGUI.chatGUI.printChatMessage(
             component
 
@@ -201,31 +204,14 @@ class ForgeMinecraft : IMinecraft {
         } ?: ""
     }
 
-    override val mouseX: Int
-        get() {
-            val width = scaledWidth
-            val mouseX = Mouse.getX() * width / Minecraft.getMinecraft().displayWidth
-            return mouseX
-        }
-
-    override val mouseY: Int
-        get() {
-            val height = scaledHeight
-            val mouseY = height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1
-            return mouseY
-        }
-    override val mouseXHF: Double
-        get() {
-            val width = ScaledResolution(Minecraft.getMinecraft()).scaledWidth_double
-            val mouseX = Mouse.getX() * width / Minecraft.getMinecraft().displayWidth
-            return mouseX
-        }
-    override val mouseYHF: Double
-        get() {
-            val height = ScaledResolution(Minecraft.getMinecraft()).scaledHeight_double
-            val mouseY = height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1
-            return mouseY
-        }
+    override fun getMousePositionHF(): Pair<Double, Double> {
+        val sr = ScaledResolution(Minecraft.getMinecraft())
+        val width = sr.scaledWidth_double
+        val mouseX = Mouse.getX() * width / Minecraft.getMinecraft().displayWidth
+        val height = sr.scaledHeight_double
+        val mouseY = height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1
+        return mouseX to mouseY
+    }
 
     companion object {
         @JvmStatic
@@ -242,11 +228,15 @@ class ForgeMinecraft : IMinecraft {
         }
     }
 
-    override val isOnMacOS: Boolean
-        get() = Minecraft.isRunningOnMac
+    override fun isOnMacOs(): Boolean {
+        return Minecraft.isRunningOnMac
+    }
 
-    override val defaultFontRenderer: IFontRenderer
-        get() = ForgeFontRenderer(Minecraft.getMinecraft().fontRendererObj)
-    override val keyboardConstants: IKeyboardConstants
-        get() = ForgeKeyboardConstants
+    override fun getDefaultFontRenderer(): IFontRenderer {
+        return ForgeFontRenderer(Minecraft.getMinecraft().fontRendererObj)
+    }
+
+    override fun getKeyboardConstants(): IKeyboardConstants {
+        return ForgeKeyboardConstants
+    }
 }

legacy/src/main/java/io/github/notenoughupdates/moulconfig/internal/ForgeRenderContext.kt

@@ -60,16 +60,17 @@ class ForgeRenderContext : RenderContext {
         GlStateManager.color(ColourUtil.unpackARGBRedF(color), ColourUtil.unpackARGBGreenF(color), ColourUtil.unpackARGBBlueF(color), ColourUtil.unpackARGBAlphaF(color))
     }
 
-    override fun drawColoredTriangles(color: Int, vararg coordinates: Float) {
+
+    override fun drawColouredQuads(colour: Int, vararg coordinates: Float) {
         val tessellator = Tessellator.getInstance()
         val worldrenderer = tessellator.worldRenderer
         GlStateManager.enableBlend()
         GlStateManager.disableTexture2D()
         GlStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0)
-        worldrenderer.begin(GL11.GL_TRIANGLES, DefaultVertexFormats.POSITION)
+        worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION)
 
-        applyGlobalColor(color)
-        require(coordinates.size % 6 == 0)
+        applyGlobalColor(colour)
+        require(coordinates.size % 8 == 0)
         for (i in 0 until (coordinates.size / 2)) {
             worldrenderer.pos(coordinates[i * 2].toDouble(), coordinates[i * 2 + 1].toDouble(), 0.0).endVertex()
         }