strips/foundation
2
0 Fork 0
mirror of https://github.com/GayPizzaSpecifications/foundation.git synced 2026-11-04 11:12:20 +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 authored and alex committed 2025-04-10 21:19:48 -07:00
1 parent 6a05d5f29f
commit 772cc32099
13 files changed
+19 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

foundation-shared/src/main/kotlin/gay/pizza/foundation/shared/ChatExtensions.kt → common-plugin/src/main/kotlin/gay/pizza/foundation/common/ChatExtensions.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package gay.pizza.foundation.shared
package gay.pizza.foundation.common
import org.bukkit.entity.Player
foundation-shared/src/main/kotlin/gay/pizza/foundation/shared/CollectionExtensions.kt → common-plugin/src/main/kotlin/gay/pizza/foundation/common/CollectionExtensions.kt
+1 -1
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) {
foundation-shared/src/main/kotlin/gay/pizza/foundation/shared/ServerExtensions.kt → common-plugin/src/main/kotlin/gay/pizza/foundation/common/ServerExtensions.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package gay.pizza.foundation.shared
package gay.pizza.foundation.common
import org.bukkit.Material
import org.bukkit.OfflinePlayer
foundation-shared/src/main/kotlin/gay/pizza/foundation/shared/SortOrder.kt → common-plugin/src/main/kotlin/gay/pizza/foundation/common/SortOrder.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package gay.pizza.foundation.shared
package gay.pizza.foundation.common
enum class SortOrder {
Ascending,
foundation-shared/src/main/kotlin/gay/pizza/foundation/shared/SpawnExtensions.kt → common-plugin/src/main/kotlin/gay/pizza/foundation/common/SpawnExtensions.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package gay.pizza.foundation.shared
package gay.pizza.foundation.common
import org.bukkit.Location
import org.bukkit.World
foundation-chaos/src/main/kotlin/gay/pizza/foundation/chaos/ChaosController.kt
+2 -1
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
foundation-chaos/src/main/kotlin/gay/pizza/foundation/chaos/ChaosSelectorController.kt
+4 -2
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() {
foundation-chaos/src/main/kotlin/gay/pizza/foundation/chaos/modules/MegaTnt.kt
+1 -1
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
foundation-chaos/src/main/kotlin/gay/pizza/foundation/chaos/modules/TntAllPlayers.kt
+1 -1
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
foundation-chaos/src/main/kotlin/gay/pizza/foundation/chaos/modules/WorldSwapper.kt
+2
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
foundation-core/src/main/kotlin/gay/pizza/foundation/core/features/player/GooseCommand.kt
+1 -1
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
foundation-core/src/main/kotlin/gay/pizza/foundation/core/features/player/MegaTntCommand.kt
+1 -1
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
foundation-core/src/main/kotlin/gay/pizza/foundation/core/features/stats/LeaderboardCommand.kt
+2 -2
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