feat: integrate inventory framework and add test inventory functionality

- Added `InventoryLoader` for managing inventory framework lifecycle.
- Implemented `ViewFrameAccessor` to interact with the inventory framework.
- Introduced `TestInventoryView` and `InventoryTest` for testing inventory UI.
- Updated dependencies to include the new inventory framework version.
- Registered inventory views and lifecycle handling in `BukkitInstance`.
- Bumped version to 1.21.10-2.40.0.

Author: twisti-dev

gradle.properties

@@ -7,6 +7,6 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 javaVersion=21
 mcVersion=1.21.10
 group=dev.slne.surf
-version=1.21.10-2.39.2
+version=1.21.10-2.40.0
 relocationPrefix=dev.slne.surf.surfapi.libs
 snapshot=false

gradle/libs.versions.toml

@@ -51,7 +51,8 @@ reflection-remapper = "0.1.3"
 brigadier = "1.0.18"
 configurate = "4.2.0"
 more-persistent-data-types = "2.4.0"
-inventoryframework = "0.11.3"
+stefvanschie-if = "0.11.3"
+inventory-framework = "3.5.4"
 flogger = "0.9"
 aide-reflection = "1.3"
 auto-service = "1.1.1"
@@ -139,7 +140,9 @@ configurate-yaml = { module = "org.spongepowered:configurate-yaml", version.ref
 configurate-jackson = { module = "org.spongepowered:configurate-jackson", version.ref = "configurate" }
 configurate-kotlin = { module = "org.spongepowered:configurate-extra-kotlin", version.ref = "configurate" }
 more-persistent-data-types = { module = "com.jeff_media:MorePersistentDataTypes", version.ref = "more-persistent-data-types" }
-inventoryframework = { module = "com.github.stefvanschie.inventoryframework:IF", version.ref = "inventoryframework" }
+stefvanschie-if = { module = "com.github.stefvanschie.inventoryframework:IF", version.ref = "stefvanschie-if" }
+inventory-framework-platform-paper = { module = "me.devnatan:inventory-framework-platform-paper", version.ref = "inventory-framework" }
+inventory-framework-platform-bukkit = { module = "me.devnatan:inventory-framework-platform-bukkit", version.ref = "inventory-framework" }
 flogger = { module = "com.google.flogger:flogger", version.ref = "flogger" }
 flogger-slf4j-backend = { module = "com.google.flogger:flogger-slf4j-backend", version.ref = "flogger" }
 aide-reflection = { module = "tech.hiddenproject:aide-reflection", version.ref = "aide-reflection" }
@@ -174,4 +177,5 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp-version" }
 
 [bundles]
-ktor-client = ["ktor-client-core", "ktor-client-okhttp", "ktor-client-content-negotiation", "ktor-serialization-kotlinx-json"]
+ktor-client = ["ktor-client-core", "ktor-client-okhttp", "ktor-client-content-negotiation", "ktor-serialization-kotlinx-json"]
+inventory-framework = ["inventory-framework-platform-paper", "inventory-framework-platform-bukkit"]

surf-api-bukkit/surf-api-bukkit-api/api/surf-api-bukkit-api.api

@@ -11,7 +11,8 @@ dependencies {
     compileOnlyApi(libs.commandapi.paper)
     compileOnlyApi(libs.reflection.remapper)
     compileOnlyApi(libs.more.persistent.data.types)
-    compileOnlyApi(libs.inventoryframework)
+    compileOnlyApi(libs.stefvanschie.`if`)
+    api(libs.bundles.inventory.framework)
 
     api(libs.commandapi.bukkit.kotlin)
     compileOnlyApi(libs.mccoroutine.folia.api)

surf-api-bukkit/surf-api-bukkit-api/build.gradle.kts

@@ -6,6 +6,7 @@ import net.kyori.adventure.text.Component
 import net.kyori.adventure.text.format.TextDecoration
 import org.bukkit.Material
 import org.bukkit.inventory.ItemStack
+import org.bukkit.inventory.ItemType
 import org.bukkit.inventory.meta.ItemMeta
 
 @Target(AnnotationTarget.TYPE, AnnotationTarget.CLASS)
@@ -17,7 +18,17 @@ inline fun buildItem(
     amount: Int = 1,
     init: (@ItemDsl ItemStack).() -> Unit,
 ): ItemStack {
-    val item = ItemStack(material, amount)
+    val item = ItemStack.of(material, amount)
+    item.init()
+    return item
+}
+
+inline fun buildItem(
+    type: ItemType,
+    amount: Int = 1,
+    init: (@ItemDsl ItemStack).() -> Unit,
+): ItemStack {
+    val item = type.createItemStack(amount)
     item.init()
     return item
 }

surf-api-bukkit/surf-api-bukkit-api/src/main/kotlin/dev/slne/surf/surfapi/bukkit/api/builder/item-stack.kt

@@ -0,0 +1,17 @@
+package dev.slne.surf.surfapi.bukkit.api.inventory.framework
+
+import dev.slne.surf.surfapi.core.api.util.requiredService
+import me.devnatan.inventoryframework.ViewFrame
+import org.jetbrains.annotations.ApiStatus
+
+@ApiStatus.NonExtendable
+interface ViewFrameAccessor {
+    fun viewFrame(): ViewFrame
+
+    companion object {
+        val instance = requiredService<ViewFrameAccessor>()
+    }
+}
+
+val viewFrame: ViewFrame
+    get() = ViewFrameAccessor.instance.viewFrame()

surf-api-bukkit/surf-api-bukkit-api/src/main/kotlin/dev/slne/surf/surfapi/bukkit/api/inventory/framework/ViewFrameAccessor.kt

@@ -0,0 +1,39 @@
+@file:JvmName("InventoryFrameworkExtensions")
+
+package dev.slne.surf.surfapi.bukkit.api.inventory.framework
+
+import dev.slne.surf.surfapi.core.api.messages.builder.SurfComponentBuilder
+import me.devnatan.inventoryframework.View
+import me.devnatan.inventoryframework.ViewConfigBuilder
+import me.devnatan.inventoryframework.context.OpenContext
+import org.bukkit.entity.Player
+
+fun View.register() {
+    viewFrame.with(this)
+}
+
+fun View.unregister() {
+    viewFrame.remove(this)
+}
+
+fun View.open(player: Player) {
+    viewFrame.open(javaClass, player)
+}
+
+fun View.open(player: Player, data: Any) {
+    viewFrame.open(javaClass, player, data)
+}
+
+fun View.open(players: Collection<Player>) {
+    viewFrame.open(javaClass, players)
+}
+
+fun View.open(players: Collection<Player>, data: Any) {
+    viewFrame.open(javaClass, players, data)
+}
+
+inline fun ViewConfigBuilder.titleBuilder(title: SurfComponentBuilder.() -> Unit): ViewConfigBuilder =
+    this.title(SurfComponentBuilder(title))
+
+inline fun OpenContext.modifyConfig(modifier: ViewConfigBuilder.() -> Unit) =
+    this.modifyConfig().apply(modifier)

surf-api-bukkit/surf-api-bukkit-api/src/main/kotlin/dev/slne/surf/surfapi/bukkit/api/inventory/framework/extensions.kt

@@ -53,7 +53,8 @@ tasks {
 
         downloadPlugins {
             hangar("CommandAPI", libs.versions.commandapi.get())
-            modrinth("packetevents", "2.9.1+spigot")
+//            modrinth("packetevents", libs.versions.packetevents.plugin.get() + "spigot")
+            url("https://ci.codemc.io/job/retrooper/job/packetevents/770/artifact/build/libs/packetevents-spigot-2.10.0-SNAPSHOT.jar")
         }
     }
 }

surf-api-bukkit/surf-api-bukkit-plugin-test/build.gradle.kts

@@ -1,8 +1,10 @@
 package dev.slne.surf.surfapi.bukkit.test;
 
 import dev.jorel.commandapi.CommandAPI;
+import dev.slne.surf.surfapi.bukkit.api.inventory.framework.InventoryFrameworkExtensions;
 import dev.slne.surf.surfapi.bukkit.api.packet.listener.SurfBukkitPacketListenerApi;
 import dev.slne.surf.surfapi.bukkit.test.command.SurfApiTestCommand;
+import dev.slne.surf.surfapi.bukkit.test.command.subcommands.inventory.TestInventoryView;
 import dev.slne.surf.surfapi.bukkit.test.command.subcommands.reflection.Reflection;
 import dev.slne.surf.surfapi.bukkit.test.listener.ChatListener;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -18,7 +20,7 @@ public class BukkitPluginMain extends JavaPlugin {
   @Override
   public void onLoad() {
     SurfBukkitPacketListenerApi.Companion.getInstance().registerListeners(new ChatListener());
-
+    InventoryFrameworkExtensions.register(TestInventoryView.INSTANCE);
 //    TestConfig config = SurfCore#Api.getCore()
 //        .createModernYamlConfig(TestConfig.class, getDataFolder().toPath(), "test.yml");
 //    TestConfig2 config2 = SurfCoreApi.getCore()

surf-api-bukkit/surf-api-bukkit-plugin-test/src/main/java/dev/slne/surf/surfapi/bukkit/test/BukkitPluginMain.java

@@ -3,6 +3,7 @@
 import dev.jorel.commandapi.CommandAPICommand;
 import dev.slne.surf.surfapi.bukkit.test.command.subcommands.CommandExceptionTest;
 import dev.slne.surf.surfapi.bukkit.test.command.subcommands.GlowingTest;
+import dev.slne.surf.surfapi.bukkit.test.command.subcommands.InventoryTest;
 import dev.slne.surf.surfapi.bukkit.test.command.subcommands.MaxStacksizeTest;
 import dev.slne.surf.surfapi.bukkit.test.command.subcommands.PacketEntityTest;
 import dev.slne.surf.surfapi.bukkit.test.command.subcommands.PacketLoreTest;
@@ -33,7 +34,8 @@ public SurfApiTestCommand() {
         new MaxStacksizeTest("maxstacksize"),
         new VisualizerTest("visualizer"),
         new GlowingTest("glowing"),
-        new PaginationTest("pagination")
+        new PaginationTest("pagination"),
+        new InventoryTest("inventory")
     );
   }
 }