Feat/version/1.21.11 paper

.gitignore

@@ -9,6 +9,7 @@ build/
 .idea/jarRepositories.xml
 .idea/compiler.xml
 .idea/libraries/
+.idea
 *.iws
 *.iml
 *.ipr

gradle.properties

@@ -1,4 +1,4 @@
 kotlin.code.style=official
 kotlin.stdlib.default.dependency=false
 org.gradle.parallel=true
-version=1.21.11-2.0.2-SNAPSHOT
+version=1.21.11-3.0.0-SNAPSHOT

gradle/wrapper/gradle-wrapper.properties

@@ -4,4 +4,4 @@ distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-9.4.
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

settings.gradle.kts

@@ -3,5 +3,5 @@ plugins {
 }
 include("surf-friends-api")
 include("surf-friends-core")
-include("surf-friends-velocity")
-include("surf-friends-fallback")
+include("surf-friends-backend")
+include("surf-friends-paper")

surf-friends-api/build.gradle.kts

@@ -1,3 +1,7 @@
 plugins {
-    id("dev.slne.surf.surfapi.gradle.core")
+    id("dev.slne.surf.surfapi.gradle.paper-raw")
+}
+
+surfRawPaperApi {
+    withCorePaper()
 }

surf-friends-api/src/main/kotlin/dev/slne/surf/friends/api/SurfFriendsApi.kt

@@ -1,107 +1,9 @@
 package dev.slne.surf.friends.api
 
-import dev.slne.surf.friends.api.model.FriendRequest
-import dev.slne.surf.friends.api.model.Friendship
-import it.unimi.dsi.fastutil.objects.ObjectSet
-import java.util.UUID
+import dev.slne.surf.surfapi.core.api.util.requiredService
 
-interface SurfFriendsApi {
-    /**
-     * Creates a friendship between two users.
-     *
-     * @param uuid The UUID of the first user.
-     * @param friend The UUID of the friend.
-     * @return The created Friendship object.
-     */
-    suspend fun createFriendship(uuid: UUID, friend: UUID): Friendship
-
-    /**
-     * Removes a friendship between two users.
-     *
-     * @param uuid The UUID of the first user.
-     * @param friend The UUID of the friend.
-     */
-    suspend fun removeFriendship(uuid: UUID, friend: UUID)
-
-    /**
-     * Retrieves all friendships of a user.
-     *
-     * @param uuid The UUID of the user.
-     * @return A set of Friendships representing the user's friends.
-     */
-    suspend fun getFriendships(uuid: UUID): ObjectSet<Friendship>
-
-    /**
-     * Sends a friend request from one user to another.
-     *
-     * @param sender The UUID of the sender.
-     * @param receiver The UUID of the receiver.
-     * @return The created FriendRequest object.
-     */
-    suspend fun sendFriendRequest(sender: UUID, receiver: UUID): FriendRequest
-
-    /**
-     * Accepts a friend request.
-     *
-     * @param sender The UUID of the sender of the request.
-     * @param receiver The UUID of the receiver of the request.
-     */
-    suspend fun acceptFriendRequest(sender: UUID, receiver: UUID)
-
-    /**
-     * Declines a friend request.
-     *
-     * @param sender The UUID of the sender of the request.
-     * @param receiver The UUID of the receiver of the request.
-     */
-    suspend fun declineFriendRequest(sender: UUID, receiver: UUID)
+val surfFriendsApi = requiredService<SurfFriendsApi>()
 
-    /**
-     * Revokes a sent friend request.
-     *
-     * @param sender The UUID of the sender of the request.
-     * @param receiver The UUID of the receiver of the request.
-     */
-    suspend fun revokeFriendRequest(sender: UUID, receiver: UUID)
-
-    /**
-     * Retrieves all sent friend requests of a user.
-     *
-     * @param uuid The UUID of the user.
-     * @return A set of FriendRequests representing the recipients of the sent requests.
-     */
-    suspend fun getSentFriendRequests(uuid: UUID): ObjectSet<FriendRequest>
-
-    /**
-     * Retrieves all received friend requests of a user.
-     *
-     * @param uuid The UUID of the user.
-     * @return A set of FriendRequests representing the senders of the received requests.
-     */
-    suspend fun getReceivedFriendRequests(uuid: UUID): ObjectSet<FriendRequest>
-
-    /**
-     * Toggles announcements for a user.
-     *
-     * @param uuid The UUID of the user.
-     * @return The new status of announcements (true if enabled, false if disabled).
-     */
-    suspend fun toggleAnnouncements(uuid: UUID): Boolean
-
-    /**
-     * Toggles sounds for a user.
-     *
-     * @param uuid The UUID of the user.
-     * @return The new status of sounds (true if enabled, false if disabled).
-     */
-    suspend fun toggleSounds(uuid: UUID): Boolean
+interface SurfFriendsApi {
 
-    /**
-     * Checks if two users are friends and retrieves their friendship details.
-     *
-     * @param uuid The UUID of the first user.
-     * @param friend The UUID of the second user.
-     * @return The Friendship object representing the friendship between the two users, or null if they are not friends.
-     */
-    suspend fun areFriends(uuid: UUID, friend: UUID): Friendship?
 }

surf-friends-api/src/main/kotlin/dev/slne/surf/friends/api/friend/FriendRequest.kt

@@ -0,0 +1,26 @@
+package dev.slne.surf.friends.api.friend
+
+import dev.slne.surf.surfapi.core.api.serializer.java.datetime.datetime.offset.SerializableOffsetDateTime
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.Serializable
+import java.time.OffsetDateTime
+import java.util.*
+
+
+fun friendRequest(
+    senderUuid: UUID,
+    receiverUuid: UUID,
+    senderName: String,
+    receiverName: String
+) = FriendRequest(senderUuid, receiverUuid, senderName, receiverName, OffsetDateTime.now())
+
+@Serializable
+data class FriendRequest(
+    val senderUuid: @Contextual UUID,
+    val receiverUuid: @Contextual UUID,
+
+    val senderName: String,
+    val receiverName: String,
+
+    val sentAt: SerializableOffsetDateTime
+)