diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/CommandManager.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/CommandManager.kt index 2f7ed05..074a3e7 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/CommandManager.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/CommandManager.kt @@ -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() { diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/ResourcePack.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/ResourcePack.kt index a78f4b7..7da17ea 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/ResourcePack.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/ResourcePack.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/TTTItemListener.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/TTTItemListener.kt index b7a9b17..2a6a031 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/TTTItemListener.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/TTTItemListener.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/game/GameManager.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/GameManager.kt index b30c7de..e71e160 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/game/GameManager.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/GameManager.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/game/corpses/TTTCorpse.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/corpses/TTTCorpse.kt index 2de86ac..f1d9af5 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/game/corpses/TTTCorpse.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/corpses/TTTCorpse.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/items/AddItemSpawnCommand.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/AddItemSpawnCommand.kt similarity index 95% rename from src/main/kotlin/de/moritzruth/spigot_ttt/items/AddItemSpawnCommand.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/AddItemSpawnCommand.kt index 6947870..e731f45 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/items/AddItemSpawnCommand.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/AddItemSpawnCommand.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/items/ItemManager.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/ItemManager.kt similarity index 93% rename from src/main/kotlin/de/moritzruth/spigot_ttt/items/ItemManager.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/ItemManager.kt index f3eb774..dd60325 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/items/ItemManager.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/ItemManager.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/items/ItemSpawner.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/ItemSpawner.kt similarity index 97% rename from src/main/kotlin/de/moritzruth/spigot_ttt/items/ItemSpawner.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/ItemSpawner.kt index 17f5f67..acd81c5 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/items/ItemSpawner.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/ItemSpawner.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/LoreHelper.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/LoreHelper.kt similarity index 94% rename from src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/LoreHelper.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/LoreHelper.kt index 82ff9a6..3f62c5b 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/LoreHelper.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/LoreHelper.kt @@ -1,4 +1,4 @@ -package de.moritzruth.spigot_ttt.items.weapons +package de.moritzruth.spigot_ttt.game.items import org.bukkit.ChatColor diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/items/TTTItem.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/TTTItem.kt similarity index 96% rename from src/main/kotlin/de/moritzruth/spigot_ttt/items/TTTItem.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/TTTItem.kt index 0f986bf..2042668 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/items/TTTItem.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/TTTItem.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/CloakingDevice.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/CloakingDevice.kt similarity index 94% rename from src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/CloakingDevice.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/CloakingDevice.kt index be07832..ebe251b 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/CloakingDevice.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/CloakingDevice.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/Defibrillator.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Defibrillator.kt similarity index 97% rename from src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/Defibrillator.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Defibrillator.kt index b42b5c1..d567f06 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/Defibrillator.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Defibrillator.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/EnderPearl.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/EnderPearl.kt similarity index 84% rename from src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/EnderPearl.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/EnderPearl.kt index 614c038..acd4dc4 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/EnderPearl.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/EnderPearl.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/FakeCorpse.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/FakeCorpse.kt similarity index 96% rename from src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/FakeCorpse.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/FakeCorpse.kt index da74636..3ba90da 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/FakeCorpse.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/FakeCorpse.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/Fireball.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Fireball.kt similarity index 94% rename from src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/Fireball.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Fireball.kt index debd5dc..63b7e60 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/Fireball.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Fireball.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/HealingPotion.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/HealingPotion.kt similarity index 92% rename from src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/HealingPotion.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/HealingPotion.kt index 095b5c5..74328b4 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/HealingPotion.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/HealingPotion.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/MartyrdomGrenade.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/MartyrdomGrenade.kt similarity index 91% rename from src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/MartyrdomGrenade.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/MartyrdomGrenade.kt index 22d964f..19b6140 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/MartyrdomGrenade.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/MartyrdomGrenade.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/Radar.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Radar.kt similarity index 96% rename from src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/Radar.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Radar.kt index 108168d..db4e48b 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/Radar.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Radar.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/SecondChance.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/SecondChance.kt similarity index 93% rename from src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/SecondChance.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/SecondChance.kt index 5d3c98f..c7bab46 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/SecondChance.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/SecondChance.kt @@ -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) {} } } diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/Teleporter.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Teleporter.kt similarity index 96% rename from src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/Teleporter.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Teleporter.kt index 86f08aa..a65c462 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/items/impl/Teleporter.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/Teleporter.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/impl/BaseballBat.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/BaseballBat.kt similarity index 93% rename from src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/impl/BaseballBat.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/BaseballBat.kt index a554a79..975b553 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/impl/BaseballBat.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/BaseballBat.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/impl/Knife.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/Knife.kt similarity index 93% rename from src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/impl/Knife.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/Knife.kt index f9762ba..d0636bb 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/impl/Knife.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/Knife.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/impl/Deagle.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Deagle.kt similarity index 75% rename from src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/impl/Deagle.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Deagle.kt index 1e05f98..8e06d00 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/impl/Deagle.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Deagle.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/impl/Glock.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Glock.kt similarity index 75% rename from src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/impl/Glock.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Glock.kt index f679e1a..4912a53 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/impl/Glock.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Glock.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/Gun.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Gun.kt similarity index 96% rename from src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/Gun.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Gun.kt index 83ba61e..6d15387 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/Gun.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Gun.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/impl/Pistol.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Pistol.kt similarity index 75% rename from src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/impl/Pistol.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Pistol.kt index cdc53c0..ae08694 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/impl/Pistol.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Pistol.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/impl/Rifle.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Rifle.kt similarity index 75% rename from src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/impl/Rifle.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Rifle.kt index f12da74..e73c9a5 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/impl/Rifle.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Rifle.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/impl/Shotgun.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Shotgun.kt similarity index 95% rename from src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/impl/Shotgun.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Shotgun.kt index 7f49243..e0c085b 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/impl/Shotgun.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/Shotgun.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/impl/SidekickDeagle.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/SidekickDeagle.kt similarity index 92% rename from src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/impl/SidekickDeagle.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/SidekickDeagle.kt index 01c48a6..b20aa1c 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/items/weapons/guns/impl/SidekickDeagle.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/impl/weapons/guns/SidekickDeagle.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/shop/Shop.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/shop/Shop.kt similarity index 92% rename from src/main/kotlin/de/moritzruth/spigot_ttt/shop/Shop.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/shop/Shop.kt index b100a55..f30b3dc 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/shop/Shop.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/shop/Shop.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/shop/ShopListener.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/shop/ShopListener.kt similarity index 95% rename from src/main/kotlin/de/moritzruth/spigot_ttt/shop/ShopListener.kt rename to src/main/kotlin/de/moritzruth/spigot_ttt/game/items/shop/ShopListener.kt index eff1388..3ae0301 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/shop/ShopListener.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/shop/ShopListener.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/game/players/DeathReason.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/players/DeathReason.kt index 0a8a0ba..7093c91 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/game/players/DeathReason.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/players/DeathReason.kt @@ -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") diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/game/players/TTTPlayer.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/players/TTTPlayer.kt index 3ee1e7b..b4c6440 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/game/players/TTTPlayer.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/players/TTTPlayer.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/utils/CreateKillExplosion.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/utils/CreateKillExplosion.kt index 62c8a63..febe37d 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/utils/CreateKillExplosion.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/utils/CreateKillExplosion.kt @@ -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 diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/utils/InventoryExtensions.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/utils/InventoryExtensions.kt index 18a87d6..81378f4 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/utils/InventoryExtensions.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/utils/InventoryExtensions.kt @@ -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