McScrims-Network/GameModes-SpeedHG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add kit inventory

Browse Source
This commit is contained in:
TDSTOS
2025-12-11 19:47:45 +01:00
parent c741739cdd
commit 1acb5681fc
5 changed files with 271 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/club/mcscrims/speedhg/command/KitsCommand.kt
View File

@@ -18,7 +18,8 @@ class KitsCommand(
label: String,
args: Array<out String>
): Boolean {
if (sender !is Player) {
if ( sender !is Player )
{
sender.sendMessage("§cOnly players can use this command.")
return true
}
@@ -26,4 +27,5 @@ class KitsCommand(
kitInventoryManager.openKitInventory( sender, 1 )
return true
}
}

9
src/main/kotlin/club/mcscrims/speedhg/kit/KitInventoryHolder.kt
View File

@@ -3,13 +3,18 @@ package club.mcscrims.speedhg.kit
import org.bukkit.inventory.Inventory
import org.bukkit.inventory.InventoryHolder
class KitInventoryHolder(val page: Int) : InventoryHolder {
class KitInventoryHolder(
val page: Int
) : InventoryHolder {
private lateinit var inventory: Inventory
override fun getInventory(): Inventory = inventory
fun setInventory(inventory: Inventory) {
fun setInventory(
inventory: Inventory
) {
this.inventory = inventory
}
}

34
src/main/kotlin/club/mcscrims/speedhg/kit/KitInventoryListener.kt
View File

@@ -1,6 +1,7 @@
package club.mcscrims.speedhg.kit
import club.mcscrims.speedhg.SpeedHG
import club.mcscrims.speedhg.SpeedHG.Companion.content
import org.bukkit.Material
import org.bukkit.Sound
import org.bukkit.entity.Player
@@ -16,25 +17,27 @@ class KitInventoryListener(
) : Listener {
@EventHandler
fun onInventoryClick(event: InventoryClickEvent) {
fun onInventoryClick(
event: InventoryClickEvent
) {
val holder = event.inventory.holder
if (holder !is KitInventoryHolder) {
if ( holder !is KitInventoryHolder )
return
}
event.isCancelled = true
val player = event.whoClicked as? Player ?: return
val clickedItem = event.currentItem ?: return
if (clickedItem.type == Material.AIR) {
if ( clickedItem.type == Material.AIR )
return
}
when (event.rawSlot) {
when( event.rawSlot )
{
45 -> {
if (holder.page > 1) {
if ( holder.page > 1 )
{
player.playSound( player.location, Sound.UI_BUTTON_CLICK, 1f, 1f )
kitInventoryManager.openKitInventory( player, holder.page - 1 )
}
@@ -46,7 +49,8 @@ class KitInventoryListener(
53 -> {
val totalKits = kitManager.getAllKits().size
val totalPages = ( totalKits + 27 ) / 28
if (holder.page < totalPages) {
if ( holder.page < totalPages )
{
player.playSound( player.location, Sound.UI_BUTTON_CLICK, 1f, 1f )
kitInventoryManager.openKitInventory( player, holder.page + 1 )
}
@@ -65,10 +69,12 @@ class KitInventoryListener(
)
val slotIndex = kitSlots.indexOf( event.rawSlot )
if (slotIndex != -1 && slotIndex < kitsOnPage.size) {
if ( slotIndex != -1 && slotIndex < kitsOnPage.size )
{
val selectedKit = kitsOnPage[slotIndex]
if (kitManager.selectKit(player, selectedKit.id)) {
if (kitManager.selectKit( player, selectedKit.id ))
{
player.playSound( player.location, Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1f, 1.2f )
plugin.chatManager.sendMessage(
player,
@@ -85,11 +91,13 @@ class KitInventoryListener(
}
@EventHandler
fun onInventoryDrag(event: InventoryDragEvent) {
fun onInventoryDrag(
event: InventoryDragEvent
) {
val holder = event.inventory.holder
if (holder is KitInventoryHolder) {
if ( holder is KitInventoryHolder )
event.isCancelled = true
}
}
}

68
src/main/kotlin/club/mcscrims/speedhg/kit/KitInventoryManager.kt
View File

@@ -1,7 +1,7 @@
package club.mcscrims.speedhg.kit
import club.mcscrims.speedhg.SpeedHG
import club.mcscrims.speedhg.SpeedHG.Companion.content
import kotlinx.coroutines.runBlocking
import net.kyori.adventure.text.Component
import net.kyori.adventure.text.format.NamedTextColor
import net.kyori.adventure.text.format.TextDecoration
@@ -11,7 +11,6 @@ import org.bukkit.enchantments.Enchantment
import org.bukkit.entity.Player
import org.bukkit.inventory.ItemFlag
import org.bukkit.inventory.ItemStack
import org.bukkit.inventory.meta.ItemMeta
class KitInventoryManager(
private val plugin: SpeedHG,
@@ -21,7 +20,10 @@ class KitInventoryManager(
private val kitsPerPage = 28
private val rows = 6
fun openKitInventory(player: Player, page: Int = 1) {
fun openKitInventory(
player: Player,
page: Int = 1
) {
val allKits = kitManager.getAllKits().toList()
val totalPages = ( allKits.size + kitsPerPage - 1 ) / kitsPerPage
val validPage = page.coerceIn( 1, totalPages.coerceAtLeast( 1 ))
@@ -41,17 +43,17 @@ class KitInventoryManager(
player.openInventory( inventory )
}
private fun fillBorder(inventory: org.bukkit.inventory.Inventory) {
private fun fillBorder(
inventory: org.bukkit.inventory.Inventory
) {
val borderItem = createBorderItem()
for (i in 0..8) {
for ( i in 0..8 )
inventory.setItem( i, borderItem )
}
for (i in 45..53) {
for ( i in 45..53 )
inventory.setItem( i, borderItem )
}
}
private fun fillKits(
inventory: org.bukkit.inventory.Inventory,
@@ -73,7 +75,8 @@ class KitInventoryManager(
)
kitsOnPage.forEachIndexed { index, kit ->
if (index < kitSlots.size) {
if ( index < kitSlots.size )
{
val isSelected = selectedKit?.id == kit.id
val kitItem = createKitItem( kit, isSelected, player )
inventory.setItem(kitSlots[ index ], kitItem )
@@ -86,18 +89,17 @@ class KitInventoryManager(
page: Int,
totalPages: Int
) {
if (page > 1) {
if ( page > 1 )
inventory.setItem( 45, createPreviousPageItem() )
}
inventory.setItem( 49, createCloseItem() )
if (page < totalPages) {
if ( page < totalPages )
inventory.setItem( 53, createNextPageItem() )
}
}
private fun createBorderItem(): ItemStack {
private fun createBorderItem(): ItemStack
{
val item = ItemStack( Material.GRAY_STAINED_GLASS_PANE )
val meta = item.itemMeta
meta.displayName(Component.text( " " ))
@@ -105,7 +107,12 @@ class KitInventoryManager(
return item
}
private fun createKitItem(kit: AbstractKit, isSelected: Boolean, player: Player): ItemStack {
private fun createKitItem(
kit: AbstractKit,
isSelected: Boolean,
player: Player
): ItemStack
{
val item = ItemStack( kit.icon )
val meta = item.itemMeta
@@ -131,14 +138,14 @@ class KitInventoryManager(
kit.description.forEach { line ->
lore.add(
Component.text(line)
.color(NamedTextColor.GRAY)
line.color( NamedTextColor.GRAY )
.decoration( TextDecoration.ITALIC, false )
)
}
if (canUseKit( player, kit )) {
if (isSelected) {
if ( isSelected )
{
meta.addEnchant( Enchantment.UNBREAKING, 1, true )
meta.addItemFlags( ItemFlag.HIDE_ENCHANTS )
}
@@ -159,7 +166,8 @@ class KitInventoryManager(
return item
}
private fun createPreviousPageItem(): ItemStack {
private fun createPreviousPageItem(): ItemStack
{
val item = ItemStack( Material.ARROW )
val meta = item.itemMeta
meta.displayName(
@@ -171,7 +179,8 @@ class KitInventoryManager(
return item
}
private fun createNextPageItem(): ItemStack {
private fun createNextPageItem(): ItemStack
{
val item = ItemStack( Material.ARROW )
val meta = item.itemMeta
meta.displayName(
@@ -183,7 +192,8 @@ class KitInventoryManager(
return item
}
private fun createCloseItem(): ItemStack {
private fun createCloseItem(): ItemStack
{
val item = ItemStack( Material.BARRIER )
val meta = item.itemMeta
meta.displayName(
@@ -195,7 +205,19 @@ class KitInventoryManager(
return item
}
private fun canUseKit(player: Player, kit: AbstractKit): Boolean {
return true
private fun canUseKit(
player: Player,
kit: AbstractKit
): Boolean
{
val unlockedKits = mutableListOf<String>()
runBlocking {
val kitPlayer = plugin.playerRepository.findByUuid( player.uniqueId )
if ( kitPlayer != null ) unlockedKits.addAll( kitPlayer.unlockedKits )
}
return unlockedKits.contains( kit.id )
}
}

130
src/main/kotlin/club/mcscrims/speedhg/listener/GameStateListener.kt
View File

@@ -4,12 +4,16 @@ import club.mcscrims.speedhg.SpeedHG
import club.mcscrims.speedhg.game.GameManager
import club.mcscrims.speedhg.game.GameStateTypes
import club.mcscrims.speedhg.util.DirectionUtil
import club.mcscrims.spigot.chat.getDisplayName
import kotlinx.coroutines.runBlocking
import org.bukkit.Bukkit
import org.bukkit.Material
import org.bukkit.Sound
import org.bukkit.attribute.Attribute
import org.bukkit.entity.Entity
import org.bukkit.entity.Player
import org.bukkit.entity.Projectile
import org.bukkit.entity.Tameable
import org.bukkit.event.Event
import org.bukkit.event.EventHandler
import org.bukkit.event.Listener
@@ -22,6 +26,7 @@ import org.bukkit.event.enchantment.EnchantItemEvent
import org.bukkit.event.entity.EntityDamageByEntityEvent
import org.bukkit.event.entity.EntityDamageEvent
import org.bukkit.event.entity.FoodLevelChangeEvent
import org.bukkit.event.entity.PlayerDeathEvent
import org.bukkit.event.inventory.ClickType
import org.bukkit.event.inventory.CraftItemEvent
import org.bukkit.event.inventory.InventoryClickEvent
@@ -542,4 +547,129 @@ class GameStateListener(
event.isCancelled = true
}
enum class DeathType {
PLAYER,
ENTITY,
WORLD
}
private val playerDeathMessages: Int = plugin.messageConfig.data.deathMessages["player"]!!.size
private val entityDeathMessages: Int = plugin.messageConfig.data.deathMessages["entity"]!!.size
private val worldDeathMessages: Int = plugin.messageConfig.data.deathMessages["world"]!!.size
@EventHandler
fun onDeath(
event: PlayerDeathEvent
) {
val player = event.entity
suppressEvent( event )
val lastDamageCause = player.lastDamageCause
var killer: Entity? = null
var deathType = DeathType.WORLD
if ( lastDamageCause is EntityDamageByEntityEvent )
{
val damager = lastDamageCause.damager
if ( damager !is Player )
{
if ( damager is Projectile )
{
if ( damager.shooter is Player )
{
deathType = DeathType.PLAYER
killer = damager.shooter as Player
}
else
{
deathType = DeathType.ENTITY
killer = damager.shooter as Entity
}
}
else if ( damager is Tameable && damager.isTamed && damager.owner is Player )
{
deathType = DeathType.PLAYER
killer = damager.owner as Player
}
else
{
deathType = DeathType.ENTITY
killer = damager
}
}
else
{
deathType = DeathType.PLAYER
killer = damager
}
}
if ( killer != null && killer is Player )
{
killer.exp += 0.5f
runBlocking { plugin.statsRepository.addKills( killer.uniqueId, 1 ) }
}
when( deathType )
{
DeathType.PLAYER ->
{
val random = this.random.nextInt( 0, playerDeathMessages )
val message = plugin.chatFormatter.formatList( "death.player",
"{player}" to player.getDisplayName, "{killer}" to (killer as Player).getDisplayName
)[ random ]
for ( p in Bukkit.getOnlinePlayers() )
plugin.chatManager.sendInteractiveMessage( p, message )
}
DeathType.ENTITY ->
{
val random = this.random.nextInt( 0, entityDeathMessages )
val message = plugin.chatFormatter.formatList( "death.entity",
"{player}" to player.getDisplayName, "{entity}" to killer!!.type.name
)[ random ]
for ( p in Bukkit.getOnlinePlayers() )
plugin.chatManager.sendInteractiveMessage( p, message )
}
DeathType.WORLD ->
{
val random = this.random.nextInt( 0, worldDeathMessages )
val message = plugin.chatFormatter.formatList( "death.world",
"{player}" to player.getDisplayName
)[ random ]
for ( p in Bukkit.getOnlinePlayers() )
plugin.chatManager.sendInteractiveMessage( p, message )
}
}
}
private fun suppressEvent(
event: PlayerDeathEvent
) {
val player = event.entity
event.deathMessage( null )
event.setShouldDropExperience( false )
event.setShouldPlayDeathSound( false )
player.world.strikeLightningEffect( player.location )
runBlocking {
plugin.statsRepository.addDeaths( player.uniqueId, 1 )
plugin.playerRepository.updateAliveStatus( player.uniqueId, false )
}
if ( player.isOnline )
player.kick(plugin.chatFormatter.format( "death.kick" ))
}
}