Port user function editor to vanilla, handle clipping

Author: Niko-sk2x

src/main/java/io/github/opencubicchunks/cubicchunks/cubicgen/common/gui/DrawUtils.java

@@ -25,65 +25,67 @@
 
 import static java.lang.Math.max;
 
-import net.malisis.core.client.gui.GuiRenderer;
-import net.malisis.core.client.gui.element.GuiShape;
-import net.malisis.core.client.gui.element.SimpleGuiShape;
-import net.malisis.core.renderer.RenderParameters;
-import net.malisis.core.renderer.element.Face;
-import net.malisis.core.renderer.element.Vertex;
-import net.malisis.core.renderer.font.FontOptions;
-import net.malisis.core.renderer.font.MalisisFont;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+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 net.minecraft.util.math.MathHelper;
 
 import java.math.BigInteger;
 import java.text.DecimalFormat;
 
 public class DrawUtils {
 
-    public static void drawLineF(GuiRenderer render, float x1, float y1, float x2, float y2, int argb, float width) {
+    public static void drawLineF(float x1, float y1, float x2, float y2, int argb, float width) {
         double dx = x2 - x1;
         double dy = y2 - y1;
         double lenInv = width / Math.sqrt(dx * dx + dy * dy);
         dx *= lenInv;
         dy *= lenInv;
 
-        GuiShape shape = directShape(
-                new Vertex(x2 - dy, y2 + dx, 0),
-                new Vertex(x2 + dy, y2 - dx, 0),
-                new Vertex(x1 + dy, y1 - dx, 0),
-                new Vertex(x1 - dy, y1 + dx, 0)
-        );
-        RenderParameters rp = new RenderParameters();
-        rp.setColor(argb & 0xFFFFFF);
-        rp.setAlpha(argb >>> 24);
-        render.drawShape(shape, rp);
-    }
-
-    public static void drawRectF(GuiRenderer render, float x1, float y1, float x2, float y2, int argb) {
-        GuiShape shape = directShape(
-                new Vertex(x1, y1, 0),
-                new Vertex(x1, y2, 0),
-                new Vertex(x2, y2, 0),
-                new Vertex(x2, y1, 0)
-        );
-        RenderParameters rp = new RenderParameters();
-        rp.setColor(argb & 0xFFFFFF);
-        rp.setAlpha(argb >>> 24);
-        render.drawShape(shape, rp);
+        float alpha = (float) (argb >> 24 & 255) / 255.0F;
+        float r = (float) (argb >> 16 & 255) / 255.0F;
+        float g = (float) (argb >> 8 & 255) / 255.0F;
+        float b = (float) (argb & 255) / 255.0F;
+        Tessellator tessellator = Tessellator.getInstance();
+        BufferBuilder buf = tessellator.getBuffer();
+        GlStateManager.enableBlend();
+        GlStateManager.disableTexture2D();
+        GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA,
+                GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
+        GlStateManager.color(r, g, b, alpha);
+        buf.begin(7, DefaultVertexFormats.POSITION);
+        buf.pos(x2 - dy, y2 + dx, 0.0D).endVertex();
+        buf.pos(x2 + dy, y2 - dx, 0.0D).endVertex();
+        buf.pos(x1 + dy, y1 - dx, 0.0D).endVertex();
+        buf.pos(x1 - dy, y1 + dx, 0.0D).endVertex();
+        tessellator.draw();
+        GlStateManager.enableTexture2D();
+        GlStateManager.disableBlend();
     }
 
-    public static GuiShape directShape(Vertex... vertices) {
-        return new GuiShape(new Face(vertices)) {
-
-            @Override public void setSize(int i, int i1) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override public void scale(float v, float v1) {
-                throw new UnsupportedOperationException();
-            }
-        };
+    public static void drawRectF(float x1, float y1, float x2, float y2, int argb) {
+        float alpha = (float) (argb >> 24 & 255) / 255.0F;
+        float r = (float) (argb >> 16 & 255) / 255.0F;
+        float g = (float) (argb >> 8 & 255) / 255.0F;
+        float b = (float) (argb & 255) / 255.0F;
+        Tessellator tessellator = Tessellator.getInstance();
+        BufferBuilder buf = tessellator.getBuffer();
+        GlStateManager.enableBlend();
+        GlStateManager.disableTexture2D();
+        GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA,
+                GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
+        GlStateManager.color(r, g, b, alpha);
+        buf.begin(7, DefaultVertexFormats.POSITION);
+        buf.pos(x1, y1, 0.0D).endVertex();
+        buf.pos(x1, y2, 0.0D).endVertex();
+        buf.pos(x2, y2, 0.0D).endVertex();
+        buf.pos(x2, y1, 0.0D).endVertex();
+        tessellator.draw();
+        GlStateManager.enableTexture2D();
+        GlStateManager.disableBlend();
     }
 
     private static String formatFloatX(double f) {
@@ -94,22 +96,18 @@ private static String formatFloatY(double f) {
         return new DecimalFormat("#.#####").format(f);
     }
 
-    public static void drawXScale(GuiRenderer render, int width, int height, double offsetX, double scaleX) {
+    public static void drawXScale(int posX, int posY, int width, int height, double offsetX, double scaleX) {
         double blockLeft = posToX(width, 0, offsetX, scaleX);
         double blockRight = posToX(width, width, offsetX, scaleX);
 
-        FontOptions fo = new FontOptions.FontOptionsBuilder().color(0xFFFFFF).shadow(true).build();
-
+        FontRenderer font = Minecraft.getMinecraft().fontRenderer;
 
         String maxFormatted = formatFloatX(max(blockLeft, blockRight));
         String minFormatted = formatFloatX(Math.min(blockLeft, blockRight));
         String withFractionFormatted = formatFloatX(Math.min(blockLeft, blockRight) < 0 ? -0.11111111 : 0.11111111);
         float entryWidth = max(
-                max(
-                        MalisisFont.minecraftFont.getStringWidth(maxFormatted, fo),
-                        MalisisFont.minecraftFont.getStringWidth(minFormatted, fo)
-                ),
-                MalisisFont.minecraftFont.getStringWidth(withFractionFormatted, fo)
+                max(font.getStringWidth(maxFormatted), font.getStringWidth(minFormatted)),
+                font.getStringWidth(withFractionFormatted)
         );
 
         int count = max(1, (int) (width / entryWidth));
@@ -120,34 +118,25 @@ public static void drawXScale(GuiRenderer render, int width, int height, double
             double x = start + i * increment;
             int pos = (int) xToPos(width, x, offsetX, scaleX);
             String formatted = formatFloatX(x);
-            int strWidth = (int) MalisisFont.minecraftFont.getStringWidth(formatted, fo) / 2;
+            int strWidth = font.getStringWidth(formatted) / 2;
             int strPos = pos - strWidth + 1;
             if (strPos < 30) {
                 continue;// avoid intersecting with y axis
             }
-            render.drawText(MalisisFont.minecraftFont, formatted, strPos, height - 10, 0, fo);
+            font.drawString(formatted, posX + strPos, posY + height - 10, 0xFFFFFFFF);
         }
 
-        render.next();
         GlStateManager.disableTexture2D();
-        SimpleGuiShape shape = new SimpleGuiShape();
-        shape.setSize(1, 2);
-        RenderParameters rp = new RenderParameters();
         for (int i = 0; i < count; i++) {
             double x = start + i * increment;
             int pos = (int) xToPos(width, x, offsetX, scaleX);
-            shape.storeState();
-            shape.setPosition(pos, height - 1);
-            render.drawShape(shape, rp);
-
-            shape.resetState();
+            drawRectF(posX + pos, posY + height - 1, posX + pos + 1, posY + height + 1, 0xFFFFFFFF);
         }
-        render.next();
         GlStateManager.enableTexture2D();
     }
 
 
-    public static void drawYScale(GuiRenderer render, int width, int height, double offsetY, double scaleY) {
+    public static void drawYScale(int posX, int posY, int width, int height, double offsetY, double scaleY) {
         double blockBottom = posToY(height, height, offsetY, scaleY);// bottom -> getHeight()
         double blockTop = posToY(height, 0, offsetY, scaleY);
 
@@ -156,9 +145,9 @@ public static void drawYScale(GuiRenderer render, int width, int height, double
 
         double start = Math.round(blockBottom / increment) * increment;
 
-        FontOptions fo = new FontOptions.FontOptionsBuilder().color(0xFFFFFF).shadow(true).build();
+        FontRenderer font = Minecraft.getMinecraft().fontRenderer;
 
-        int maxSrtY = MathHelper.ceil(height - MalisisFont.minecraftFont.getStringHeight(fo));
+        int maxSrtY = MathHelper.ceil(height - font.FONT_HEIGHT);
 
         float[] yMarkYCoords = new float[count];
         for (int i = 0; i < count; i++) {
@@ -167,20 +156,18 @@ public static void drawYScale(GuiRenderer render, int width, int height, double
             if (pos < -1 || pos > height) {
                 continue;
             }
-            int strHeight = (int) (MalisisFont.minecraftFont.getStringHeight() / 2);
+            int strHeight = font.FONT_HEIGHT / 2;
 
             int yDraw = pos - strHeight;
             int yDrawStr = MathHelper.clamp(yDraw, 0, maxSrtY);
             yMarkYCoords[i] = pos;
-            render.drawText(MalisisFont.minecraftFont, formatFloatY(y), 10, yDrawStr, 0, fo);
+            font.drawString(formatFloatY(y), posX + 10, posY + yDrawStr, 0xFFFFFFFF);
         }
 
-        render.next();
         GlStateManager.disableTexture2D();
         for (float pos : yMarkYCoords) {
-            DrawUtils.drawLineF(render, 0, pos, 4, pos, 0xFFFFFFFF, 1f);
+            DrawUtils.drawLineF(posX, posY + pos, posX + 4, posY + pos, 0xFFFFFFFF, 1f);
         }
-        render.next();
         GlStateManager.enableTexture2D();
     }
 

src/main/java/io/github/opencubicchunks/cubicchunks/cubicgen/common/gui/component/CwgGuiComponent.java

@@ -34,7 +34,7 @@
 public abstract class CwgGuiComponent extends Gui implements ICwgGuiComponent {
 
     private int x, y, width, height;
-    private boolean enabled, visible, hovered;
+    private boolean enabled = true, visible = true, hovered;
     private final List<String> tooltipLines = new ArrayList<>();
     private Consumer<? super CwgGuiComponent> onClick;
 
@@ -128,7 +128,10 @@ public boolean isHovered() {
     }
 
     @Override
-    public boolean onMousePressed(Minecraft mc, int x, int y) {
+    public boolean onMousePressed(Minecraft mc, int x, int y, int mouseButton) {
+        if (mouseButton != 0) {
+            return false;
+        }
         if (onClick == null) {
             return false;
         }