mirror of
https://github.com/GayPizzaSpecifications/foundation.git
synced 2025-08-02 21:20:55 +00:00
Repair extension loading by placing them in common-plugin rather than foundation-shared.
This commit is contained in:
parent
6a05d5f29f
commit
772cc32099
@ -1,4 +1,4 @@
|
||||
package gay.pizza.foundation.shared
|
||||
package gay.pizza.foundation.common
|
||||
|
||||
import org.bukkit.entity.Player
|
||||
|
@ -1,4 +1,4 @@
|
||||
package gay.pizza.foundation.shared
|
||||
package gay.pizza.foundation.common
|
||||
|
||||
fun <T, R : Comparable<R>> Collection<T>.sortedBy(order: SortOrder, selector: (T) -> R?): List<T> =
|
||||
if (order == SortOrder.Ascending) {
|
@ -1,4 +1,4 @@
|
||||
package gay.pizza.foundation.shared
|
||||
package gay.pizza.foundation.common
|
||||
|
||||
import org.bukkit.Material
|
||||
import org.bukkit.OfflinePlayer
|
@ -1,4 +1,4 @@
|
||||
package gay.pizza.foundation.shared
|
||||
package gay.pizza.foundation.common
|
||||
|
||||
enum class SortOrder {
|
||||
Ascending,
|
@ -1,4 +1,4 @@
|
||||
package gay.pizza.foundation.shared
|
||||
package gay.pizza.foundation.common
|
||||
|
||||
import org.bukkit.Location
|
||||
import org.bukkit.World
|
@ -18,7 +18,8 @@ class ChaosController(val plugin: Plugin, val config: ChaosConfig) : Listener {
|
||||
val selectorController = ChaosSelectorController(this, plugin)
|
||||
|
||||
val allModules = ChaosModules.all(plugin)
|
||||
private var allowedModules: List<ChaosModule> = emptyList()
|
||||
var allowedModules: List<ChaosModule> = emptyList()
|
||||
|
||||
private var activeModules = mutableSetOf<ChaosModule>()
|
||||
|
||||
var bossBar: BossBar? = null
|
||||
|
@ -15,8 +15,10 @@ class ChaosSelectorController(val controller: ChaosController, val plugin: Plugi
|
||||
|
||||
fun select() {
|
||||
controller.deactivateAll()
|
||||
val module = controller.allModules.random()
|
||||
controller.activate(module)
|
||||
val module = controller.allowedModules.randomOrNull()
|
||||
if (module != null) {
|
||||
controller.activate(module)
|
||||
}
|
||||
}
|
||||
|
||||
fun cancel() {
|
||||
|
@ -1,6 +1,6 @@
|
||||
package gay.pizza.foundation.chaos.modules
|
||||
|
||||
import gay.pizza.foundation.shared.spawn
|
||||
import gay.pizza.foundation.common.spawn
|
||||
import org.bukkit.entity.TNTPrimed
|
||||
import org.bukkit.plugin.Plugin
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
package gay.pizza.foundation.chaos.modules
|
||||
|
||||
import gay.pizza.foundation.shared.spawn
|
||||
import gay.pizza.foundation.common.spawn
|
||||
import org.bukkit.entity.TNTPrimed
|
||||
import org.bukkit.plugin.Plugin
|
||||
|
||||
|
@ -4,6 +4,8 @@ import gay.pizza.foundation.chaos.randomPlayer
|
||||
import gay.pizza.foundation.common.without
|
||||
import org.bukkit.Chunk
|
||||
import org.bukkit.ChunkSnapshot
|
||||
import org.bukkit.Location
|
||||
import org.bukkit.Material
|
||||
import org.bukkit.block.Block
|
||||
import org.bukkit.block.data.BlockData
|
||||
import org.bukkit.plugin.Plugin
|
||||
|
@ -1,6 +1,6 @@
|
||||
package gay.pizza.foundation.core.features.player
|
||||
|
||||
import gay.pizza.foundation.shared.chat
|
||||
import gay.pizza.foundation.common.chat
|
||||
import org.bukkit.command.Command
|
||||
import org.bukkit.command.CommandExecutor
|
||||
import org.bukkit.command.CommandSender
|
||||
|
@ -1,6 +1,6 @@
|
||||
package gay.pizza.foundation.core.features.player
|
||||
|
||||
import gay.pizza.foundation.shared.spawn
|
||||
import gay.pizza.foundation.common.spawn
|
||||
import org.bukkit.command.Command
|
||||
import org.bukkit.command.CommandExecutor
|
||||
import org.bukkit.command.CommandSender
|
||||
|
@ -1,7 +1,7 @@
|
||||
package gay.pizza.foundation.core.features.stats
|
||||
|
||||
import gay.pizza.foundation.shared.SortOrder
|
||||
import gay.pizza.foundation.shared.allPlayerStatisticsOf
|
||||
import gay.pizza.foundation.common.SortOrder
|
||||
import gay.pizza.foundation.common.allPlayerStatisticsOf
|
||||
import org.bukkit.Statistic
|
||||
import org.bukkit.command.Command
|
||||
import org.bukkit.command.CommandExecutor
|
||||
|
Loading…
Reference in New Issue
Block a user