moritzruth/spigot-ttt
Archived
1
0
Fork 0
Code Activity

Change package structure and fix bug of Second Chance

Browse source
This commit is contained in:
Moritz Ruth 2020-06-09 21:37:47 +02:00
parent e6b22c9e62
commit 80acfbad32
No known key found for this signature in database
GPG key ID: AFD57E23E753841B
35 changed files with 98 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/kotlin/de/moritzruth/spigot_ttt/CommandManager.kt
View file

@ -2,7 +2,7 @@ package de.moritzruth.spigot_ttt
import de.moritzruth.spigot_ttt.game.AbortCommand
import de.moritzruth.spigot_ttt.game.StartCommand
import de.moritzruth.spigot_ttt.items.AddItemSpawnCommand
import de.moritzruth.spigot_ttt.game.items.AddItemSpawnCommand
object CommandManager {
fun initializeCommands() {

2
src/main/kotlin/de/moritzruth/spigot_ttt/ResourcePack.kt
View file

@ -8,7 +8,7 @@ object ResourcePack {
object Items {
val textureless = Material.WHITE_STAINED_GLASS_PANE
val deathReason = Material.GRAY_STAINED_GLASS_PANE
val questionMark = Material.GRASS_BLOCK
val questionMark = Material.STONE
val time = Material.CLOCK
val dot = Material.GRAY_STAINED_GLASS
val arrowDown = Material.WHITE_STAINED_GLASS

2
src/main/kotlin/de/moritzruth/spigot_ttt/TTTItemListener.kt
View file

@ -2,7 +2,7 @@ package de.moritzruth.spigot_ttt
import de.moritzruth.spigot_ttt.game.players.PlayerManager
import de.moritzruth.spigot_ttt.game.players.TTTPlayer
import de.moritzruth.spigot_ttt.items.TTTItem
import de.moritzruth.spigot_ttt.game.items.TTTItem
import de.moritzruth.spigot_ttt.utils.isLeftClick
import de.moritzruth.spigot_ttt.utils.isRightClick
import org.bukkit.entity.Player

8
src/main/kotlin/de/moritzruth/spigot_ttt/game/GameManager.kt
View file

@ -2,13 +2,13 @@ package de.moritzruth.spigot_ttt.game
import de.moritzruth.spigot_ttt.game.corpses.CorpseListener
import de.moritzruth.spigot_ttt.game.corpses.CorpseManager
import de.moritzruth.spigot_ttt.game.items.ItemManager
import de.moritzruth.spigot_ttt.game.items.ItemSpawner
import de.moritzruth.spigot_ttt.game.items.shop.Shop
import de.moritzruth.spigot_ttt.game.items.shop.ShopListener
import de.moritzruth.spigot_ttt.game.players.PlayerManager
import de.moritzruth.spigot_ttt.game.players.Role
import de.moritzruth.spigot_ttt.items.ItemManager
import de.moritzruth.spigot_ttt.items.ItemSpawner
import de.moritzruth.spigot_ttt.plugin
import de.moritzruth.spigot_ttt.shop.Shop
import de.moritzruth.spigot_ttt.shop.ShopListener
import org.bukkit.GameRule
import kotlin.random.Random

2
src/main/kotlin/de/moritzruth/spigot_ttt/game/corpses/TTTCorpse.kt
View file

@ -6,7 +6,7 @@ import de.moritzruth.spigot_ttt.game.GameMessenger
import de.moritzruth.spigot_ttt.game.players.DeathReason
import de.moritzruth.spigot_ttt.game.players.Role
import de.moritzruth.spigot_ttt.game.players.TTTPlayer
import de.moritzruth.spigot_ttt.items.weapons.guns.impl.Pistol
import de.moritzruth.spigot_ttt.game.items.impl.weapons.guns.Pistol
import de.moritzruth.spigot_ttt.plugin
import de.moritzruth.spigot_ttt.utils.applyMeta
import de.moritzruth.spigot_ttt.utils.secondsToTicks

2
src/main/kotlin/de/moritzruth/spigot_ttt/items/AddItemSpawnCommand.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/AddItemSpawnCommand.kt
View file

@ -1,4 +1,4 @@
package de.moritzruth.spigot_ttt.items
package de.moritzruth.spigot_ttt.game.items
import de.moritzruth.spigot_ttt.TTTPlugin
import de.moritzruth.spigot_ttt.plugin

10
src/main/kotlin/de/moritzruth/spigot_ttt/items/ItemManager.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/ItemManager.kt
View file

@ -1,14 +1,14 @@
package de.moritzruth.spigot_ttt.items
package de.moritzruth.spigot_ttt.game.items
import com.comphenix.protocol.ProtocolLibrary
import com.connorlinfoot.actionbarapi.ActionBarAPI
import de.moritzruth.spigot_ttt.game.GameManager
import de.moritzruth.spigot_ttt.game.players.IState
import de.moritzruth.spigot_ttt.game.players.PlayerManager
import de.moritzruth.spigot_ttt.items.impl.*
import de.moritzruth.spigot_ttt.items.weapons.guns.impl.*
import de.moritzruth.spigot_ttt.items.weapons.impl.BaseballBat
import de.moritzruth.spigot_ttt.items.weapons.impl.Knife
import de.moritzruth.spigot_ttt.game.items.impl.*
import de.moritzruth.spigot_ttt.game.items.impl.weapons.BaseballBat
import de.moritzruth.spigot_ttt.game.items.impl.weapons.Knife
import de.moritzruth.spigot_ttt.game.items.impl.weapons.guns.*
import de.moritzruth.spigot_ttt.plugin
import de.moritzruth.spigot_ttt.utils.nextTick
import org.bukkit.ChatColor

2
src/main/kotlin/de/moritzruth/spigot_ttt/items/ItemSpawner.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/ItemSpawner.kt
View file

@ -1,4 +1,4 @@
package de.moritzruth.spigot_ttt.items
package de.moritzruth.spigot_ttt.game.items
import de.moritzruth.spigot_ttt.game.GameManager
import de.moritzruth.spigot_ttt.utils.ConfigurationFile

2
src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/LoreHelper.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/LoreHelper.kt
View file

@ -1,4 +1,4 @@
package de.moritzruth.spigot_ttt.items.weapons
package de.moritzruth.spigot_ttt.game.items
import org.bukkit.ChatColor

2
src/main/kotlin/de/moritzruth/spigot_ttt/items/TTTItem.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/TTTItem.kt
View file

@ -1,4 +1,4 @@
package de.moritzruth.spigot_ttt.items
package de.moritzruth.spigot_ttt.game.items
import com.comphenix.protocol.events.PacketListener
import de.moritzruth.spigot_ttt.game.players.Role

8
src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/CloakingDevice.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/CloakingDevice.kt
View file

@ -1,12 +1,12 @@
package de.moritzruth.spigot_ttt.items.impl
package de.moritzruth.spigot_ttt.game.items.impl
import de.moritzruth.spigot_ttt.ResourcePack
import de.moritzruth.spigot_ttt.TTTItemListener
import de.moritzruth.spigot_ttt.game.GameEndEvent
import de.moritzruth.spigot_ttt.game.items.Buyable
import de.moritzruth.spigot_ttt.game.items.Selectable
import de.moritzruth.spigot_ttt.game.items.TTTItem
import de.moritzruth.spigot_ttt.game.players.*
import de.moritzruth.spigot_ttt.items.Buyable
import de.moritzruth.spigot_ttt.items.Selectable
import de.moritzruth.spigot_ttt.items.TTTItem
import de.moritzruth.spigot_ttt.utils.applyMeta
import de.moritzruth.spigot_ttt.utils.startItemDamageProgress
import org.bukkit.ChatColor

6
src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/Defibrillator.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Defibrillator.kt
View file

@ -1,4 +1,4 @@
package de.moritzruth.spigot_ttt.items.impl
package de.moritzruth.spigot_ttt.game.items.impl
import com.connorlinfoot.actionbarapi.ActionBarAPI
import de.moritzruth.spigot_ttt.ResourcePack
@ -7,8 +7,8 @@ import de.moritzruth.spigot_ttt.game.GameEndEvent
import de.moritzruth.spigot_ttt.game.GameManager
import de.moritzruth.spigot_ttt.game.corpses.CorpseManager
import de.moritzruth.spigot_ttt.game.players.*
import de.moritzruth.spigot_ttt.items.Buyable
import de.moritzruth.spigot_ttt.items.TTTItem
import de.moritzruth.spigot_ttt.game.items.Buyable
import de.moritzruth.spigot_ttt.game.items.TTTItem
import de.moritzruth.spigot_ttt.plugin
import de.moritzruth.spigot_ttt.utils.*
import org.bukkit.ChatColor

6
src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/EnderPearl.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/EnderPearl.kt
View file

@ -1,10 +1,10 @@
package de.moritzruth.spigot_ttt.items.impl
package de.moritzruth.spigot_ttt.game.items.impl
import de.moritzruth.spigot_ttt.TTTItemListener
import de.moritzruth.spigot_ttt.game.players.Role
import de.moritzruth.spigot_ttt.game.players.roles
import de.moritzruth.spigot_ttt.items.Buyable
import de.moritzruth.spigot_ttt.items.TTTItem
import de.moritzruth.spigot_ttt.game.items.Buyable
import de.moritzruth.spigot_ttt.game.items.TTTItem
import de.moritzruth.spigot_ttt.utils.applyMeta
import org.bukkit.ChatColor
import org.bukkit.Material

6
src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/FakeCorpse.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/FakeCorpse.kt
View file

@ -1,12 +1,12 @@
package de.moritzruth.spigot_ttt.items.impl
package de.moritzruth.spigot_ttt.game.items.impl
import com.connorlinfoot.actionbarapi.ActionBarAPI
import de.moritzruth.spigot_ttt.ResourcePack
import de.moritzruth.spigot_ttt.TTTItemListener
import de.moritzruth.spigot_ttt.game.corpses.TTTCorpse
import de.moritzruth.spigot_ttt.game.players.*
import de.moritzruth.spigot_ttt.items.Buyable
import de.moritzruth.spigot_ttt.items.TTTItem
import de.moritzruth.spigot_ttt.game.items.Buyable
import de.moritzruth.spigot_ttt.game.items.TTTItem
import de.moritzruth.spigot_ttt.plugin
import de.moritzruth.spigot_ttt.utils.applyMeta
import de.moritzruth.spigot_ttt.utils.hideInfo

6
src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/Fireball.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Fireball.kt
View file

@ -1,12 +1,12 @@
package de.moritzruth.spigot_ttt.items.impl
package de.moritzruth.spigot_ttt.game.items.impl
import de.moritzruth.spigot_ttt.TTTItemListener
import de.moritzruth.spigot_ttt.game.GameManager
import de.moritzruth.spigot_ttt.game.players.Role
import de.moritzruth.spigot_ttt.game.players.TTTPlayer
import de.moritzruth.spigot_ttt.game.players.roles
import de.moritzruth.spigot_ttt.items.Buyable
import de.moritzruth.spigot_ttt.items.TTTItem
import de.moritzruth.spigot_ttt.game.items.Buyable
import de.moritzruth.spigot_ttt.game.items.TTTItem
import de.moritzruth.spigot_ttt.utils.applyMeta
import de.moritzruth.spigot_ttt.utils.clearHeldItemSlot
import de.moritzruth.spigot_ttt.utils.createKillExplosion

6
src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/HealingPotion.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/HealingPotion.kt
View file

@ -1,10 +1,10 @@
package de.moritzruth.spigot_ttt.items.impl
package de.moritzruth.spigot_ttt.game.items.impl
import de.moritzruth.spigot_ttt.TTTItemListener
import de.moritzruth.spigot_ttt.game.players.Role
import de.moritzruth.spigot_ttt.game.players.roles
import de.moritzruth.spigot_ttt.items.Buyable
import de.moritzruth.spigot_ttt.items.TTTItem
import de.moritzruth.spigot_ttt.game.items.Buyable
import de.moritzruth.spigot_ttt.game.items.TTTItem
import de.moritzruth.spigot_ttt.utils.applyMeta
import org.bukkit.ChatColor
import org.bukkit.Material

8
src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/MartyrdomGrenade.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/MartyrdomGrenade.kt
View file

@ -1,13 +1,13 @@
package de.moritzruth.spigot_ttt.items.impl
package de.moritzruth.spigot_ttt.game.items.impl
import de.moritzruth.spigot_ttt.ResourcePack
import de.moritzruth.spigot_ttt.TTTItemListener
import de.moritzruth.spigot_ttt.game.GameEndEvent
import de.moritzruth.spigot_ttt.game.GameManager
import de.moritzruth.spigot_ttt.game.players.*
import de.moritzruth.spigot_ttt.items.Buyable
import de.moritzruth.spigot_ttt.items.PASSIVE
import de.moritzruth.spigot_ttt.items.TTTItem
import de.moritzruth.spigot_ttt.game.items.Buyable
import de.moritzruth.spigot_ttt.game.items.PASSIVE
import de.moritzruth.spigot_ttt.game.items.TTTItem
import de.moritzruth.spigot_ttt.plugin
import de.moritzruth.spigot_ttt.utils.applyMeta
import de.moritzruth.spigot_ttt.utils.createKillExplosion

8
src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/Radar.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Radar.kt
View file

@ -1,4 +1,4 @@
package de.moritzruth.spigot_ttt.items.impl
package de.moritzruth.spigot_ttt.game.items.impl
import com.comphenix.packetwrapper.WrapperPlayServerEntityMetadata
import com.comphenix.protocol.PacketType
@ -8,9 +8,9 @@ import de.moritzruth.spigot_ttt.ResourcePack
import de.moritzruth.spigot_ttt.TTTItemListener
import de.moritzruth.spigot_ttt.game.GameEndEvent
import de.moritzruth.spigot_ttt.game.players.*
import de.moritzruth.spigot_ttt.items.Buyable
import de.moritzruth.spigot_ttt.items.PASSIVE
import de.moritzruth.spigot_ttt.items.TTTItem
import de.moritzruth.spigot_ttt.game.items.Buyable
import de.moritzruth.spigot_ttt.game.items.PASSIVE
import de.moritzruth.spigot_ttt.game.items.TTTItem
import de.moritzruth.spigot_ttt.plugin
import de.moritzruth.spigot_ttt.utils.applyMeta
import de.moritzruth.spigot_ttt.utils.hideInfo

14
src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/SecondChance.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/SecondChance.kt
View file

@ -1,13 +1,13 @@
package de.moritzruth.spigot_ttt.items.impl
package de.moritzruth.spigot_ttt.game.items.impl
import de.moritzruth.spigot_ttt.ResourcePack
import de.moritzruth.spigot_ttt.TTTItemListener
import de.moritzruth.spigot_ttt.game.GameEndEvent
import de.moritzruth.spigot_ttt.game.GameManager
import de.moritzruth.spigot_ttt.game.items.Buyable
import de.moritzruth.spigot_ttt.game.items.PASSIVE
import de.moritzruth.spigot_ttt.game.items.TTTItem
import de.moritzruth.spigot_ttt.game.players.*
import de.moritzruth.spigot_ttt.items.Buyable
import de.moritzruth.spigot_ttt.items.PASSIVE
import de.moritzruth.spigot_ttt.items.TTTItem
import de.moritzruth.spigot_ttt.plugin
import de.moritzruth.spigot_ttt.utils.applyMeta
import de.moritzruth.spigot_ttt.utils.hideInfo
@ -31,7 +31,7 @@ object SecondChance: TTTItem, Buyable {
private val DISPLAY_NAME = "${ChatColor.GREEN}${ChatColor.BOLD}Second Chance"
val ON_CORPSE = ResourcePack.Items.arrowDown
val ON_SPAWN = ResourcePack.Items.dot
private const val TIMEOUT = 20.0
private const val TIMEOUT = 10.0
override val type = TTTItem.Type.SPECIAL
override val itemStack = ItemStack(ResourcePack.Items.secondChance).applyMeta {
@ -145,6 +145,10 @@ object SecondChance: TTTItem, Buyable {
task.cancel()
tttPlayer.player.closeInventory()
bossBar.removePlayer(tttPlayer.player)
try {
PlayerManager.letRemainingRoleGroupWin()
} catch (e: IllegalStateException) {}
}
}

6
src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/Teleporter.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Teleporter.kt
View file

@ -1,12 +1,12 @@
package de.moritzruth.spigot_ttt.items.impl
package de.moritzruth.spigot_ttt.game.items.impl
import com.connorlinfoot.actionbarapi.ActionBarAPI
import de.moritzruth.spigot_ttt.ResourcePack
import de.moritzruth.spigot_ttt.TTTItemListener
import de.moritzruth.spigot_ttt.game.GameManager
import de.moritzruth.spigot_ttt.game.players.*
import de.moritzruth.spigot_ttt.items.Buyable
import de.moritzruth.spigot_ttt.items.TTTItem
import de.moritzruth.spigot_ttt.game.items.Buyable
import de.moritzruth.spigot_ttt.game.items.TTTItem
import de.moritzruth.spigot_ttt.utils.applyMeta
import de.moritzruth.spigot_ttt.utils.clearHeldItemSlot
import org.bukkit.ChatColor

8
src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/impl/BaseballBat.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/BaseballBat.kt
View file

@ -1,4 +1,4 @@
package de.moritzruth.spigot_ttt.items.weapons.impl
package de.moritzruth.spigot_ttt.game.items.impl.weapons
import de.moritzruth.spigot_ttt.ResourcePack
import de.moritzruth.spigot_ttt.TTTItemListener
@ -6,9 +6,9 @@ import de.moritzruth.spigot_ttt.game.GameManager
import de.moritzruth.spigot_ttt.game.players.Role
import de.moritzruth.spigot_ttt.game.players.TTTPlayer
import de.moritzruth.spigot_ttt.game.players.roles
import de.moritzruth.spigot_ttt.items.Buyable
import de.moritzruth.spigot_ttt.items.Selectable
import de.moritzruth.spigot_ttt.items.TTTItem
import de.moritzruth.spigot_ttt.game.items.Buyable
import de.moritzruth.spigot_ttt.game.items.Selectable
import de.moritzruth.spigot_ttt.game.items.TTTItem
import de.moritzruth.spigot_ttt.utils.applyMeta
import de.moritzruth.spigot_ttt.utils.hideInfo
import de.moritzruth.spigot_ttt.utils.removeTTTItemNextTick

8
src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/impl/Knife.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/Knife.kt
View file

@ -1,4 +1,4 @@
package de.moritzruth.spigot_ttt.items.weapons.impl
package de.moritzruth.spigot_ttt.game.items.impl.weapons
import de.moritzruth.spigot_ttt.ResourcePack
import de.moritzruth.spigot_ttt.TTTItemListener
@ -7,9 +7,9 @@ import de.moritzruth.spigot_ttt.game.players.DamageInfo
import de.moritzruth.spigot_ttt.game.players.DeathReason
import de.moritzruth.spigot_ttt.game.players.Role
import de.moritzruth.spigot_ttt.game.players.roles
import de.moritzruth.spigot_ttt.items.Buyable
import de.moritzruth.spigot_ttt.items.TTTItem
import de.moritzruth.spigot_ttt.items.weapons.LoreHelper
import de.moritzruth.spigot_ttt.game.items.Buyable
import de.moritzruth.spigot_ttt.game.items.TTTItem
import de.moritzruth.spigot_ttt.game.items.LoreHelper
import de.moritzruth.spigot_ttt.utils.applyMeta
import de.moritzruth.spigot_ttt.utils.hideInfo
import de.moritzruth.spigot_ttt.utils.removeTTTItemNextTick

7
src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/impl/Deagle.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Deagle.kt
View file

@ -1,9 +1,8 @@
package de.moritzruth.spigot_ttt.items.weapons.guns.impl
package de.moritzruth.spigot_ttt.game.items.impl.weapons.guns
import de.moritzruth.spigot_ttt.ResourcePack
import de.moritzruth.spigot_ttt.items.Spawning
import de.moritzruth.spigot_ttt.items.TTTItem
import de.moritzruth.spigot_ttt.items.weapons.guns.Gun
import de.moritzruth.spigot_ttt.game.items.Spawning
import de.moritzruth.spigot_ttt.game.items.TTTItem
import de.moritzruth.spigot_ttt.utils.heartsToHealth
import org.bukkit.ChatColor

7
src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/impl/Glock.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Glock.kt
View file

@ -1,9 +1,8 @@
package de.moritzruth.spigot_ttt.items.weapons.guns.impl
package de.moritzruth.spigot_ttt.game.items.impl.weapons.guns
import de.moritzruth.spigot_ttt.ResourcePack
import de.moritzruth.spigot_ttt.items.Spawning
import de.moritzruth.spigot_ttt.items.TTTItem
import de.moritzruth.spigot_ttt.items.weapons.guns.Gun
import de.moritzruth.spigot_ttt.game.items.Spawning
import de.moritzruth.spigot_ttt.game.items.TTTItem
import de.moritzruth.spigot_ttt.utils.heartsToHealth
import org.bukkit.ChatColor

9
src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/Gun.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Gun.kt
View file

@ -1,4 +1,4 @@
package de.moritzruth.spigot_ttt.items.weapons.guns
package de.moritzruth.spigot_ttt.game.items.impl.weapons.guns
import de.moritzruth.spigot_ttt.ResourcePack
import de.moritzruth.spigot_ttt.TTTItemListener
@ -6,12 +6,7 @@ import de.moritzruth.spigot_ttt.game.GameEndEvent
import de.moritzruth.spigot_ttt.game.GameManager
import de.moritzruth.spigot_ttt.game.GamePhase
import de.moritzruth.spigot_ttt.game.players.*
import de.moritzruth.spigot_ttt.items.DropHandler
import de.moritzruth.spigot_ttt.items.ItemManager
import de.moritzruth.spigot_ttt.items.Selectable
import de.moritzruth.spigot_ttt.items.TTTItem
import de.moritzruth.spigot_ttt.items.weapons.LoreHelper
import de.moritzruth.spigot_ttt.plugin
import de.moritzruth.spigot_ttt.game.items.*
import de.moritzruth.spigot_ttt.utils.applyMeta
import de.moritzruth.spigot_ttt.utils.nextTick
import de.moritzruth.spigot_ttt.utils.startItemDamageProgress

7
src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/impl/Pistol.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Pistol.kt
View file

@ -1,9 +1,8 @@
package de.moritzruth.spigot_ttt.items.weapons.guns.impl
package de.moritzruth.spigot_ttt.game.items.impl.weapons.guns
import de.moritzruth.spigot_ttt.ResourcePack
import de.moritzruth.spigot_ttt.items.Spawning
import de.moritzruth.spigot_ttt.items.TTTItem
import de.moritzruth.spigot_ttt.items.weapons.guns.Gun
import de.moritzruth.spigot_ttt.game.items.Spawning
import de.moritzruth.spigot_ttt.game.items.TTTItem
import de.moritzruth.spigot_ttt.utils.heartsToHealth
import org.bukkit.ChatColor

7
src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/impl/Rifle.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Rifle.kt
View file

@ -1,9 +1,8 @@
package de.moritzruth.spigot_ttt.items.weapons.guns.impl
package de.moritzruth.spigot_ttt.game.items.impl.weapons.guns
import de.moritzruth.spigot_ttt.ResourcePack
import de.moritzruth.spigot_ttt.items.Spawning
import de.moritzruth.spigot_ttt.items.TTTItem
import de.moritzruth.spigot_ttt.items.weapons.guns.Gun
import de.moritzruth.spigot_ttt.game.items.Spawning
import de.moritzruth.spigot_ttt.game.items.TTTItem
import de.moritzruth.spigot_ttt.utils.heartsToHealth
import org.bukkit.ChatColor

7
src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/impl/Shotgun.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Shotgun.kt
View file

@ -1,11 +1,10 @@
package de.moritzruth.spigot_ttt.items.weapons.guns.impl
package de.moritzruth.spigot_ttt.game.items.impl.weapons.guns
import de.moritzruth.spigot_ttt.ResourcePack
import de.moritzruth.spigot_ttt.game.GameManager
import de.moritzruth.spigot_ttt.game.players.TTTPlayer
import de.moritzruth.spigot_ttt.items.Spawning
import de.moritzruth.spigot_ttt.items.TTTItem
import de.moritzruth.spigot_ttt.items.weapons.guns.Gun
import de.moritzruth.spigot_ttt.game.items.Spawning
import de.moritzruth.spigot_ttt.game.items.TTTItem
import de.moritzruth.spigot_ttt.plugin
import de.moritzruth.spigot_ttt.utils.heartsToHealth
import de.moritzruth.spigot_ttt.utils.secondsToTicks

7
src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/impl/SidekickDeagle.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/SidekickDeagle.kt
View file

@ -1,13 +1,12 @@
package de.moritzruth.spigot_ttt.items.weapons.guns.impl
package de.moritzruth.spigot_ttt.game.items.impl.weapons.guns
import com.connorlinfoot.actionbarapi.ActionBarAPI
import de.moritzruth.spigot_ttt.ResourcePack
import de.moritzruth.spigot_ttt.game.players.Role
import de.moritzruth.spigot_ttt.game.players.TTTPlayer
import de.moritzruth.spigot_ttt.game.players.roles
import de.moritzruth.spigot_ttt.items.Buyable
import de.moritzruth.spigot_ttt.items.TTTItem
import de.moritzruth.spigot_ttt.items.weapons.guns.Gun
import de.moritzruth.spigot_ttt.game.items.Buyable
import de.moritzruth.spigot_ttt.game.items.TTTItem
import de.moritzruth.spigot_ttt.utils.applyMeta
import de.moritzruth.spigot_ttt.utils.hideInfo
import org.bukkit.ChatColor

8
src/main/kotlin/de/moritzruth/spigot_ttt/shop/Shop.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/shop/Shop.kt
View file

@ -1,11 +1,11 @@
package de.moritzruth.spigot_ttt.shop
package de.moritzruth.spigot_ttt.game.items.shop
import com.connorlinfoot.actionbarapi.ActionBarAPI
import de.moritzruth.spigot_ttt.game.players.PlayerManager
import de.moritzruth.spigot_ttt.game.players.TTTPlayer
import de.moritzruth.spigot_ttt.items.Buyable
import de.moritzruth.spigot_ttt.items.ItemManager
import de.moritzruth.spigot_ttt.items.TTTItem
import de.moritzruth.spigot_ttt.game.items.Buyable
import de.moritzruth.spigot_ttt.game.items.ItemManager
import de.moritzruth.spigot_ttt.game.items.TTTItem
import de.moritzruth.spigot_ttt.plugin
import de.moritzruth.spigot_ttt.utils.applyMeta
import de.moritzruth.spigot_ttt.utils.secondsToTicks

6
src/main/kotlin/de/moritzruth/spigot_ttt/shop/ShopListener.kt → src/main/kotlin/de/moritzruth/spigot_ttt/game/items/shop/ShopListener.kt
View file

@ -1,11 +1,11 @@
package de.moritzruth.spigot_ttt.shop
package de.moritzruth.spigot_ttt.game.items.shop
import com.connorlinfoot.actionbarapi.ActionBarAPI
import de.moritzruth.spigot_ttt.game.players.PlayerManager
import de.moritzruth.spigot_ttt.game.players.TTTPlayer
import de.moritzruth.spigot_ttt.game.players.TTTPlayerDeathEvent
import de.moritzruth.spigot_ttt.items.Buyable
import de.moritzruth.spigot_ttt.items.ItemManager
import de.moritzruth.spigot_ttt.game.items.Buyable
import de.moritzruth.spigot_ttt.game.items.ItemManager
import de.moritzruth.spigot_ttt.plugin
import org.bukkit.ChatColor
import org.bukkit.entity.Player

2
src/main/kotlin/de/moritzruth/spigot_ttt/game/players/DeathReason.kt
View file

@ -1,6 +1,6 @@
package de.moritzruth.spigot_ttt.game.players
import de.moritzruth.spigot_ttt.items.TTTItem
import de.moritzruth.spigot_ttt.game.items.TTTItem
sealed class DeathReason(val displayText: String) {
object DISCONNECTED: DeathReason("Verbindung unterbrochen")

8
src/main/kotlin/de/moritzruth/spigot_ttt/game/players/TTTPlayer.kt
View file

@ -5,11 +5,11 @@ import de.moritzruth.spigot_ttt.TTTPlugin
import de.moritzruth.spigot_ttt.game.GameManager
import de.moritzruth.spigot_ttt.game.GamePhase
import de.moritzruth.spigot_ttt.game.corpses.TTTCorpse
import de.moritzruth.spigot_ttt.items.ItemManager
import de.moritzruth.spigot_ttt.items.Selectable
import de.moritzruth.spigot_ttt.items.TTTItem
import de.moritzruth.spigot_ttt.game.items.ItemManager
import de.moritzruth.spigot_ttt.game.items.Selectable
import de.moritzruth.spigot_ttt.game.items.TTTItem
import de.moritzruth.spigot_ttt.plugin
import de.moritzruth.spigot_ttt.shop.Shop
import de.moritzruth.spigot_ttt.game.items.shop.Shop
import de.moritzruth.spigot_ttt.utils.hotbarContents
import de.moritzruth.spigot_ttt.utils.nextTick
import de.moritzruth.spigot_ttt.utils.secondsToTicks

2
src/main/kotlin/de/moritzruth/spigot_ttt/utils/CreateKillExplosion.kt
View file

@ -5,7 +5,7 @@ import de.moritzruth.spigot_ttt.game.players.DamageInfo
import de.moritzruth.spigot_ttt.game.players.DeathReason
import de.moritzruth.spigot_ttt.game.players.PlayerManager
import de.moritzruth.spigot_ttt.game.players.TTTPlayer
import de.moritzruth.spigot_ttt.items.impl.Fireball
import de.moritzruth.spigot_ttt.game.items.impl.Fireball
import org.bukkit.Location
import org.bukkit.Particle
import org.bukkit.entity.Player

2
src/main/kotlin/de/moritzruth/spigot_ttt/utils/InventoryExtensions.kt
View file

@ -1,6 +1,6 @@
package de.moritzruth.spigot_ttt.utils
import de.moritzruth.spigot_ttt.items.TTTItem
import de.moritzruth.spigot_ttt.game.items.TTTItem
import org.bukkit.inventory.Inventory
import org.bukkit.inventory.ItemStack
import org.bukkit.inventory.PlayerInventory