Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skip stacked mobs from nametag check #27

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+34 −16
Open

Skip stacked mobs from nametag check #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a364450
add bentobox integration
rudde0 Aug 4, 2024
e310a38
skip stacked mobs to nametag check
rudde0 Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions common/src/main/kotlin/com/artillexstudios/axminions/commands/AxMinionsCommand.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
7 changes: 1 addition & 6 deletions common/src/main/kotlin/com/artillexstudios/axminions/integrations/Integrations.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!"))
}
Expand Down Expand Up @@ -188,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())
}
Expand Down
32 changes: 32 additions & 0 deletions .../src/main/kotlin/com/artillexstudios/axminions/integrations/island/BentoBoxIntegration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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() {

}
}
2 changes: 1 addition & 1 deletion common/src/main/kotlin/com/artillexstudios/axminions/minions/miniontype/SlayerMinionType.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down