Skip to content

Commit a566dbd

Browse files
MairwunNxMairwunNx
committed
Improved configuration logging after configuration loading.
1 parent 4232769 commit a566dbd

File tree

6 files changed

+70
-7
lines changed

6 files changed

+70
-7
lines changed

‎gradle.properties

Lines changed: 1 addition & 1 deletion
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.1.0
17+
projectEssentialsVersion=1.14.4-0.2.0.0
1818
projectEssentialsName=Project Essentials Permissions
1919
projectEssentialsId=project_essentials_permissions
2020
projectEssentialsVendor=MairwunNx (Pavel Erokhin)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ internal class EntryPoint : EssBase() {
1919

2020
init {
2121
modInstance = this
22-
modVersion = "1.14.4-0.1.1.0"
22+
modVersion = "1.14.4-0.2.0.0"
2323
logBaseInfo()
2424
validateForgeVersion()
2525
logger.debug("Register event bus for $modName mod ...")

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

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.mairwunnx.projectessentialspermissions.commands
33
import com.mairwunnx.projectessentialscore.extensions.isPlayerSender
44
import com.mairwunnx.projectessentialscore.extensions.playerName
55
import com.mairwunnx.projectessentialscore.extensions.sendMsg
6+
import com.mairwunnx.projectessentialscore.helpers.PERMISSION_LEVEL
67
import com.mairwunnx.projectessentialspermissions.EntryPoint
78
import com.mairwunnx.projectessentialspermissions.permissions.PermissionBase
89
import com.mairwunnx.projectessentialspermissions.permissions.PermissionsAPI
@@ -15,6 +16,7 @@ import net.minecraft.command.CommandSource
1516
import net.minecraft.command.Commands
1617
import org.apache.logging.log4j.LogManager
1718

19+
@Suppress("DuplicatedCode") // todo: DuplicatedCode warning.
1820
internal object PermissionsCommand {
1921
private val aliases = arrayOf("essentials", "ess")
2022
private val logger = LogManager.getLogger()
@@ -58,6 +60,11 @@ internal object PermissionsCommand {
5860
)
5961
} else {
6062
sendMsg("permissions", c.source, "perm.about.restricted")
63+
logger.info(
64+
PERMISSION_LEVEL
65+
.replace("%0", c.playerName())
66+
.replace("%1", "essentials permissions")
67+
)
6168
}
6269
} else {
6370
logger.info(" ${EntryPoint.modInstance.modName}")
@@ -85,6 +92,11 @@ internal object PermissionsCommand {
8592
c.playerName(), "perm.reload"
8693
) -> {
8794
sendMsg("permissions", c.source, "perm.reload.restricted")
95+
logger.info(
96+
PERMISSION_LEVEL
97+
.replace("%0", c.playerName())
98+
.replace("%1", "essentials permissions reload")
99+
)
88100
0
89101
}
90102
else -> {
@@ -114,6 +126,11 @@ internal object PermissionsCommand {
114126
c.source.asPlayer().name.string, "ess.perm.save"
115127
) -> {
116128
sendMsg("permissions", c.source, "perm.save.restricted")
129+
logger.info(
130+
PERMISSION_LEVEL
131+
.replace("%0", c.playerName())
132+
.replace("%1", "essentials permissions save")
133+
)
117134
0
118135
}
119136
else -> {
@@ -168,6 +185,11 @@ internal object PermissionsCommand {
168185
!PermissionsAPI.hasPermission(c.playerName(), "ess.perm.group")
169186
) {
170187
sendMsg("permissions", c.source, "perm.group.restricted")
188+
logger.info(
189+
PERMISSION_LEVEL
190+
.replace("%0", c.playerName())
191+
.replace("%1", "essentials permissions group [...]")
192+
)
171193
return 0
172194
}
173195
when {
@@ -184,6 +206,11 @@ internal object PermissionsCommand {
184206
!PermissionsAPI.hasPermission(c.playerName(), "ess.perm.group")
185207
) {
186208
sendMsg("permissions", c.source, "perm.group.restricted")
209+
logger.info(
210+
PERMISSION_LEVEL
211+
.replace("%0", c.playerName())
212+
.replace("%1", "essentials permissions group [...]")
213+
)
187214
return 0
188215
}
189216
val targetGroup = StringArgumentType.getString(c, "name")
@@ -208,6 +235,11 @@ internal object PermissionsCommand {
208235
!PermissionsAPI.hasPermission(c.playerName(), "ess.perm.group")
209236
) {
210237
sendMsg("permissions", c.source, "perm.group.restricted")
238+
logger.info(
239+
PERMISSION_LEVEL
240+
.replace("%0", c.playerName())
241+
.replace("%1", "essentials permissions group [...]")
242+
)
211243
return 0
212244
}
213245
val targetGroup = StringArgumentType.getString(c, "name")
@@ -277,6 +309,11 @@ internal object PermissionsCommand {
277309
!PermissionsAPI.hasPermission(c.playerName(), "ess.perm.user")
278310
) {
279311
sendMsg("permissions", c.source, "perm.user.restricted")
312+
logger.info(
313+
PERMISSION_LEVEL
314+
.replace("%0", c.playerName())
315+
.replace("%1", "essentials permissions user [...]")
316+
)
280317
return 0
281318
}
282319
when {
@@ -295,6 +332,11 @@ internal object PermissionsCommand {
295332
!PermissionsAPI.hasPermission(c.playerName(), "ess.perm.user")
296333
) {
297334
sendMsg("permissions", c.source, "perm.user.restricted")
335+
logger.info(
336+
PERMISSION_LEVEL
337+
.replace("%0", c.playerName())
338+
.replace("%1", "essentials permissions user [...]")
339+
)
298340
return 0
299341
}
300342
val targetUser = StringArgumentType.getString(c, "nickname")
@@ -319,6 +361,11 @@ internal object PermissionsCommand {
319361
!PermissionsAPI.hasPermission(c.playerName(), "ess.perm.user")
320362
) {
321363
sendMsg("permissions", c.source, "perm.user.restricted")
364+
logger.info(
365+
PERMISSION_LEVEL
366+
.replace("%0", c.playerName())
367+
.replace("%1", "essentials permissions user [...]")
368+
)
322369
return 0
323370
}
324371
val targetUser = StringArgumentType.getString(c, "nickname")
@@ -354,6 +401,11 @@ internal object PermissionsCommand {
354401
!PermissionsAPI.hasPermission(c.playerName(), "ess.perm.user")
355402
) {
356403
sendMsg("permissions", c.source, "perm.user.restricted")
404+
logger.info(
405+
PERMISSION_LEVEL
406+
.replace("%0", c.playerName())
407+
.replace("%1", "essentials permissions user [...]")
408+
)
357409
return 0
358410
}
359411
val targetUser = StringArgumentType.getString(c, "nickname")

‎src/main/kotlin/com/mairwunnx/projectessentialspermissions/permissions/PermissionBase.kt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,17 @@ internal object PermissionBase {
3737
}
3838
val permConfigRaw = File(permissionConfig).readText()
3939
permissionData = Json.parse(PermissionData.serializer(), permConfigRaw)
40+
logger.info("*** PermissionsAPI by Project Essentials!")
41+
logger.info(" - loaded groups (${permissionData.groups.size})")
42+
permissionData.groups.forEach {
43+
logger.info(" - name: ${it.name}; nodes: ${it.permissions.size}")
44+
}
45+
logger.info(" - loaded users (${permissionData.users.size}): first 17 users!")
46+
permissionData.users.slice(0..16).forEach {
47+
logger.info(
48+
" - name: ${it.nickname}; group: ${it.group}; nodes: ${it.permissions.size}"
49+
)
50+
}
4051
}
4152

4253
internal fun saveData() {

‎src/main/resources/META-INF/mods.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ issueTrackerURL="https://github.com/ProjectEssentials/ProjectEssentials-Permissi
44

55
[[mods]]
66
modId="project_essentials_permissions"
7-
version="1.14.4-0.1.1.0"
7+
version="1.14.4-0.2.0.0"
88
displayName="Project Essentials Permissions"
99
updateJSONURL="https://raw.githubusercontent.com/ProjectEssentials/ProjectEssentials-Permissions/MC-1.14.X/update.json"
1010
displayURL="https://github.com/ProjectEssentials/ProjectEssentials-Permissions"

‎update.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"homepage": "https://github.com/ProjectEssentials/ProjectEssentials-Permissions/releases/tag/v1.14.4-0.1.1.0",
2+
"homepage": "https://github.com/ProjectEssentials/ProjectEssentials-Permissions/releases/tag/v1.14.4-0.2.0.0",
33
"1.14.4": {
4-
"1.14.4-0.1.1.0": " - Fixed some wrong meta information for mod."
4+
"1.14.4-0.2.0.0": " - Improved configuration logging after loading."
55
},
66
"promos": {
7-
"1.14.4-latest": "1.14.4-0.1.1.0",
8-
"1.14.4-recommended": "1.14.4-0.1.1.0"
7+
"1.14.4-latest": "1.14.4-0.2.0.0",
8+
"1.14.4-recommended": "1.14.4-0.2.0.0"
99
}
1010
}

0 commit comments

Comments
 (0)