added the ability to hide snippets of code

XTerPL · XTerPL · commit 80ee54fa60e2 · 2023-02-05T04:23:37.000+01:00
diff --git a/src/main/java/io/github/techstreet/dfscript/script/ScriptSnippet.java b/src/main/java/io/github/techstreet/dfscript/script/ScriptSnippet.java
@@ -8,6 +8,7 @@
 import io.github.techstreet.dfscript.screen.script.ScriptPartCategoryScreen;
 import io.github.techstreet.dfscript.screen.widget.CButton;
 import io.github.techstreet.dfscript.screen.widget.CScrollPanel;
+import io.github.techstreet.dfscript.screen.widget.CText;
 import io.github.techstreet.dfscript.screen.widget.CWidget;
 import io.github.techstreet.dfscript.script.action.ScriptActionType;
 import io.github.techstreet.dfscript.script.action.ScriptBuiltinAction;
@@ -22,10 +23,13 @@
 import io.github.techstreet.dfscript.script.render.ScriptPartRender;
 import io.github.techstreet.dfscript.script.repetitions.ScriptBuiltinRepetition;
 import io.github.techstreet.dfscript.script.repetitions.ScriptRepetitionType;
+import io.github.techstreet.dfscript.util.RenderUtil;
 import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.client.sound.PositionedSoundInstance;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.sound.SoundEvents;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
 
 import javax.naming.Context;
 import java.awt.*;
@@ -34,6 +38,7 @@
 import java.util.List;
 
 public class ScriptSnippet extends ArrayList<ScriptPart> {
+    boolean hidden = false;
     ScriptSnippet() {
 
     }
@@ -44,8 +49,44 @@ public void run(ScriptTask task, ScriptScopeParent parent)
     }
 
     public int create(CScrollPanel panel, int y, int indent, Script script) {
-        int index = 0;
         ScriptSnippet thisSnippet = this;
+        panel.add(new CButton(3, y, 2, 8, "", () -> {
+            thisSnippet.hidden = !thisSnippet.hidden;
+            if(DFScript.MC.currentScreen instanceof ScriptEditScreen e) {
+                e.reload();
+            }
+        }) {
+            @Override
+            public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
+                Rectangle b = getBounds();
+
+                int color = 0xFF323232;
+
+                if(b.contains(mouseX, mouseY)) {
+                    color = 0xFF707070;
+                }
+
+                if(thisSnippet.hidden) {
+                    RenderUtil.renderLine(stack, b.x, b.y, b.x+b.width, b.y+(b.height/2f), color, 0.5f);
+                    RenderUtil.renderLine(stack, b.x, b.y+b.height, b.x+b.width, b.y+(b.height/2f), color, 0.5f);
+                }
+                else {
+                    RenderUtil.renderLine(stack, b.x, b.y, b.x+(b.width/2f), b.y+b.height, color, 0.5f);
+                    RenderUtil.renderLine(stack, b.x+b.width, b.y, b.x+(b.width/2f), b.y+b.height, color, 0.5f);
+                }
+            }
+        });
+
+        if(hidden) {
+            ScriptPartRender.createIndent(panel, indent, y, 8);
+
+            panel.add(new CText(15 + indent * 5, y + 2, Text.literal("...")));
+
+            return y+10;
+        }
+
+        int index = 0;
+
         for(ScriptPart part : this) {
             ScriptPartRender render = new ScriptPartRender();
             part.create(render, script);
@@ -215,6 +256,10 @@ public ScriptSnippet deserialize(JsonElement json, Type typeOfT, JsonDeserializa
                 snippet.add(context.deserialize(element, ScriptPart.class));
             }
 
+            if(obj.has("hidden")) {
+                snippet.hidden = obj.get("hidden").getAsBoolean();
+            }
+
             return snippet;
         }
 
@@ -228,6 +273,8 @@ public JsonElement serialize(ScriptSnippet src, Type typeOfSrc, JsonSerializatio
             }
 
             obj.add("parts", parts);
+            obj.addProperty("hidden", src.hidden);
+
             return obj;
         }
     }
diff --git a/src/main/java/io/github/techstreet/dfscript/util/RenderUtil.java b/src/main/java/io/github/techstreet/dfscript/util/RenderUtil.java
@@ -5,18 +5,16 @@
 import java.util.ArrayList;
 import java.util.List;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.BufferBuilder;
-import net.minecraft.client.render.GameRenderer;
-import net.minecraft.client.render.Tessellator;
-import net.minecraft.client.render.VertexFormat;
-import net.minecraft.client.render.VertexFormats;
+import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.render.*;
 import net.minecraft.client.render.item.ItemRenderer;
 import net.minecraft.client.toast.SystemToast;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemStack;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.math.Matrix4f;
 import net.minecraft.util.math.Vector4f;
 import org.lwjgl.opengl.GL11;
 
@@ -179,4 +177,53 @@ public static void sendToaster(String title, String description, SystemToast.Typ
     public static void sendToaster(MutableText title, MutableText description, SystemToast.Type type) {
         MinecraftClient.getInstance().getToastManager().add(new SystemToast(type, title, description));
     }
+
+    static int renderSteps = 100;
+
+    public static void renderLine(MatrixStack stack, float x1, float y1, float x2, float y2, int color, float size) {
+        float stepX = (x2-x1)/renderSteps;
+        float stepY = (y2-y1)/renderSteps;
+
+        for(int i = 0; i <= renderSteps; i++) {
+            fill(stack, (x1-(size/2)), (y1-(size/2)), (x1+(size/2)), (y1+(size/2)), color);
+
+            x1 += stepX;
+            y1 += stepY;
+        }
+    }
+
+    // these functions exist because fabric api dumb and used an integer for positions in the DrawableHelper class...
+    public static void fill(MatrixStack stack, float x1, float y1, float x2, float y2, int color) {
+        fill(stack.peek().getPositionMatrix(), x1, y1, x2, y2, color);
+    }
+    public static void fill(Matrix4f matrix, float x1, float y1, float x2, float y2, int color) {
+        float i;
+        if (x1 < x2) {
+            i = x1;
+            x1 = x2;
+            x2 = i;
+        }
+        if (y1 < y2) {
+            i = y1;
+            y1 = y2;
+            y2 = i;
+        }
+        float f = (float)(color >> 24 & 0xFF) / 255.0f;
+        float g = (float)(color >> 16 & 0xFF) / 255.0f;
+        float h = (float)(color >> 8 & 0xFF) / 255.0f;
+        float j = (float)(color & 0xFF) / 255.0f;
+        BufferBuilder bufferBuilder = Tessellator.getInstance().getBuffer();
+        RenderSystem.enableBlend();
+        RenderSystem.disableTexture();
+        RenderSystem.defaultBlendFunc();
+        RenderSystem.setShader(GameRenderer::getPositionColorShader);
+        bufferBuilder.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR);
+        bufferBuilder.vertex(matrix, x1, y2, 0.0f).color(g, h, j, f).next();
+        bufferBuilder.vertex(matrix, x2, y2, 0.0f).color(g, h, j, f).next();
+        bufferBuilder.vertex(matrix, x2, y1, 0.0f).color(g, h, j, f).next();
+        bufferBuilder.vertex(matrix, x1, y1, 0.0f).color(g, h, j, f).next();
+        BufferRenderer.drawWithShader(bufferBuilder.end());
+        RenderSystem.enableTexture();
+        RenderSystem.disableBlend();
+    }
 }
