From a364450a41481f03fe0a4fe4b2a6b9830e2e38a7 Mon Sep 17 00:00:00 2001
From: rudde <hazar.akbuz@outlook.com>
Date: Sun, 4 Aug 2024 18:34:17 +0300
Subject: [PATCH 1/2] add bentobox integration

---
 .idea/misc.xml                                |  1 -
 .../axminions/commands/AxMinionsCommand.kt    |  8 -----
 .../axminions/integrations/Integrations.kt    |  1 +
 .../island/BentoBoxIntegration.kt             | 32 +++++++++++++++++++
 4 files changed, 33 insertions(+), 9 deletions(-)
 create mode 100644 common/src/main/kotlin/com/artillexstudios/axminions/integrations/island/BentoBoxIntegration.kt

diff --git a/.idea/misc.xml b/.idea/misc.xml
index b6a1c48..6b2e9ce 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DiscordProjectSettings">
     <option name="show" value="ASK" />
diff --git a/common/src/main/kotlin/com/artillexstudios/axminions/commands/AxMinionsCommand.kt b/common/src/main/kotlin/com/artillexstudios/axminions/commands/AxMinionsCommand.kt
index 9bc5639..6135e2e 100644
--- a/common/src/main/kotlin/com/artillexstudios/axminions/commands/AxMinionsCommand.kt
+++ b/common/src/main/kotlin/com/artillexstudios/axminions/commands/AxMinionsCommand.kt
@@ -1,29 +1,21 @@
 package com.artillexstudios.axminions.commands
 
-import com.artillexstudios.axapi.scheduler.Scheduler
 import com.artillexstudios.axapi.utils.ItemBuilder
 import com.artillexstudios.axapi.utils.StringUtils
 import com.artillexstudios.axminions.AxMinionsPlugin
 import com.artillexstudios.axminions.api.AxMinionsAPI
 import com.artillexstudios.axminions.api.config.Config
 import com.artillexstudios.axminions.api.config.Messages
-import com.artillexstudios.axminions.api.data.DataHandler
 import com.artillexstudios.axminions.api.minions.miniontype.MinionType
 import com.artillexstudios.axminions.api.minions.miniontype.MinionTypes
 import com.artillexstudios.axminions.api.utils.fastFor
 import com.artillexstudios.axminions.converter.LitMinionsConverter
-import com.artillexstudios.axminions.integrations.island.SuperiorSkyBlock2Integration
-import com.artillexstudios.axminions.minions.Minions
-import com.bgsoftware.superiorskyblock.api.SuperiorSkyblockAPI
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder
-import org.bukkit.Chunk
 import org.bukkit.OfflinePlayer
-import org.bukkit.World.Environment
 import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
 import revxrsal.commands.annotation.*
 import revxrsal.commands.bukkit.annotation.CommandPermission
-import java.util.concurrent.CompletableFuture
 
 @Command("axminions", "minion", "minions")
 class AxMinionsCommand {
diff --git a/common/src/main/kotlin/com/artillexstudios/axminions/integrations/Integrations.kt b/common/src/main/kotlin/com/artillexstudios/axminions/integrations/Integrations.kt
index da87d51..8008c0f 100644
--- a/common/src/main/kotlin/com/artillexstudios/axminions/integrations/Integrations.kt
+++ b/common/src/main/kotlin/com/artillexstudios/axminions/integrations/Integrations.kt
@@ -147,6 +147,7 @@ class Integrations : Integrations {
 
         if (Bukkit.getPluginManager().getPlugin("BentoBox") != null) {
             register(BentoBoxIntegration())
+            register(com.artillexstudios.axminions.integrations.island.BentoBoxIntegration())
             Bukkit.getConsoleSender()
                 .sendMessage(StringUtils.formatToString("<#33FF33>[AxMinions] Hooked into BentoBox!"))
         }
diff --git a/common/src/main/kotlin/com/artillexstudios/axminions/integrations/island/BentoBoxIntegration.kt b/common/src/main/kotlin/com/artillexstudios/axminions/integrations/island/BentoBoxIntegration.kt
new file mode 100644
index 0000000..a2704e0
--- /dev/null
+++ b/common/src/main/kotlin/com/artillexstudios/axminions/integrations/island/BentoBoxIntegration.kt
@@ -0,0 +1,32 @@
+package com.artillexstudios.axminions.integrations.island
+
+import com.artillexstudios.axminions.api.integrations.types.IslandIntegration
+import org.bukkit.Location
+import org.bukkit.block.Block
+import world.bentobox.bentobox.BentoBox
+
+class BentoBoxIntegration : IslandIntegration {
+
+    override fun getIslandAt(location: Location): String {
+        val island = BentoBox.getInstance().islandsManager.islandCache.getIslandAt(location)
+
+        if (island !== null) {
+            return island.uniqueId
+        }
+
+        return ""
+    }
+
+    override fun getExtra(location: Location): Int {
+        return 0
+    }
+
+
+    override fun handleBlockBreak(block: Block) {
+
+    }
+
+    override fun register() {
+
+    }
+}
\ No newline at end of file

From e310a38f9b96991dd1fdf5a4ba9f95a5638c6f0e Mon Sep 17 00:00:00 2001
From: rudde <hazar.akbuz@outlook.com>
Date: Tue, 6 Aug 2024 14:39:49 +0300
Subject: [PATCH 2/2] skip stacked mobs to nametag check

---
 .../artillexstudios/axminions/integrations/Integrations.kt  | 6 ------
 .../axminions/minions/miniontype/SlayerMinionType.kt        | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/common/src/main/kotlin/com/artillexstudios/axminions/integrations/Integrations.kt b/common/src/main/kotlin/com/artillexstudios/axminions/integrations/Integrations.kt
index 8008c0f..4171c89 100644
--- a/common/src/main/kotlin/com/artillexstudios/axminions/integrations/Integrations.kt
+++ b/common/src/main/kotlin/com/artillexstudios/axminions/integrations/Integrations.kt
@@ -189,12 +189,6 @@ class Integrations : Integrations {
                 .sendMessage(StringUtils.formatToString("<#33FF33>[AxMinions] Hooked into ItemsAdder!"))
         }
 
-        if (Bukkit.getPluginManager().getPlugin("ItemsAdder") != null) {
-            itemsAdderIntegration = true
-            Bukkit.getConsoleSender()
-                .sendMessage(StringUtils.formatToString("<#33FF33>[AxMinions] Hooked into ItemsAdder!"))
-        }
-
         if (Bukkit.getPluginManager().getPlugin("Towny") != null) {
             register(TownyIntegration())
         }
diff --git a/common/src/main/kotlin/com/artillexstudios/axminions/minions/miniontype/SlayerMinionType.kt b/common/src/main/kotlin/com/artillexstudios/axminions/minions/miniontype/SlayerMinionType.kt
index 259ec0e..505a477 100644
--- a/common/src/main/kotlin/com/artillexstudios/axminions/minions/miniontype/SlayerMinionType.kt
+++ b/common/src/main/kotlin/com/artillexstudios/axminions/minions/miniontype/SlayerMinionType.kt
@@ -77,7 +77,7 @@ class SlayerMinionType : MinionType("slayer", AxMinionsPlugin.INSTANCE.getResour
                 return@fastFor
             }
 
-            if (!getConfig().getBoolean("damage-renamed") && it.customName != null) {
+            if (!getConfig().getBoolean("damage-renamed") && it.customName != null && AxMinionsPlugin.integrations.getStackerIntegration().getStackSize(it) <= 1) {
                 return@fastFor
             }