Skip to content

Commit 5bbc06a

Browse files
committed
Changes synced with 1.14.4.
Signed-off-by: Pavel Erokhin (MairwunNx) <[email protected]>
1 parent 4577b74 commit 5bbc06a

File tree

5 files changed

+14
-8
lines changed

5 files changed

+14
-8
lines changed

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ kotlin.code.style=official
1515
kotlin_version=1.3.72
1616
kotlinx_serialization_version=0.20.0
1717
# Module informatation.
18-
module_version=2.0.0+MC-1.14.4
18+
module_version=2.0.1+MC-1.14.4
1919
module_name=Project Essentials Permissions
2020
module_id=project_essentials_permissions
2121
module_vendor=MairwunNx (Pavel Erokhin)

readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Not mandatory dependency for Project Essentials mods and other mods uses permiss
66

77
### Explore
88

9-
#### [Download mod](https://github.com/ProjectEssentials/ProjectEssentials-Permissions/releases/download/2.0.0%2BMC-1.14.4/Project.Essentials.Permissions-2.0.0+MC-1.14.4.jar) · [Documentation and Guides](https://projectessentials.github.io/manual) · [Troubleshooting](https://github.com/ProjectEssentials/ProjectEssentials-Permissions/issues/new/choose) · [Telegram](https://t.me/minecraftforge) · [Discord](https://discord.gg/VU9XZAt) · [CurseForge](https://www.curseforge.com/minecraft/mc-mods/project-essentials-permissions) · [Change log](https://github.com/ProjectEssentials/ProjectEssentials-Permissions/blob/master/changelog.md)
9+
#### [Download mod](https://github.com/ProjectEssentials/ProjectEssentials-Permissions/releases/download/2.0.1%2BMC-1.14.4/Project.Essentials.Permissions-2.0.1+MC-1.14.4.jar) · [Documentation and Guides](https://projectessentials.github.io/manual) · [Troubleshooting](https://github.com/ProjectEssentials/ProjectEssentials-Permissions/issues/new/choose) · [Telegram](https://t.me/minecraftforge) · [Discord](https://discord.gg/VU9XZAt) · [CurseForge](https://www.curseforge.com/minecraft/mc-mods/project-essentials-permissions) · [Change log](https://github.com/ProjectEssentials/ProjectEssentials-Permissions/blob/master/changelog.md)
1010

1111
[![](https://github.com/ProjectEssentials/ProjectEssentials-Assets/raw/ASSETS-20-Q2/assets/common/support.png)](https://gist.github.com/MairwunNx/fda95062618db6880ef8ee06e1bba54f)
1212

src/main/kotlin/com/mairwunnx/projectessentials/permissions/api/v1/PermissionsAPI.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ object PermissionsAPI {
3232
* @return true if group with specified name exist.
3333
* @since 2.0.0-SNAPSHOT.1.
3434
*/
35-
fun groupExist(name: String) = permissions.take().groups.filter { it.name == name }.count() > 0
35+
fun groupExist(name: String) = getGroups().filter { it.name == name }.count() > 0
3636

3737
/**
3838
* @return default group data model instance.
@@ -405,7 +405,7 @@ object PermissionsAPI {
405405
* @since 2.0.0-SNAPSHOT.1.
406406
*/
407407
fun setUserGroup(name: String, groupName: String): Boolean {
408-
if (!groupExist(name)) return false
408+
if (!groupExist(groupName)) return false
409409
if (getUserGroup(name) == groupName) return false
410410

411411
if (!userExist(name)) addUser(User(name, groupName, mutableListOf()))

src/main/kotlin/com/mairwunnx/projectessentials/permissions/impl/configurations/PermissionsConfigurationModel.kt

+7-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ data class PermissionsConfigurationModel(
5454
"^native.event.world.overworld.block.bedrock.place",
5555
"^native.event.world.overworld.block.bedrock.break"
5656
), mutableListOf()
57-
), Group("owner", false, mutableListOf("*"), mutableListOf(), "§c[§7owner§c]")
57+
), Group("owner", false, mutableListOf("*"), mutableListOf(), " §c[§7owner§c] ")
5858
),
5959
/**
6060
* stores all registered users.
@@ -93,7 +93,12 @@ data class PermissionsConfigurationModel(
9393
* Group message prefix for user.
9494
* @since Mod: 2.0.0-RC.1
9595
*/
96-
var prefix: String = String.empty
96+
var prefix: String = String.empty,
97+
/**
98+
* Group message suffix for user.
99+
* @since Mod: 2.0.0-RC.1
100+
*/
101+
var suffix: String = String.empty
97102
)
98103

99104
/**

updatev2.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
22
"homepage": "https://github.com/ProjectEssentials/ProjectEssentials-Permissions",
33
"1.14.4": {
4+
"2.0.1": "change log -> https://github.com/ProjectEssentials/ProjectEssentials-Permissions/blob/master/changelog.md#201---2020-06-24",
45
"2.0.0": "change log -> https://github.com/ProjectEssentials/ProjectEssentials-Permissions/blob/master/changelog.md#200---2020-06-08",
56
"2.0.0-RC.3": "change log -> https://github.com/ProjectEssentials/ProjectEssentials-Permissions/blob/master/changelog.md#200-rc3---2020-06-05",
67
"2.0.0-RC.2": "change log -> https://github.com/ProjectEssentials/ProjectEssentials-Permissions/blob/master/changelog.md#200-rc2---2020-06-05",
78
"2.0.0-RC.1": "change log -> https://github.com/ProjectEssentials/ProjectEssentials-Permissions/blob/master/changelog.md#200-rc1---2020-05-20"
89
},
910
"promos": {
10-
"1.14.4-latest": "2.0.0",
11-
"1.14.4-recommended": "2.0.0"
11+
"1.14.4-latest": "2.0.1",
12+
"1.14.4-recommended": "2.0.1"
1213
}
1314
}

0 commit comments

Comments
 (0)