GH-143 Add 'max parcels per locker' option

Jakubk15 · gemini-code-assist[bot] · web-flow · commit 031459d9dbe2 · 2025-11-15T10:58:39.000+01:00
* Add 'max parcels per locker' option

* Update src/main/java/com/eternalcode/parcellockers/parcel/repository/ParcelRepositoryOrmLite.java

Co-authored-by: gemini-code-assist[bot] &lt;176961590+gemini-code-assist[bot]@users.noreply.github.com&gt;

* adjust to copilot's suggestions

* thenRun -&gt; thenAccept

* [ci skip] delete redundant comment

* Adjust to Mike's suggestion, simplify code, bump MC version to 1.21.10

---------

Co-authored-by: gemini-code-assist[bot] &lt;176961590+gemini-code-assist[bot]@users.noreply.github.com&gt;
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -20,7 +20,7 @@ repositories {
 
 dependencies {
     // minecraft development api
-    compileOnly("io.papermc.paper:paper-api:1.21.8-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT")
     paperLibrary("dev.rollczi:litecommands-bukkit:3.10.6")
     paperLibrary("dev.rollczi:litecommands-adventure:3.10.6")
 
@@ -109,7 +109,7 @@ tasks.withType<JavaCompile> {
 
 tasks {
     runServer {
-        minecraftVersion("1.21.8")
+        minecraftVersion("1.21.10")
         downloadPlugins.modrinth("luckperms", "v5.5.0-bukkit")
     }
 
diff --git a/src/main/java/com/eternalcode/parcellockers/ParcelLockers.java b/src/main/java/com/eternalcode/parcellockers/ParcelLockers.java
@@ -121,7 +121,7 @@ public void onEnable() {
         UserValidationService userValidationService = new UserValidator();
         UserManager userManager = new UserManagerImpl(userRepository, userValidationService);
         LockerValidationService lockerValidationService = new LockerValidator();
-        LockerManager lockerManager = new LockerManager(lockerRepository, lockerValidationService);
+        LockerManager lockerManager = new LockerManager(config, lockerRepository, lockerValidationService, parcelRepository);
         ParcelContentManager parcelContentManager = new ParcelContentManager(parcelContentRepository);
         ItemStorageManager itemStorageManager = new ItemStorageManager(itemStorageRepository);
         DeliveryManager deliveryManager = new DeliveryManager(deliveryRepository);
@@ -131,6 +131,7 @@ public void onEnable() {
         GuiManager guiManager = new GuiManager(
             config,
             scheduler,
+            noticeService,
             parcelService,
             lockerManager,
             userManager,
diff --git a/src/main/java/com/eternalcode/parcellockers/configuration/implementation/MessageConfig.java b/src/main/java/com/eternalcode/parcellockers/configuration/implementation/MessageConfig.java
@@ -96,6 +96,10 @@ public static class ParcelMessages extends OkaeriConfig {
             .chat("&4✘ &cThe parcel destination locker is not set!")
             .sound(Sound.ENTITY_ENDERMAN_AMBIENT.key())
             .build();
+        public Notice lockerFull = Notice.builder()
+            .chat("&4✘ &cThe destination locker is full! Please select another locker.")
+            .sound(Sound.ENTITY_VILLAGER_NO.key())
+            .build();
         public Notice illegalItem = Notice.builder()
             .chat("&4✘ &cThe parcel contains illegal items that cannot be sent. ({ITEMS})")
             .build();
diff --git a/src/main/java/com/eternalcode/parcellockers/configuration/implementation/PluginConfig.java b/src/main/java/com/eternalcode/parcellockers/configuration/implementation/PluginConfig.java
@@ -58,6 +58,9 @@ public static class Settings extends OkaeriConfig {
 
         @Comment({"", "# Parcel sending duration for priority parcels"})
         public Duration priorityParcelSendDuration = Duration.ofSeconds(30);
+
+        @Comment({"", "# Maximum number of parcels that can be stored in a single locker"})
+        public int maxParcelsPerLocker = 30;
     }
 
     public static class GuiSettings extends OkaeriConfig {
diff --git a/src/main/java/com/eternalcode/parcellockers/gui/GuiManager.java b/src/main/java/com/eternalcode/parcellockers/gui/GuiManager.java
@@ -8,6 +8,7 @@
 import com.eternalcode.parcellockers.itemstorage.ItemStorageManager;
 import com.eternalcode.parcellockers.locker.Locker;
 import com.eternalcode.parcellockers.locker.LockerManager;
+import com.eternalcode.parcellockers.notification.NoticeService;
 import com.eternalcode.parcellockers.parcel.Parcel;
 import com.eternalcode.parcellockers.parcel.ParcelService;
 import com.eternalcode.parcellockers.parcel.task.ParcelSendTask;
@@ -28,6 +29,7 @@ public class GuiManager {
 
     private final PluginConfig config;
     private final Scheduler scheduler;
+    private final NoticeService noticeService;
     private final ParcelService parcelService;
     private final LockerManager lockerManager;
     private final UserManager userManager;
@@ -36,7 +38,7 @@ public class GuiManager {
     private final DeliveryManager deliveryManager;
 
     public GuiManager(
-        PluginConfig config, Scheduler scheduler, ParcelService parcelService,
+        PluginConfig config, Scheduler scheduler, NoticeService noticeService, ParcelService parcelService,
         LockerManager lockerManager,
         UserManager userManager,
         ItemStorageManager itemStorageManager,
@@ -45,6 +47,7 @@ public GuiManager(
     ) {
         this.config = config;
         this.scheduler = scheduler;
+        this.noticeService = noticeService;
         this.parcelService = parcelService;
         this.lockerManager = lockerManager;
         this.userManager = userManager;
@@ -54,20 +57,38 @@ public GuiManager(
     }
 
     public void sendParcel(Player sender, Parcel parcel, List<ItemStack> items) {
-        Duration delay = parcel.priority()
-            ? this.config.settings.priorityParcelSendDuration
-            : this.config.settings.parcelSendDuration;
-        this.parcelService.send(sender, parcel, items);
-        this.deliveryManager.create(parcel.uuid(), Instant.now().plus(delay));
-        this.parcelContentManager.create(parcel.uuid(), items);
-
-        ParcelSendTask task = new ParcelSendTask(
-            parcel,
-            this.parcelService,
-            this.deliveryManager
-        );
-
-        this.scheduler.runLaterAsync(task, delay);
+        this.lockerManager.isLockerFull(parcel.destinationLocker()).thenAccept(isFull -> {
+            if (isFull) {
+                this.noticeService.create()
+                    .notice(messages -> messages.parcel.lockerFull)
+                    .player(sender.getUniqueId())
+                    .send();
+                return;
+            }
+
+            Duration delay = parcel.priority()
+                ? this.config.settings.priorityParcelSendDuration
+                : this.config.settings.parcelSendDuration;
+
+            this.parcelService.send(sender, parcel, items)
+                .thenAccept(v -> this.deliveryManager.create(parcel.uuid(), Instant.now().plus(delay)))
+                .thenRun(() -> {
+                    ParcelSendTask task = new ParcelSendTask(
+                        parcel,
+                        this.parcelService,
+                        this.deliveryManager
+                    );
+                    this.itemStorageManager.delete(sender.getUniqueId());
+
+                    this.scheduler.runLaterAsync(task, delay);
+                });
+        }).exceptionally(throwable -> {
+            this.noticeService.create()
+                .notice(messages -> messages.parcel.cannotSend)
+                .player(sender.getUniqueId())
+                .send();
+            return null;
+        });
     }
 
     public void collectParcel(Player player, Parcel parcel) {
diff --git a/src/main/java/com/eternalcode/parcellockers/gui/implementation/locker/SendingGui.java b/src/main/java/com/eternalcode/parcellockers/gui/implementation/locker/SendingGui.java
@@ -244,8 +244,6 @@ public void show(Player player) {
                 );
 
                 this.guiManager.sendParcel(player, parcel, result.items());
-                this.guiManager.deleteItemStorage(player.getUniqueId());
-
                 this.gui.close(player);
             }).orTimeout(5, TimeUnit.SECONDS));
 
diff --git a/src/main/java/com/eternalcode/parcellockers/locker/LockerManager.java b/src/main/java/com/eternalcode/parcellockers/locker/LockerManager.java
@@ -1,8 +1,10 @@
 package com.eternalcode.parcellockers.locker;
 
+import com.eternalcode.parcellockers.configuration.implementation.PluginConfig;
 import com.eternalcode.parcellockers.locker.repository.LockerRepository;
 import com.eternalcode.parcellockers.locker.validation.LockerValidationService;
 import com.eternalcode.parcellockers.notification.NoticeService;
+import com.eternalcode.parcellockers.parcel.repository.ParcelRepository;
 import com.eternalcode.parcellockers.shared.Page;
 import com.eternalcode.parcellockers.shared.PageResult;
 import com.eternalcode.parcellockers.shared.Position;
@@ -19,15 +21,24 @@
 
 public class LockerManager {
 
+    private final PluginConfig config;
     private final LockerRepository lockerRepository;
     private final LockerValidationService validationService;
+    private final ParcelRepository parcelRepository;
 
     private final Cache<UUID, Locker> lockersByUUID;
     private final Cache<Position, Locker> lockersByPosition;
 
-    public LockerManager(LockerRepository lockerRepository, LockerValidationService validationService) {
+    public LockerManager(
+        PluginConfig config,
+        LockerRepository lockerRepository,
+        LockerValidationService validationService,
+        ParcelRepository parcelRepository
+    ) {
+        this.config = config;
         this.lockerRepository = lockerRepository;
         this.validationService = validationService;
+        this.parcelRepository = parcelRepository;
 
         this.lockersByUUID = Caffeine.newBuilder()
             .expireAfterAccess(Duration.ofHours(2))
@@ -148,6 +159,11 @@ public CompletableFuture<Void> deleteAll(CommandSender sender, NoticeService not
         });
     }
 
+    public CompletableFuture<Boolean> isLockerFull(UUID lockerUuid) {
+        return this.parcelRepository.countByDestinationLocker(lockerUuid)
+            .thenApply(count -> count > 0 && count >= this.config.settings.maxParcelsPerLocker);
+    }
+
     private void cacheAll() {
         this.lockerRepository.fetchAll()
             .thenAccept(optionalLockers -> optionalLockers.ifPresent(lockers -> lockers.forEach(locker -> {
@@ -156,3 +172,4 @@ private void cacheAll() {
             })));
     }
 }
+
diff --git a/src/main/java/com/eternalcode/parcellockers/parcel/ParcelService.java b/src/main/java/com/eternalcode/parcellockers/parcel/ParcelService.java
@@ -29,6 +29,7 @@ public interface ParcelService {
 
     CompletableFuture<PageResult<Parcel>> getByReceiver(UUID receiver, Page page);
 
+
     CompletableFuture<Integer> delete(UUID uuid);
 
     CompletableFuture<Integer> delete(Parcel parcel);
diff --git a/src/main/java/com/eternalcode/parcellockers/parcel/ParcelServiceImpl.java b/src/main/java/com/eternalcode/parcellockers/parcel/ParcelServiceImpl.java
@@ -196,6 +196,7 @@ public CompletableFuture<PageResult<Parcel>> getByReceiver(UUID receiver, Page p
             });
     }
 
+
     private void cacheAll() {
         this.parcelRepository.fetchAll()
             .thenAccept(optional -> optional.ifPresent(parcels -> parcels.forEach(this::cache)));
diff --git a/src/main/java/com/eternalcode/parcellockers/parcel/repository/ParcelRepository.java b/src/main/java/com/eternalcode/parcellockers/parcel/repository/ParcelRepository.java
@@ -29,6 +29,8 @@ public interface ParcelRepository {
 
     CompletableFuture<PageResult<Parcel>> fetchByReceiver(UUID receiver, Page page);
 
+    CompletableFuture<Integer> countByDestinationLocker(UUID destinationLocker);
+
     CompletableFuture<Integer> delete(Parcel parcel);
 
     CompletableFuture<Integer> delete(UUID uuid);
diff --git a/src/main/java/com/eternalcode/parcellockers/parcel/repository/ParcelRepositoryOrmLite.java b/src/main/java/com/eternalcode/parcellockers/parcel/repository/ParcelRepositoryOrmLite.java
@@ -4,6 +4,7 @@
 import com.eternalcode.parcellockers.database.DatabaseManager;
 import com.eternalcode.parcellockers.database.wrapper.AbstractRepositoryOrmLite;
 import com.eternalcode.parcellockers.parcel.Parcel;
+import com.eternalcode.parcellockers.parcel.ParcelStatus;
 import com.eternalcode.parcellockers.shared.Page;
 import com.eternalcode.parcellockers.shared.PageResult;
 import com.j256.ormlite.table.TableUtils;
@@ -18,6 +19,7 @@ public class ParcelRepositoryOrmLite extends AbstractRepositoryOrmLite implement
 
     private static final String RECEIVER_COLUMN = "receiver";
     private static final String SENDER_COLUMN = "sender";
+    private static final String DESTINATION_LOCKER_COLUMN = "destination_locker";
 
     public ParcelRepositoryOrmLite(DatabaseManager databaseManager, Scheduler scheduler) {
         super(databaseManager, scheduler);
@@ -70,6 +72,18 @@ public CompletableFuture<PageResult<Parcel>> fetchByReceiver(UUID receiver, Page
         return this.fetchByPaged(receiver, page, RECEIVER_COLUMN);
     }
 
+    @Override
+    public CompletableFuture<Integer> countByDestinationLocker(UUID destinationLocker) {
+        return this.action(ParcelTable.class, dao -> {
+            long count = dao.queryBuilder()
+                .where()
+                .eq(DESTINATION_LOCKER_COLUMN, destinationLocker)
+                .eq("status", ParcelStatus.DELIVERED)
+                .countOf();
+            return (int) count;
+        });
+    }
+
     private CompletableFuture<PageResult<Parcel>> fetchByPaged(UUID key, Page page, String column) {
         return this.action(
             ParcelTable.class, dao -> {

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,9 @@ public static class Settings extends OkaeriConfig {`
`58`	`58`
`59`	`59`	`@Comment({"", "# Parcel sending duration for priority parcels"})`
`60`	`60`	`public Duration priorityParcelSendDuration = Duration.ofSeconds(30);`
	`61`	`+`
	`62`	`+ @Comment({"", "# Maximum number of parcels that can be stored in a single locker"})`
	`63`	`+ public int maxParcelsPerLocker = 30;`
`61`	`64`	`}`
`62`	`65`
`63`	`66`	`public static class GuiSettings extends OkaeriConfig {`
Original file line number	Diff line number	Diff line change
`@@ -196,6 +196,7 @@ public CompletableFuture<PageResult<Parcel>> getByReceiver(UUID receiver, Page p`
`196`	`196`	`});`
`197`	`197`	`}`
`198`	`198`
	`199`	`+`
`199`	`200`	`private void cacheAll() {`
`200`	`201`	`this.parcelRepository.fetchAll()`
`201`	`202`	`.thenAccept(optional -> optional.ifPresent(parcels -> parcels.forEach(this::cache)));`