it works so cool

1 files changed, 171 insertions, 23 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/fancybars/StatusBar.java b/src/main/java/de/hysky/skyblocker/skyblock/fancybars/StatusBar.java
index 6d321a90..ea4a0388 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/fancybars/StatusBar.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/fancybars/StatusBar.java
@@ -1,5 +1,8 @@
 package de.hysky.skyblocker.skyblock.fancybars;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import de.hysky.skyblocker.SkyblockerMod;
 import de.hysky.skyblocker.utils.render.RenderHelper;
 import net.minecraft.client.MinecraftClient;
@@ -8,7 +11,7 @@ import net.minecraft.client.gui.*;
 import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder;
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.client.gui.widget.Widget;
-import net.minecraft.util.Colors;
+import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.jetbrains.annotations.Nullable;
@@ -21,13 +24,66 @@ public class StatusBar implements Widget, Drawable, Element, Selectable {
     private static final Identifier BAR_FILL = new Identifier(SkyblockerMod.NAMESPACE, "bars/bar_fill");
     private static final Identifier BAR_BACK = new Identifier(SkyblockerMod.NAMESPACE, "bars/bar_back");
 
+
+   /* public static final Codec<StatusBar> CODEC = RecordCodecBuilder.create(instance -> instance.group(
+                    Codec.INT.fieldOf("size").forGetter(bar -> bar.size),
+                    Codec.INT.fieldOf("x").forGetter(bar -> bar.gridX),
+                    Codec.INT.fieldOf("y").forGetter(bar -> bar.gridY),
+                    Codec.STRING.listOf().fieldOf("colors").xmap(
+                                    strings -> strings.stream().map(s -> Integer.parseInt(s, 16)).map(Color::new).toArray(Color[]::new),
+                                    colors -> Arrays.stream(colors).map(color -> Integer.toHexString(color.getRGB())).toList())
+                            .forGetter(StatusBar::getColors),
+                    Codec.STRING.optionalFieldOf("text_color").xmap(
+                                    s -> {
+                                        if (s.isPresent()) {
+                                            return Optional.of(new Color(Integer.parseInt(s.get(), 16)));
+                                        } else return Optional.empty();
+                                    },
+                                    o -> o.map(object -> Integer.toHexString(((Color) object).getRGB())))
+                            .forGetter(bar -> {
+                                if (bar.getTextColor() != null) {
+                                    return Optional.of(bar.getTextColor());
+                                } else return Optional.empty();
+                            }),
+                    Codec.BOOL.optionalFieldOf("show_text", true).forGetter(StatusBar::showText),
+                    Codec.STRING.fieldOf("icon_position").xmap(
+                            IconPosition::valueOf,
+                            Enum::toString
+                    ).forGetter(bar -> bar.iconPosition)
+            )
+
+            .apply(instance, ));*/
+
     private final Identifier icon;
-    private final Color[] colors;
+
+    public Color[] getColors() {
+        return colors;
+    }
+
+    public boolean hasOverflow() {
+        return hasOverflow;
+    }
+
+    public @Nullable Color getTextColor() {
+        return textColor;
+    }
+
+    private Color[] colors;
     private final boolean hasOverflow;
-    private final @Nullable Color textColor;
-    private final String name;
 
-    private @Nullable Consumer<StatusBar> onClick = null;
+    public void setTextColor(@Nullable Color textColor) {
+        this.textColor = textColor;
+    }
+
+    private @Nullable Color textColor;
+
+    public Text getName() {
+        return name;
+    }
+
+    private final Text name;
+
+    private @Nullable OnClick onClick = null;
     public int gridX = 0;
     public int gridY = 0;
 
@@ -37,12 +93,15 @@ public class StatusBar implements Widget, Drawable, Element, Selectable {
     public float fill = 0;
     public float overflowFill = 0;
 
-    private Object text = "";
+    private Object value = "";
 
     private int x = 0;
     private int y = 0;
 
-    public StatusBar(Identifier icon, Color[] colors, boolean hasOverflow, @Nullable Color textColor, String name) {
+    private IconPosition iconPosition = IconPosition.LEFT;
+    private boolean showText = true;
+
+    public StatusBar(Identifier icon, Color[] colors, boolean hasOverflow, @Nullable Color textColor, Text name) {
         this.icon = icon;
         this.colors = colors;
         this.hasOverflow = hasOverflow;
@@ -50,32 +109,42 @@ public class StatusBar implements Widget, Drawable, Element, Selectable {
         this.name = name;
     }
 
-    public StatusBar(Identifier icon, Color[] colors, boolean hasOverflow, @Nullable Color textColor){
-        this(icon, colors, hasOverflow, textColor, "no name");
+    public StatusBar(Identifier icon, Color[] colors, boolean hasOverflow, @Nullable Color textColor) {
+        this(icon, colors, hasOverflow, textColor, Text.empty());
     }
 
     @Override
     public void render(DrawContext context, int mouseX, int mouseY, float delta) {
         if (width <= 0) return;
-        context.drawGuiTexture(icon, x, y, 9, 9);
-        context.drawGuiTexture(BAR_BACK, x + 10, y + 1, width - 10, 7);
-        RenderHelper.renderNineSliceColored(context, BAR_FILL, x + 11, y + 2, (int) ((width - 12) * fill), 5, colors[0]);
+        switch (iconPosition) {
+            case LEFT -> context.drawGuiTexture(icon, x, y, 9, 9);
+            case RIGHT -> context.drawGuiTexture(icon, x + width - 9, y, 9, 9);
+        }
+
+        int barWith = iconPosition.equals(IconPosition.OFF) ? width : width - 10;
+        int barX = iconPosition.equals(IconPosition.LEFT) ? x + 10 : x;
+        context.drawGuiTexture(BAR_BACK, barX, y + 1, barWith, 7);
+        RenderHelper.renderNineSliceColored(context, BAR_FILL, barX + 1, y + 2, (int) ((barWith - 2) * fill), 5, colors[0]);
+
+
         if (hasOverflow && overflowFill > 0) {
-            RenderHelper.renderNineSliceColored(context, BAR_FILL, x + 11, y + 2, (int) ((width - 12) * overflowFill), 5, colors[1]);
+            RenderHelper.renderNineSliceColored(context, BAR_FILL, barX + 1, y + 2, (int) ((barWith - 2) * overflowFill), 5, colors[1]);
         }
-        context.drawText(MinecraftClient.getInstance().textRenderer, gridX + " ; " + gridY , x, y-9, Colors.WHITE, true);
+        //context.drawText(MinecraftClient.getInstance().textRenderer, gridX + " " + gridY + " s:" + size , x, y-9, Colors.WHITE, true);
     }
 
     public void updateValues(float fill, float overflowFill, Object text) {
-        this.text = text;
+        this.value = text;
         this.fill = fill;
         this.overflowFill = overflowFill;
     }
 
     public void renderText(DrawContext context) {
         TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
-        String text = this.text.toString();
-        int x = this.x + 11 + (width - textRenderer.getWidth(text) - 12) / 2;
+        int barWith = iconPosition.equals(IconPosition.OFF) ? width : width - 10;
+        int barX = iconPosition.equals(IconPosition.LEFT) ? x + 10 : x;
+        String text = this.value.toString();
+        int x = barX + (barWith - textRenderer.getWidth(text)) / 2;
         int y = this.y - 3;
 
         final int[] offsets = new int[]{-1, 1};
@@ -83,7 +152,7 @@ public class StatusBar implements Widget, Drawable, Element, Selectable {
             context.drawText(textRenderer, text, x + i, y, 0, false);
             context.drawText(textRenderer, text, x, y + i, 0, false);
         }
-        context.drawText(textRenderer, text, x, y, (textColor == null ? colors[0]: textColor).getRGB(), false);
+        context.drawText(textRenderer, text, x, y, (textColor == null ? colors[0] : textColor).getRGB(), false);
     }
 
     public void renderCursor(DrawContext context, int mouseX, int mouseY, float delta) {
@@ -135,6 +204,14 @@ public class StatusBar implements Widget, Drawable, Element, Selectable {
         return 9;
     }
 
+    public int getMinimumSize() {
+        return 2;
+    }
+
+    public int getMaximumSize() {
+        return gridY < 0 ? 6 : 12;
+    }
+
     @Override
     public ScreenRect getNavigationFocus() {
         return Widget.super.getNavigationFocus();
@@ -146,11 +223,11 @@ public class StatusBar implements Widget, Drawable, Element, Selectable {
     }
 
     @Override
-    public void forEachChild(Consumer<ClickableWidget> consumer) {}
+    public void forEachChild(Consumer<ClickableWidget> consumer) {
+    }
 
     @Override
     public void setFocused(boolean focused) {
-
     }
 
     @Override
@@ -167,18 +244,17 @@ public class StatusBar implements Widget, Drawable, Element, Selectable {
     public boolean mouseClicked(double mouseX, double mouseY, int button) {
         if (!isMouseOver(mouseX, mouseY)) return false;
         if (onClick != null) {
-            onClick.accept(this);
+            onClick.onClick(this, button, (int) mouseX, (int) mouseY);
         }
         return true;
     }
 
-    public void setOnClick(@Nullable Consumer<StatusBar> onClick) {
+    public void setOnClick(@Nullable OnClick onClick) {
         this.onClick = onClick;
     }
 
     @Override
     public void appendNarrations(NarrationMessageBuilder builder) {
-
     }
 
     @Override
@@ -193,4 +269,76 @@ public class StatusBar implements Widget, Drawable, Element, Selectable {
                 .append("width", width)
                 .toString();
     }
+
+    public IconPosition getIconPosition() {
+        return iconPosition;
+    }
+
+    public void setIconPosition(IconPosition iconPosition) {
+        this.iconPosition = iconPosition;
+    }
+
+    public boolean showText() {
+        return showText;
+    }
+
+    public void setShowText(boolean showText) {
+        this.showText = showText;
+    }
+
+    public enum IconPosition {
+        LEFT,
+        RIGHT,
+        OFF
+    }
+
+    @FunctionalInterface
+    public interface OnClick {
+
+        void onClick(StatusBar statusBar, int button, int mouseX, int mouseY);
+    }
+
+    public void loadFromJson(JsonObject object) {
+        // Make colors optional, so it's easy to reset to default
+        if (object.has("colors")) {
+            JsonArray colors1 = object.get("colors").getAsJsonArray();
+            if (colors1.size() < 2 && hasOverflow) {
+                throw new IllegalStateException("Missing second color of bar that has overflow");
+            }
+            Color[] newColors = new Color[colors1.size()];
+            for (int i = 0; i < colors1.size(); i++) {
+                JsonElement jsonElement = colors1.get(i);
+                newColors[i] = new Color(Integer.parseInt(jsonElement.getAsString(), 16));
+            }
+            this.colors = newColors;
+        }
+
+        if (object.has("text_color")) this.textColor = new Color(Integer.parseInt(object.get("text_color").getAsString(), 16));
+
+        this.size = object.get("size").getAsInt();
+        this.gridX = object.get("x").getAsInt();
+        this.gridY = object.get("y").getAsInt();
+        // these are optional too, why not
+        if (object.has("icon_position")) this.iconPosition = IconPosition.valueOf(object.get("icon_position").getAsString());
+        if (object.has("show_text")) this.showText = object.get("show_text").getAsBoolean();
+
+    }
+
+    public JsonObject toJson() {
+        JsonObject object = new JsonObject();
+        JsonArray colors1 = new JsonArray();
+        for (Color color : colors) {
+            colors1.add(Integer.toHexString(color.getRGB()).substring(2));
+        }
+        object.add("colors", colors1);
+        if (textColor != null) {
+            object.addProperty("text_color", Integer.toHexString(textColor.getRGB()).substring(2));
+        }
+        object.addProperty("size", size);
+        object.addProperty("x", gridX);
+        object.addProperty("y", gridY);
+        object.addProperty("icon_position", iconPosition.toString());
+        object.addProperty("show_text", showText);
+        return object;
+    }
 }