strips/foundation
2
0
Fork 0
mirror of https://github.com/GayPizzaSpecifications/foundation.git synced 2025-08-02 21:20:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
foundation-shared/src/main/kotlin/gay/pizza/foundation/shared/ChatExtensions.kt → common-plugin/src/main/kotlin/gay/pizza/foundation/common/ChatExtensions.kt
View File

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

2
foundation-shared/src/main/kotlin/gay/pizza/foundation/shared/CollectionExtensions.kt → common-plugin/src/main/kotlin/gay/pizza/foundation/common/CollectionExtensions.kt
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> = fun <T, R : Comparable<R>> Collection<T>.sortedBy(order: SortOrder, selector: (T) -> R?): List<T> =
if (order == SortOrder.Ascending) { if (order == SortOrder.Ascending) {

2
foundation-shared/src/main/kotlin/gay/pizza/foundation/shared/ServerExtensions.kt → common-plugin/src/main/kotlin/gay/pizza/foundation/common/ServerExtensions.kt
View File

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

2
foundation-shared/src/main/kotlin/gay/pizza/foundation/shared/SortOrder.kt → common-plugin/src/main/kotlin/gay/pizza/foundation/common/SortOrder.kt
View File

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

2
foundation-shared/src/main/kotlin/gay/pizza/foundation/shared/SpawnExtensions.kt → common-plugin/src/main/kotlin/gay/pizza/foundation/common/SpawnExtensions.kt
View File

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

3
foundation-chaos/src/main/kotlin/gay/pizza/foundation/chaos/ChaosController.kt
View File

@ -18,7 +18,8 @@ class ChaosController(val plugin: Plugin, val config: ChaosConfig) : Listener {
val selectorController = ChaosSelectorController(this, plugin) val selectorController = ChaosSelectorController(this, plugin)
val allModules = ChaosModules.all(plugin) val allModules = ChaosModules.all(plugin)
private var allowedModules: List<ChaosModule> = emptyList() var allowedModules: List<ChaosModule> = emptyList()
private var activeModules = mutableSetOf<ChaosModule>() private var activeModules = mutableSetOf<ChaosModule>()
var bossBar: BossBar? = null var bossBar: BossBar? = null

6
foundation-chaos/src/main/kotlin/gay/pizza/foundation/chaos/ChaosSelectorController.kt
View File

@ -15,8 +15,10 @@ class ChaosSelectorController(val controller: ChaosController, val plugin: Plugi
fun select() { fun select() {
controller.deactivateAll() controller.deactivateAll()
val module = controller.allModules.random() val module = controller.allowedModules.randomOrNull()
controller.activate(module) if (module != null) {
controller.activate(module)
}
} }
fun cancel() { fun cancel() {

2
foundation-chaos/src/main/kotlin/gay/pizza/foundation/chaos/modules/MegaTnt.kt
View File

@ -1,6 +1,6 @@
package gay.pizza.foundation.chaos.modules 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.entity.TNTPrimed
import org.bukkit.plugin.Plugin import org.bukkit.plugin.Plugin

2
foundation-chaos/src/main/kotlin/gay/pizza/foundation/chaos/modules/TntAllPlayers.kt
View File

@ -1,6 +1,6 @@
package gay.pizza.foundation.chaos.modules 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.entity.TNTPrimed
import org.bukkit.plugin.Plugin import org.bukkit.plugin.Plugin

2
foundation-chaos/src/main/kotlin/gay/pizza/foundation/chaos/modules/WorldSwapper.kt
View File

@ -4,6 +4,8 @@ import gay.pizza.foundation.chaos.randomPlayer
import gay.pizza.foundation.common.without import gay.pizza.foundation.common.without
import org.bukkit.Chunk import org.bukkit.Chunk
import org.bukkit.ChunkSnapshot import org.bukkit.ChunkSnapshot
import org.bukkit.Location
import org.bukkit.Material
import org.bukkit.block.Block import org.bukkit.block.Block
import org.bukkit.block.data.BlockData import org.bukkit.block.data.BlockData
import org.bukkit.plugin.Plugin import org.bukkit.plugin.Plugin

2
foundation-core/src/main/kotlin/gay/pizza/foundation/core/features/player/GooseCommand.kt
View File

@ -1,6 +1,6 @@
package gay.pizza.foundation.core.features.player 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.Command
import org.bukkit.command.CommandExecutor import org.bukkit.command.CommandExecutor
import org.bukkit.command.CommandSender import org.bukkit.command.CommandSender

2
foundation-core/src/main/kotlin/gay/pizza/foundation/core/features/player/MegaTntCommand.kt
View File

@ -1,6 +1,6 @@
package gay.pizza.foundation.core.features.player 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.Command
import org.bukkit.command.CommandExecutor import org.bukkit.command.CommandExecutor
import org.bukkit.command.CommandSender import org.bukkit.command.CommandSender

4
foundation-core/src/main/kotlin/gay/pizza/foundation/core/features/stats/LeaderboardCommand.kt
View File

@ -1,7 +1,7 @@
package gay.pizza.foundation.core.features.stats package gay.pizza.foundation.core.features.stats
import gay.pizza.foundation.shared.SortOrder import gay.pizza.foundation.common.SortOrder
import gay.pizza.foundation.shared.allPlayerStatisticsOf import gay.pizza.foundation.common.allPlayerStatisticsOf
import org.bukkit.Statistic import org.bukkit.Statistic
import org.bukkit.command.Command import org.bukkit.command.Command
import org.bukkit.command.CommandExecutor import org.bukkit.command.CommandExecutor