fix: minestom compilation issues

Author: devnatan

inventory-framework-core/src/main/java/me/devnatan/inventoryframework/component/DefaultComponentBuilder.java

@@ -5,6 +5,7 @@
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
 import java.util.function.BooleanSupplier;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -18,6 +19,9 @@
 public abstract class DefaultComponentBuilder<S extends ComponentBuilder<S, C>, C extends IFContext>
         implements ComponentBuilder<S, C> {
 
+	protected static final Function<IFContext, String> RANDOM_KEY_FACTORY =
+		__ -> UUID.randomUUID().toString();
+
     protected Function<? extends IFContext, String> keyFactory;
     protected Ref<Component> reference;
     protected Map<String, Object> data;

inventory-framework-platform-bukkit/src/main/java/me/devnatan/inventoryframework/component/BukkitItemComponentBuilder.java

@@ -22,9 +22,6 @@
 public final class BukkitItemComponentBuilder extends DefaultComponentBuilder<BukkitItemComponentBuilder, Context>
         implements ItemComponentBuilder<BukkitItemComponentBuilder, Context>, ComponentFactory {
 
-    private static final Function<IFContext, String> RANDOM_KEY_FACTORY =
-            __ -> UUID.randomUUID().toString();
-
     private final VirtualView root;
     private int slot;
     private ItemStack item;

inventory-framework-platform-minestom/src/main/kotlin/me/devnatan/inventoryframework/component/MinestomItemComponentBuilder.kt

@@ -4,6 +4,7 @@ import me.devnatan.inventoryframework.Ref
 import me.devnatan.inventoryframework.ViewContainer
 import me.devnatan.inventoryframework.VirtualView
 import me.devnatan.inventoryframework.context.Context
+import me.devnatan.inventoryframework.context.IFContext
 import me.devnatan.inventoryframework.context.IFRenderContext
 import me.devnatan.inventoryframework.context.IFSlotClickContext
 import me.devnatan.inventoryframework.context.IFSlotContext
@@ -16,13 +17,14 @@ import me.devnatan.inventoryframework.utils.SlotConverter
 import net.minestom.server.item.ItemStack
 import java.util.UUID
 import java.util.function.Consumer
+import java.util.function.Function
 import java.util.function.Predicate
 import java.util.function.Supplier
 
 class MinestomItemComponentBuilder
     private constructor(
         private val root: VirtualView,
-        key: String?,
+        keyFactory: Function<out IFContext, String>?,
         slot: Int,
         item: ItemStack?,
         renderHandler: Consumer<in IFSlotRenderContext>?,
@@ -37,7 +39,7 @@ class MinestomItemComponentBuilder
         isManagedExternally: Boolean,
         displayCondition: Predicate<Context>?,
     ) : DefaultComponentBuilder<MinestomItemComponentBuilder, Context>(
-            key,
+            keyFactory,
             reference,
             data,
             cancelOnClick,
@@ -59,7 +61,7 @@ class MinestomItemComponentBuilder
             root: VirtualView,
         ) : this(
             root = root,
-            key = null,
+            keyFactory = null,
             slot = -1,
             item = null,
             renderHandler = null,
@@ -207,29 +209,33 @@ class MinestomItemComponentBuilder
             return this
         }
 
-        override fun create(): Component =
-            ItemComponent(
-                key ?: UUID.randomUUID().toString(),
-                root,
-                slot,
-                item,
-                cancelOnClick,
-                closeOnClick,
-                displayCondition,
-                renderHandler,
-                updateHandler,
-                clickHandler,
-                watchingStates,
-                isManagedExternally,
-                updateOnClick,
-                false,
-                reference,
+        override fun create(): Component {
+            val componentKeyProvider =
+                if (keyFactory == null) RANDOM_KEY_FACTORY else keyFactory
+
+            return ItemComponent(
+                /* keyFactory = */ componentKeyProvider,
+                /* root = */ root,
+                /* position = */ slot,
+                /* stack = */ item,
+                /* cancelOnClick = */ cancelOnClick,
+                /* closeOnClick = */ closeOnClick,
+                /* displayCondition = */ displayCondition,
+                /* renderHandler = */ renderHandler,
+                /* updateHandler = */ updateHandler,
+                /* clickHandler = */ clickHandler,
+                /* watching = */ watchingStates,
+                /* isManagedExternally = */ isManagedExternally,
+                /* updateOnClick = */ updateOnClick,
+                /* isVisible = */ false,
+                /* reference = */ reference,
             )
+        }
 
         override fun copy(): MinestomItemComponentBuilder =
             MinestomItemComponentBuilder(
                 root = root,
-                key = key,
+                keyFactory = keyFactory,
                 slot = slot,
                 item = item,
                 renderHandler = renderHandler,

inventory-framework-platform-minestom/src/main/kotlin/me/devnatan/inventoryframework/context/SlotRenderContext.kt

@@ -3,16 +3,19 @@ package me.devnatan.inventoryframework.context
 import me.devnatan.inventoryframework.MinestomViewer
 import me.devnatan.inventoryframework.RootView
 import me.devnatan.inventoryframework.Viewer
+import me.devnatan.inventoryframework.component.Component
 import net.minestom.server.entity.Player
 import net.minestom.server.item.ItemStack
 import org.jetbrains.annotations.ApiStatus
+import org.jetbrains.annotations.UnknownNullability
 
 class SlotRenderContext
     @ApiStatus.Internal
     constructor(
         slot: Int,
         parent: IFRenderContext,
         private val viewer: Viewer?,
+        private val _component: Component,
     ) : SlotContext(slot, parent),
         IFSlotRenderContext {
         override val player: Player = (viewer as MinestomViewer).player
@@ -48,6 +51,8 @@ class SlotRenderContext
 
         override fun isOnEntityContainer(): Boolean = container.isEntityContainer
 
+        override fun getComponent(): @UnknownNullability Component = _component
+
         override fun getViewer(): Viewer? = viewer
 
         override fun closeForPlayer() {

inventory-framework-platform-minestom/src/main/kotlin/me/devnatan/inventoryframework/internal/MinestomElementFactory.kt

@@ -164,7 +164,8 @@ class MinestomElementFactory : ElementFactory() {
         slot: Int,
         parent: IFRenderContext,
         viewer: Viewer?,
-    ): IFSlotRenderContext = SlotRenderContext(slot, parent, viewer)
+        component: Component,
+    ): IFSlotRenderContext = SlotRenderContext(slot, parent, viewer, component)
 
     override fun createCloseContext(
         viewer: Viewer,

inventory-framework-test/src/main/java/me/devnatan/inventoryframework/internal/MockElementFactory.java

@@ -92,7 +92,7 @@ public IFSlotRenderContext createSlotRenderContext(
         when(mock.getParent()).thenReturn(parent);
         when(mock.getViewer()).thenReturn(viewer);
         when(mock.getContainer()).then(ignored -> parent.getContainer());
-        when(mock.getComponent()).then(component);
+        when(mock.getComponent()).thenReturn(component);
         return mock;
     }