Add waypoint deleting

5 files changed, 57 insertions, 20 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigListWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigListWidget.java
index 3918037f..a6b5e62d 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigListWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigListWidget.java
@@ -1,5 +1,6 @@
 package de.hysky.skyblocker.skyblock.shortcut;
 
+import de.hysky.skyblocker.debug.Debug;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.Element;
@@ -77,6 +78,11 @@ public class ShortcutsConfigListWidget extends ElementListWidget<ShortcutsConfig
     }
 
     @Override
+    protected boolean isSelectedEntry(int index) {
+        return Debug.debugEnabled() ? Objects.equals(getSelectedOrNull(), children().get(index)) : super.isSelectedEntry(index);
+    }
+
+    @Override
     protected boolean removeEntry(AbstractShortcutEntry entry) {
         return super.removeEntry(entry);
     }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigScreen.java
index c73836ab..9d411fa4 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigScreen.java
@@ -11,7 +11,6 @@ import net.minecraft.screen.ScreenTexts;
 import net.minecraft.text.Text;
 
 public class ShortcutsConfigScreen extends Screen {
-
     private ShortcutsConfigListWidget shortcutsConfigListWidget;
     private ButtonWidget buttonDelete;
     private ButtonWidget buttonNew;
@@ -41,14 +40,14 @@ public class ShortcutsConfigScreen extends Screen {
             shortcutsConfigListWidget.setDimensions(width, height - 96);
             shortcutsConfigListWidget.updatePositions();
         } else {
-            shortcutsConfigListWidget = new ShortcutsConfigListWidget(client, this, width, height - 96, 32, 25);
+            shortcutsConfigListWidget = new ShortcutsConfigListWidget(client, this, width, height - 96, 32, 24);
             initialized = true;
         }
         addDrawableChild(shortcutsConfigListWidget);
         GridWidget gridWidget = new GridWidget();
         gridWidget.getMainPositioner().marginX(5).marginY(2);
         GridWidget.Adder adder = gridWidget.createAdder(2);
-        buttonDelete = ButtonWidget.builder(Text.translatable("selectServer.delete"), button -> {
+        buttonDelete = ButtonWidget.builder(Text.translatable("selectServer.deleteButton"), button -> {
             if (client != null && shortcutsConfigListWidget.getSelectedOrNull() instanceof ShortcutsConfigListWidget.ShortcutEntry shortcutEntry) {
                 scrollAmount = shortcutsConfigListWidget.getScrollAmount();
                 client.setScreen(new ConfirmScreen(this::deleteEntry, Text.translatable("skyblocker.shortcuts.deleteQuestion"), Text.translatable("skyblocker.shortcuts.deleteWarning", shortcutEntry.toString()), Text.translatable("selectServer.deleteButton"), ScreenTexts.CANCEL));
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/WaypointsListWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/WaypointsListWidget.java
index 22d3e2bb..7a01a494 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/WaypointsListWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/WaypointsListWidget.java
@@ -1,5 +1,6 @@
 package de.hysky.skyblocker.skyblock.waypoint;
 
+import de.hysky.skyblocker.debug.Debug;
 import de.hysky.skyblocker.utils.Utils;
 import de.hysky.skyblocker.utils.waypoint.NamedWaypoint;
 import de.hysky.skyblocker.utils.waypoint.WaypointCategory;
@@ -37,6 +38,16 @@ public class WaypointsListWidget extends ElementListWidget<WaypointsListWidget.A
         }
     }
 
+    @Override
+    public int getRowWidth() {
+        return super.getRowWidth() + 100;
+    }
+
+    @Override
+    protected int getScrollbarPositionX() {
+        return super.getScrollbarPositionX() + 50;
+    }
+
     Optional<WaypointCategoryEntry> getCategory() {
         if (getSelectedOrNull() instanceof WaypointCategoryEntry category) {
             return Optional.of(category);
@@ -65,21 +76,17 @@ public class WaypointsListWidget extends ElementListWidget<WaypointsListWidget.A
 
     @Override
     protected boolean isSelectedEntry(int index) {
-        return Objects.equals(getSelectedOrNull(), children().get(index));
+        return Debug.debugEnabled() ? Objects.equals(getSelectedOrNull(), children().get(index)) : super.isSelectedEntry(index);
     }
 
     protected static abstract class AbstractWaypointEntry extends ElementListWidget.Entry<AbstractWaypointEntry> {
-        @Override
-        public boolean mouseClicked(double mouseX, double mouseY, int button) {
-            super.mouseClicked(mouseX, mouseY, button);
-            return true;
-        }
     }
 
     protected class WaypointCategoryEntry extends AbstractWaypointEntry {
         private final WaypointCategory category;
         private final List<ClickableWidget> children;
         private final ButtonWidget buttonNewWaypoint;
+        private final ButtonWidget buttonDelete;
 
         public WaypointCategoryEntry() {
             this(new WaypointCategory("New Category", island, new ArrayList<>()));
@@ -94,14 +101,22 @@ public class WaypointsListWidget extends ElementListWidget<WaypointsListWidget.A
                     entryIndex = WaypointsListWidget.this.children().indexOf(selectedWaypointEntry) + 1;
                 } else {
                     entryIndex = WaypointsListWidget.this.children().indexOf(this) + 1;
-                    while (entryIndex < children().size() && !(children().get(entryIndex) instanceof WaypointCategoryEntry)) {
+                    while (entryIndex < WaypointsListWidget.this.children().size() && !(WaypointsListWidget.this.children().get(entryIndex) instanceof WaypointCategoryEntry)) {
                         entryIndex++;
                     }
                 }
                 category.waypoints().add(waypointEntry.waypoint);
                 WaypointsListWidget.this.children().add(entryIndex, waypointEntry);
-            }).width(100).build();
-            children = List.of(buttonNewWaypoint);
+            }).width(75).build();
+            buttonDelete = ButtonWidget.builder(Text.translatable("selectServer.deleteButton"), buttonDelete -> {
+                int entryIndex = WaypointsListWidget.this.children().indexOf(this) + 1;
+                while (entryIndex < WaypointsListWidget.this.children().size() && !(WaypointsListWidget.this.children().get(entryIndex) instanceof WaypointCategoryEntry)) {
+                    WaypointsListWidget.this.children().remove(entryIndex);
+                }
+                WaypointsListWidget.this.children().remove(this);
+                waypoints.remove(category);
+            }).width(50).build();
+            children = List.of(buttonNewWaypoint, buttonDelete);
         }
 
         @Override
@@ -116,15 +131,19 @@ public class WaypointsListWidget extends ElementListWidget<WaypointsListWidget.A
 
         @Override
         public void render(DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
-            buttonNewWaypoint.setPosition(x + entryWidth - 30, y + 6);
-            buttonNewWaypoint.render(context, mouseX, mouseY, tickDelta);
             context.drawTextWithShadow(client.textRenderer, category.name(), width / 2 - 150, y + 5, 0xFFFFFF);
+            buttonNewWaypoint.setPosition(x + entryWidth - 133, y);
+            buttonDelete.setPosition(x + entryWidth - 54, y);
+            buttonNewWaypoint.render(context, mouseX, mouseY, tickDelta);
+            buttonDelete.render(context, mouseX, mouseY, tickDelta);
         }
     }
 
     protected class WaypointEntry extends AbstractWaypointEntry {
         private final WaypointCategoryEntry category;
         private final NamedWaypoint waypoint;
+        private final List<ClickableWidget> children;
+        private final ButtonWidget buttonDelete;
 
         public WaypointEntry(WaypointCategoryEntry category) {
             this(category, new NamedWaypoint(BlockPos.ORIGIN, "New Waypoint", new float[]{0f, 1f, 0f}));
@@ -133,24 +152,31 @@ public class WaypointsListWidget extends ElementListWidget<WaypointsListWidget.A
         public WaypointEntry(WaypointCategoryEntry category, NamedWaypoint waypoint) {
             this.category = category;
             this.waypoint = waypoint;
+            buttonDelete = ButtonWidget.builder(Text.translatable("selectServer.deleteButton"), button -> {
+                category.category.waypoints().remove(waypoint);
+                WaypointsListWidget.this.children().remove(this);
+            }).width(50).build();
+            children = List.of(buttonDelete);
         }
 
         @Override
         public List<? extends Selectable> selectableChildren() {
-            return List.of();
+            return children;
         }
 
         @Override
         public List<? extends Element> children() {
-            return List.of();
+            return children;
         }
 
         @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);
+            context.drawTextWithShadow(client.textRenderer, waypoint.pos.toShortString(), width / 2 - 25, 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);
+            context.drawTextWithShadow(client.textRenderer, String.format("#%02X%02X%02X", (int) (colorComponents[0] * 255), (int) (colorComponents[1] * 255), (int) (colorComponents[2] * 255)), width / 2 + 25, y + 5, 0xFFFFFF);
+            buttonDelete.setPosition(x + entryWidth - 54, y);
+            buttonDelete.render(context, mouseX, mouseY, tickDelta);
         }
     }
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/WaypointsScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/WaypointsScreen.java
index 4f760995..9f82f7a2 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/WaypointsScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/WaypointsScreen.java
@@ -13,7 +13,7 @@ import net.minecraft.text.Text;
 
 public class WaypointsScreen extends Screen {
     private final Screen parent;
-    final Multimap<String, WaypointCategory> waypoints = MultimapBuilder.hashKeys().arrayListValues().build(Waypoints.waypoints); // TODO deep copy
+    final Multimap<String, WaypointCategory> waypoints = MultimapBuilder.hashKeys().arrayListValues().build();
     private WaypointsListWidget waypointsListWidget;
     private ButtonWidget buttonNew;
     private ButtonWidget buttonDone;
@@ -25,12 +25,13 @@ public class WaypointsScreen extends Screen {
     public WaypointsScreen(Screen parent) {
         super(Text.translatable("skyblocker.waypoints.config"));
         this.parent = parent;
+        Waypoints.waypoints.forEach((island, category) -> waypoints.put(island, new WaypointCategory(category)));
     }
 
     @Override
     protected void init() {
         super.init();
-        waypointsListWidget = addDrawableChild(new WaypointsListWidget(client, this, width, height - 96, 32, 25));
+        waypointsListWidget = addDrawableChild(new WaypointsListWidget(client, this, width, height - 96, 32, 24));
         GridWidget gridWidget = new GridWidget();
         gridWidget.getMainPositioner().marginX(5).marginY(2);
         GridWidget.Adder adder = gridWidget.createAdder(2);
diff --git a/src/main/java/de/hysky/skyblocker/utils/waypoint/WaypointCategory.java b/src/main/java/de/hysky/skyblocker/utils/waypoint/WaypointCategory.java
index 16a22796..d31455f6 100644
--- a/src/main/java/de/hysky/skyblocker/utils/waypoint/WaypointCategory.java
+++ b/src/main/java/de/hysky/skyblocker/utils/waypoint/WaypointCategory.java
@@ -5,6 +5,7 @@ import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public record WaypointCategory(String name, String island, List<NamedWaypoint> waypoints) {
@@ -14,6 +15,10 @@ public record WaypointCategory(String name, String island, List<NamedWaypoint> w
             NamedWaypoint.CODEC.listOf().fieldOf("waypoints").forGetter(WaypointCategory::waypoints)
     ).apply(instance, WaypointCategory::new));
 
+    public WaypointCategory(WaypointCategory waypointCategory) {
+        this(waypointCategory.name(), waypointCategory.island(), new ArrayList<>(waypointCategory.waypoints()));
+    }
+
     public static WaypointCategory fromSkytilsJson(JsonObject waypointCategory) {
         return new WaypointCategory(
                 waypointCategory.get("name").getAsString(),