Merge remote-tracking branch 'origin/master' into develop

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
         }
 

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
         }
 

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

@@ -13,6 +13,8 @@ loadbefore:
   - Lands
   - EconomyShopGUI
   - EconomyShopGUI-Premium
+  - CMI
+  - DeluxeCombat
 softdepend:
   - Terra
   - ProtocolLib
@@ -36,11 +38,9 @@ softdepend:
   - Alice
   - HolographicDisplays
   - GHolo
-  - CMI
   - Essentials
   - Vault
   - BentoBox
-  - DeluxeCombat
   - IridiumSkyblock
   - SuperiorSkyblock2
   - FabledSkyBlock