Repair extension loading by placing them in common-plugin rather than foundation-shared.

This commit is contained in:
Alex Zenla 2023-04-20 20:23:57 -07:00 committed by Alex Zenla
parent 6a05d5f29f
commit 772cc32099
No known key found for this signature in database
GPG Key ID: 067B238899B51269
13 changed files with 19 additions and 14 deletions

View File

@ -1,4 +1,4 @@
package gay.pizza.foundation.shared
package gay.pizza.foundation.common
import org.bukkit.entity.Player

View File

@ -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) {

View File

@ -1,4 +1,4 @@
package gay.pizza.foundation.shared
package gay.pizza.foundation.common
import org.bukkit.Material
import org.bukkit.OfflinePlayer

View File

@ -1,4 +1,4 @@
package gay.pizza.foundation.shared
package gay.pizza.foundation.common
enum class SortOrder {
Ascending,

View File

@ -1,4 +1,4 @@
package gay.pizza.foundation.shared
package gay.pizza.foundation.common
import org.bukkit.Location
import org.bukkit.World

View File

@ -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

View File

@ -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() {

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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