From c667dbb187a0fc4ba6f40a9818544d0e0c4ef3e1 Mon Sep 17 00:00:00 2001
From: Surya <n.suryap@gmail.com>
Date: Thu, 20 May 2021 22:43:56 +0530
Subject: [PATCH] Add save and list features

---
 README.md                                     |  12 +-
 gradle.properties                             |   2 +-
 .../mods/SaveCoordinatesClient.java           |  50 +++---
 .../mods/api/ICoordinateListHandler.java      |  10 ++
 .../{core => api}/ICoordinateSaveHandler.java |   2 +-
 .../mods/{core => api}/IFileStore.java        |   4 +-
 .../mods/api/IPositionCalculator.java         |   9 ++
 .../me/bionicbeanie/mods/api/IScreen.java     |   6 +
 .../mods/core/IPositionCalculator.java        |   9 --
 .../mods/gui/CoordinateListItem.java          |  37 +++++
 .../bionicbeanie/mods/gui/CoordinatesGui.java | 144 ++++++++++++++++++
 .../gui/PlayerPositionGuiDescription.java     |  76 ---------
 .../mods/impl/CoordinateListHandler.java      |  29 ++++
 .../mods/impl/CoordinateSaveHandler.java      |   4 +-
 .../me/bionicbeanie/mods/impl/FileStore.java  |  27 ++--
 .../mods/impl/PositionCalculator.java         |  14 +-
 .../mods/model/PlayerRawPosition.java         |  11 +-
 .../mods/util/DimensionSpriteUtil.java        |  24 +++
 src/main/resources/assets/savecoords/icon.png | Bin 453 -> 10663 bytes
 19 files changed, 324 insertions(+), 146 deletions(-)
 create mode 100644 src/main/java/me/bionicbeanie/mods/api/ICoordinateListHandler.java
 rename src/main/java/me/bionicbeanie/mods/{core => api}/ICoordinateSaveHandler.java (79%)
 rename src/main/java/me/bionicbeanie/mods/{core => api}/IFileStore.java (74%)
 create mode 100644 src/main/java/me/bionicbeanie/mods/api/IPositionCalculator.java
 create mode 100644 src/main/java/me/bionicbeanie/mods/api/IScreen.java
 delete mode 100644 src/main/java/me/bionicbeanie/mods/core/IPositionCalculator.java
 create mode 100644 src/main/java/me/bionicbeanie/mods/gui/CoordinateListItem.java
 create mode 100644 src/main/java/me/bionicbeanie/mods/gui/CoordinatesGui.java
 delete mode 100644 src/main/java/me/bionicbeanie/mods/gui/PlayerPositionGuiDescription.java
 create mode 100644 src/main/java/me/bionicbeanie/mods/impl/CoordinateListHandler.java
 create mode 100644 src/main/java/me/bionicbeanie/mods/util/DimensionSpriteUtil.java

diff --git a/README.md b/README.md
index 7c3c7f0..28fa9ec 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,13 @@
-# Save Coordinates Fabric MC 1.16.4+
+# Save Coordinates Fabric MC 1.16.5+
 
 ## Usage
 
-`/sc "My House"`
+- Press `B` for menu.
+- Select `save` to save the coordinate.
+- Select `list` to view saved coordinates
 
-`/sc Portal`
\ No newline at end of file
+## Roadmap
+
+- Server side support
+- More metadata to a coordinate
+- Better gui
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index b432913..da59756 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.11.3
 
 # Mod Properties
-	mod_version = 1.0.0
+	mod_version = 0.0.1
 	maven_group = me.bionicbeanie.mods
 	archives_base_name = save-coordinates
 
diff --git a/src/main/java/me/bionicbeanie/mods/SaveCoordinatesClient.java b/src/main/java/me/bionicbeanie/mods/SaveCoordinatesClient.java
index 2f48d9e..80c4d1c 100644
--- a/src/main/java/me/bionicbeanie/mods/SaveCoordinatesClient.java
+++ b/src/main/java/me/bionicbeanie/mods/SaveCoordinatesClient.java
@@ -2,28 +2,23 @@ package me.bionicbeanie.mods;
 
 import org.lwjgl.glfw.GLFW;
 
-import com.mojang.brigadier.arguments.StringArgumentType;
-import com.mojang.brigadier.context.CommandContext;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-
-import me.bionicbeanie.mods.core.ICoordinateSaveHandler;
-import me.bionicbeanie.mods.core.IFileStore;
-import me.bionicbeanie.mods.core.IPositionCalculator;
+import me.bionicbeanie.mods.api.ICoordinateListHandler;
+import me.bionicbeanie.mods.api.ICoordinateSaveHandler;
+import me.bionicbeanie.mods.api.IFileStore;
+import me.bionicbeanie.mods.api.IPositionCalculator;
+import me.bionicbeanie.mods.api.IScreen;
+import me.bionicbeanie.mods.gui.CoordinatesGui;
 import me.bionicbeanie.mods.gui.CoordinatesScreen;
-import me.bionicbeanie.mods.gui.PlayerPositionGuiDescription;
+import me.bionicbeanie.mods.impl.CoordinateListHandler;
 import me.bionicbeanie.mods.impl.CoordinateSaveHandler;
 import me.bionicbeanie.mods.impl.FileStore;
 import me.bionicbeanie.mods.impl.PositionCalculator;
 import me.bionicbeanie.mods.model.PlayerRawPosition;
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.command.v1.ClientCommandManager;
-import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.client.options.KeyBinding;
 import net.minecraft.client.util.InputUtil;
-import net.minecraft.text.LiteralText;
-import net.minecraft.text.Text;
 
 public class SaveCoordinatesClient implements ClientModInitializer {
 
@@ -31,33 +26,26 @@ public class SaveCoordinatesClient implements ClientModInitializer {
 
     @Override
     public void onInitializeClient() {
-
-        ClientCommandManager.DISPATCHER.register(ClientCommandManager.literal("coords").then(ClientCommandManager
-                .argument("desc", StringArgumentType.string()).executes(SaveCoordinatesClient::printCoordinates)));
-
+       
         KeyBinding keyBinding = KeyBindingHelper.registerKeyBinding(new KeyBinding("key.savecoords.coords",
                 InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_H, "category.savecoords.generic"));
 
         ClientTickEvents.END_CLIENT_TICK.register(client -> {
             while (keyBinding.wasPressed()) {
-                PlayerRawPosition rawPosition = positionCalculator.locate(client.player);
+                PlayerRawPosition rawPosition = positionCalculator.locate(client);
                 IFileStore fileStore = new FileStore(client.runDirectory.getAbsolutePath());
                 ICoordinateSaveHandler saveHandler = new CoordinateSaveHandler(fileStore);
-                client.openScreen(new CoordinatesScreen(new PlayerPositionGuiDescription(rawPosition, saveHandler)));
+                ICoordinateListHandler listHandler = new CoordinateListHandler(fileStore);
+                IScreen screen = new IScreen() {
+
+                    @Override
+                    public void close() {
+                        client.openScreen(null);
+                    }
+                };
+                client.openScreen(
+                        new CoordinatesScreen(new CoordinatesGui(rawPosition, saveHandler, screen, listHandler)));
             }
         });
     }
-
-    private static int printCoordinates(CommandContext<FabricClientCommandSource> context)
-            throws CommandSyntaxException {
-        FabricClientCommandSource source = context.getSource();
-        PlayerRawPosition position = positionCalculator.locate(source.getPlayer());
-
-        Text text = new LiteralText("<Coordinates> " + position.getWorldDimension() + " at " + " [ " + position.getX()
-                + " , " + position.getY() + " , " + position.getZ() + " ]");
-
-        source.getPlayer().sendMessage(text, false);
-
-        return 1;
-    }
 }
diff --git a/src/main/java/me/bionicbeanie/mods/api/ICoordinateListHandler.java b/src/main/java/me/bionicbeanie/mods/api/ICoordinateListHandler.java
new file mode 100644
index 0000000..2c4c2da
--- /dev/null
+++ b/src/main/java/me/bionicbeanie/mods/api/ICoordinateListHandler.java
@@ -0,0 +1,10 @@
+package me.bionicbeanie.mods.api;
+
+import java.util.List;
+
+import me.bionicbeanie.mods.model.PlayerPosition;
+
+public interface ICoordinateListHandler {
+
+    List<PlayerPosition> list();
+}
diff --git a/src/main/java/me/bionicbeanie/mods/core/ICoordinateSaveHandler.java b/src/main/java/me/bionicbeanie/mods/api/ICoordinateSaveHandler.java
similarity index 79%
rename from src/main/java/me/bionicbeanie/mods/core/ICoordinateSaveHandler.java
rename to src/main/java/me/bionicbeanie/mods/api/ICoordinateSaveHandler.java
index 5cb84f0..0434723 100644
--- a/src/main/java/me/bionicbeanie/mods/core/ICoordinateSaveHandler.java
+++ b/src/main/java/me/bionicbeanie/mods/api/ICoordinateSaveHandler.java
@@ -1,4 +1,4 @@
-package me.bionicbeanie.mods.core;
+package me.bionicbeanie.mods.api;
 
 import me.bionicbeanie.mods.model.PlayerPosition;
 
diff --git a/src/main/java/me/bionicbeanie/mods/core/IFileStore.java b/src/main/java/me/bionicbeanie/mods/api/IFileStore.java
similarity index 74%
rename from src/main/java/me/bionicbeanie/mods/core/IFileStore.java
rename to src/main/java/me/bionicbeanie/mods/api/IFileStore.java
index 6d6e017..9f751f8 100644
--- a/src/main/java/me/bionicbeanie/mods/core/IFileStore.java
+++ b/src/main/java/me/bionicbeanie/mods/api/IFileStore.java
@@ -1,4 +1,4 @@
-package me.bionicbeanie.mods.core;
+package me.bionicbeanie.mods.api;
 
 import java.io.IOException;
 import java.util.List;
@@ -10,4 +10,6 @@ public interface IFileStore {
     public void save(List<PlayerPosition> positions) throws IOException;
     
     public void save(PlayerPosition position) throws IOException;
+    
+    public List<PlayerPosition> list() throws IOException;
 }
diff --git a/src/main/java/me/bionicbeanie/mods/api/IPositionCalculator.java b/src/main/java/me/bionicbeanie/mods/api/IPositionCalculator.java
new file mode 100644
index 0000000..d237f4f
--- /dev/null
+++ b/src/main/java/me/bionicbeanie/mods/api/IPositionCalculator.java
@@ -0,0 +1,9 @@
+package me.bionicbeanie.mods.api;
+
+import me.bionicbeanie.mods.model.PlayerRawPosition;
+import net.minecraft.client.MinecraftClient;
+
+public interface IPositionCalculator {
+
+    public PlayerRawPosition locate(MinecraftClient client);
+}
diff --git a/src/main/java/me/bionicbeanie/mods/api/IScreen.java b/src/main/java/me/bionicbeanie/mods/api/IScreen.java
new file mode 100644
index 0000000..0337741
--- /dev/null
+++ b/src/main/java/me/bionicbeanie/mods/api/IScreen.java
@@ -0,0 +1,6 @@
+package me.bionicbeanie.mods.api;
+
+public interface IScreen {
+
+    void close();
+}
diff --git a/src/main/java/me/bionicbeanie/mods/core/IPositionCalculator.java b/src/main/java/me/bionicbeanie/mods/core/IPositionCalculator.java
deleted file mode 100644
index a8be730..0000000
--- a/src/main/java/me/bionicbeanie/mods/core/IPositionCalculator.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.bionicbeanie.mods.core;
-
-import me.bionicbeanie.mods.model.PlayerRawPosition;
-import net.minecraft.client.network.ClientPlayerEntity;
-
-public interface IPositionCalculator {
-
-    public PlayerRawPosition locate(ClientPlayerEntity player);
-}
diff --git a/src/main/java/me/bionicbeanie/mods/gui/CoordinateListItem.java b/src/main/java/me/bionicbeanie/mods/gui/CoordinateListItem.java
new file mode 100644
index 0000000..477f4bb
--- /dev/null
+++ b/src/main/java/me/bionicbeanie/mods/gui/CoordinateListItem.java
@@ -0,0 +1,37 @@
+package me.bionicbeanie.mods.gui;
+
+import io.github.cottonmc.cotton.gui.widget.WLabel;
+import io.github.cottonmc.cotton.gui.widget.WPlainPanel;
+import io.github.cottonmc.cotton.gui.widget.WSprite;
+import me.bionicbeanie.mods.model.PlayerPosition;
+import me.bionicbeanie.mods.util.DimensionSpriteUtil;
+import net.minecraft.text.LiteralText;
+import net.minecraft.util.Identifier;
+
+public class CoordinateListItem extends WPlainPanel{
+
+    private WLabel coordinates;
+    private WLabel location;
+    private WSprite icon;
+    
+    public CoordinateListItem() {
+        this.coordinates = new WLabel("Foo");
+        this.location = new WLabel("Foo");
+        this.icon = new WSprite(new Identifier("minecraft:textures/item/ender_eye.png"));
+        
+        this.add(icon, 0, 0, 1*18, 1*18);
+        this.add(coordinates, 1*18, 0, 2*18, 1*18);
+        this.add(location, 0, 1*18, 3*18, 1*18);
+        
+        this.icon.setSize(1*18, 1*18);
+        this.coordinates.setSize(2*18, 1*18);
+        this.location.setSize(3*18, 1*18);
+        this.setSize(3*18, 2*18);
+    }
+    
+    public void setPosition(PlayerPosition position) {
+        this.icon.setImage(DimensionSpriteUtil.CreateWorldIconIdentifier(position.getWorldDimension()));
+        this.location.setText(new LiteralText(position.getLocationName()));
+        this.coordinates.setText(new LiteralText(position.getX() + "," + position.getY() + "," + position.getZ()));
+    }
+}
diff --git a/src/main/java/me/bionicbeanie/mods/gui/CoordinatesGui.java b/src/main/java/me/bionicbeanie/mods/gui/CoordinatesGui.java
new file mode 100644
index 0000000..2cbea72
--- /dev/null
+++ b/src/main/java/me/bionicbeanie/mods/gui/CoordinatesGui.java
@@ -0,0 +1,144 @@
+package me.bionicbeanie.mods.gui;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.BiConsumer;
+
+import io.github.cottonmc.cotton.gui.client.LightweightGuiDescription;
+import io.github.cottonmc.cotton.gui.widget.WButton;
+import io.github.cottonmc.cotton.gui.widget.WGridPanel;
+import io.github.cottonmc.cotton.gui.widget.WListPanel;
+import io.github.cottonmc.cotton.gui.widget.WText;
+import io.github.cottonmc.cotton.gui.widget.WTextField;
+import io.github.cottonmc.cotton.gui.widget.WWidget;
+import me.bionicbeanie.mods.api.ICoordinateListHandler;
+import me.bionicbeanie.mods.api.ICoordinateSaveHandler;
+import me.bionicbeanie.mods.api.IScreen;
+import me.bionicbeanie.mods.model.PlayerPosition;
+import me.bionicbeanie.mods.model.PlayerRawPosition;
+import me.bionicbeanie.mods.util.DimensionSpriteUtil;
+import net.minecraft.text.LiteralText;
+
+public class CoordinatesGui extends LightweightGuiDescription {
+
+    private WGridPanel root;
+    private ICoordinateSaveHandler coordinateSaveHandler;
+    private ICoordinateListHandler coordinateListHandler;
+    private PlayerRawPosition rawPosition;
+    private List<WWidget> children;
+    private IScreen screen;
+
+    public CoordinatesGui(PlayerRawPosition rawPosition, ICoordinateSaveHandler onSave, IScreen screen,
+            ICoordinateListHandler onList) {
+        this.root = createRootPanel();
+        this.rawPosition = rawPosition;
+        this.coordinateSaveHandler = onSave;
+        this.coordinateListHandler = onList;
+        this.screen = screen;
+        this.children = new ArrayList<>();
+
+        reset();
+        initializeDefaultView();
+
+        root.validate(this);
+    }
+
+    private void initializeDefaultView() {
+        WWidget xText = CreateWidgetForCoordinate(rawPosition.getX());
+        WWidget yText = CreateWidgetForCoordinate(rawPosition.getY());
+        WWidget zText = CreateWidgetForCoordinate(rawPosition.getZ());
+
+        add(xText, 0, 1, 2, 1);
+        add(yText, 0, 2, 2, 1);
+        add(zText, 0, 3, 2, 1);
+
+        WWidget icon = DimensionSpriteUtil.CreateWorldIcon(rawPosition.getWorldDimension());
+        add(icon, 4, 0, 1, 1);
+
+        WTextField name = CreateNameField();
+        add(name, 2, 2, 5, 1);
+
+        WWidget save = CreateSaveButton(coordinateSaveHandler, rawPosition, name);
+        add(save, 5, 5, 2, 1);
+
+        WWidget list = CreateListButton();
+        add(list, 0, 5, 2, 1);
+    }
+
+    private void initializeListView(List<PlayerPosition> playerPositions) {
+        BiConsumer<PlayerPosition, CoordinateListItem> configurator = (PlayerPosition position,
+                CoordinateListItem panel) -> {
+            panel.setPosition(position);
+        };
+
+        WListPanel<PlayerPosition, CoordinateListItem> listPanel = new WListPanel<>(playerPositions,
+                CoordinateListItem::new, configurator);
+
+        listPanel.setListItemHeight(2 * 18);
+
+        add(listPanel, 0, 0, 7, 7);
+
+    }
+
+    private void add(WWidget widget, int x, int y, int w, int h) {
+        root.add(widget, x, y, w, h);
+        children.add(widget);
+    }
+
+    private void reset() {
+        children.forEach(root::remove);
+        children.clear();
+    }
+
+    private WGridPanel createRootPanel() {
+        WGridPanel panel = new WGridPanel(18);
+        panel.setSize(7 * 18, 7 * 18);
+
+        setRootPanel(panel);
+        return panel;
+    }
+
+    private WWidget CreateWidgetForCoordinate(long l) {
+        return new WText(new LiteralText(String.valueOf(l)), 0x3939ac);
+    }
+
+    private WTextField CreateNameField() {
+        return new WTextField(new LiteralText("name"));
+    }
+
+    private WWidget CreateSaveButton(ICoordinateSaveHandler onSaveHandler, PlayerRawPosition rawPosition,
+            WTextField textField) {
+        WButton button = new WButton(new LiteralText("save"));
+        button.setOnClick(new Runnable() {
+            @Override
+            public void run() {
+                onSaveHandler.save(new PlayerPosition(rawPosition, textField.getText()));
+                reset();
+                screen.close();
+            }
+        });
+        return button;
+    }
+
+    private WWidget CreateListButton() {
+
+        CoordinatesGui gui = this;
+        WButton button = new WButton(new LiteralText("list"));
+
+        button.setOnClick(new Runnable() {
+
+            @Override
+            public void run() {
+                reset();
+                root.validate(gui);
+
+                List<PlayerPosition> playerPositions = coordinateListHandler.list();
+                initializeListView(playerPositions);
+
+                root.validate(gui);
+            }
+        });
+
+        return button;
+    }
+}
diff --git a/src/main/java/me/bionicbeanie/mods/gui/PlayerPositionGuiDescription.java b/src/main/java/me/bionicbeanie/mods/gui/PlayerPositionGuiDescription.java
deleted file mode 100644
index 35e61d5..0000000
--- a/src/main/java/me/bionicbeanie/mods/gui/PlayerPositionGuiDescription.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package me.bionicbeanie.mods.gui;
-
-import io.github.cottonmc.cotton.gui.client.LightweightGuiDescription;
-import io.github.cottonmc.cotton.gui.widget.WButton;
-import io.github.cottonmc.cotton.gui.widget.WGridPanel;
-import io.github.cottonmc.cotton.gui.widget.WSprite;
-import io.github.cottonmc.cotton.gui.widget.WText;
-import io.github.cottonmc.cotton.gui.widget.WTextField;
-import io.github.cottonmc.cotton.gui.widget.WWidget;
-import me.bionicbeanie.mods.core.ICoordinateSaveHandler;
-import me.bionicbeanie.mods.model.PlayerPosition;
-import me.bionicbeanie.mods.model.PlayerRawPosition;
-import net.minecraft.text.LiteralText;
-import net.minecraft.util.Identifier;
-
-public class PlayerPositionGuiDescription extends LightweightGuiDescription {
-    
-    public PlayerPositionGuiDescription(PlayerRawPosition rawPosition, ICoordinateSaveHandler onSave) {
-        WGridPanel root = new WGridPanel(18);
-        setRootPanel(root);
-        
-        // 18 * 18 is the size of 1 item slot. Inset is 7 px
-        // Dims should be 18 * 3 + 14 by 18 + 14
-        root.setSize(70, 34);
-        
-        WWidget xText = CreateWidgetForCoordinate(rawPosition.getX());
-        WWidget yText = CreateWidgetForCoordinate(rawPosition.getY());
-        WWidget zText = CreateWidgetForCoordinate(rawPosition.getZ());
-        
-        root.add(xText, 0, 1, 5, 2);
-        root.add(yText, 0, 2, 5, 2);
-        root.add(zText, 0, 3, 5, 2);
-        
-        WWidget icon = CreateWorldIcon(rawPosition.getWorldDimension());
-        root.add(icon, 3, 0, 1, 1);
-        
-        WTextField name = CreateNameField();
-        root.add(name, 2, 2, 5, 5);
-        
-        WWidget save = CreateSaveButton(onSave, rawPosition, name);
-        root.add(save, 3, 4, 2, 2);
-
-        root.validate(this);
-    }
-    
-    private WWidget CreateWidgetForCoordinate(long l) {
-        return new WText(new LiteralText(String.valueOf(l)), 0x3939ac);
-    }
-    
-    private WWidget CreateWorldIcon(String dimension) {
-        String dimensionItem = "netherite_ingot";
-        
-        if(dimension.contains("overworld")) {
-            dimensionItem = "diamond";
-        } else if(dimension.contains("end")) {
-            dimensionItem = "ender_eye";
-        }
-        return new WSprite(new Identifier("minecraft:textures/item/" + dimensionItem + ".png"));
-    }
-    
-    private WTextField CreateNameField() {
-        return new WTextField(new LiteralText("name"));
-    }
-    
-    private WWidget CreateSaveButton(ICoordinateSaveHandler onSaveHandler, PlayerRawPosition rawPosition, WTextField textField) {
-        WButton button = new WButton(new LiteralText("save"));
-        button.setOnClick(new Runnable() {
-            
-            @Override
-            public void run() {
-                onSaveHandler.save(new PlayerPosition(rawPosition, textField.getText()));
-            }
-        });
-        return button;
-    }
-}
diff --git a/src/main/java/me/bionicbeanie/mods/impl/CoordinateListHandler.java b/src/main/java/me/bionicbeanie/mods/impl/CoordinateListHandler.java
new file mode 100644
index 0000000..280645e
--- /dev/null
+++ b/src/main/java/me/bionicbeanie/mods/impl/CoordinateListHandler.java
@@ -0,0 +1,29 @@
+package me.bionicbeanie.mods.impl;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
+import me.bionicbeanie.mods.api.ICoordinateListHandler;
+import me.bionicbeanie.mods.api.IFileStore;
+import me.bionicbeanie.mods.model.PlayerPosition;
+
+public class CoordinateListHandler implements ICoordinateListHandler{
+
+    private IFileStore fileStore;
+    
+    public CoordinateListHandler(IFileStore fileStore) {
+        this.fileStore = fileStore;
+    }
+    
+    @Override
+    public List<PlayerPosition> list() {
+        
+        try {
+            return fileStore.list();
+        } catch (IOException e) {
+            return Collections.emptyList();
+        }
+    }
+
+}
diff --git a/src/main/java/me/bionicbeanie/mods/impl/CoordinateSaveHandler.java b/src/main/java/me/bionicbeanie/mods/impl/CoordinateSaveHandler.java
index 969db85..6ac16a6 100644
--- a/src/main/java/me/bionicbeanie/mods/impl/CoordinateSaveHandler.java
+++ b/src/main/java/me/bionicbeanie/mods/impl/CoordinateSaveHandler.java
@@ -2,8 +2,8 @@ package me.bionicbeanie.mods.impl;
 
 import java.io.IOException;
 
-import me.bionicbeanie.mods.core.ICoordinateSaveHandler;
-import me.bionicbeanie.mods.core.IFileStore;
+import me.bionicbeanie.mods.api.ICoordinateSaveHandler;
+import me.bionicbeanie.mods.api.IFileStore;
 import me.bionicbeanie.mods.model.PlayerPosition;
 
 public class CoordinateSaveHandler implements ICoordinateSaveHandler{
diff --git a/src/main/java/me/bionicbeanie/mods/impl/FileStore.java b/src/main/java/me/bionicbeanie/mods/impl/FileStore.java
index dc22b2c..fc7dde4 100644
--- a/src/main/java/me/bionicbeanie/mods/impl/FileStore.java
+++ b/src/main/java/me/bionicbeanie/mods/impl/FileStore.java
@@ -11,7 +11,7 @@ import java.util.List;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-import me.bionicbeanie.mods.core.IFileStore;
+import me.bionicbeanie.mods.api.IFileStore;
 import me.bionicbeanie.mods.model.PlayerPosition;
 
 public class FileStore implements IFileStore {
@@ -41,23 +41,30 @@ public class FileStore implements IFileStore {
         // TODO Auto-generated method stub
 
     }
-
+    
     @Override
-    public void save(PlayerPosition position) throws IOException {
+    public List<PlayerPosition> list() throws IOException {
         List<String> lines = Files.readAllLines(saveFilePath);
-        PlayerPosition[] players = gson.fromJson(String.join("", lines), PlayerPosition[].class);
+        PlayerPosition[] positions = gson.fromJson(String.join("", lines), PlayerPosition[].class);
         
-        List<PlayerPosition> playersList = new LinkedList<>();
+        List<PlayerPosition> playerPositionList = new LinkedList<>();
         
-        if(players != null) {
-            for(int i = 0; i < players.length; ++i) {
-                playersList.add(players[i]);
+        if(positions != null) {
+            for(int i = 0; i < positions.length; ++i) {
+                playerPositionList.add(positions[i]);
             }
         }
         
-        playersList.add(position);
+        return playerPositionList;
+    }
+
+    @Override
+    public void save(PlayerPosition position) throws IOException {
         
-        String serialized = gson.toJson(playersList.toArray());
+        List<PlayerPosition> playerPositions = list();
+        playerPositions.add(position);
+        
+        String serialized = gson.toJson(playerPositions.toArray());
         Files.writeString(saveFilePath, serialized, StandardOpenOption.WRITE);
     }
 
diff --git a/src/main/java/me/bionicbeanie/mods/impl/PositionCalculator.java b/src/main/java/me/bionicbeanie/mods/impl/PositionCalculator.java
index dfdf79c..fe6f33f 100644
--- a/src/main/java/me/bionicbeanie/mods/impl/PositionCalculator.java
+++ b/src/main/java/me/bionicbeanie/mods/impl/PositionCalculator.java
@@ -1,19 +1,19 @@
 package me.bionicbeanie.mods.impl;
 
-import me.bionicbeanie.mods.core.IPositionCalculator;
+import me.bionicbeanie.mods.api.IPositionCalculator;
 import me.bionicbeanie.mods.model.PlayerRawPosition;
-import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.util.math.Vec3d;
 
-public class PositionCalculator implements IPositionCalculator{
+public class PositionCalculator implements IPositionCalculator {
 
-    public PlayerRawPosition locate(ClientPlayerEntity player) {
-        Vec3d pos = player.getPos();
+    public PlayerRawPosition locate(MinecraftClient client) {
+        Vec3d pos = client.player.getPos();
         long x = Math.round(pos.x);
         long y = Math.round(pos.y);
         long z = Math.round(pos.z);
-        String worldDimension = player.world.getRegistryKey().getValue().toString();
-    
+        String worldDimension = client.player.getEntityWorld().getRegistryKey().getValue().toString();
+
         return new PlayerRawPosition(x, y, z, worldDimension);
     }
 }
diff --git a/src/main/java/me/bionicbeanie/mods/model/PlayerRawPosition.java b/src/main/java/me/bionicbeanie/mods/model/PlayerRawPosition.java
index ea61f2f..ea2eaa3 100644
--- a/src/main/java/me/bionicbeanie/mods/model/PlayerRawPosition.java
+++ b/src/main/java/me/bionicbeanie/mods/model/PlayerRawPosition.java
@@ -3,27 +3,28 @@ package me.bionicbeanie.mods.model;
 public class PlayerRawPosition {
     private long x, y, z;
     private String worldDimension;
-    
+
     public PlayerRawPosition(long x, long y, long z, String worldDimension) {
         this.x = x;
         this.y = y;
         this.z = z;
         this.worldDimension = worldDimension;
     }
-    
+
     public long getX() {
         return x;
     }
-    
+
     public long getY() {
         return y;
     }
-    
+
     public long getZ() {
         return z;
     }
-    
+
     public String getWorldDimension() {
         return worldDimension;
     }
+
 }
diff --git a/src/main/java/me/bionicbeanie/mods/util/DimensionSpriteUtil.java b/src/main/java/me/bionicbeanie/mods/util/DimensionSpriteUtil.java
new file mode 100644
index 0000000..a373a63
--- /dev/null
+++ b/src/main/java/me/bionicbeanie/mods/util/DimensionSpriteUtil.java
@@ -0,0 +1,24 @@
+package me.bionicbeanie.mods.util;
+
+import io.github.cottonmc.cotton.gui.widget.WSprite;
+import io.github.cottonmc.cotton.gui.widget.WWidget;
+import net.minecraft.util.Identifier;
+
+public class DimensionSpriteUtil {
+    
+    public static WWidget CreateWorldIcon(String dimension) {
+        return new WSprite(CreateWorldIconIdentifier(dimension));
+    }
+
+    public static Identifier CreateWorldIconIdentifier(String dimension) {
+        String dimensionItem = "netherite_ingot";
+
+        if (dimension.contains("overworld")) {
+            dimensionItem = "diamond";
+        } else if (dimension.contains("end")) {
+            dimensionItem = "ender_eye";
+        }
+
+        return new Identifier("minecraft:textures/item/" + dimensionItem + ".png");
+    }
+}
diff --git a/src/main/resources/assets/savecoords/icon.png b/src/main/resources/assets/savecoords/icon.png
index 047b91f2347de5cf95f23284476fddbe21ba23fe..1cfa11d5e4fad2bd62a02c75d9a81a4a8eed4eba 100644
GIT binary patch
literal 10663
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

delta 439
zcmZ1;e3W^DL_H%j0|Ud)51%_27#P?Bd_r6q7#RNl|G)I+{JRVcj8&d4jv*e$uU_7m
z8)L}BmcYfO6n-stfoRY!u6&XH0%;FNvB~BaIdmd9e#O4nTRlndn<U3N1MNrJ5d#1H
zBiiKnOlw4CPVtCo_Fd4)Xxi0u%dC0E?|^iT@C&>i=_k@>D%Q_^YT~?4Cm^ogH{sOl
zRHo>2!Y0u#4l##ltMD*<xpI(`)4Z!UgIzgB^9t{k?yC!)l(a7hYo2h|v1u3IdFBdB
zNzR?j;qiO_m>p_mbb2Y!yP>4Rp;YKH$63!aLhKt3MJ{q_n6Uo9Qf7vn1I#TtbNCH}
zHns5OGkkEb4VoWU!4OpMzMT1$|6&&thM87OQZu(Pnr)cD@MJ<=fQ*8}p&4I~@M~Ro
zoY?=JA&<4X!DxYtxj=e_;=IP-2!-FQr?_5;tte|OV@_+_*FPaoL2p91Mh$<TMaB<t
zmKFQiuf7eiZ!mNG%XL7{+>ZG_<Db7W6%F4!HvDJi3y_oB;uz}~K0$kdf%7-+fEkV*
v>I?4mb8cvu%dm3$hZnh0T4v|IH<s6(oPCHT(sMoo0|SGntDnm{r-UW|hx@ao