From 75afe1f2b03f41fa5c9cd6073e6654b31bcd808d Mon Sep 17 00:00:00 2001 From: Will FP Date: Sun, 7 Jan 2024 14:31:22 +0000 Subject: [PATCH 1/5] Moved CMI to loadbefore --- eco-core/core-plugin/src/main/resources/plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eco-core/core-plugin/src/main/resources/plugin.yml b/eco-core/core-plugin/src/main/resources/plugin.yml index 350858e4..a46b6d68 100644 --- a/eco-core/core-plugin/src/main/resources/plugin.yml +++ b/eco-core/core-plugin/src/main/resources/plugin.yml @@ -13,6 +13,7 @@ loadbefore: - Lands - EconomyShopGUI - EconomyShopGUI-Premium + - CMI softdepend: - ProtocolLib - WorldGuard @@ -35,7 +36,6 @@ softdepend: - Alice - HolographicDisplays - GHolo - - CMI - Essentials - Vault - BentoBox From b97506ae70651ec0d0d752526a2eab400f273ab8 Mon Sep 17 00:00:00 2001 From: Will FP Date: Sun, 14 Jan 2024 16:44:09 +0000 Subject: [PATCH 2/5] Fixed bugs on spigot and old paper versions --- eco-api/src/main/kotlin/com/willfp/eco/core/items/Items.kt | 5 +++++ .../com/willfp/eco/internal/gui/menu/RenderedInventory.kt | 3 ++- .../willfp/eco/internal/spigot/arrows/ArrowDataListener.kt | 4 ++-- .../eco/internal/spigot/recipes/StackedRecipeListener.kt | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/eco-api/src/main/kotlin/com/willfp/eco/core/items/Items.kt b/eco-api/src/main/kotlin/com/willfp/eco/core/items/Items.kt index 7cf81af1..5d56d779 100644 --- a/eco-api/src/main/kotlin/com/willfp/eco/core/items/Items.kt +++ b/eco-api/src/main/kotlin/com/willfp/eco/core/items/Items.kt @@ -37,9 +37,14 @@ fun ItemStack.toSNBT() = Items.toSNBT(this) /** @see Items.isEmpty */ +@Deprecated("Use ItemStack.isEcoEmpty", ReplaceWith("Items.isEmpty(this)")) val ItemStack?.isEmpty: Boolean get() = Items.isEmpty(this) +/** @see Items.isEmpty */ +val ItemStack?.isEcoEmpty: Boolean + get() = Items.isEmpty(this) + /** @see Items.matchesAny */ fun Collection.matches(item: ItemStack): Boolean = Items.matchesAny(item, this) diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/menu/RenderedInventory.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/menu/RenderedInventory.kt index dcdd097e..718645ad 100644 --- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/menu/RenderedInventory.kt +++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/menu/RenderedInventory.kt @@ -1,6 +1,7 @@ package com.willfp.eco.internal.gui.menu import com.willfp.eco.core.gui.menu.events.CaptiveItemChangeEvent +import com.willfp.eco.core.items.isEcoEmpty import com.willfp.eco.core.recipe.parts.EmptyTestableItem import com.willfp.eco.util.MenuUtils import com.willfp.eco.util.openMenu @@ -54,7 +55,7 @@ class RenderedInventory( val actualItem = inventory.getItem(bukkit) ?: continue if (slot.isCaptiveFromEmpty) { - if (!actualItem.isEmpty) { + if (!actualItem.isEcoEmpty) { newCaptive[position] = actualItem } } else { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/arrows/ArrowDataListener.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/arrows/ArrowDataListener.kt index 385d8dad..6e0efe7b 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/arrows/ArrowDataListener.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/arrows/ArrowDataListener.kt @@ -1,7 +1,7 @@ package com.willfp.eco.internal.spigot.arrows import com.willfp.eco.core.EcoPlugin -import com.willfp.eco.core.items.isEmpty +import com.willfp.eco.core.items.isEcoEmpty import org.bukkit.entity.Arrow import org.bukkit.entity.LivingEntity import org.bukkit.event.EventHandler @@ -29,7 +29,7 @@ class ArrowDataListener( val item = entity.equipment?.itemInMainHand - if (item.isEmpty || item == null) { + if (item.isEcoEmpty || item == null) { return } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/recipes/StackedRecipeListener.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/recipes/StackedRecipeListener.kt index bfd6560b..36fcd28c 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/recipes/StackedRecipeListener.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/recipes/StackedRecipeListener.kt @@ -2,7 +2,7 @@ package com.willfp.eco.internal.spigot.recipes import com.willfp.eco.core.EcoPlugin import com.willfp.eco.core.items.TestableItem -import com.willfp.eco.core.items.isEmpty +import com.willfp.eco.core.items.isEcoEmpty import com.willfp.eco.core.recipe.Recipes import com.willfp.eco.core.recipe.parts.GroupedTestableItems import com.willfp.eco.core.recipe.parts.TestableStack @@ -33,7 +33,7 @@ class StackedRecipeListener( } // Just in case - if (inventory.getItem(event.slot).isEmpty) { + if (inventory.getItem(event.slot).isEcoEmpty) { return } From 2df60bffee04f343818ee44b25ad2d08de8e0c7f Mon Sep 17 00:00:00 2001 From: Will FP Date: Sun, 14 Jan 2024 16:44:31 +0000 Subject: [PATCH 3/5] Updated to 6.68.4 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 244dbe0a..bf6885a3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 6.68.3 +version = 6.68.4 kotlin.incremental.useClasspathSnapshot=false \ No newline at end of file From 03eb2f5d0aae171218623bb64981f9c9204e7dba Mon Sep 17 00:00:00 2001 From: Will FP Date: Mon, 15 Jan 2024 23:17:17 +0000 Subject: [PATCH 4/5] Fixed DeluxeCombat --- eco-core/core-plugin/src/main/resources/plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eco-core/core-plugin/src/main/resources/plugin.yml b/eco-core/core-plugin/src/main/resources/plugin.yml index a46b6d68..30e044c4 100644 --- a/eco-core/core-plugin/src/main/resources/plugin.yml +++ b/eco-core/core-plugin/src/main/resources/plugin.yml @@ -14,6 +14,7 @@ loadbefore: - EconomyShopGUI - EconomyShopGUI-Premium - CMI + - DeluxeCombat softdepend: - ProtocolLib - WorldGuard @@ -39,7 +40,6 @@ softdepend: - Essentials - Vault - BentoBox - - DeluxeCombat - IridiumSkyblock - SuperiorSkyblock2 - FabledSkyBlock From 67981b4f9a354552699b00f30ebd5d2347ffee09 Mon Sep 17 00:00:00 2001 From: Will FP Date: Mon, 15 Jan 2024 23:17:27 +0000 Subject: [PATCH 5/5] Updated to 6.68.5 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index bf6885a3..19a5d789 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 6.68.4 +version = 6.68.5 kotlin.incremental.useClasspathSnapshot=false \ No newline at end of file