GH-110 Add parcel receiving logic

build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
     id("net.minecrell.plugin-yml.bukkit") version "0.6.0"
     id("xyz.jpenilla.run-paper") version "2.3.1"
     id("com.gradleup.shadow") version "8.3.5"
+    id("net.kyori.blossom") version "2.1.0"
 }
 
 group = "com.eternalcode"
@@ -103,7 +104,7 @@ java {
 checkstyle {
     toolVersion = "10.21.1"
 
-    configFile = file("${rootDir}/config/checkstyle/checkstyle.xml")
+    configFile = file("${rootDir}/gradle/checkstyle/checkstyle.xml")
 
     maxErrors = 0
     maxWarnings = 0
@@ -115,10 +116,9 @@ bukkit {
     prefix = "ParcelLockers"
     author = "EternalCodeTeam"
     name = "ParcelLockers"
-    description =
-        "Plugin that provides functionality of parcel lockers in Minecraft, allowing players to send and receive parcels safely."
+    description = "Plugin that provides functionality of parcel lockers in Minecraft, allowing players to send and receive parcels safely."
     website = "https://github.com/EternalCodeTeam/ParcelLockers"
-    version = "1.0.0-SNAPSHOT"
+    version = "0.0.1-SNAPSHOT"
 }
 
 tasks.withType<JavaCompile> {
@@ -128,6 +128,14 @@ tasks.withType<JavaCompile> {
     options.release = 21
 }
 
+sourceSets.main {
+    blossom.javaSources {
+        property("@NAME@", project.name)
+        property("@VERSION@", project.version.toString())
+        property("@DEVELOPER_MODE@", System.getenv("DEVELOPER_MODE") ?: "false")
+    }
+}
+
 tasks {
     runServer {
         minecraftVersion("1.21.4")
@@ -145,25 +153,37 @@ tasks {
             "org/jetbrains/annotations/**",
             "META-INF/**",
             "javax/**",
+            "javassist/**",
+            "org/h2/util/**"
         )
 
         mergeServiceFiles()
         minimize {
             exclude(dependency("de\\.rapha149\\.signgui:signgui:.*")) // https://github.com/Rapha149/SignGUI/issues/15
         }
 
-        val prefix = "com.eternalcode.parcellockers.libs"
+        val relocationPrefix = "com.eternalcode.parcellockers.libs"
         listOf(
             "panda",
-            "org.panda_lang",
-            "net.dzikoysk",
-            "io.papermc.lib",
             "org.bstats",
-            "dev.rollczi",
-            "net.kyori",
             "org.json",
+            "org.postgresql",
+            "net.dzikoysk",
+            "net.kyori",
+            "io.papermc",
+            "io.sentry",
+            "dev.rollczi",
+            "de.eldoria",
+            "com.eternalcode.commons",
+            "com.eternalcode.gitcheck",
             "com.fasterxml",
-            "de.rapha149"
-        ).forEach { relocate(it, prefix) }
+            "com.j256",
+            "com.spotify",
+            "com.zaxxer",
+            "de.rapha149",
+            "dev.triumphteam"
+        ).forEach { relocate(it, "$relocationPrefix.$it") }
     }
 }
+
+

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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

@@ -11,9 +11,9 @@
 import com.eternalcode.parcellockers.content.repository.ParcelContentRepository;
 import com.eternalcode.parcellockers.content.repository.ParcelContentRepositoryOrmLite;
 import com.eternalcode.parcellockers.database.DatabaseManager;
-import com.eternalcode.parcellockers.gui.implementation.locker.LockerMainGUI;
-import com.eternalcode.parcellockers.gui.implementation.remote.MainGUI;
-import com.eternalcode.parcellockers.gui.implementation.remote.ParcelListGUI;
+import com.eternalcode.parcellockers.gui.implementation.locker.LockerMainGui;
+import com.eternalcode.parcellockers.gui.implementation.remote.MainGui;
+import com.eternalcode.parcellockers.gui.implementation.remote.ParcelListGui;
 import com.eternalcode.parcellockers.itemstorage.repository.ItemStorageRepository;
 import com.eternalcode.parcellockers.itemstorage.repository.ItemStorageRepositoryOrmLite;
 import com.eternalcode.parcellockers.locker.Locker;
@@ -138,17 +138,17 @@ public void onEnable() {
         ParcelRepositoryOrmLite parcelRepository = new ParcelRepositoryOrmLite(databaseManager, scheduler, parcelCache);
         parcelRepository.updateCaches();
 
-        ParcelManager parcelManager = new ParcelManager(config, announcer, parcelRepository);
+        ParcelContentRepository parcelContentRepository = new ParcelContentRepositoryOrmLite(databaseManager, scheduler);
+        ParcelManager parcelManager = new ParcelManager(config, announcer, parcelRepository, parcelContentRepository);
 
         ItemStorageRepository itemStorageRepository = new ItemStorageRepositoryOrmLite(databaseManager, scheduler);
 
         UserRepository userRepository = new UserRepositoryOrmLite(databaseManager, scheduler);
         UserManager userManager = new UserManager(userRepository);
 
-        ParcelContentRepository parcelContentRepository = new ParcelContentRepositoryOrmLite(databaseManager, scheduler);
 
-        MainGUI mainGUI = new MainGUI(this, server, miniMessage, config, parcelRepository, lockerRepository, userManager);
-        ParcelListGUI parcelListGUI = new ParcelListGUI(this, server, miniMessage, config, parcelRepository, lockerRepository, userManager, mainGUI);
+        MainGui mainGUI = new MainGui(this, server, miniMessage, config, parcelRepository, lockerRepository, userManager);
+        ParcelListGui parcelListGUI = new ParcelListGui(this, server, miniMessage, config, parcelRepository, lockerRepository, userManager, mainGUI);
 
         this.liteCommands = LiteBukkitFactory.builder("parcellockers", this)
             .argument(Parcel.class, new ParcelArgument(parcelCache))
@@ -169,7 +169,7 @@ public void onEnable() {
             return;
         }*/
 
-        LockerMainGUI lockerMainGUI = new LockerMainGUI(this, miniMessage, config, itemStorageRepository, parcelRepository, lockerRepository, announcer, parcelContentRepository, userRepository, this.skullAPI);
+        LockerMainGui lockerMainGUI = new LockerMainGui(this, miniMessage, config, itemStorageRepository, parcelRepository, lockerRepository, announcer, parcelContentRepository, userRepository, this.skullAPI);
 
         Stream.of(
             new LockerInteractionController(lockerCache, lockerMainGUI),

src/main/java/com/eternalcode/parcellockers/configuration/implementation/PluginConfiguration.java

@@ -109,6 +109,9 @@ public static class Messages {
         public String parcelDestinationSet = "&2✔ &aParcel destination locker set successfully.";
         public String alreadyCreatingLocker = "&4✘ &cYou are already creating a parcel locker!";
         public String receiverNotSet = "&4✘ &cThe parcel receiver is not set!";
+        public String parcelSuccessfullyCollected = "&2✔ &aParcel collected successfully.";
+        public String failedToCollectParcel = "&4✘ &cAn error occurred while collecting the parcel.";
+        public String notEnoughInventorySpace = "&4✘ &cYou don't have enough space in your inventory to collect the parcel!";
 
         @Description({ " ", "# The parcel info message." })
         public List<String> parcelInfoMessages = List.of(
@@ -119,8 +122,7 @@ public static class Messages {
             "&6Size: &e{SIZE}",
             "&6Position: &6X: &e{POSITION_X}, &6Y: &e{POSITION_Y}, &6Z: &e{POSITION_Z}",
             "&6Priority: &e{PRIORITY}",
-            "&6Description: &e{DESCRIPTION}",
-            "&6Recipients: &e{RECIPIENTS}"
+            "&6Description: &e{DESCRIPTION}"
         );
     }
 
@@ -142,6 +144,9 @@ public static class GuiSettings {
         @Description({ " ", "# The item of the parcel recipient pick GUI" })
         public String parcelReceiverSelectionGuiTitle = "&5Select recipient";
 
+        @Description({ " ", "# The item of the parcel collection GUI" })
+        public String parcelCollectionGuiTitle = "&aCollect parcels";
+
         @Description({ " ", "# The item of the small parcel size button" })
         public ConfigItem smallParcelSizeItem = new ConfigItem()
             .setName("&a✧ Small")
@@ -269,8 +274,7 @@ public static class GuiSettings {
                     "&6Size: &e{SIZE}",
                     "&6Position: &6X: &e{POSITION_X}, &6Y: &e{POSITION_Y}, &6Z: &e{POSITION_Z}",
                     "&6Priority: &e{PRIORITY}",
-                    "&6Description: &e{DESCRIPTION}",
-                    "&6Recipients: &e{RECIPIENTS}"
+                    "&6Description: &e{DESCRIPTION}"
                 )
             )
             .setType(Material.CHEST_MINECART);
@@ -378,5 +382,23 @@ public static class GuiSettings {
             Material.SPAWNER,
             Material.BEDROCK
         );
+
+        @Description({ " ", "# The item of the parcel item in the collection GUI" })
+        public ConfigItem parcelCollectionItem = new ConfigItem()
+            .setName("&a{NAME}")
+            .setLore(List.of(
+                    "&6UUID: &e{UUID}",
+                    "&6Sender: &e{SENDER}",
+                    "&6Size: &e{SIZE}",
+                    "&6Description: &e{DESCRIPTION}"
+                )
+            )
+            .setType(Material.CHEST_MINECART);
+
+        @Description({ " ", "# The item that is displayed in the collection GUI when no parcels are found" })
+        public ConfigItem noParcelsItem = new ConfigItem()
+            .setName("&cNo parcels found")
+            .setLore(List.of("&cYou don't have any parcels to collect."))
+            .setType(Material.BARRIER);
     }
 }

src/main/java/com/eternalcode/parcellockers/database/persister/ItemStackPersister.java

@@ -15,6 +15,7 @@
 import java.sql.SQLException;
 import java.util.List;
 
+@SuppressWarnings("unchecked")
 public class ItemStackPersister extends BaseDataType {
 
     private static final ItemStackPersister instance = new ItemStackPersister();
@@ -39,8 +40,7 @@ public Object javaToSqlArg(FieldType fieldType, Object javaObject) {
 
         try {
             return JSON.writeValueAsString(stacks);
-        }
-        catch (JsonProcessingException e) {
+        } catch (JsonProcessingException e) {
             Sentry.captureException(e);
             throw new ParcelLockersException("Failed to serialize itemstacks", e);
         }
@@ -62,8 +62,7 @@ public Object sqlArgToJava(FieldType fieldType, Object sqlArg, int columnPos) {
 
         try {
             return JSON.readValue(string, JSON.getTypeFactory().constructCollectionType(List.class, ItemStack.class));
-        }
-        catch (JsonProcessingException exception) {
+        } catch (JsonProcessingException exception) {
             Sentry.captureException(exception);
             throw new ParcelLockersException("Failed to deserialize itemstacks", exception);
         }

src/main/java/com/eternalcode/parcellockers/database/wrapper/AbstractRepositoryOrmLite.java

@@ -3,7 +3,6 @@
 import com.eternalcode.commons.scheduler.Scheduler;
 import com.eternalcode.parcellockers.database.DatabaseManager;
 import com.j256.ormlite.dao.Dao;
-import io.sentry.Sentry;
 import panda.std.function.ThrowingFunction;
 
 import java.sql.SQLException;
@@ -61,9 +60,7 @@ protected <T, ID, R> CompletableFuture<R> action(Class<T> type, ThrowingFunction
 
             try {
                 completableFuture.complete(action.apply(dao));
-            }
-            catch (Throwable throwable) {
-                Sentry.captureException(throwable);
+            } catch (Throwable throwable) {
                 completableFuture.completeExceptionally(throwable);
                 throwable.printStackTrace();
             }

src/main/java/com/eternalcode/parcellockers/gui/GuiView.java

@@ -4,10 +4,10 @@
 
 
 // TODO INTERFACE
-public abstract class GuiView {
+public interface GuiView {
 
-    public static final int[] CORNER_SLOTS = { 0, 8, 45, 53 };
-    public static final int[] BORDER_SLOTS = { 1, 2, 3, 4, 5, 6, 7, 9, 17, 18, 26, 27, 35, 36, 44, 46, 47, 48, 49, 50, 51, 52 };
+    int[] CORNER_SLOTS = { 0, 8, 45, 53 };
+    int[] BORDER_SLOTS = { 1, 2, 3, 4, 5, 6, 7, 9, 17, 18, 26, 27, 35, 36, 44, 46, 47, 48, 49, 50, 51, 52 };
 
-    public abstract void show(Player player);
+    void show(Player player);
 }

src/main/java/com/eternalcode/parcellockers/gui/implementation/locker/DestinationSelectionGUI.java → src/main/java/com/eternalcode/parcellockers/gui/implementation/locker/DestinationSelectionGui.java

@@ -7,8 +7,8 @@
 import com.eternalcode.parcellockers.locker.Locker;
 import com.eternalcode.parcellockers.locker.repository.LockerPageResult;
 import com.eternalcode.parcellockers.locker.repository.LockerRepository;
-import com.eternalcode.parcellockers.shared.ExceptionHandler;
 import com.eternalcode.parcellockers.shared.Page;
+import com.eternalcode.parcellockers.shared.SentryExceptionHandler;
 import dev.triumphteam.gui.guis.Gui;
 import dev.triumphteam.gui.guis.GuiItem;
 import dev.triumphteam.gui.guis.PaginatedGui;
@@ -22,7 +22,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
-public class DestinationSelectionGUI extends GuiView {
+public class DestinationSelectionGui implements GuiView {
 
     private static final int WIDTH = 7;
     private static final int HEIGHT = 4;
@@ -33,10 +33,10 @@ public class DestinationSelectionGUI extends GuiView {
     private final PluginConfiguration config;
     private final MiniMessage miniMessage;
     private final LockerRepository lockerRepository;
-    private final ParcelSendingGUI sendingGUI;
-    private final ParcelSendingGUIState state;
+    private final ParcelSendingGui sendingGUI;
+    private final ParcelSendingGuiState state;
 
-    public DestinationSelectionGUI(Plugin plugin, BukkitScheduler scheduler, PluginConfiguration config, MiniMessage miniMessage, LockerRepository lockerRepository, ParcelSendingGUI sendingGUI, ParcelSendingGUIState state) {
+    public DestinationSelectionGui(Plugin plugin, BukkitScheduler scheduler, PluginConfiguration config, MiniMessage miniMessage, LockerRepository lockerRepository, ParcelSendingGui sendingGUI, ParcelSendingGuiState state) {
         this.plugin = plugin;
         this.scheduler = scheduler;
         this.config = config;
@@ -76,17 +76,17 @@ private void show(Player player, Page page) {
         gui.setItem(49, closeItem);
 
         this.lockerRepository.findPage(page).thenAccept(result -> {
-            if (result.hasNextPage()) {
-                gui.setItem(51, nextPageItem);
-            }
+                if (result.hasNextPage()) {
+                    gui.setItem(51, nextPageItem);
+                }
 
-            if (page.hasPrevious()) {
-                gui.setItem(47, previousPageItem);
-            }
+                if (page.hasPrevious()) {
+                    gui.setItem(47, previousPageItem);
+                }
 
-            this.loadLockers(player, result, refresher).forEach(refresher::addItem);
-            this.scheduler.runTask(this.plugin, () -> gui.open(player));
-        }).whenComplete(ExceptionHandler.handler())
+                this.loadLockers(player, result, refresher).forEach(refresher::addItem);
+                this.scheduler.runTask(this.plugin, () -> gui.open(player));
+            }).whenComplete(SentryExceptionHandler.handler())
             .orTimeout(5, TimeUnit.SECONDS);
     }
 

src/main/java/com/eternalcode/parcellockers/gui/implementation/locker/LockerMainGUI.java → src/main/java/com/eternalcode/parcellockers/gui/implementation/locker/LockerMainGui.java

@@ -18,7 +18,7 @@
 
 import static com.eternalcode.commons.adventure.AdventureUtil.resetItalic;
 
-public class LockerMainGUI extends GuiView {
+public class LockerMainGui implements GuiView {
 
     private final Plugin plugin;
     private final MiniMessage miniMessage;
@@ -31,7 +31,7 @@ public class LockerMainGUI extends GuiView {
     private final UserRepository userRepository;
     private final SkullAPI skullAPI;
 
-    public LockerMainGUI(Plugin plugin,
+    public LockerMainGui(Plugin plugin,
                          MiniMessage miniMessage,
                          PluginConfiguration config,
                          ItemStorageRepository itemStorageRepository,
@@ -66,7 +66,7 @@ public void show(Player player) {
         GuiItem cornerItem = this.config.guiSettings.cornerItem.toGuiItem();
         GuiItem closeItem = this.config.guiSettings.closeItem.toGuiItem(event -> gui.close(player));
 
-        gui.setDefaultClickAction(event -> event.setCancelled(true));
+        //gui.setDefaultClickAction(event -> event.setCancelled(true));
 
         for (int slot : CORNER_SLOTS) {
             gui.setItem(slot, cornerItem);
@@ -76,8 +76,14 @@ public void show(Player player) {
             gui.setItem(slot, backgroundItem);
         }
 
-        gui.setItem(20, this.config.guiSettings.parcelLockerCollectItem.toGuiItem(event -> event.setCancelled(true)));
-        gui.setItem(22, this.config.guiSettings.parcelLockerSendItem.toGuiItem(event -> new ParcelSendingGUI(this.plugin,
+        gui.setItem(20, this.config.guiSettings.parcelLockerCollectItem.toGuiItem(event -> new ParcelCollectionGui(this.plugin,
+            this.config,
+            this.plugin.getServer().getScheduler(),
+            this.parcelRepository,
+            this.miniMessage
+        ).show(player)));
+
+        gui.setItem(22, this.config.guiSettings.parcelLockerSendItem.toGuiItem(event -> new ParcelSendingGui(this.plugin,
             this.config,
             this.miniMessage,
             this.itemStorageRepository,
@@ -87,7 +93,7 @@ public void show(Player player) {
             this.parcelContentRepository,
             this.userRepository,
             this.skullAPI,
-            new ParcelSendingGUIState()
+            new ParcelSendingGuiState()
         ).show(player)));
 
         gui.setItem(24, this.config.guiSettings.parcelLockerStatusItem.toGuiItem());