Skip to content

Commit 4985c1e

Browse files
MairwunNxMairwunNx
committed
PermissionAPI code cleanup.
1 parent 2551b67 commit 4985c1e

16 files changed

+116
-185
lines changed

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ dependencies {
9595
compile(
9696
group: "com.github.projectessentials",
9797
name: "ProjectEssentials-Core",
98-
version: "v1.14.4-1.0.0.1"
98+
version: "v1.14.4-1.0.2.0"
9999
)
100100
}
101101

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ mappingsChannelVersion=20190719-1.14.3
1414
kotlinJdkVersionTarget=jdk8
1515
kotlinxSerializationVersion=0.12.0
1616
kotlinVersion=1.3.50
17-
projectEssentialsVersion=1.14.4-0.1.0.2
17+
projectEssentialsVersion=1.14.4-0.1.1.0
1818
projectEssentialsName=Project Essentials Permissions
1919
projectEssentialsId=project_essentials_permissions
2020
projectEssentialsVendor=MairwunNx (Pavel Erokhin)

‎src/main/kotlin/com/mairwunnx/projectessentialspermissions/EntryPoint.kt

+13-29
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.mairwunnx.projectessentialspermissions
22

3+
import com.mairwunnx.projectessentialscore.EssBase
34
import com.mairwunnx.projectessentialspermissions.commands.PermissionsCommand
4-
import com.mairwunnx.projectessentialspermissions.helpers.validateForgeVersion
55
import com.mairwunnx.projectessentialspermissions.permissions.PermissionBase
66
import com.mojang.brigadier.CommandDispatcher
77
import net.minecraft.command.CommandSource
@@ -12,45 +12,25 @@ import net.minecraftforge.fml.event.server.FMLServerStartingEvent
1212
import net.minecraftforge.fml.event.server.FMLServerStoppingEvent
1313
import org.apache.logging.log4j.LogManager
1414

15-
internal const val MOD_ID = "project_essentials_permissions"
16-
internal const val MOD_NAME = "Project Essentials Permissions"
17-
internal const val PART_OF_MOD = "Project Essentials"
18-
internal const val MOD_VERSION = "1.14.4-0.1.0.2"
19-
internal const val MOD_MAINTAINER = "MairwunNx (Pavel Erokhin)"
20-
internal const val MOD_TARGET_FORGE = "28.0.X"
21-
internal const val MOD_TARGET_FORGE_REGEX = "^28\\.0\\..\\d{1,}|28\\.0\\.[\\d]\$"
22-
internal const val MOD_TARGET_MC = "1.14.4"
23-
internal const val MOD_SOURCES_LINK = "https://github.com/ProjectEssentials/ProjectEssentials-Permissions/"
24-
internal const val MOD_TELEGRAM_LINK = "https://t.me/minecraftforge"
25-
2615
@Suppress("unused")
27-
@Mod(MOD_ID)
28-
internal class EntryPoint {
16+
@Mod("project_essentials_permissions")
17+
internal class EntryPoint : EssBase() {
2918
private val logger = LogManager.getLogger()
3019

3120
init {
21+
modInstance = this
22+
modVersion = "1.14.4-0.1.1.0"
3223
logBaseInfo()
3324
validateForgeVersion()
34-
logger.debug("Register event bus for $MOD_NAME mod ...")
25+
logger.debug("Register event bus for $modName mod ...")
3526
MinecraftForge.EVENT_BUS.register(this)
36-
logger.info("Loading $MOD_NAME permissions data ...")
27+
logger.info("Loading $modName permissions data ...")
3728
PermissionBase.loadData()
3829
}
3930

40-
private fun logBaseInfo() {
41-
logger.info("$MOD_NAME starting initializing ...")
42-
logger.info(" - Mod Id: $MOD_ID")
43-
logger.info(" - Version: $MOD_VERSION")
44-
logger.info(" - Maintainer: $MOD_MAINTAINER")
45-
logger.info(" - Target Forge version: $MOD_TARGET_FORGE")
46-
logger.info(" - Target Minecraft version: $MOD_TARGET_MC")
47-
logger.info(" - Source code: $MOD_SOURCES_LINK")
48-
logger.info(" - Telegram chat: $MOD_TELEGRAM_LINK")
49-
}
50-
5131
@SubscribeEvent
5232
internal fun onServerStarting(it: FMLServerStartingEvent) {
53-
logger.info("$MOD_NAME starting mod loading ...")
33+
logger.info("$modName starting mod loading ...")
5434
registerCommands(it.server.commandManager.dispatcher)
5535
}
5636

@@ -64,8 +44,12 @@ internal class EntryPoint {
6444
@Suppress("UNUSED_PARAMETER")
6545
@SubscribeEvent
6646
internal fun onServerStopping(it: FMLServerStoppingEvent) {
67-
logger.info("Shutting down $MOD_NAME mod ...")
47+
logger.info("Shutting down $modName mod ...")
6848
logger.info(" - Saving permission users data ...")
6949
PermissionBase.saveData()
7050
}
51+
52+
internal companion object {
53+
internal lateinit var modInstance: EntryPoint
54+
}
7155
}

‎src/main/kotlin/com/mairwunnx/projectessentialspermissions/commands/PermissionsCommand.kt

+79-38
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.mairwunnx.projectessentialspermissions.commands
22

3-
import com.mairwunnx.projectessentialspermissions.*
4-
import com.mairwunnx.projectessentialspermissions.extensions.isPlayerSender
5-
import com.mairwunnx.projectessentialspermissions.extensions.playerName
6-
import com.mairwunnx.projectessentialspermissions.extensions.sendMsg
3+
import com.mairwunnx.projectessentialscore.extensions.isPlayerSender
4+
import com.mairwunnx.projectessentialscore.extensions.playerName
5+
import com.mairwunnx.projectessentialscore.extensions.sendMsg
6+
import com.mairwunnx.projectessentialspermissions.EntryPoint
77
import com.mairwunnx.projectessentialspermissions.permissions.PermissionBase
88
import com.mairwunnx.projectessentialspermissions.permissions.PermissionsAPI
99
import com.mojang.brigadier.CommandDispatcher
@@ -45,27 +45,28 @@ internal object PermissionsCommand {
4545
if (c.isPlayerSender()) {
4646
if (PermissionsAPI.hasPermission(c.playerName(), "ess.perm")) {
4747
sendMsg(
48+
"permissions",
4849
c.source,
4950
"perm.about.out",
50-
MOD_NAME,
51-
MOD_VERSION,
52-
MOD_MAINTAINER,
53-
MOD_TARGET_FORGE,
54-
MOD_TARGET_MC,
55-
MOD_SOURCES_LINK,
56-
MOD_TELEGRAM_LINK
51+
EntryPoint.modInstance.modName,
52+
EntryPoint.modInstance.modVersion,
53+
EntryPoint.modInstance.modMaintainer,
54+
EntryPoint.modInstance.modTargetForge,
55+
EntryPoint.modInstance.modTargetMC,
56+
EntryPoint.modInstance.modSources,
57+
EntryPoint.modInstance.modTelegram
5758
)
5859
} else {
59-
sendMsg(c.source, "perm.about.restricted")
60+
sendMsg("permissions", c.source, "perm.about.restricted")
6061
}
6162
} else {
62-
logger.info(" $MOD_NAME")
63-
logger.info("Version: $MOD_VERSION")
64-
logger.info("Maintainer: $MOD_MAINTAINER")
65-
logger.info("Target Forge version: $MOD_TARGET_FORGE")
66-
logger.info("Target Minecraft version: $MOD_TARGET_MC")
67-
logger.info("Source code: $MOD_SOURCES_LINK")
68-
logger.info("Telegram chat: $MOD_TELEGRAM_LINK")
63+
logger.info(" ${EntryPoint.modInstance.modName}")
64+
logger.info("Version: ${EntryPoint.modInstance.modVersion}")
65+
logger.info("Maintainer: ${EntryPoint.modInstance.modMaintainer}")
66+
logger.info("Target Forge version: ${EntryPoint.modInstance.modTargetForge}")
67+
logger.info("Target Minecraft version: ${EntryPoint.modInstance.modTargetMC}")
68+
logger.info("Source code: ${EntryPoint.modInstance.modSources}")
69+
logger.info("Telegram chat: ${EntryPoint.modInstance.modTelegram}")
6970
}
7071
return 0
7172
}
@@ -83,13 +84,15 @@ internal object PermissionsCommand {
8384
c.isPlayerSender() && !PermissionsAPI.hasPermission(
8485
c.playerName(), "perm.reload"
8586
) -> {
86-
sendMsg(c.source, "perm.reload.restricted")
87+
sendMsg("permissions", c.source, "perm.reload.restricted")
8788
0
8889
}
8990
else -> {
9091
PermissionBase.loadData()
9192
when {
92-
c.isPlayerSender() -> sendMsg(c.source, "perm.reload.success")
93+
c.isPlayerSender() -> sendMsg(
94+
"permissions", c.source, "perm.reload.success"
95+
)
9396
else -> logger.info("Permission configuration reloaded.")
9497
}
9598
0
@@ -110,13 +113,15 @@ internal object PermissionsCommand {
110113
c.isPlayerSender() && !PermissionsAPI.hasPermission(
111114
c.source.asPlayer().name.string, "ess.perm.save"
112115
) -> {
113-
sendMsg(c.source, "perm.save.restricted")
116+
sendMsg("permissions", c.source, "perm.save.restricted")
114117
0
115118
}
116119
else -> {
117120
PermissionBase.saveData()
118121
when {
119-
c.isPlayerSender() -> sendMsg(c.source, "perm.save.success")
122+
c.isPlayerSender() -> sendMsg(
123+
"permissions", c.source, "perm.save.success"
124+
)
120125
else -> logger.info("Permission configuration saved.")
121126
}
122127
0
@@ -162,11 +167,13 @@ internal object PermissionsCommand {
162167
if (c.isPlayerSender() &&
163168
!PermissionsAPI.hasPermission(c.playerName(), "ess.perm.group")
164169
) {
165-
sendMsg(c.source, "perm.group.restricted")
170+
sendMsg("permissions", c.source, "perm.group.restricted")
166171
return 0
167172
}
168173
when {
169-
c.isPlayerSender() -> sendMsg(c.source, "perm.group.example")
174+
c.isPlayerSender() -> sendMsg(
175+
"permissions", c.source, "perm.group.example"
176+
)
170177
else -> logger.info("Usage example: /ess permissions group <group> [set|remove] <node>")
171178
}
172179
return 0
@@ -176,14 +183,20 @@ internal object PermissionsCommand {
176183
if (c.isPlayerSender() &&
177184
!PermissionsAPI.hasPermission(c.playerName(), "ess.perm.group")
178185
) {
179-
sendMsg(c.source, "perm.group.restricted")
186+
sendMsg("permissions", c.source, "perm.group.restricted")
180187
return 0
181188
}
182189
val targetGroup = StringArgumentType.getString(c, "name")
183190
val targetNode = StringArgumentType.getString(c, "node")
184191
PermissionsAPI.setGroupPermissionNode(targetGroup, targetNode)
185192
if (c.isPlayerSender()) {
186-
sendMsg(c.source, "perm.group.success", targetNode, targetGroup)
193+
sendMsg(
194+
"permissions",
195+
c.source,
196+
"perm.group.success",
197+
targetNode,
198+
targetGroup
199+
)
187200
} else {
188201
logger.info("Permission $targetNode added to group $targetGroup.")
189202
}
@@ -194,14 +207,20 @@ internal object PermissionsCommand {
194207
if (c.isPlayerSender() &&
195208
!PermissionsAPI.hasPermission(c.playerName(), "ess.perm.group")
196209
) {
197-
sendMsg(c.source, "perm.group.restricted")
210+
sendMsg("permissions", c.source, "perm.group.restricted")
198211
return 0
199212
}
200213
val targetGroup = StringArgumentType.getString(c, "name")
201214
val targetNode = StringArgumentType.getString(c, "node")
202215
PermissionsAPI.removeGroupPermission(targetGroup, targetNode)
203216
if (c.isPlayerSender()) {
204-
sendMsg(c.source, "perm.group.remove.success", targetNode, targetGroup)
217+
sendMsg(
218+
"permissions",
219+
c.source,
220+
"perm.group.remove.success",
221+
targetNode,
222+
targetGroup
223+
)
205224
} else {
206225
logger.info("Permission $targetNode removed from group $targetGroup.")
207226
}
@@ -257,11 +276,13 @@ internal object PermissionsCommand {
257276
if (c.isPlayerSender() &&
258277
!PermissionsAPI.hasPermission(c.playerName(), "ess.perm.user")
259278
) {
260-
sendMsg(c.source, "perm.user.restricted")
279+
sendMsg("permissions", c.source, "perm.user.restricted")
261280
return 0
262281
}
263282
when {
264-
c.isPlayerSender() -> sendMsg(c.source, "perm.user.example")
283+
c.isPlayerSender() -> sendMsg(
284+
"permissions", c.source, "perm.user.example"
285+
)
265286
else -> logger.info(
266287
"Usage example: /ess permissions user <nickname> [[set]|remove] [<node>] [[group]] [[<group name>]]"
267288
)
@@ -273,14 +294,20 @@ internal object PermissionsCommand {
273294
if (c.isPlayerSender() &&
274295
!PermissionsAPI.hasPermission(c.playerName(), "ess.perm.user")
275296
) {
276-
sendMsg(c.source, "perm.user.restricted")
297+
sendMsg("permissions", c.source, "perm.user.restricted")
277298
return 0
278299
}
279300
val targetUser = StringArgumentType.getString(c, "nickname")
280301
val targetNode = StringArgumentType.getString(c, "node")
281302
PermissionsAPI.setUserPermissionNode(targetUser, targetNode)
282303
if (c.isPlayerSender()) {
283-
sendMsg(c.source, "perm.user.success", targetNode, targetUser)
304+
sendMsg(
305+
"permissions",
306+
c.source,
307+
"perm.user.success",
308+
targetNode,
309+
targetUser
310+
)
284311
} else {
285312
logger.info("Permission $targetNode added for user $targetUser.")
286313
}
@@ -291,14 +318,16 @@ internal object PermissionsCommand {
291318
if (c.isPlayerSender() &&
292319
!PermissionsAPI.hasPermission(c.playerName(), "ess.perm.user")
293320
) {
294-
sendMsg(c.source, "perm.user.restricted")
321+
sendMsg("permissions", c.source, "perm.user.restricted")
295322
return 0
296323
}
297324
val targetUser = StringArgumentType.getString(c, "nickname")
298325
val targetGroup = StringArgumentType.getString(c, "groupName")
299326
if (targetGroup.isNullOrEmpty()) {
300327
when {
301-
c.isPlayerSender() -> sendMsg(c.source, "perm.user.group.example")
328+
c.isPlayerSender() -> sendMsg(
329+
"permissions", c.source, "perm.user.group.example"
330+
)
302331
else -> logger.info(
303332
"Usage example: /ess permissions user <nickname> set group <group name>"
304333
)
@@ -307,7 +336,13 @@ internal object PermissionsCommand {
307336
}
308337
PermissionsAPI.setUserPermissionGroup(targetUser, targetGroup)
309338
if (c.isPlayerSender()) {
310-
sendMsg(c.source, "perm.user.group.success", targetGroup, targetUser)
339+
sendMsg(
340+
"permissions",
341+
c.source,
342+
"perm.user.group.success",
343+
targetGroup,
344+
targetUser
345+
)
311346
} else {
312347
logger.info("Installed new group $targetGroup for user $targetUser.")
313348
}
@@ -318,14 +353,20 @@ internal object PermissionsCommand {
318353
if (c.isPlayerSender() &&
319354
!PermissionsAPI.hasPermission(c.playerName(), "ess.perm.user")
320355
) {
321-
sendMsg(c.source, "perm.user.restricted")
356+
sendMsg("permissions", c.source, "perm.user.restricted")
322357
return 0
323358
}
324359
val targetUser = StringArgumentType.getString(c, "nickname")
325360
val targetNode = StringArgumentType.getString(c, "node")
326361
PermissionsAPI.setUserPermissionNode(targetUser, targetNode)
327362
if (c.isPlayerSender()) {
328-
sendMsg(c.source, "perm.user.remove.success", targetNode, targetUser)
363+
sendMsg(
364+
"permissions",
365+
c.source,
366+
"perm.user.remove.success",
367+
targetNode,
368+
targetUser
369+
)
329370
} else {
330371
logger.info("Permission $targetNode removed from user $targetUser")
331372
}

‎src/main/kotlin/com/mairwunnx/projectessentialspermissions/enums/ForgeRootPaths.kt

-3
This file was deleted.

‎src/main/kotlin/com/mairwunnx/projectessentialspermissions/extensions/CommandContextExtensions.kt

-13
This file was deleted.

‎src/main/kotlin/com/mairwunnx/projectessentialspermissions/extensions/CommandSourceExtensions.kt

-16
This file was deleted.

‎src/main/kotlin/com/mairwunnx/projectessentialspermissions/extensions/StringExtensions.kt

-3
This file was deleted.

0 commit comments

Comments
 (0)