GH-137 Refactor project

* begin refactor

* extract interfaces

* Update SentParcelsGui.java

* Rename UserService back to UserManager

* add new lines

* Change config library from CDN to Okaeri configs, remove Sentry

* Remove debug mode

* Finish general refactor

* update gradle config

* continue refactoring

* ItemBuilder -> PaperItemBuilder

* ItemBuilder -> PaperItemBuilder

* Refactor

* Refactor GUI buttons

* Continue refactor

* Refactor GUI dependencies

* continue refactoring services, isolate repositories

* more refactoring...

* change persister type class

* Simplify ReceiverGui

* fix gui issues

* Beautify GUI classes

* Beautify configs, delete unnecessary tests

* find -> fetch, fix improper item type set in config

* fix gui stuff and immutable list supplying

* shifting items fix attempt

* shifting works but only in a certain order. atomic counter still does not work

* Fix shifting and refreshing

* Simplify PlaceholderUtil and CollectionGui through CompletableFutures

* Use CompletableFutures from spotify where applicable, clarify some comments

* Simplify .gitignore and .gitattributes

* change annotations, use expiring cache

* remove unused InventoryUtil#shiftItems method

* delete unnecessary comment

* better empty PageResult handling

* Update src/main/java/com/eternalcode/parcellockers/parcel/util/PlaceholderUtil.java

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/main/java/com/eternalcode/parcellockers/user/repository/UserRepositoryOrmLite.java

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Fix potential CME

* fix build

* fix build

* move cache initialization to constructor

* Add Validation classes and architecture (suggestion from @noyzys)

* Implement validation

* Use CompletableFuture in Service/Manager-like classes

* Cache object after the cache is initialized

* ParcelStatus.PENDING -> IN_PROGRESS

* Add static import for AdventureUtil.resetItalic

* Delete unused transformers, change command route

* Add ItemStorage gui preview

* Add validation for users, more nullchecks in SendingGui and SendingGuiState, add comment to LoadUserController, improve CollectionGui empty result handling

* adjust to AI requested changes

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: Jakubk15

.gitattributes

@@ -1,7 +1,7 @@
 * text=auto
+
 *.sh text eol=lf
 gradlew text eol=lf
 *.bat text eol=crlf
-*.java text eol=lf
 
 *.jar binary

.github/workflows/gradle.yml

@@ -8,15 +8,13 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v5
       - name: Set up JDK 17
         uses: actions/setup-java@v5
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: gradle
       - uses: actions/cache@v4
@@ -30,9 +28,9 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
-        run: ./gradlew clean shadowJar
+        run: ./gradlew shadowJar
       - name: Upload a Build Artifact
         uses: actions/upload-artifact@v4.6.2
         with:
-          name: 'ParcelLockers (MC 1.8.8 - 1.20.x)'
+          name: 'ParcelLockers'
           path: build/libs/ParcelLockers*

.gitignore

@@ -1,41 +1,14 @@
-.idea/
 *.iml
 *.ipr
 *.iws
+.idea/
+.gradle/
+.kotlin/
+run/
 out/
-*.class
-*.log
-*.ctxt
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-hs_err_pid*
-*~
-.fuse_hidden*
-.directory
-.Trash-*
-.nfs*
-.DS_Store
-.AppleDouble
-.LSOverride
-Icon
-._*
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-*.stackdump
-.gradle
 build/
-gradle-app.setting
-.gradletasknamecache
-**/build/
-run/
-!gradle-wrapper.jar
+
+.DS_Store
+[Dd]esktop.ini
+
+!gradle/wrapper/gradle-wrapper.jar

build.gradle.kts

@@ -1,85 +1,77 @@
 plugins {
     `java-library`
-    id("net.minecrell.plugin-yml.bukkit") version "0.6.0"
+    id("de.eldoria.plugin-yml.paper") version "0.7.1"
     id("xyz.jpenilla.run-paper") version "3.0.0"
     id("com.gradleup.shadow") version "9.1.0"
 }
 
 group = "com.eternalcode"
 version = "0.0.2-SNAPSHOT"
-description = "Plugin that provides functionality of parcel lockers in Minecraft, allowing players to send and receive parcels safely."
 
 repositories {
     gradlePluginPortal()
-    mavenCentral()
+    maven { url = uri("https://maven-central.storage-download.googleapis.com/maven2/")}
 
-    maven { url = uri("https://repo.panda-lang.org/releases") }
-    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://repo.triumphteam.dev/snapshots/")}
     maven { url = uri("https://repo.papermc.io/repository/maven-public/") }
     maven { url = uri("https://repo.eternalcode.pl/releases") }
+    maven { url  = uri("https://storehouse.okaeri.eu/repository/maven-public/") }
 }
 
 dependencies {
     // minecraft development api
-    compileOnly("org.spigotmc:spigot-api:1.21.5-R0.1-SNAPSHOT")
-    implementation("net.kyori:adventure-platform-bukkit:4.4.1")
-    implementation("net.kyori:adventure-text-minimessage:4.24.0")
-    implementation("dev.rollczi:litecommands-bukkit:3.10.5")
-    implementation("dev.rollczi:litecommands-adventure:3.10.5")
+    compileOnly("io.papermc.paper:paper-api:1.21.8-R0.1-SNAPSHOT")
+    paperLibrary("dev.rollczi:litecommands-bukkit:3.10.5")
+    paperLibrary("dev.rollczi:litecommands-adventure:3.10.5")
 
     // skull api
-    implementation("dev.rollczi:liteskullapi:2.0.0")
+    paperLibrary("dev.rollczi:liteskullapi:2.0.0")
 
     // gui
-    implementation("dev.triumphteam:triumph-gui:3.1.12")
-    implementation("de.rapha149.signgui:signgui:2.5.4")
+    paperLibrary("dev.triumphteam:triumph-gui-paper:3.1.13-SNAPSHOT")
+    paperLibrary("de.rapha149.signgui:signgui:2.5.4")
 
-    // CDN
-    implementation("net.dzikoysk:cdn:1.14.9")
-
-    // expressible
-    implementation("org.panda-lang:expressible:1.3.6")
+    // configs
+    paperLibrary("eu.okaeri:okaeri-configs-serdes-commons:5.0.9")
+    paperLibrary("eu.okaeri:okaeri-configs-serdes-bukkit:5.0.9")
+    paperLibrary("eu.okaeri:okaeri-configs-yaml-bukkit:5.0.9")
 
     // gitcheck
-    implementation("com.eternalcode:gitcheck:1.0.0")
+    paperLibrary("com.eternalcode:gitcheck:1.0.0")
 
     // metrics and sentry
     implementation("org.bstats:bstats-bukkit:3.1.0")
-    implementation("io.sentry:sentry:8.21.1")
 
     // database
-    implementation("com.zaxxer:HikariCP:7.0.2")
-    implementation("com.j256.ormlite:ormlite-jdbc:6.1")
-    implementation("com.h2database:h2:2.3.232")
-    implementation("org.postgresql:postgresql:42.7.7")
+    paperLibrary("com.zaxxer:HikariCP:7.0.2")
+    paperLibrary("com.j256.ormlite:ormlite-jdbc:6.1")
+    paperLibrary("com.h2database:h2:2.3.232")
+    paperLibrary("org.postgresql:postgresql:42.7.7")
 
     // lombok
     compileOnly("org.projectlombok:lombok:1.18.40")
     annotationProcessor("org.projectlombok:lombok:1.18.40")
 
     // jetbrains annotations
-    api("org.jetbrains:annotations:26.0.2-1")
-
-    // paperlib
-    implementation("io.papermc:paperlib:1.0.8")
-
-    // panda-utilities
-    implementation("org.panda-lang:panda-utilities:0.5.2-alpha")
+    compileOnly("org.jetbrains:annotations:26.0.2")
 
     // jackson-bukkit
-    implementation("de.eldoria.jacksonbukkit:paper:1.2.0")
+    paperLibrary("de.eldoria.jacksonbukkit:paper:1.2.0")
 
     // completable-futures
-    implementation("com.spotify:completable-futures:0.3.6")
+    paperLibrary("com.spotify:completable-futures:0.3.6")
+
+    // eternalcode commons
+    paperLibrary("com.eternalcode:eternalcode-commons-adventure:1.3.1")
+    paperLibrary("com.eternalcode:eternalcode-commons-bukkit:1.3.1")
+    paperLibrary("com.eternalcode:eternalcode-commons-shared:1.3.1")
 
-    // eternalcode-commons
-    implementation("com.eternalcode:eternalcode-commons-adventure:1.3.1")
-    implementation("com.eternalcode:eternalcode-commons-bukkit:1.3.1")
+    // multification
+    paperLibrary("com.eternalcode:multification-bukkit:1.2.2")
+    paperLibrary("com.eternalcode:multification-okaeri:1.2.2")
 
     // caffeine
-    implementation("com.github.ben-manes.caffeine:caffeine:3.2.2")
+    paperLibrary("com.github.ben-manes.caffeine:caffeine:3.2.2")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.13.4")
     testImplementation("org.junit.jupiter:junit-jupiter-params:5.13.4")
@@ -89,21 +81,23 @@ dependencies {
     testImplementation("org.testcontainers:junit-jupiter:1.21.3")
     testImplementation("org.testcontainers:mysql:1.21.3")
     testImplementation("mysql:mysql-connector-java:8.0.33")
+    testImplementation("com.eternalcode:eternalcode-commons-shared:1.3.1")
 }
 
 java {
     toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 }
 
-bukkit {
+paper {
+    name = "ParcelLockers"
     main = "com.eternalcode.parcellockers.ParcelLockers"
-    apiVersion = "1.13"
-    prefix = "ParcelLockers"
+    version = project.version.toString()
+    apiVersion = "1.21"
     author = "EternalCodeTeam"
-    name = "ParcelLockers"
-    description = project.description
     website = "https://github.com/EternalCodeTeam/ParcelLockers"
-    version = project.version.toString()
+    loader = "com.eternalcode.parcellockers.ParcelLockersLibraryLoader"
+    generateLibrariesJson = true
+    foliaSupported = false
 }
 
 tasks.withType<JavaCompile> {
@@ -115,14 +109,8 @@ tasks.withType<JavaCompile> {
 
 tasks {
     runServer {
-        minecraftVersion("1.21.5")
-    }
-
-    clean {
-        doLast {
-            project.file("run/plugins").deleteRecursively()
-            project.file("run/logs").deleteRecursively()
-        }
+        minecraftVersion("1.21.8")
+        downloadPlugins.modrinth("luckperms", "v5.5.0-bukkit")
     }
 
     test {
@@ -135,40 +123,14 @@ tasks {
         exclude(
             "org/intellij/lang/annotations/**",
             "org/jetbrains/annotations/**",
-            "META-INF/**",
-            "javax/**",
-            "javassist/**",
-            "org/h2/util/**"
+            "META-INF/**"
         )
 
         mergeServiceFiles()
-        minimize {
-            exclude(dependency("de\\.rapha149\\.signgui:signgui:.*")) // https://github.com/Rapha149/SignGUI/issues/15
-        }
 
         val relocationPrefix = "com.eternalcode.parcellockers.libs"
         listOf(
-            "panda",
-            "org.bstats",
-            "org.json",
-            "org.postgresql",
-            "net.dzikoysk",
-            "net.kyori",
-            "io.papermc",
-            "io.sentry",
-            "dev.rollczi",
-            "de.eldoria",
-            "com.eternalcode",
-            "com.fasterxml",
-            "com.j256",
-            "com.spotify",
-            "com.zaxxer",
-            "de.rapha149",
-            "dev.triumphteam",
-            "com.github.benmanes.caffeine"
+            "org.bstats"
         ).forEach { relocate(it, "$relocationPrefix.$it") }
     }
 }
-
-
-

deletePluginConfigs.bat

@@ -0,0 +1,2 @@
+del run\plugins\ParcelLockers\config.yml
+del run\plugins\ParcelLockers\messages.yml

gradle.properties

@@ -1,7 +1,4 @@
-org.gradle.daemon=true
-org.gradle.jvmargs=-Xmx4096M -XX:MaxMetaspaceSize=2048m
 org.gradle.parallel=true
-org.gradle.workers.max=8
 org.gradle.caching=true
-#org.gradle.configuration-cache=true
-org.gradle.vfs.watch=true
+org.gradle.configuration-cache=true
+org.gradle.configuration-cache.parallel=true