Skip to content

Commit cddae40

Browse files
InnecticInnectic
committed
More misc fixes
1 parent 15b9005 commit cddae40

File tree

10 files changed

+200
-132
lines changed

10 files changed

+200
-132
lines changed

‎API/src/main/java/me/innectic/permissify/api/PermissifyConstants.java‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,8 @@ public class PermissifyConstants {
5656
public static final String PERMISSIFY_PLAYER_GROUP_ADD = "permissify.player.group.add";
5757
public static final String PERMISSIFY_PLAYER_GROUP_REMOVE = "permissify.player.group.remove";
5858
public static final String PERMISSIFY_PLAYER_GROUP_LIST = "permissify.player.group.list";
59-
public static final String PERMISSIFY_PLAYER_SET_MAIN_GROUP = "permissify.player.group.setmain";
59+
public static final String PERMISSIFY_PLAYER_SET_MAIN_GROUP = "permissify.player.group.primarygroup";
6060
public static final String PERMISSIFY_GROUP_DEFAULT = "permissify.group.default";
61-
public static final String PERMISSIFY_FORMAT = "permissify.format";
6261
public static final String PERMISSIFY_CACHE = "permissify.cache";
6362
public static final String PERMISSIFY_ADMIN = "permissify.admin";
6463
public static final String PERMISSIFY_PROFILE = "permissify.profile";
@@ -72,6 +71,7 @@ public class PermissifyConstants {
7271
public static final String PLAYER_GROUP_LIST = PERMISSIFY_PREFIX + "&e&lGroups for <PLAYER>: <GROUPS>";
7372
public static final String CACHE_PURGED = PERMISSIFY_PREFIX + "&e&lCache has been purged!";
7473
public static final String CACHE_INFORMATION = PERMISSIFY_PREFIX + "&e&lCached groups: <GROUPS>, cached permissions: <PERMISSIONS>, default group: <DEFAULT>";
74+
public static final String PRIMARY_GROUP_TEMPLATE = PERMISSIFY_PREFIX + "&e&lCurrent primary group: <GROUP>";
7575

7676
public static final String PERMISSION_ADDED_GROUP = PERMISSIFY_PREFIX + "&e&lPermission <PERMISSION> has been added to <GROUP>!";
7777
public static final String PERMISSION_REMOVED_GROUP = PERMISSIFY_PREFIX + "&e&lPermission <PERMISSION> has been removed from <GROUP>!";
@@ -84,6 +84,7 @@ public class PermissifyConstants {
8484
public static final String MAIN_GROUP_SET = PERMISSIFY_PREFIX + "&e&lSet main group for <PLAYER> to <GROUP>!";
8585
public static final String PLAYER_ALREADY_HAS_PERMISSION = PERMISSIFY_PREFIX + "&c&lPlayer <PLAYER> already has permission <PERMISSION>";
8686
public static final String PLAYER_DOES_NOT_HAVE_PERMISSION = PERMISSIFY_PREFIX + "&c&lPlayer <PLAYER> does not have permission <PERMISSION>";
87+
public static final String ALREADY_MAIN_GROUP = PERMISSIFY_PREFIX + "&c&l<GROUP> is already the main group!";
8788

8889
public static final String EMPTY_DEFAULT_GROUP_NAME = "&c&lNONE";
8990
public static final String DEFAULT_GROUP_RESPONSE = PERMISSIFY_PREFIX + "&e&lThe current default group is '<GROUP>&e&l'.";
@@ -101,7 +102,7 @@ public class PermissifyConstants {
101102
public static final String NOT_ENOUGH_ARGUMENTS_PLAYER_ADD_GROUP= PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player addgroup [player] [group]";
102103
public static final String NOT_ENOUGH_ARGUMENTS_PLAYER_REMOVE_GROUP= PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player removegroup [player] [group]";
103104
public static final String NOT_ENOUGH_ARGUMENTS_PLAYER_LIST_GROUP = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player listgroup [player]";
104-
public static final String NOT_ENOUGH_ARGUMENTS_SET_MAIN_GROUP = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player setmain [player] [group]";
105+
public static final String NOT_ENOUGH_ARGUMENTS_SET_MAIN_GROUP = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player primarygroup <player> [group]";
105106
public static final String NOT_ENOUGH_ARGUMENTS_PROFILE = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify profile [save|load] [profile]";
106107
public static final String NOT_ENOUGH_ARGUMENTS_PROFILE_SAVE = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify profile save [fileName]";
107108
public static final String NOT_ENOUGH_ARGUMENTS_PROFILE_LOAD = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify profile load [source]";
@@ -131,24 +132,24 @@ public class PermissifyConstants {
131132

132133
public static final List<List<String>> PERMISSIFY_HELP_PAGES = new ArrayList<>(Arrays.asList(Arrays.asList(
133134
"&a&l/permissify help [page]",
134-
"&a&l/permissify superadmin [player] - &c&lWARNING: &e&lSUPERADMIN GIVES PERMISSION FOR EVERYTHING!",
135+
"&a&l/permissify superadmin <player> - &c&lWARNING: &e&lSUPERADMIN GIVES PERMISSION FOR EVERYTHING!",
135136
"&a&l/permissify cache",
136137
"&a&l/permissify cache purge",
137-
"&a&l/permissify group create [name] [display_name] [prefix] [suffix] [chatcolor]",
138-
"&a&l/permissify group remove [name]",
139-
"&a&l/permissify group addpermission [group] [permissions...] [(optional) lifespan]",
140-
"&a&l/permissify group removepermission [group] [permissions...]"
138+
"&a&l/permissify group create <name> <display_name> <prefix> <suffix> <chatcolor>",
139+
"&a&l/permissify group remove <name>",
140+
"&a&l/permissify group addpermission <group> <permissions...> [lifespan]",
141+
"&a&l/permissify group removepermission <group> <permissions...>"
141142
), Arrays.asList(
142-
"&a&l/permissify group listpermissions [group]",
143+
"&a&l/permissify group listpermissions <group>",
143144
"&a&l/permissify group list",
144-
"&a&l/permissify player addpermission [permission] [player]",
145-
"&a&l/permissify player removepermission [permission] [player]",
146-
"&a&l/permissify player addgroup [player] [group]",
147-
"&a&l/permissify player listpermissions [player]",
148-
"&a&l/permissify player listgroups [player]",
149-
"&a&l/permissify player removegroup [player] [group]",
150-
"&a&l/permissify player setmain [player] [group]",
151-
"&a&l/permissify group default [group?]"
145+
"&a&l/permissify player addpermission <permission> <player>",
146+
"&a&l/permissify player removepermission <permission> <player>",
147+
"&a&l/permissify player addgroup <player> <group>",
148+
"&a&l/permissify player listpermissions <player>",
149+
"&a&l/permissify player listgroups <player>",
150+
"&a&l/permissify player removegroup <player> <group>",
151+
"&a&l/permissify player primarygroup <player> [group]",
152+
"&a&l/permissify group default [group]"
152153
)));
153154

154155
// Error response

‎API/src/main/java/me/innectic/permissify/api/database/DatabaseHandler.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@
2525
package me.innectic.permissify.api.database;
2626

2727
import lombok.Getter;
28+
import lombok.RequiredArgsConstructor;
2829
import me.innectic.permissify.api.permission.Permission;
2930
import me.innectic.permissify.api.permission.PermissionGroup;
3031
import me.innectic.permissify.api.profile.PermissifyProfile;
32+
import me.innectic.permissify.api.util.Tristate;
3133

3234
import java.util.*;
3335

@@ -37,18 +39,15 @@
3739
*
3840
* The base database type.
3941
*/
42+
@RequiredArgsConstructor
4043
public abstract class DatabaseHandler {
4144

4245
@Getter protected Map<UUID, List<Permission>> cachedPermissions = new HashMap<>();
4346
@Getter protected Map<String, PermissionGroup> cachedGroups = new HashMap<>();
4447
@Getter protected Optional<PermissionGroup> defaultGroup = Optional.empty();
45-
@Getter protected final Optional<ConnectionInformation> connectionInformation;
48+
@Getter protected final ConnectionInformation connectionInformation;
4649
@Getter protected List<UUID> superAdmins = new ArrayList<>();
4750

48-
public DatabaseHandler(ConnectionInformation connectionInformation) {
49-
this.connectionInformation = Optional.ofNullable(connectionInformation);
50-
}
51-
5251
/**
5352
* Initialize the database handler
5453
*/
@@ -198,7 +197,7 @@ public DatabaseHandler(ConnectionInformation connectionInformation) {
198197
* @param group the group to set as the primary
199198
* @param uuid the uuid of the player to set the primary of
200199
*/
201-
public abstract boolean setPrimaryGroup(PermissionGroup group, UUID uuid);
200+
public abstract Tristate setPrimaryGroup(PermissionGroup group, UUID uuid);
202201

203202
/**
204203
* Get the primary group of a player.

0 commit comments

Comments
 (0)