Merge branch 'master' into renovate/all

Author: Jakubk15

build.gradle.kts

@@ -17,15 +17,13 @@ repositories {
     maven { url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") }
     maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots") }
     maven { url = uri("https://oss.sonatype.org/content/repositories/central") }
-    maven { url = uri("https://papermc.io/repo/repository/maven-public/") }
+    maven { url = uri("https://repo.papermc.io/repository/maven-public/") }
     maven { url = uri("https://repo.eternalcode.pl/releases") }
-    maven { url = uri("https://repository.minecodes.pl/releases") }
-    maven { url = uri("https://jitpack.io") }
 }
 
 dependencies {
     // minecraft development api
-    compileOnly("org.spigotmc:spigot-api:1.21.4-R0.1-SNAPSHOT")
+    compileOnly("org.spigotmc:spigot-api:1.21.7-R0.1-SNAPSHOT")
     implementation("net.kyori:adventure-platform-bukkit:4.4.0")
     implementation("net.kyori:adventure-text-minimessage:4.23.0")
     implementation("dev.rollczi:litecommands-bukkit:3.10.2")
@@ -38,9 +36,6 @@ dependencies {
     implementation("dev.triumphteam:triumph-gui:3.1.12")
     implementation("de.rapha149.signgui:signgui:2.5.3")
 
-    // economy
-    compileOnly("com.github.MilkBowl:VaultAPI:1.7.1")
-
     // CDN
     implementation("net.dzikoysk:cdn:1.14.9")
 
@@ -86,6 +81,7 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.13.3")
     testImplementation("org.junit.jupiter:junit-jupiter-params:5.13.3")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.13.3")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 
     testImplementation("org.testcontainers:junit-jupiter:1.21.3")
     testImplementation("org.testcontainers:mysql:1.21.3")
@@ -119,17 +115,10 @@ tasks {
         minecraftVersion("1.21.4")
     }
 
-    cleanPaperPluginsCache {
+    clean {
         doLast {
             project.file("run/plugins").deleteRecursively()
-        }
-    }
-
-    cleanPaperCache {
-        doLast {
-            project.file("run/cache").deleteRecursively()
             project.file("run/logs").deleteRecursively()
-            project.file("run/versions").deleteRecursively()
         }
     }
 
@@ -138,7 +127,7 @@ tasks {
     }
 
     shadowJar {
-        archiveFileName.set("ParcelLockers v${project.version} (MC 1.21.3-1.21.4).jar")
+        archiveFileName.set("ParcelLockers v${project.version}.jar")
 
         exclude(
             "org/intellij/lang/annotations/**",

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

@@ -12,6 +12,7 @@
 import com.eternalcode.parcellockers.content.repository.ParcelContentRepository;
 import com.eternalcode.parcellockers.content.repository.ParcelContentRepositoryOrmLite;
 import com.eternalcode.parcellockers.database.DatabaseManager;
+import com.eternalcode.parcellockers.delivery.repository.DeliveryRepositoryOrmLite;
 import com.eternalcode.parcellockers.gui.implementation.locker.LockerMainGui;
 import com.eternalcode.parcellockers.gui.implementation.remote.MainGui;
 import com.eternalcode.parcellockers.gui.implementation.remote.ParcelListGui;
@@ -27,10 +28,12 @@
 import com.eternalcode.parcellockers.notification.NotificationAnnouncer;
 import com.eternalcode.parcellockers.parcel.Parcel;
 import com.eternalcode.parcellockers.parcel.ParcelManager;
+import com.eternalcode.parcellockers.parcel.ParcelStatus;
 import com.eternalcode.parcellockers.parcel.command.ParcelCommand;
 import com.eternalcode.parcellockers.parcel.command.argument.ParcelArgument;
 import com.eternalcode.parcellockers.parcel.repository.ParcelCache;
 import com.eternalcode.parcellockers.parcel.repository.ParcelRepositoryOrmLite;
+import com.eternalcode.parcellockers.parcel.task.ParcelSendTask;
 import com.eternalcode.parcellockers.updater.UpdaterService;
 import com.eternalcode.parcellockers.user.UserManager;
 import com.eternalcode.parcellockers.user.controller.LoadUserController;
@@ -52,21 +55,21 @@
 import io.sentry.Sentry;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.milkbowl.vault.economy.Economy;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.slf4j.helpers.NOPLogger;
 
 import java.sql.SQLException;
 import java.time.Duration;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
-import org.slf4j.helpers.NOPLogger;
 
 public final class ParcelLockers extends JavaPlugin {
 
@@ -75,7 +78,7 @@ public final class ParcelLockers extends JavaPlugin {
     private LiteCommands<CommandSender> liteCommands;
     private BukkitAudiences audiences;
     private SkullAPI skullAPI;
-    private Economy economy;
+
     private DatabaseManager databaseManager;
 
     @Override
@@ -141,15 +144,16 @@ public void onEnable() {
         ParcelRepositoryOrmLite parcelRepository = new ParcelRepositoryOrmLite(databaseManager, scheduler, parcelCache);
         parcelRepository.updateCaches();
 
+        DeliveryRepositoryOrmLite deliveryRepository = new DeliveryRepositoryOrmLite(databaseManager, scheduler);
+
         ParcelContentRepository parcelContentRepository = new ParcelContentRepositoryOrmLite(databaseManager, scheduler);
-        ParcelManager parcelManager = new ParcelManager(config, announcer, parcelRepository, parcelContentRepository, scheduler);
+        ParcelManager parcelManager = new ParcelManager(config, announcer, parcelRepository, deliveryRepository, parcelContentRepository, scheduler);
 
         ItemStorageRepository itemStorageRepository = new ItemStorageRepositoryOrmLite(databaseManager, scheduler);
 
         UserRepository userRepository = new UserRepositoryOrmLite(databaseManager, scheduler);
         UserManager userManager = new UserManager(userRepository);
 
-
         MainGui mainGUI = new MainGui(this, server, miniMessage, config, parcelRepository, lockerRepository, userManager);
         ParcelListGui parcelListGUI = new ParcelListGui(this, server, miniMessage, config, parcelRepository, lockerRepository, userManager, mainGUI);
 
@@ -168,12 +172,6 @@ public void onEnable() {
             .missingPermission(new PermissionMessage(announcer, config))
             .build();
 
-        /*if (!this.setupEconomy()) {
-            this.getLogger().severe("Disabling due to no Vault dependency or its implementator(s) found!");
-            server.getPluginManager().disablePlugin(this);
-            return;
-        }*/
-
         LockerMainGui lockerMainGUI = new LockerMainGui(this, miniMessage, config, itemStorageRepository, parcelRepository, lockerRepository, announcer, parcelContentRepository, userRepository, this.skullAPI, parcelManager);
 
         Stream.of(
@@ -187,6 +185,24 @@ public void onEnable() {
         new Metrics(this, 17677);
         new UpdaterService(this.getDescription());
 
+        parcelRepository.findAll().thenAccept(optionalParcels -> {
+            List<Parcel> parcels = optionalParcels.orElseGet(ArrayList::new).stream()
+                .filter(parcel -> parcel.status() != ParcelStatus.DELIVERED)
+                .toList();
+
+            parcels.forEach(parcel ->
+                deliveryRepository.find(parcel.uuid()).thenAccept(optionalDelivery ->
+                    optionalDelivery.ifPresent(delivery -> {
+                        long delay = Math.max(0, delivery.deliveryTimestamp().toEpochMilli() - System.currentTimeMillis());
+                        scheduler.runLaterAsync(
+                            new ParcelSendTask(parcel, delivery, parcelRepository, deliveryRepository, config),
+                            Duration.ofMillis(delay)
+                        );
+                    })
+                )
+            );
+        });
+
         long millis = started.elapsed(TimeUnit.MILLISECONDS);
         this.getLogger().log(Level.INFO, "Successfully enabled ParcelLockers in {0}ms", millis);
     }
@@ -227,24 +243,6 @@ private void softwareCheck() {
         logger.info("Your server is running on supported software, congratulations!");
         logger.info("Server version: " + this.getServer().getVersion());
     }
-
-    private boolean setupEconomy() {
-        if (this.getServer().getPluginManager().getPlugin("Vault") == null) {
-            return false;
-        }
-
-        RegisteredServiceProvider<Economy> rsp = this.getServer().getServicesManager().getRegistration(Economy.class);
-        if (rsp == null) {
-            return false; // Vault is installed but no economy plugin is registered (e.g. EssentialsX) - majk
-        }
-
-        this.economy = rsp.getProvider();
-        return true;
-    }
-
-    public Economy getEconomy() {
-        return this.economy;
-    }
 }
 
 

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

@@ -3,7 +3,6 @@
 import com.eternalcode.parcellockers.configuration.ConfigurationManager;
 import com.eternalcode.parcellockers.configuration.implementation.PluginConfiguration;
 import com.eternalcode.parcellockers.notification.NotificationAnnouncer;
-import dev.rollczi.litecommands.annotations.async.Async;
 import dev.rollczi.litecommands.annotations.command.Command;
 import dev.rollczi.litecommands.annotations.context.Context;
 import dev.rollczi.litecommands.annotations.execute.Execute;
@@ -26,8 +25,7 @@ public ParcelLockersCommand(ConfigurationManager configManager, PluginConfigurat
         this.announcer = announcer;
     }
 
-    @Async
-    @Execute(name = "reload", aliases = { "rl" })
+    @Execute(name = "reload")
     void reload(@Context CommandSender sender) {
         this.configManager.reload();
         this.announcer.sendMessage(sender, this.config.messages.reload);

src/main/java/com/eternalcode/parcellockers/command/debug/DebugCommand.java

@@ -11,6 +11,7 @@
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
@@ -37,44 +38,44 @@ public DebugCommand(ParcelRepository parcelRepository, LockerRepository lockerRe
         this.announcer = announcer;
     }
 
-    @Execute(name = "deleteparcels")
-    void deleteParcels(@Context Player player) {
+    @Execute(name = "delete parcels")
+    void deleteParcels(@Context CommandSender sender) {
         this.parcelRepository.removeAll().exceptionally(throwable -> {
-            this.announcer.sendMessage(player, "&cFailed to delete parcels");
+            this.announcer.sendMessage(sender, "&4Failed to delete parcels");
             return null;
-        }).thenRun(() -> this.announcer.sendMessage(player, "&aParcels deleted"));
+        }).thenRun(() -> this.announcer.sendMessage(sender, "&cParcels deleted"));
     }
 
-    @Execute(name = "deletelockers")
-    void deleteLockers(@Context Player player) {
+    @Execute(name = "delete lockers")
+    void deleteLockers(@Context CommandSender sender) {
         this.lockerRepository.removeAll().exceptionally(throwable -> {
-            this.announcer.sendMessage(player, "&cFailed to delete lockers");
+            this.announcer.sendMessage(sender, "&4Failed to delete lockers");
             return null;
-        }).thenRun(() -> this.announcer.sendMessage(player, "&aLockers deleted"));
+        }).thenRun(() -> this.announcer.sendMessage(sender, "&cLockers deleted"));
     }
 
-    @Execute(name = "deleteitemstorages")
-    void deleteItemStorages(@Context Player player) {
+    @Execute(name = "delete itemstorages")
+    void deleteItemStorages(@Context CommandSender sender) {
         this.itemStorageRepository.removeAll().exceptionally(throwable -> {
-            this.announcer.sendMessage(player, "&cFailed to delete item storages");
+            this.announcer.sendMessage(sender, "&4Failed to delete item storages");
             return null;
-        }).thenRun(() -> this.announcer.sendMessage(player, "&aItem storages deleted"));
+        }).thenRun(() -> this.announcer.sendMessage(sender, "&cItem storages deleted"));
     }
 
-    @Execute(name = "deleteparcelcontents")
-    void deleteParcelContents(@Context Player player) {
+    @Execute(name = "delete parcelcontents")
+    void deleteParcelContents(@Context CommandSender sender) {
         this.contentRepository.removeAll().exceptionally(throwable -> {
-            this.announcer.sendMessage(player, "&cFailed to delete parcel contents");
+            this.announcer.sendMessage(sender, "&4Failed to delete parcel contents");
             return null;
-        }).thenRun(() -> this.announcer.sendMessage(player, "&aParcel contents deleted"));
+        }).thenRun(() -> this.announcer.sendMessage(sender, "&cParcel contents deleted"));
     }
 
-    @Execute(name = "deleteall")
-    void deleteAll(@Context Player player) {
-        this.deleteItemStorages(player);
-        this.deleteLockers(player);
-        this.deleteParcels(player);
-        this.deleteParcelContents(player);
+    @Execute(name = "delete all")
+    void deleteAll(@Context CommandSender sender) {
+        this.deleteItemStorages(sender);
+        this.deleteLockers(sender);
+        this.deleteParcels(sender);
+        this.deleteParcelContents(sender);
     }
 
     @Execute(name = "getrandomitem")

src/main/java/com/eternalcode/parcellockers/configuration/ConfigurationManager.java

@@ -1,10 +1,13 @@
 package com.eternalcode.parcellockers.configuration;
 
+import com.eternalcode.parcellockers.configuration.composer.DurationComposer;
 import com.eternalcode.parcellockers.configuration.composer.PositionComposer;
+import com.eternalcode.parcellockers.shared.Position;
 import net.dzikoysk.cdn.Cdn;
 import net.dzikoysk.cdn.CdnFactory;
 
 import java.io.File;
+import java.time.Duration;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -13,7 +16,8 @@ public class ConfigurationManager {
     private static final Cdn CDN = CdnFactory
         .createYamlLike()
         .getSettings()
-        .withComposer(PositionComposer.class, new PositionComposer())
+        .withComposer(Position.class, new PositionComposer())
+        .withComposer(Duration.class, new DurationComposer())
         .build();
 
     private final Set<ReloadableConfig> configs = new HashSet<>();