Add waypoints gui

7 files changed, 150 insertions, 2 deletions

diff --git a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
index 1477d669..305c85f2 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
@@ -4,6 +4,9 @@ import de.hysky.skyblocker.config.ConfigUtils;
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.configs.GeneralConfig;
 import de.hysky.skyblocker.skyblock.shortcut.ShortcutsConfigScreen;
+import de.hysky.skyblocker.skyblock.waypoint.WaypointsScreen;
+import de.hysky.skyblocker.utils.render.title.TitleContainerConfigScreen;
+import de.hysky.skyblocker.utils.waypoint.Waypoint;
 import dev.isxander.yacl3.api.*;
 import dev.isxander.yacl3.api.controller.FloatSliderControllerBuilder;
 import net.minecraft.client.MinecraftClient;
@@ -67,6 +70,32 @@ public class GeneralCategory {
                                 .build())
                         .build())
 
+                //Waypoints
+                .group(OptionGroup.createBuilder()
+                        .name(Text.translatable("text.autoconfig.skyblocker.option.general.waypoints"))
+                        .collapsed(true)
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("text.autoconfig.skyblocker.option.general.waypoints.enableWaypoints"))
+                                .binding(defaults.general.waypoints.enableWaypoints,
+                                        () -> config.general.waypoints.enableWaypoints,
+                                        newValue -> config.general.waypoints.enableWaypoints = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .option(Option.<Waypoint.Type>createBuilder()
+                                .name(Text.translatable("text.autoconfig.skyblocker.option.general.waypoints.waypointType"))
+                                .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.waypoints.waypointType.@Tooltip"), Text.translatable("text.autoconfig.skyblocker.option.general.waypoints.waypointType.generalNote")))
+                                .binding(defaults.general.waypoints.waypointType,
+                                        () -> config.general.waypoints.waypointType,
+                                        newValue -> config.general.waypoints.waypointType = newValue)
+                                .controller(ConfigUtils::createEnumCyclingListController)
+                                .build())
+                        .option(ButtonOption.createBuilder()
+                                .name(Text.translatable("skyblocker.waypoints.config"))
+                                .text(Text.translatable("text.skyblocker.open"))
+                                .action((screen, opt) -> MinecraftClient.getInstance().setScreen(new WaypointsScreen(screen)))
+                                .build())
+                        .build())
+
                 //Quiver Warning
                 .group(OptionGroup.createBuilder()
                         .name(Text.translatable("skyblocker.config.general.quiverWarning"))
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/WaypointsListWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/WaypointsListWidget.java
new file mode 100644
index 00000000..a1410397
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/WaypointsListWidget.java
@@ -0,0 +1,76 @@
+package de.hysky.skyblocker.skyblock.waypoint;
+
+import de.hysky.skyblocker.utils.waypoint.NamedWaypoint;
+import de.hysky.skyblocker.utils.waypoint.WaypointCategory;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.Element;
+import net.minecraft.client.gui.Selectable;
+import net.minecraft.client.gui.widget.ElementListWidget;
+import net.minecraft.util.math.BlockPos;
+
+import java.util.List;
+
+public class WaypointsListWidget extends ElementListWidget<WaypointsListWidget.AbstractWaypointEntry> {
+    public WaypointsListWidget(MinecraftClient client, int width, int height, int y, int itemHeight) {
+        super(client, width, height, y, itemHeight);
+    }
+
+    protected static abstract class AbstractWaypointEntry extends ElementListWidget.Entry<AbstractWaypointEntry> {
+    }
+
+    protected class WaypointCategoryEntry extends AbstractWaypointEntry {
+        private final WaypointCategory category;
+
+        public WaypointCategoryEntry(WaypointCategory category) {
+            this.category = category;
+        }
+
+        @Override
+        public List<? extends Selectable> selectableChildren() {
+            return List.of();
+        }
+
+        @Override
+        public List<? extends Element> children() {
+            return List.of();
+        }
+
+        @Override
+        public void render(DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
+            context.drawTextWithShadow(client.textRenderer, category.name(), width / 2 - 150, y + 5, 0xFFFFFF);
+        }
+    }
+
+    protected class WaypointEntry extends AbstractWaypointEntry {
+        private final WaypointCategoryEntry category;
+        private final NamedWaypoint waypoint;
+
+        public WaypointEntry(WaypointCategoryEntry category) {
+            this(category, new NamedWaypoint(BlockPos.ORIGIN, "New Waypoint", new float[]{0f, 1f, 0f}));
+        }
+
+        public WaypointEntry(WaypointCategoryEntry category, NamedWaypoint waypoint) {
+            this.category = category;
+            this.waypoint = waypoint;
+        }
+
+        @Override
+        public List<? extends Selectable> selectableChildren() {
+            return null;
+        }
+
+        @Override
+        public List<? extends Element> children() {
+            return null;
+        }
+
+        @Override
+        public void render(DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
+            context.drawTextWithShadow(client.textRenderer, waypoint.getName(), width / 2 - 125, y + 5, 0xFFFFFF);
+            context.drawTextWithShadow(client.textRenderer, waypoint.pos.toString(), width / 2 - 50, y + 5, 0xFFFFFF);
+            float[] colorComponents = waypoint.getColorComponents();
+            context.drawTextWithShadow(client.textRenderer, String.format("#%02X%02X%02X", (int) (colorComponents[0] * 255), (int) (colorComponents[1] * 255), (int) (colorComponents[2] * 255)), width / 2 + 10, y + 5, 0xFFFFFF);
+        }
+    }
+}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/WaypointsScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/WaypointsScreen.java
new file mode 100644
index 00000000..f98addda
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/WaypointsScreen.java
@@ -0,0 +1,37 @@
+package de.hysky.skyblocker.skyblock.waypoint;
+
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.text.Text;
+
+public class WaypointsScreen extends Screen {
+    private WaypointsListWidget waypointsListWidget;
+    private final Screen parent;
+
+    protected WaypointsScreen() {
+        this(null);
+    }
+
+    public WaypointsScreen(Screen parent) {
+        super(Text.translatable("skyblocker.waypoints.config"));
+        this.parent = parent;
+    }
+
+    @Override
+    protected void init() {
+        super.init();
+        waypointsListWidget = addDrawableChild(new WaypointsListWidget(client, width, height - 96, 32, 25));
+    }
+
+    @Override
+    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+        super.render(context, mouseX, mouseY, delta);
+        context.drawCenteredTextWithShadow(this.textRenderer, this.title, this.width / 2, 16, 0xFFFFFF);
+    }
+
+    @SuppressWarnings("DataFlowIssue")
+    @Override
+    public void close() {
+        client.setScreen(parent);
+    }
+}
diff --git a/src/main/java/de/hysky/skyblocker/utils/waypoint/NamedWaypoint.java b/src/main/java/de/hysky/skyblocker/utils/waypoint/NamedWaypoint.java
index f35ad95d..db95634b 100644
--- a/src/main/java/de/hysky/skyblocker/utils/waypoint/NamedWaypoint.java
+++ b/src/main/java/de/hysky/skyblocker/utils/waypoint/NamedWaypoint.java
@@ -29,6 +29,10 @@ public class NamedWaypoint extends Waypoint {
     protected final Text name;
     protected final Vec3d centerPos;
 
+    public NamedWaypoint(BlockPos pos, String name, float[] colorComponents) {
+        this(pos, name, colorComponents, true);
+    }
+
     public NamedWaypoint(BlockPos pos, String name, float[] colorComponents, boolean shouldRender) {
         this(pos, Text.of(name), colorComponents, shouldRender);
     }
diff --git a/src/main/java/de/hysky/skyblocker/utils/waypoint/ProfileAwareWaypoint.java b/src/main/java/de/hysky/skyblocker/utils/waypoint/ProfileAwareWaypoint.java
index 7aa99d14..7369a2ef 100644
--- a/src/main/java/de/hysky/skyblocker/utils/waypoint/ProfileAwareWaypoint.java
+++ b/src/main/java/de/hysky/skyblocker/utils/waypoint/ProfileAwareWaypoint.java
@@ -38,7 +38,7 @@ public class ProfileAwareWaypoint extends Waypoint {
     }
 
     @Override
-    protected float[] getColorComponents() {
+    public float[] getColorComponents() {
         return foundProfiles.contains(Utils.getProfile()) ? foundColor : missingColor;
     }
 }
diff --git a/src/main/java/de/hysky/skyblocker/utils/waypoint/Waypoint.java b/src/main/java/de/hysky/skyblocker/utils/waypoint/Waypoint.java
index 1a83f175..75e2edcf 100644
--- a/src/main/java/de/hysky/skyblocker/utils/waypoint/Waypoint.java
+++ b/src/main/java/de/hysky/skyblocker/utils/waypoint/Waypoint.java
@@ -72,7 +72,7 @@ public class Waypoint implements Renderable {
         this.shouldRender = !this.shouldRender;
     }
 
-    protected float[] getColorComponents() {
+    public float[] getColorComponents() {
         return colorComponents;
     }
 
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index dbc60ca0..6c663dc1 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -720,6 +720,8 @@
   "skyblocker.shortcuts.new": "New Shortcut",
   "skyblocker.shortcuts.commandSuggestionTooltip": "Due to limitations of Minecraft, command suggestions will only work after joining a new world.",
 
+  "skyblocker.waypoints.config": "Waypoints Config",
+
   "skyblocker.customItemNames.removed": "§fRemoved this item's custom name.",
   "skyblocker.customItemNames.neverHad": "§fThis item doesn't have a custom name set, but why not add one? ;)",
   "skyblocker.customItemNames.added": "§fSet a custom name for your currently held item!",