GH-58 Add basic Parcel locker business logic

build.gradle.kts

@@ -26,7 +26,7 @@ repositories {
 
 dependencies {
     // minecraft development api
-    compileOnly("org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT")
+    compileOnly("org.spigotmc:spigot-api:1.20.2-R0.1-SNAPSHOT")
     implementation("net.kyori:adventure-platform-bukkit:4.3.0")
     implementation("net.kyori:adventure-text-minimessage:4.14.0")
     implementation("dev.rollczi.litecommands:bukkit-adventure:2.8.9")
@@ -140,11 +140,8 @@ tasks {
             "org.bstats",
             "dev.rollczi",
             "net.kyori",
-            "okhttp3",
             "org.json",
             "com.fasterxml"
-        ).forEach { pack ->
-            relocate(pack, "$prefix.$pack")
-        }
+        ).forEach { relocate(it, prefix) }
     }
 }

src/main/java/com/eternalcode/parcellockers/ParcelLockers.java

@@ -1,7 +1,5 @@
 package com.eternalcode.parcellockers;
 
-import com.eternalcode.parcellockers.command.ParcelCommand;
-import com.eternalcode.parcellockers.command.argument.ParcelArgument;
 import com.eternalcode.parcellockers.command.argument.PlayerArgument;
 import com.eternalcode.parcellockers.command.handler.InvalidUsage;
 import com.eternalcode.parcellockers.command.handler.PermissionMessage;
@@ -17,6 +15,8 @@
 import com.eternalcode.parcellockers.notification.NotificationAnnouncer;
 import com.eternalcode.parcellockers.parcel.Parcel;
 import com.eternalcode.parcellockers.parcel.ParcelManager;
+import com.eternalcode.parcellockers.parcel.command.ParcelCommand;
+import com.eternalcode.parcellockers.parcel.command.argument.ParcelArgument;
 import com.eternalcode.parcellockers.parcel.database.ParcelDatabaseService;
 import com.eternalcode.parcellockers.parcel.gui.ParcelListGUI;
 import com.eternalcode.parcellockers.updater.UpdaterService;

src/main/java/com/eternalcode/parcellockers/locker/database/LockerDatabaseService.java

@@ -59,6 +59,7 @@ public CompletableFuture<Void> save(Locker locker) {
                 statement.setString(2, locker.description());
                 statement.setString(3, locker.position().toString());
                 statement.execute();
+
                 this.cache.put(locker.uuid(), locker);
                 this.positionCache.put(locker.position(), locker.uuid());
             }
@@ -122,9 +123,9 @@ private List<Locker> extractParcelLockers(PreparedStatement statement) throws SQ
 
         while (rs.next()) {
             Locker locker = new Locker(
-                    UUID.fromString(rs.getString("uuid")),
-                    rs.getString("description"),
-                    Position.parse(rs.getString("position"))
+                UUID.fromString(rs.getString("uuid")),
+                rs.getString("description"),
+                Position.parse(rs.getString("position"))
             );
 
             list.add(locker);

src/main/java/com/eternalcode/parcellockers/locker/gui/MainGUI.java

@@ -2,7 +2,7 @@
 
 import com.eternalcode.parcellockers.configuration.implementation.PluginConfiguration;
 import com.eternalcode.parcellockers.gui.GuiView;
-import com.eternalcode.parcellockers.locker.repository.LockerRepository;
+import com.eternalcode.parcellockers.locker.database.LockerDatabaseService;
 import com.eternalcode.parcellockers.parcel.gui.ParcelListGUI;
 import com.eternalcode.parcellockers.parcel.gui.SentParcelsGUI;
 import com.eternalcode.parcellockers.parcel.repository.ParcelRepository;
@@ -23,9 +23,9 @@ public class MainGUI extends GuiView {
     private final MiniMessage miniMessage;
     private final PluginConfiguration config;
     private final ParcelRepository parcelRepository;
-    private final LockerRepository lockerRepository;
+    private final LockerDatabaseService lockerRepository;
 
-    public MainGUI(Plugin plugin, Server server, MiniMessage miniMessage, PluginConfiguration config, ParcelRepository parcelRepository, LockerRepository lockerRepository) {
+    public MainGUI(Plugin plugin, Server server, MiniMessage miniMessage, PluginConfiguration config, ParcelRepository parcelRepository, LockerDatabaseService lockerRepository) {
         this.plugin = plugin;
         this.server = server;
         this.miniMessage = miniMessage;

src/main/java/com/eternalcode/parcellockers/command/ParcelCommand.java → src/main/java/com/eternalcode/parcellockers/parcel/command/ParcelCommand.java

@@ -1,4 +1,4 @@
-package com.eternalcode.parcellockers.command;
+package com.eternalcode.parcellockers.parcel.command;
 
 import com.eternalcode.parcellockers.configuration.implementation.PluginConfiguration;
 import com.eternalcode.parcellockers.locker.gui.MainGUI;

src/main/java/com/eternalcode/parcellockers/command/argument/ParcelArgument.java → src/main/java/com/eternalcode/parcellockers/parcel/command/argument/ParcelArgument.java

@@ -1,4 +1,4 @@
-package com.eternalcode.parcellockers.command.argument;
+package com.eternalcode.parcellockers.parcel.command.argument;
 
 import com.eternalcode.parcellockers.parcel.Parcel;
 import com.eternalcode.parcellockers.parcel.database.ParcelDatabaseService;
@@ -30,7 +30,6 @@ public ParcelArgument(ParcelDatabaseService cache) {
         return Result.ok(parcel);
     }
 
-
     @Override
     public List<Suggestion> suggest(LiteInvocation invocation) {
         return this.databaseService.cache().values().stream()

src/main/java/com/eternalcode/parcellockers/parcel/gui/ParcelListGUI.java

@@ -2,8 +2,8 @@
 
 import com.eternalcode.parcellockers.configuration.implementation.PluginConfiguration;
 import com.eternalcode.parcellockers.gui.GuiView;
+import com.eternalcode.parcellockers.locker.database.LockerDatabaseService;
 import com.eternalcode.parcellockers.locker.gui.MainGUI;
-import com.eternalcode.parcellockers.locker.repository.LockerRepository;
 import com.eternalcode.parcellockers.parcel.Parcel;
 import com.eternalcode.parcellockers.parcel.repository.ParcelRepository;
 import com.eternalcode.parcellockers.shared.Page;
@@ -13,13 +13,15 @@
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.plugin.Plugin;
 import panda.utilities.text.Formatter;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 
 public class ParcelListGUI extends GuiView {
 
@@ -28,14 +30,14 @@ public class ParcelListGUI extends GuiView {
     private final MiniMessage miniMessage;
     private final PluginConfiguration config;
     private final ParcelRepository parcelRepository;
-    private final LockerRepository lockerRepository;
+    private final LockerDatabaseService lockerRepository;
     private final MainGUI mainGUI;
 
     private static final int WIDTH = 7;
     private static final int HEIGHT = 4;
     private static final Page FIRST_PAGE = new Page(0, WIDTH * HEIGHT);
 
-    public ParcelListGUI(Plugin plugin, Server server, MiniMessage miniMessage, PluginConfiguration config, ParcelRepository parcelRepository, LockerRepository lockerRepository, MainGUI mainGUI) {
+    public ParcelListGUI(Plugin plugin, Server server, MiniMessage miniMessage, PluginConfiguration config, ParcelRepository parcelRepository, LockerDatabaseService lockerRepository, MainGUI mainGUI) {
         this.plugin = plugin;
         this.server = server;
         this.miniMessage = miniMessage;
@@ -90,9 +92,11 @@ private void show(Player player, Page page) {
                     continue;
                 }
 
-                List<String> newLore = this.replaceParcelPlaceholders(parcel, parcelItem.getItemStack().getItemMeta().getLore());
+                ItemMeta parcelItemMeta = parcelItem.getItemStack().getItemMeta();
+
+                List<String> newLore = this.replaceParcelPlaceholders(parcel, parcelItemMeta.getLore());
 
-                parcelItem.getItemStack().getItemMeta().setLore(newLore);
+                parcelItemMeta.setLore(newLore);
                 gui.addItem(parcelItem);
 
             }
@@ -112,7 +116,7 @@ private void show(Player player, Page page) {
 
     }
 
-    public List<String> replaceParcelPlaceholders(Parcel parcel, List<String> lore) {
+    private List<String> replaceParcelPlaceholders(Parcel parcel, List<String> lore) {
         if (lore == null || lore.isEmpty()) {
             return Collections.emptyList();
         }
@@ -133,12 +137,22 @@ public List<String> replaceParcelPlaceholders(Parcel parcel, List<String> lore)
                 .toString()
             );
 
-        this.lockerRepository.findByUUID(parcel.destinationLocker()).join().ifPresent(locker -> formatter
+        UUID destinationLocker = parcel.destinationLocker();
+        if (!this.lockerRepository.isInCache(destinationLocker)) {
+            this.lockerRepository.findByUUID(destinationLocker).join().ifPresent(locker -> formatter
+                .register("{POSITION_X}", locker.position().x())
+                .register("{POSITION_Y}", locker.position().y())
+                .register("{POSITION_Z}", locker.position().z())
+            );
+        }
+
+        this.lockerRepository.findLocker(destinationLocker).ifPresent(locker -> formatter
             .register("{POSITION_X}", locker.position().x())
             .register("{POSITION_Y}", locker.position().y())
             .register("{POSITION_Z}", locker.position().z())
         );
 
+
         List<String> newLore = new ArrayList<>();
 
         for (String line : lore) {

src/main/java/com/eternalcode/parcellockers/parcel/gui/SentParcelsGUI.java

@@ -2,7 +2,6 @@
 
 import com.eternalcode.parcellockers.configuration.implementation.PluginConfiguration;
 import com.eternalcode.parcellockers.gui.GuiView;
-import com.eternalcode.parcellockers.locker.Locker;
 import com.eternalcode.parcellockers.locker.gui.MainGUI;
 import com.eternalcode.parcellockers.locker.repository.LockerRepository;
 import com.eternalcode.parcellockers.parcel.Parcel;
@@ -80,7 +79,6 @@ public List<String> replaceParcelPlaceholders(Parcel parcel, List<String> lore)
             return Collections.emptyList();
         }
 
-        Locker destination = this.lockerRepository.findByUUID(parcel.destinationLocker()).join().get();
         Formatter formatter = new Formatter()
             .register("{UUID}", parcel.uuid().toString())
             .register("{NAME}", parcel.name())