Added %player% to configslot

eco-api/src/main/java/com/willfp/eco/core/gui/component/GUIComponent.java

@@ -0,0 +1,35 @@
+package com.willfp.eco.core.gui.component;
+
+import com.willfp.eco.core.gui.slot.Slot;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A GUI Component is a 2-dimensional set of slots that can be
+ * placed in a menu.
+ */
+public interface GUIComponent {
+    /**
+     * Get the amount of rows in the component.
+     *
+     * @return The rows.
+     */
+    int getRows();
+
+    /**
+     * Get the amount of columns in the component.
+     *
+     * @return The columns.
+     */
+    int getColumns();
+
+    /**
+     * Get the slot at a certain position in the component.
+     *
+     * @param row    The row (1-indexed).
+     * @param column The column (1-indexed).
+     * @return The slot, or null if no slot at the location.
+     */
+    @Nullable
+    Slot getSlotAt(final int row,
+                   final int column);
+}

eco-api/src/main/java/com/willfp/eco/core/gui/menu/MenuBuilder.java

@@ -1,7 +1,9 @@
 package com.willfp.eco.core.gui.menu;
 
+import com.willfp.eco.core.gui.component.GUIComponent;
 import com.willfp.eco.core.gui.slot.FillerMask;
 import com.willfp.eco.core.gui.slot.Slot;
+import org.apache.commons.lang3.Validate;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.jetbrains.annotations.NotNull;
@@ -13,6 +15,13 @@ import java.util.function.Consumer;
  * Builder to create menus.
  */
 public interface MenuBuilder {
+    /**
+     * Get the amount of rows.
+     *
+     * @return The amount of rows.
+     */
+    int getRows();
+
     /**
      * Set the menu title.
      *
@@ -33,6 +42,32 @@ public interface MenuBuilder {
                         int column,
                         @NotNull Slot slot);
 
+    /**
+     * Add a component.
+     *
+     * @param row       The row of the top left corner.
+     * @param column    The column of the top left corner.
+     * @param component The component.
+     * @return The builder.
+     */
+    default MenuBuilder addComponent(final int row,
+                                     final int column,
+                                     @NotNull GUIComponent component) {
+        Validate.isTrue(column + component.getColumns() - 1 <= 9, "Component is too large to be placed here!");
+        Validate.isTrue(row + component.getRows() - 1 <= this.getRows(), "Component is too large to be placed here!");
+
+        for (int currentRow = row; currentRow < row + component.getRows(); currentRow++) {
+            for (int currentCol = column; currentCol < column + component.getColumns(); currentCol++) {
+                Slot slot = component.getSlotAt(currentRow, currentCol);
+                if (slot != null) {
+                    setSlot(currentRow, currentCol, slot);
+                }
+            }
+        }
+
+        return this;
+    }
+
     /**
      * Run function to modify the builder.
      *

eco-api/src/main/java/com/willfp/eco/core/gui/slot/ConfigSlot.java

@@ -0,0 +1,115 @@
+package com.willfp.eco.core.gui.slot;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.gui.slot.functional.SlotHandler;
+import com.willfp.eco.core.items.Items;
+import com.willfp.eco.util.StringUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * A slot loaded in from config.
+ */
+public class ConfigSlot extends CustomSlot {
+    /**
+     * The config of the slot.
+     */
+    private final Config config;
+
+    /**
+     * Cached handlers, for performance.
+     */
+    private final Map<String, List<CommandToDispatch>> handlers = new HashMap<>();
+
+    /**
+     * Create a new config slot.
+     *
+     * @param config The config.
+     */
+    public ConfigSlot(@NotNull final Config config) {
+        this.config = config;
+
+        init(
+                Slot.builder(Items.lookup(config.getString("item")))
+                        .onLeftClick(dispatchCommandHandler("left-click"))
+                        .onRightClick(dispatchCommandHandler("right-click"))
+                        .onShiftLeftClick(dispatchCommandHandler("shift-left-click"))
+                        .onShiftRightClick(dispatchCommandHandler("shift-right-click"))
+                        .build()
+        );
+    }
+
+    /**
+     * Create a slot handler for dispatching commands.
+     *
+     * @param configKey The config key.
+     * @return The handler.
+     */
+    private SlotHandler dispatchCommandHandler(@NotNull final String configKey) {
+        if (!handlers.containsKey(configKey)) {
+            List<CommandToDispatch> commands = new ArrayList<>();
+
+            for (String command : config.getStrings(configKey)) {
+                if (command.startsWith("console:")) {
+                    commands.add(new CommandToDispatch(
+                            StringUtils.removePrefix("console:", command),
+                            true
+                    ));
+                } else {
+                    commands.add(new CommandToDispatch(
+                            command,
+                            false
+                    ));
+                }
+            }
+
+            handlers.put(configKey, commands);
+        }
+
+        List<CommandToDispatch> toDispatch = handlers.get(configKey);
+
+        return (event, slot, menu) -> {
+            Player player = (Player) event.getWhoClicked();
+
+            for (CommandToDispatch dispatch : toDispatch) {
+                dispatch.dispatch(player);
+            }
+        };
+    }
+
+    /**
+     * Signifies a command to dispatch.
+     *
+     * @param command The command.
+     * @param console If the command should be run as console.
+     */
+    private record CommandToDispatch(
+            @NotNull String command,
+            boolean console
+    ) {
+        /**
+         * Dispatch command.
+         *
+         * @param player The player.
+         */
+        void dispatch(@NotNull final Player player) {
+            if (console()) {
+                Bukkit.dispatchCommand(
+                        Bukkit.getConsoleSender(),
+                        command().replace("%player%", player.getName())
+                );
+            } else {
+                Bukkit.dispatchCommand(
+                        player,
+                        command().replace("%player%", player.getName())
+                );
+            }
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/gui/slot/CustomSlot.java

@@ -0,0 +1,97 @@
+package com.willfp.eco.core.gui.slot;
+
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Base class for custom slot implementations.
+ */
+public abstract class CustomSlot implements Slot {
+    /**
+     * The internal slot to delegate to.
+     */
+    private Slot delegate = null;
+
+    /**
+     * Create a new custom slot.
+     */
+    protected CustomSlot() {
+
+    }
+
+    /**
+     * Initialize the slot with the delegate.
+     *
+     * @param slot The slot to delegate to.
+     */
+    protected void init(@NotNull final Slot slot) {
+        if (delegate == null) {
+            throw new IllegalStateException("Custom Slot was not initialized!");
+        }
+
+        this.delegate = slot;
+    }
+
+    /**
+     * Get the delegate slot.
+     * <p>
+     * This is not required to add the slot to a menu, but is instead used internally.
+     *
+     * @return The slot.
+     */
+    public Slot getDelegate() {
+        return this.delegate;
+    }
+
+    @Override
+    public ItemStack getItemStack(@NotNull final Player player) {
+        if (delegate == null) {
+            throw new IllegalStateException("Custom Slot was not initialized!");
+        }
+
+        return delegate.getItemStack(player);
+    }
+
+    @Override
+    public boolean isCaptive() {
+        if (delegate == null) {
+            throw new IllegalStateException("Custom Slot was not initialized!");
+        }
+
+        return delegate.isCaptive();
+    }
+
+    @Override
+    public boolean isNotCaptiveFor(@NotNull final Player player) {
+        if (delegate == null) {
+            throw new IllegalStateException("Custom Slot was not initialized!");
+        }
+
+        return delegate.isNotCaptiveFor(player);
+    }
+
+    @Override
+    public boolean isCaptiveFromEmpty() {
+        if (delegate == null) {
+            throw new IllegalStateException("Custom Slot was not initialized!");
+        }
+
+        return delegate.isCaptiveFromEmpty();
+    }
+
+    @Override
+    public final int getRows() {
+        return Slot.super.getRows();
+    }
+
+    @Override
+    public final int getColumns() {
+        return Slot.super.getColumns();
+    }
+
+    @Override
+    public final Slot getSlotAt(int row, int column) {
+        return Slot.super.getSlotAt(row, column);
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/gui/slot/Slot.java

@@ -1,7 +1,9 @@
 package com.willfp.eco.core.gui.slot;
 
 import com.willfp.eco.core.Eco;
+import com.willfp.eco.core.gui.component.GUIComponent;
 import com.willfp.eco.core.gui.slot.functional.SlotProvider;
+import com.willfp.eco.core.items.TestableItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -11,8 +13,11 @@ import java.util.function.Function;
 
 /**
  * A slot is an item in a GUI that can handle clicks.
+ * <p>
+ * Don't create custom Slot implementations directly from this class,
+ * rather extend {@link CustomSlot}.
  */
-public interface Slot {
+public interface Slot extends GUIComponent {
     /**
      * Get the ItemStack that would be shown to a player.
      *
@@ -48,6 +53,22 @@ public interface Slot {
         return false;
     }
 
+    @Override
+    default int getRows() {
+        return 1;
+    }
+
+    @Override
+    default int getColumns() {
+        return 1;
+    }
+
+    @Override
+    default Slot getSlotAt(final int row,
+                           final int column) {
+        return this;
+    }
+
     /**
      * Create a builder for an ItemStack.
      *
@@ -67,6 +88,16 @@ public interface Slot {
         return Eco.getHandler().getGUIFactory().createSlotBuilder((player, menu) -> itemStack);
     }
 
+    /**
+     * Create a builder for a TestableItem.
+     *
+     * @param item The item.
+     * @return The builder.
+     */
+    static SlotBuilder builder(@NotNull final TestableItem item) {
+        return Eco.getHandler().getGUIFactory().createSlotBuilder((player, menu) -> item.getItem());
+    }
+
     /**
      * Create a builder for a player-specific ItemStack.
      *

eco-api/src/main/kotlin/com/willfp/eco/core/gui/GUIHelpers.kt

@@ -85,6 +85,16 @@ fun slot(
     item: ItemStack
 ): Slot = Slot.builder(item).build()
 
+/** Kotlin builder for slots. */
+fun slot(
+    item: TestableItem,
+    init: SlotBuilder.() -> Unit
+): Slot {
+    val builder = Slot.builder(item)
+    init(builder)
+    return builder.build()
+}
+
 /** Kotlin builder for slots. */
 fun slot(
     item: TestableItem

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/menu/EcoMenuBuilder.kt

@@ -17,7 +17,7 @@ import org.bukkit.inventory.ItemStack
 import java.util.function.BiConsumer
 import java.util.function.Consumer
 
-class EcoMenuBuilder(private val rows: Int ) : MenuBuilder {
+class EcoMenuBuilder(private val rows: Int) : MenuBuilder {
     private var title = "Menu"
     private var maskSlots: List<MutableList<Slot?>>
     private val slots: List<MutableList<Slot?>> = ListUtils.create2DList(rows, 9)
@@ -25,6 +25,8 @@ class EcoMenuBuilder(private val rows: Int ) : MenuBuilder {
     private var onOpen = OpenHandler { _, _ -> }
     private var onRender: (Player, Menu) -> Unit = { _, _ -> }
 
+    override fun getRows() = rows
+
     override fun setTitle(title: String): MenuBuilder {
         this.title = StringUtils.format(title)
         return this

eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/Skull.kt

@@ -0,0 +1,43 @@
+package com.willfp.eco.internal.spigot.proxy.common
+
+import com.mojang.authlib.GameProfile
+import com.mojang.authlib.properties.Property
+import org.bukkit.inventory.meta.SkullMeta
+import java.lang.reflect.Field
+import java.lang.reflect.Method
+import java.util.UUID
+
+private lateinit var setProfile: Method
+private lateinit var profile: Field
+
+var SkullMeta.texture: String?
+    get() {
+        if (!::profile.isInitialized) {
+            // Assumes instance of CraftMetaSkull; package-private class so can't do manual type check
+            profile = this.javaClass.getDeclaredField("profile")
+            profile.isAccessible = true
+        }
+        val profile = profile[this] as GameProfile? ?: return null
+        val properties = profile.properties ?: return null
+        val prop = properties["textures"] ?: return null
+        return prop.toMutableList().firstOrNull()?.value
+    }
+    set(base64) {
+        if (!::setProfile.isInitialized) {
+            // Same here; that's why I can't delegate to a lazy initializer
+            setProfile = this.javaClass.getDeclaredMethod("setProfile", GameProfile::class.java)
+            setProfile.isAccessible = true
+        }
+
+        if (base64 == null) {
+            setProfile.invoke(this, null)
+        } else {
+            val uuid = UUID(
+                base64.substring(base64.length - 20).hashCode().toLong(),
+                base64.substring(base64.length - 10).hashCode().toLong()
+            )
+            val profile = GameProfile(uuid, "eco")
+            profile.properties.put("textures", Property("textures", base64))
+            setProfile.invoke(this, profile)
+        }
+    }

eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/Skull.kt

@@ -1,48 +1,18 @@
 package com.willfp.eco.internal.spigot.proxy.v1_17_R1
 
-import com.mojang.authlib.GameProfile
-import com.mojang.authlib.properties.Property
 import com.willfp.eco.internal.spigot.proxy.SkullProxy
+import com.willfp.eco.internal.spigot.proxy.common.texture
 import org.bukkit.inventory.meta.SkullMeta
-import java.lang.reflect.Field
-import java.lang.reflect.Method
-import java.util.UUID
 
 class Skull : SkullProxy {
-    private lateinit var setProfile: Method
-    private lateinit var profile: Field
-
     override fun setSkullTexture(
         meta: SkullMeta,
         base64: String
     ) {
-        if (!this::setProfile.isInitialized) {
+        meta.texture = base64
-            setProfile = meta.javaClass.getDeclaredMethod("setProfile", GameProfile::class.java)
-            setProfile.isAccessible = true
-        }
-        if (base64.length < 20) {
-            return
-        }
-
-        val uuid = UUID(
-            base64.substring(base64.length - 20).hashCode().toLong(),
-            base64.substring(base64.length - 10).hashCode().toLong()
-        )
-        val profile = GameProfile(uuid, "eco")
-        profile.properties.put("textures", Property("textures", base64))
-        setProfile.invoke(meta, profile)
     }
 
     override fun getSkullTexture(
         meta: SkullMeta
-    ): String? {
+    ): String? = meta.texture
-        if (!this::profile.isInitialized) {
+}
-            profile = meta.javaClass.getDeclaredField("profile")
-            profile.isAccessible = true
-        }
-        val profile = profile[meta] as GameProfile? ?: return null
-        val properties = profile.properties ?: return null
-        val prop = properties["textures"] ?: return null
-        return prop.toMutableList().firstOrNull()?.name
-    }
-}

eco-core/core-nms/v1_18_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R1/Skull.kt

@@ -1,48 +1,18 @@
 package com.willfp.eco.internal.spigot.proxy.v1_18_R1
 
-import com.mojang.authlib.GameProfile
-import com.mojang.authlib.properties.Property
 import com.willfp.eco.internal.spigot.proxy.SkullProxy
+import com.willfp.eco.internal.spigot.proxy.common.texture
 import org.bukkit.inventory.meta.SkullMeta
-import java.lang.reflect.Field
-import java.lang.reflect.Method
-import java.util.UUID
 
 class Skull : SkullProxy {
-    private lateinit var setProfile: Method
-    private lateinit var profile: Field
-
     override fun setSkullTexture(
         meta: SkullMeta,
         base64: String
     ) {
-        if (!this::setProfile.isInitialized) {
+        meta.texture = base64
-            setProfile = meta.javaClass.getDeclaredMethod("setProfile", GameProfile::class.java)
-            setProfile.isAccessible = true
-        }
-        if (base64.length < 20) {
-            return
-        }
-
-        val uuid = UUID(
-            base64.substring(base64.length - 20).hashCode().toLong(),
-            base64.substring(base64.length - 10).hashCode().toLong()
-        )
-        val profile = GameProfile(uuid, "eco")
-        profile.properties.put("textures", Property("textures", base64))
-        setProfile.invoke(meta, profile)
     }
 
     override fun getSkullTexture(
         meta: SkullMeta
-    ): String? {
+    ): String? = meta.texture
-        if (!this::profile.isInitialized) {
+}
-            profile = meta.javaClass.getDeclaredField("profile")
-            profile.isAccessible = true
-        }
-        val profile = profile[meta] as GameProfile? ?: return null
-        val properties = profile.properties ?: return null
-        val prop = properties["textures"] ?: return null
-        return prop.toMutableList().firstOrNull()?.name
-    }
-}

eco-core/core-nms/v1_18_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R2/Skull.kt

@@ -1,48 +1,18 @@
 package com.willfp.eco.internal.spigot.proxy.v1_18_R2
 
-import com.mojang.authlib.GameProfile
-import com.mojang.authlib.properties.Property
 import com.willfp.eco.internal.spigot.proxy.SkullProxy
+import com.willfp.eco.internal.spigot.proxy.common.texture
 import org.bukkit.inventory.meta.SkullMeta
-import java.lang.reflect.Field
-import java.lang.reflect.Method
-import java.util.UUID
 
 class Skull : SkullProxy {
-    private lateinit var setProfile: Method
-    private lateinit var profile: Field
-
     override fun setSkullTexture(
         meta: SkullMeta,
         base64: String
     ) {
-        if (!this::setProfile.isInitialized) {
+        meta.texture = base64
-            setProfile = meta.javaClass.getDeclaredMethod("setProfile", GameProfile::class.java)
-            setProfile.isAccessible = true
-        }
-        if (base64.length < 20) {
-            return
-        }
-
-        val uuid = UUID(
-            base64.substring(base64.length - 20).hashCode().toLong(),
-            base64.substring(base64.length - 10).hashCode().toLong()
-        )
-        val profile = GameProfile(uuid, "eco")
-        profile.properties.put("textures", Property("textures", base64))
-        setProfile.invoke(meta, profile)
     }
 
     override fun getSkullTexture(
         meta: SkullMeta
-    ): String? {
+    ): String? = meta.texture
-        if (!this::profile.isInitialized) {
+}
-            profile = meta.javaClass.getDeclaredField("profile")
-            profile.isAccessible = true
-        }
-        val profile = profile[meta] as GameProfile? ?: return null
-        val properties = profile.properties ?: return null
-        val prop = properties["textures"] ?: return null
-        return prop.toMutableList().firstOrNull()?.name
-    }
-}

eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R1/Skull.kt

@@ -1,48 +1,18 @@
 package com.willfp.eco.internal.spigot.proxy.v1_19_R1
 
-import com.mojang.authlib.GameProfile
-import com.mojang.authlib.properties.Property
 import com.willfp.eco.internal.spigot.proxy.SkullProxy
+import com.willfp.eco.internal.spigot.proxy.common.texture
 import org.bukkit.inventory.meta.SkullMeta
-import java.lang.reflect.Field
-import java.lang.reflect.Method
-import java.util.UUID
 
 class Skull : SkullProxy {
-    private lateinit var setProfile: Method
-    private lateinit var profile: Field
-
     override fun setSkullTexture(
         meta: SkullMeta,
         base64: String
     ) {
-        if (!this::setProfile.isInitialized) {
+        meta.texture = base64
-            setProfile = meta.javaClass.getDeclaredMethod("setProfile", GameProfile::class.java)
-            setProfile.isAccessible = true
-        }
-        if (base64.length < 20) {
-            return
-        }
-
-        val uuid = UUID(
-            base64.substring(base64.length - 20).hashCode().toLong(),
-            base64.substring(base64.length - 10).hashCode().toLong()
-        )
-        val profile = GameProfile(uuid, "eco")
-        profile.properties.put("textures", Property("textures", base64))
-        setProfile.invoke(meta, profile)
     }
 
     override fun getSkullTexture(
         meta: SkullMeta
-    ): String? {
+    ): String? = meta.texture
-        if (!this::profile.isInitialized) {
+}
-            profile = meta.javaClass.getDeclaredField("profile")
-            profile.isAccessible = true
-        }
-        val profile = profile[meta] as GameProfile? ?: return null
-        val properties = profile.properties ?: return null
-        val prop = properties["textures"] ?: return null
-        return prop.toMutableList().firstOrNull()?.name
-    }
-}

eco-core/core-plugin/build.gradle

@@ -6,7 +6,7 @@ dependencies {
     compileOnly project(":eco-core:core-backend")
 
     // Libraries
-    implementation 'com.github.Redempt:Crunch:master-SNAPSHOT'
+    implementation 'com.github.WillFP:Crunch:1.1.3'
     implementation 'mysql:mysql-connector-java:8.0.25'
     implementation 'org.jetbrains.exposed:exposed-core:0.37.3'
     implementation 'org.jetbrains.exposed:exposed-dao:0.37.3'

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/gui/GUIListener.kt

@@ -1,6 +1,8 @@
 package com.willfp.eco.internal.spigot.gui
 
 import com.willfp.eco.core.EcoPlugin
+import com.willfp.eco.core.gui.slot.CustomSlot
+import com.willfp.eco.core.gui.slot.Slot
 import com.willfp.eco.internal.gui.menu.EcoMenu
 import com.willfp.eco.internal.gui.menu.MenuHandler
 import com.willfp.eco.internal.gui.menu.asRenderedInventory
@@ -16,6 +18,13 @@ import org.bukkit.event.inventory.InventoryCloseEvent
 import org.bukkit.event.player.PlayerItemHeldEvent
 
 class GUIListener(private val plugin: EcoPlugin) : Listener {
+    private fun Slot.handle(event: InventoryClickEvent, menu: EcoMenu) {
+        when (this) {
+            is EcoSlot -> this.handleInventoryClick(event, menu)
+            is CustomSlot -> this.delegate.handle(event, menu)
+        }
+    }
+
     @EventHandler(priority = EventPriority.HIGH)
     fun handleSlotClick(event: InventoryClickEvent) {
         val rendered = event.clickedInventory?.asRenderedInventory() ?: return
@@ -24,9 +33,7 @@ class GUIListener(private val plugin: EcoPlugin) : Listener {
 
         val (row, column) = MenuUtils.convertSlotToRowColumn(event.slot)
 
-        val slot = menu.getSlot(row, column) as? EcoSlot ?: return
+        menu.getSlot(row, column).handle(event, menu)
-
-        slot.handleInventoryClick(event, menu)
 
         plugin.scheduler.run { rendered.render() }
     }

gradle.properties

@@ -1,3 +1,3 @@
-version = 6.41.3
+version = 6.42.0
 plugin-name = eco
 kotlin.code.style = official