Skip to content

Commit 37e7fd4

Browse files
committed
refactor(platform): remove unused command and runtime facades
1 parent 10d3688 commit 37e7fd4

9 files changed

Lines changed: 4 additions & 111 deletions

File tree

‎common/src/main/kotlin/top/e404/eclean/api/CommandRegistry.kt‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎common/src/main/kotlin/top/e404/eclean/api/Platform.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ interface Platform {
88
val type: top.e404.eclean.common.api.PlatformType
99
val scheduler: top.e404.eclean.common.api.Scheduler
1010
val messageSender: top.e404.eclean.common.api.MessageSender
11-
val commandRegistry: top.e404.eclean.common.api.CommandRegistry
1211
val permissionService: top.e404.eclean.common.api.PermissionService
1312
val serverInfo: top.e404.eclean.common.api.ServerInfo
1413
val worldAccess: top.e404.eclean.common.api.WorldAccess

‎common/src/main/kotlin/top/e404/eclean/platform/runtime/RuntimePlatform.kt‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎paper/src/main/kotlin/adapt/PaperCommandRegistry.kt‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎paper/src/main/kotlin/adapt/PaperPlatform.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package top.e404.eclean.paper.adapt
22

33
import org.bukkit.plugin.java.JavaPlugin
4-
import top.e404.eclean.common.api.CommandRegistry
54
import top.e404.eclean.common.api.EventBus
65
import top.e404.eclean.common.api.MessageSender
76
import top.e404.eclean.common.api.PermissionService
@@ -32,12 +31,11 @@ class PaperPlatform(
3231
) : Platform {
3332
override val type: PlatformType = PlatformType.PAPER
3433
override val messageSender: MessageSender = PaperMessageSender(plugin.logger)
35-
override val commandRegistry: CommandRegistry = PaperCommandRegistry(plugin)
3634
override val permissionService: PermissionService = PaperPermissionService()
3735
override val serverInfo: ServerInfo = PaperServerInfo()
3836
override val eventBus: EventBus = PaperEventBus(plugin)
3937

4038
override fun shutdown() {
4139
scheduler.cancelAll()
4240
}
43-
}
41+
}

‎paper/src/main/kotlin/app/RuntimeServices.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ import top.e404.eclean.platform.FoliaDetector
2626
import top.e404.eclean.platform.Schedulers
2727
import top.e404.eclean.platform.execution.BukkitExecutionGateway
2828
import top.e404.eclean.platform.execution.ExecutionGateway
29-
import top.e404.eclean.platform.runtime.RuntimePlatform
30-
import top.e404.eclean.platform.runtime.RuntimePlatformFactory
3129
import top.e404.eclean.service.PlayerTeleportService
3230
import top.e404.eclean.service.StatusSnapshotService
3331
import top.e404.eclean.service.TemporaryReturnEvent
@@ -49,7 +47,6 @@ class RuntimeServices {
4947
deactivate = { configuredServices.stop() },
5048
onLoadFailure = { PL.logger.severe("Configuration rejected; cleanup and recovery are paused. Fix the files and run /eclean reload: ${it.message}") },
5149
)
52-
val platform: RuntimePlatform = RuntimePlatformFactory.create(FoliaDetector.isFolia())
5350
val execution: ExecutionGateway = BukkitExecutionGateway()
5451
val statusSnapshots = StatusSnapshotService()
5552
val playerTeleportService = PlayerTeleportService(execution)

‎paper/src/main/kotlin/menu/MenuManager.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import top.e404.eclean.config.Config
1616
import top.e404.eclean.lang.MLang
1717
import top.e404.eclean.menu.trashcan.TrashcanMenu
1818
import top.e404.eclean.platform.Schedulers
19-
import top.e404.eclean.platform.runtime.RuntimePlatform
19+
import top.e404.eclean.platform.FoliaDetector
2020
import top.e404.eclean.ui.UiMenu
2121
import java.util.concurrent.ConcurrentHashMap
2222
import java.util.concurrent.atomic.AtomicBoolean
@@ -83,7 +83,7 @@ object MenuManager : Listener {
8383
var unownedMenus = 0
8484
for ((player, menu) in HashMap(openMenus)) {
8585
if (!openMenus.remove(player, menu)) continue
86-
if (PL.services.platform == RuntimePlatform.PAPER || Bukkit.isOwnedByCurrentRegion(player)) {
86+
if (!FoliaDetector.isFolia() || Bukkit.isOwnedByCurrentRegion(player)) {
8787
if (player.openInventory.topInventory == menu.inventory) player.closeInventory()
8888
} else {
8989
unownedMenus++

‎paper/src/test/kotlin/adapt/PaperPlatformTest.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ class PaperPlatformTest {
9191
assertEquals(PlatformType.PAPER, platform.type)
9292
assertNotNull(platform.scheduler)
9393
assertNotNull(platform.messageSender)
94-
assertNotNull(platform.commandRegistry)
9594
assertNotNull(platform.permissionService)
9695
}
97-
}
96+
}

‎paper/src/test/kotlin/platform/RuntimePlatformFactoryTest.kt‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)