Removed source/target compatibility no longer required by kotlin 1.7.x

Add MythicMobs 5.X support.

build.gradle.kts

@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
     }
 }
 
@@ -13,7 +13,7 @@ plugins {
     id("com.github.johnrengelman.shadow") version "7.1.2"
     id("maven-publish")
     id("java")
-    kotlin("jvm") version "1.6.21"
+    kotlin("jvm") version "1.7.10"
 }
 
 dependencies {
@@ -81,8 +81,8 @@ allprojects {
 
     dependencies {
         // Kotlin
-        implementation(kotlin("stdlib", version = "1.6.21"))
-        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1")
+        implementation(kotlin("stdlib", version = "1.7.10"))
+        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.2")
 
         // Included in spigot jar, no need to move to implementation
         compileOnly("org.jetbrains:annotations:23.0.0")
@@ -129,8 +129,6 @@ allprojects {
             kotlinOptions {
                 jvmTarget = "17"
             }
-            targetCompatibility = "17"
-            sourceCompatibility = "17"
         }
 
         shadowJar {

eco-api/src/main/java/com/willfp/eco/core/EcoPlugin.java

@@ -304,6 +304,11 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
         this.color = props.getColor();
         this.supportingExtensions = props.isSupportingExtensions();
 
+        this.proxyFactory = this.proxyPackage.equalsIgnoreCase("") ? null : Eco.getHandler().createProxyFactory(this);
+        this.logger = Eco.getHandler().createLogger(this);
+
+        this.getLogger().info("Initializing " + this.getColor() + this.getName());
+
         this.scheduler = Eco.getHandler().createScheduler(this);
         this.eventManager = Eco.getHandler().createEventManager(this);
         this.namespacedKeyFactory = Eco.getHandler().createNamespacedKeyFactory(this);
@@ -311,16 +316,12 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
         this.runnableFactory = Eco.getHandler().createRunnableFactory(this);
         this.extensionLoader = Eco.getHandler().createExtensionLoader(this);
         this.configHandler = Eco.getHandler().createConfigHandler(this);
-        this.logger = Eco.getHandler().createLogger(this);
-        this.proxyFactory = this.proxyPackage.equalsIgnoreCase("") ? null : Eco.getHandler().createProxyFactory(this);
 
         this.langYml = this.createLangYml();
         this.configYml = this.createConfigYml();
 
         Eco.getHandler().addNewPlugin(this);
 
-        this.getLogger().info("Initializing " + this.getColor() + this.getName());
-
         /*
         The minimum eco version check was moved here because it's very common
         to add a lot of code in the constructor of plugins; meaning that the plugin

eco-api/src/main/java/com/willfp/eco/core/Prerequisite.java

@@ -41,11 +41,19 @@ public class Prerequisite {
             "Requires server to have vault"
     );
 
+    /**
+     * Requires the server to be running 1.19.
+     */
+    public static final Prerequisite HAS_1_19 = new Prerequisite(
+            () -> ProxyConstants.NMS_VERSION.contains("19"),
+            "Requires server to be running 1.19+"
+    );
+
     /**
      * Requires the server to be running 1.18.
      */
     public static final Prerequisite HAS_1_18 = new Prerequisite(
-            () -> ProxyConstants.NMS_VERSION.contains("18"),
+            () -> ProxyConstants.NMS_VERSION.contains("18") || HAS_1_19.isMet(),
             "Requires server to be running 1.18+"
     );
 

eco-api/src/main/java/com/willfp/eco/core/display/DisplayModule.java

@@ -64,6 +64,21 @@ public abstract class DisplayModule extends PluginDependent<EcoPlugin> {
         // Technically optional.
     }
 
+    /**
+     * Display an item.
+     *
+     * @param itemStack  The item.
+     * @param player     The player.
+     * @param properties The properties.
+     * @param args       Optional args for display.
+     */
+    public void display(@NotNull final ItemStack itemStack,
+                        @Nullable final Player player,
+                        @NotNull final DisplayProperties properties,
+                        @NotNull final Object... args) {
+        // Technically optional.
+    }
+
     /**
      * Revert an item.
      *

eco-api/src/main/java/com/willfp/eco/core/display/DisplayProperties.java

@@ -0,0 +1,18 @@
+package com.willfp.eco.core.display;
+
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Extra properties passed into {@link DisplayModule}.
+ *
+ * @param inInventory  If the item was in an inventory.
+ * @param inGui        If the item is assumed to be in a gui. (Not perfectly accurate).
+ * @param originalItem The original item, not to be modified.
+ */
+public record DisplayProperties(
+        boolean inInventory,
+        boolean inGui,
+        @NotNull ItemStack originalItem
+) {
+}

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

@@ -68,6 +68,14 @@ public interface MenuBuilder {
      */
     MenuBuilder onClose(@NotNull CloseHandler action);
 
+    /**
+     * Set the menu open handler.
+     *
+     * @param action The handler.
+     * @return The builder.
+     */
+    MenuBuilder onOpen(@NotNull OpenHandler action);
+
     /**
      * Set the action to run on render.
      *

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

@@ -0,0 +1,19 @@
+package com.willfp.eco.core.gui.menu;
+
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Interface to run on menu open.
+ */
+@FunctionalInterface
+public interface OpenHandler {
+    /**
+     * Performs this operation on the given arguments.
+     *
+     * @param player The player.
+     * @param menu   The menu.
+     */
+    void handle(@NotNull Player player,
+                @NotNull Menu menu);
+}

eco-api/src/main/java/com/willfp/eco/util/MenuUtils.java

@@ -1,12 +1,24 @@
 package com.willfp.eco.util;
 
+import com.willfp.eco.core.gui.menu.Menu;
 import com.willfp.eco.core.tuples.Pair;
+import org.apache.commons.lang.Validate;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Function;
 
 /**
  * Utilities / API methods for menus.
  */
 public final class MenuUtils {
+    /**
+     * The menu supplier.
+     */
+    private static Function<Player, Menu> menuGetter = null;
+
     /**
      * Convert 0-53 slot to row and column pair.
      *
@@ -31,6 +43,29 @@ public final class MenuUtils {
         return (column - 1) + ((row - 1) * 9);
     }
 
+    /**
+     * Get a player's open menu.
+     *
+     * @param player The player.
+     * @return The menu, or null if none open.
+     */
+    @Nullable
+    public static Menu getOpenMenu(@NotNull final Player player) {
+        return menuGetter.apply(player);
+    }
+
+    /**
+     * Initialize the tps supplier function.
+     *
+     * @param function The function.
+     */
+    @ApiStatus.Internal
+    public static void initialize(@NotNull final Function<Player, Menu> function) {
+        Validate.isTrue(menuGetter == null, "Already initialized!");
+
+        menuGetter = function;
+    }
+
     private MenuUtils() {
         throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }

eco-api/src/main/java/com/willfp/eco/util/VectorUtils.java

@@ -152,6 +152,20 @@ public final class VectorUtils {
         return vectors.toArray(new Vector[0]);
     }
 
+    /**
+     * Get if a vector is a safe velocity.
+     *
+     * @param vec The vector to check.
+     * @return If safe.
+     */
+    public static boolean isSafeVelocity(@NotNull final Vector vec) {
+        double x = Math.abs(vec.getX());
+        double y = Math.abs(vec.getY());
+        double z = Math.abs(vec.getZ());
+
+        return x < 4 && y < 4 && z < 4;
+    }
+
     private VectorUtils() {
         throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }

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

@@ -109,6 +109,10 @@ fun slot(
 fun MenuBuilder.onClose(action: (InventoryCloseEvent, Menu) -> Unit): MenuBuilder =
     this.onClose { a, b -> action(a, b) }
 
+/** @see MenuBuilder.onOpen */
+fun MenuBuilder.onOpen(action: (Player, Menu) -> Unit): MenuBuilder =
+    this.onOpen { a, b -> action(a, b) }
+
 /** @see MenuBuilder.modify */
 fun MenuBuilder.modify(modifier: (MenuBuilder) -> Unit): MenuBuilder =
     this.modfiy { modifier(it) }

eco-api/src/main/kotlin/com/willfp/eco/util/MenuUtils.kt

@@ -0,0 +1,10 @@
+@file:JvmName("MenuUtilsExtensions")
+
+package com.willfp.eco.util
+
+import com.willfp.eco.core.gui.menu.Menu
+import org.bukkit.entity.Player
+
+/** @see MenuUtils.getOpenMenu */
+val Player.openMenu: Menu?
+    get() = MenuUtils.getOpenMenu(this)

eco-api/src/main/kotlin/com/willfp/eco/util/VectorUtils.kt

@@ -11,3 +11,7 @@ val Vector.isFinite: Boolean
 /** @see VectorUtils.simplifyVector */
 fun Vector.simplify(): Vector =
     VectorUtils.simplifyVector(this)
+
+/** @see VectorUtils.isSafeVelocity */
+val Vector.isSafeVelocity: Boolean
+    get() = VectorUtils.isSafeVelocity(this)

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/display/EcoDisplayHandler.kt

@@ -4,6 +4,7 @@ import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.display.Display
 import com.willfp.eco.core.display.DisplayHandler
 import com.willfp.eco.core.display.DisplayModule
+import com.willfp.eco.core.display.DisplayProperties
 import com.willfp.eco.core.fast.fast
 import org.bukkit.NamespacedKey
 import org.bukkit.entity.Player
@@ -32,13 +33,21 @@ class EcoDisplayHandler(plugin: EcoPlugin) : DisplayHandler {
             }
         }
 
-
         Display.revert(itemStack)
 
         if (!itemStack.hasItemMeta()) {
             return itemStack
         }
 
+        val original = itemStack.clone()
+        val inventory = player?.openInventory?.topInventory
+        val inInventory = inventory?.contains(original) ?: false
+
+        val props = DisplayProperties(
+            inInventory,
+            inInventory && inventory?.holder == null,
+            original
+        )
 
         for ((_, modules) in registeredModules) {
             for (module in modules) {
@@ -48,6 +57,7 @@ class EcoDisplayHandler(plugin: EcoPlugin) : DisplayHandler {
 
                 if (player != null) {
                     module.display(itemStack, player as Player?, *varargs)
+                    module.display(itemStack, player as Player?, props, *varargs)
                 }
             }
         }

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

@@ -2,6 +2,7 @@ package com.willfp.eco.internal.gui.menu
 
 import com.willfp.eco.core.gui.menu.CloseHandler
 import com.willfp.eco.core.gui.menu.Menu
+import com.willfp.eco.core.gui.menu.OpenHandler
 import com.willfp.eco.core.gui.slot.Slot
 import com.willfp.eco.internal.gui.slot.EcoSlot
 import com.willfp.eco.util.NamespacedKeyUtils
@@ -19,7 +20,8 @@ class EcoMenu(
     val slots: List<MutableList<EcoSlot>>,
     private val title: String,
     private val onClose: CloseHandler,
-    private val onRender: (Player, Menu) -> Unit
+    private val onRender: (Player, Menu) -> Unit,
+    private val onOpen: OpenHandler
 ) : Menu {
     override fun getSlot(row: Int, column: Int): Slot {
         if (row < 1 || row > this.rows) {
@@ -49,6 +51,7 @@ class EcoMenu(
 
         player.openInventory(inventory)
         MenuHandler.registerInventory(inventory, this, player)
+        onOpen.handle(player, this)
         inventory.asRenderedInventory()?.generateCaptive()
         return inventory
     }

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

@@ -3,6 +3,7 @@ package com.willfp.eco.internal.gui.menu
 import com.willfp.eco.core.gui.menu.CloseHandler
 import com.willfp.eco.core.gui.menu.Menu
 import com.willfp.eco.core.gui.menu.MenuBuilder
+import com.willfp.eco.core.gui.menu.OpenHandler
 import com.willfp.eco.core.gui.slot.FillerMask
 import com.willfp.eco.core.gui.slot.FillerSlot
 import com.willfp.eco.core.gui.slot.Slot
@@ -21,6 +22,7 @@ class EcoMenuBuilder(private val rows: Int ) : MenuBuilder {
     private var maskSlots: List<MutableList<Slot?>>
     private val slots: List<MutableList<Slot?>> = ListUtils.create2DList(rows, 9)
     private var onClose = CloseHandler { _, _ -> }
+    private var onOpen = OpenHandler { _, _ -> }
     private var onRender: (Player, Menu) -> Unit = { _, _ -> }
 
     override fun setTitle(title: String): MenuBuilder {
@@ -54,6 +56,11 @@ class EcoMenuBuilder(private val rows: Int ) : MenuBuilder {
         return this
     }
 
+    override fun onOpen(action: OpenHandler): MenuBuilder {
+        onOpen = action
+        return this
+    }
+
     override fun onRender(action: BiConsumer<Player, Menu>): MenuBuilder {
         onRender = { a, b -> action.accept(a, b) }
         return this
@@ -83,7 +90,7 @@ class EcoMenuBuilder(private val rows: Int ) : MenuBuilder {
             finalSlots.add(tempRow)
         }
 
-        return EcoMenu(rows, finalSlots, title, onClose, onRender)
+        return EcoMenu(rows, finalSlots, title, onClose, onRender, onOpen)
     }
 
     init {

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/slot/EcoSlot.kt

@@ -38,7 +38,7 @@ open class EcoSlot(
     }
 
     override fun getItemStack(player: Player): ItemStack {
-        val menu = player.openInventory.topInventory.getMenu()!!
+        val menu = player.openInventory.topInventory.getMenu() ?: return ItemStack(Material.AIR)
         val prev = provider.provide(player, menu)
         return updater.update(player, menu, prev) ?: ItemStack(Material.AIR)
     }

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

@@ -16,7 +16,11 @@ object ConflictFinder {
                 continue
             }
 
-            val conflict = plugin.getConflict()
+            val conflict = try {
+                plugin.getConflict()
+            } catch (e: Exception) {
+                continue
+            } // Really can't be fucked to do this properly.
 
             if (conflict != null) {
                 conflicts.add(conflict)

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

@@ -38,6 +38,7 @@ import com.willfp.eco.internal.entities.EntityArgParserSilent
 import com.willfp.eco.internal.entities.EntityArgParserSize
 import com.willfp.eco.internal.entities.EntityArgParserSpawnReinforcements
 import com.willfp.eco.internal.entities.EntityArgParserSpeed
+import com.willfp.eco.internal.gui.menu.getMenu
 import com.willfp.eco.internal.items.ArgParserColor
 import com.willfp.eco.internal.items.ArgParserCustomModelData
 import com.willfp.eco.internal.items.ArgParserEnchantment
@@ -111,6 +112,7 @@ import com.willfp.eco.internal.spigot.integrations.shop.ShopEconomyShopGUI
 import com.willfp.eco.internal.spigot.integrations.shop.ShopShopGuiPlus
 import com.willfp.eco.internal.spigot.integrations.shop.ShopZShop
 import com.willfp.eco.internal.spigot.math.evaluateExpression
+import com.willfp.eco.internal.spigot.player.PlayerHealthFixer
 import com.willfp.eco.internal.spigot.proxy.FastItemStackFactoryProxy
 import com.willfp.eco.internal.spigot.proxy.SkullProxy
 import com.willfp.eco.internal.spigot.proxy.TPSProxy
@@ -120,6 +122,7 @@ import com.willfp.eco.internal.spigot.recipes.listeners.ComplexInComplex
 import com.willfp.eco.internal.spigot.recipes.listeners.ComplexInVanilla
 import com.willfp.eco.internal.spigot.recipes.stackhandlers.ShapedCraftingRecipeStackHandler
 import com.willfp.eco.internal.spigot.recipes.stackhandlers.ShapelessCraftingRecipeStackHandler
+import com.willfp.eco.util.MenuUtils
 import com.willfp.eco.util.NumberUtils
 import com.willfp.eco.util.ServerUtils
 import com.willfp.eco.util.SkullUtils
@@ -182,6 +185,8 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
 
         NumberUtils.initCrunch { expression, player, context -> evaluateExpression(expression, player, context) }
 
+        MenuUtils.initialize { it.openInventory.topInventory.getMenu() }
+
         CustomItemsManager.registerProviders()
 
         postInit()
@@ -358,7 +363,8 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
             ArrowDataListener(this),
             ArmorChangeEventListeners(this),
             DataListener(this),
-            PlayerBlockListener(this)
+            PlayerBlockListener(this),
+            PlayerHealthFixer(this)
         )
 
         if (Prerequisite.HAS_PAPER.isMet) {

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsMythicMobs.kt

@@ -4,16 +4,16 @@ import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.integrations.customitems.CustomItemsIntegration
 import com.willfp.eco.core.items.Items
 import com.willfp.eco.core.recipe.parts.EmptyTestableItem
+import io.lumine.mythic.api.adapters.AbstractItemStack
 import io.lumine.mythic.api.config.MythicLineConfig
 import io.lumine.mythic.api.drops.DropMetadata
-import io.lumine.mythic.api.drops.IMultiDrop
+import io.lumine.mythic.api.drops.IItemDrop
 import io.lumine.mythic.bukkit.adapters.BukkitItemStack
 import io.lumine.mythic.bukkit.events.MythicDropLoadEvent
-import io.lumine.mythic.core.drops.Drop
-import io.lumine.mythic.core.drops.LootBag
-import io.lumine.mythic.core.drops.droppables.ItemDrop
+import org.bukkit.Material
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
+import org.bukkit.inventory.ItemStack
 
 class CustomItemsMythicMobs(
     private val plugin: EcoPlugin
@@ -39,19 +39,16 @@ class CustomItemsMythicMobs(
     private class MythicMobsDrop(
         private val plugin: EcoPlugin,
         itemConfig: MythicLineConfig
-    ) : Drop(itemConfig.line, itemConfig), IMultiDrop {
-        private val id = itemConfig.getString(arrayOf("type", "t", "item", "i"), this.dropVar)
-
-        override fun get(data: DropMetadata): LootBag {
-            val bag = LootBag(data)
+    ) : IItemDrop {
+        private val id = itemConfig.getString(arrayOf("type", "t", "item", "i"), "eco")
 
+        override fun getDrop(data: DropMetadata, v: Double): AbstractItemStack {
             val item = Items.lookup(id)
             if (item is EmptyTestableItem) {
                 plugin.logger.warning("Item with ID $id is invalid, check your configs!")
-                return bag
+                return BukkitItemStack(ItemStack(Material.AIR))
             }
-            bag.add(data, ItemDrop(this.line, this.config, BukkitItemStack(item.item)))
-            return bag
+            return BukkitItemStack(item.item.apply { amount = v.toInt() })
         }
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/player/PlayerHealthFixer.kt

@@ -0,0 +1,42 @@
+package com.willfp.eco.internal.spigot.player
+
+import com.willfp.eco.core.EcoPlugin
+import com.willfp.eco.core.data.keys.PersistentDataKey
+import com.willfp.eco.core.data.keys.PersistentDataKeyType
+import com.willfp.eco.core.data.profile
+import org.bukkit.event.EventHandler
+import org.bukkit.event.Listener
+import org.bukkit.event.player.PlayerJoinEvent
+import org.bukkit.event.player.PlayerQuitEvent
+
+class PlayerHealthFixer(
+    private val plugin: EcoPlugin
+): Listener {
+    private val lastHealthKey = PersistentDataKey(
+        plugin.namespacedKeyFactory.create("last_health"),
+        PersistentDataKeyType.DOUBLE,
+        0.0
+    )
+
+    @EventHandler
+    fun onLeave(event: PlayerQuitEvent) {
+        if (!plugin.configYml.getBool("health-fixer")) {
+            return
+        }
+
+        val player = event.player
+        player.profile.write(lastHealthKey, player.health)
+    }
+
+    @EventHandler
+    fun onJoin(event: PlayerJoinEvent) {
+        if (!plugin.configYml.getBool("health-fixer")) {
+            return
+        }
+
+        val player = event.player
+        plugin.scheduler.runLater(2) {
+            player.health = player.profile.read(lastHealthKey)
+        }
+    }
+}

eco-core/core-plugin/src/main/resources/config.yml

@@ -76,4 +76,7 @@ log-full-extension-errors: false
 # disable this option. Bear in mind that this means the auto-craft preview will fail to
 # render items nicely, which may degrade the user experience on your server. If you use
 # a custom crafting table, though, this won't affect anything, and you should disable the option.
-displayed-recipes: true
+displayed-recipes: true
+
+# Save health on leave and set it back on join - works around attribute modifiers.
+health-fixer: false

gradle.properties

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