Skip to content

Commit 484dec9

Browse files
committed
Removed OnProcessorProcessing event handling.
Signed-off-by: Pavel Erokhin (MairwunNx) <MairwunNx@gmail.com>
1 parent d1050be commit 484dec9

File tree

1 file changed

+14
-43
lines changed
  • src/main/kotlin/com/mairwunnx/projectessentials/permissions/impl

1 file changed

+14
-43
lines changed

src/main/kotlin/com/mairwunnx/projectessentials/permissions/impl/ModuleObject.kt

Lines changed: 14 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,11 @@ package com.mairwunnx.projectessentials.permissions.impl
44

55
import com.mairwunnx.projectessentials.core.api.v1.MESSAGE_MODULE_PREFIX
66
import com.mairwunnx.projectessentials.core.api.v1.configuration.ConfigurationAPI.getConfigurationByName
7-
import com.mairwunnx.projectessentials.core.api.v1.events.ModuleEventAPI
8-
import com.mairwunnx.projectessentials.core.api.v1.events.forge.FMLCommonSetupEventData
9-
import com.mairwunnx.projectessentials.core.api.v1.events.forge.ForgeEventType
10-
import com.mairwunnx.projectessentials.core.api.v1.events.internal.ModuleCoreEventType
11-
import com.mairwunnx.projectessentials.core.api.v1.events.internal.ProcessorEventData
127
import com.mairwunnx.projectessentials.core.api.v1.extensions.currentDimensionName
13-
import com.mairwunnx.projectessentials.core.api.v1.localization.Localization
148
import com.mairwunnx.projectessentials.core.api.v1.localization.LocalizationAPI
159
import com.mairwunnx.projectessentials.core.api.v1.messaging.MessagingAPI
1610
import com.mairwunnx.projectessentials.core.api.v1.module.IModule
1711
import com.mairwunnx.projectessentials.core.api.v1.providers.ProviderAPI
18-
import com.mairwunnx.projectessentials.core.api.v1.providers.ProviderType
1912
import com.mairwunnx.projectessentials.permissions.api.v1.PermissionsAPI
2013
import com.mairwunnx.projectessentials.permissions.api.v1.PermissionsWrappersAPI
2114
import com.mairwunnx.projectessentials.permissions.impl.commands.ConfigurePermissionsCommand
@@ -57,49 +50,27 @@ internal class ModuleObject : IModule {
5750
logger.info("Replacing default Forge permissions handler").run {
5851
PermissionAPI.setPermissionHandler(PermissionsWrappersAPI.ForgeWrapper)
5952
}
60-
providers.forEach(ProviderAPI::addProvider)
61-
subscribeEvents()
6253
EVENT_BUS.register(this)
54+
providers.forEach(ProviderAPI::addProvider)
55+
initLocalization()
6356
}
6457

65-
fun replaceWorldEditPermissionHandler() =
66-
logger.info("Replacing default WorldEdit permissions handler").run {
67-
ForgeWorldEdit.inst.permissionsProvider = PermissionsWrappersAPI.WorldEditWrapper
68-
}
69-
70-
private fun subscribeEvents() {
71-
ModuleEventAPI.subscribeOn<FMLCommonSetupEventData>(
72-
ForgeEventType.SetupEvent
73-
) {
74-
LocalizationAPI.apply(
75-
Localization(
76-
mutableListOf(
77-
"/assets/projectessentialspermissions/lang/de_de.json",
78-
"/assets/projectessentialspermissions/lang/en_us.json",
79-
"/assets/projectessentialspermissions/lang/ru_ru.json",
80-
"/assets/projectessentialspermissions/lang/sr_rs.json",
81-
"/assets/projectessentialspermissions/lang/zh_cn.json"
82-
), "permissions", ModuleObject::class.java
83-
)
58+
private fun initLocalization() {
59+
LocalizationAPI.apply(this.javaClass) {
60+
mutableListOf(
61+
"/assets/projectessentialspermissions/lang/de_de.json",
62+
"/assets/projectessentialspermissions/lang/en_us.json",
63+
"/assets/projectessentialspermissions/lang/ru_ru.json",
64+
"/assets/projectessentialspermissions/lang/sr_rs.json",
65+
"/assets/projectessentialspermissions/lang/zh_cn.json"
8466
)
8567
}
68+
}
8669

87-
/*
88-
Remove permissions command if `enablePermissionsCommand` is false.
89-
It need to do in `OnProcessorProcessing` event.
90-
*/
91-
ModuleEventAPI.subscribeOn<ProcessorEventData>(
92-
ModuleCoreEventType.OnProcessorProcessing
93-
) { event ->
94-
if (event.processor.processorName == "command") {
95-
if (!permissionsSettings.take().enablePermissionsCommand) {
96-
ProviderAPI.getProvidersByType(ProviderType.COMMAND).removeIf {
97-
it.name == PermissionsCommand::class.java.name
98-
}
99-
}
100-
}
70+
fun replaceWorldEditPermissionHandler() =
71+
logger.info("Replacing default WorldEdit permissions handler").run {
72+
ForgeWorldEdit.inst.permissionsProvider = PermissionsWrappersAPI.WorldEditWrapper
10173
}
102-
}
10374

10475
override fun init() {
10576
ModList.get().mods.find { it.modId == "worldedit" }?.let {

0 commit comments

Comments
 (0)