Skip to content

Commit 774cd9a

Browse files
InnecticInnectic
committed
Fix help command
1 parent 5f29f8b commit 774cd9a

File tree

4 files changed

+18
-21
lines changed

4 files changed

+18
-21
lines changed

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

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -91,17 +91,16 @@ public class PermissifyConstants {
9191

9292
public static final String NOT_ENOUGH_ARGUMENTS_GROUP_CREATE = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify group create [name] [prefix] [suffix] [chat-color]";
9393
public static final String NOT_ENOUGH_ARGUMENTS_GROUP_REMOVE = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify group remove [name]";
94-
public static final String NOT_ENOUGH_ARGUMENTS_GROUP_PERMISSION_ADD = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify group addpermission [name] [permission]";
95-
public static final String NOT_ENOUGH_ARGUMENTS_GROUP_PERMISSION_REMOVE = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify group removepermission [name] [permission]";
94+
public static final String NOT_ENOUGH_ARGUMENTS_GROUP_PERMISSION_ADD = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify group addpermission [group] [permission]";
95+
public static final String NOT_ENOUGH_ARGUMENTS_GROUP_PERMISSION_REMOVE = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify group removepermission [group] [permission]";
9696
public static final String NOT_ENOUGH_ARGUMENTS_GROUP_PERMISSION_LIST = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify group listpermissions [group]";
9797
public static final String NOT_ENOUGH_ARGUMENTS_PLAYER = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player [addgroup|removegroup|listpermissions|listgroups|addpermission|removepermission] [player]";
98-
public static final String NOT_ENOUGH_ARGUMENTS_PLAYER_ADD_PERMISSION = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player addpermission [permission] [player]";
99-
public static final String NOT_ENOUGH_ARGUMENTS_PLAYER_REMOVE_PERMISSION = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player removepermission [permission] [player]";
98+
public static final String NOT_ENOUGH_ARGUMENTS_PLAYER_ADD_PERMISSION = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player addpermission [player] [permission]";
99+
public static final String NOT_ENOUGH_ARGUMENTS_PLAYER_REMOVE_PERMISSION = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player removepermission [player] [permission]";
100100
public static final String NOT_ENOUGH_ARGUMENTS_PLAYER_LIST_PERMISSIONS = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player listpermissions [player]";
101-
public static final String NOT_ENOUGH_ARGUMENTS_PLAYER_ADD_GROUP= PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player addgroup [group] [player]";
102-
public static final String NOT_ENOUGH_ARGUMENTS_PLAYER_REMOVE_GROUP= PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player removegroup [group] [player]";
101+
public static final String NOT_ENOUGH_ARGUMENTS_PLAYER_ADD_GROUP= PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player addgroup [player] [group]";
102+
public static final String NOT_ENOUGH_ARGUMENTS_PLAYER_REMOVE_GROUP= PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player removegroup [player] [group]";
103103
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_FORMAT = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify format [whisper|chat|disable|enable] [format?...]";
105104
public static final String NOT_ENOUGH_ARGUMENTS_SET_MAIN_GROUP = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player setmain [player] [group]";
106105
public static final String NOT_ENOUGH_ARGUMENTS_PROFILE = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify profile [save|load] [profile]";
107106
public static final String NOT_ENOUGH_ARGUMENTS_PROFILE_SAVE = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify profile save [fileName]";
@@ -135,24 +134,19 @@ public class PermissifyConstants {
135134
"&a&l/permissify superadmin [player] - &c&lWARNING: &e&lSUPERADMIN GIVES PERMISSION FOR EVERYTHING!",
136135
"&a&l/permissify cache",
137136
"&a&l/permissify cache purge",
138-
"&a&l/permissify format chat [format]",
139-
"&a&l/permissify format whisper [format]",
140-
"&a&l/permissify format enable",
141-
"&a&l/permissify format disable",
142137
"&a&l/permissify group create [name] [prefix] [suffix] [chatcolor]",
143-
"&a&l/permissify group remove [name]"
144-
), Arrays.asList(
138+
"&a&l/permissify group remove [name]",
145139
"&a&l/permissify group addpermission [group] [permissions...] [(optional) lifespan]",
146-
"&a&l/permissify group removepermission [group] [permissions...]",
140+
"&a&l/permissify group removepermission [group] [permissions...]"
141+
), Arrays.asList(
147142
"&a&l/permissify group listpermissions [group]",
148143
"&a&l/permissify group list",
149144
"&a&l/permissify player addpermission [permission] [player]",
150145
"&a&l/permissify player removepermission [permission] [player]",
151146
"&a&l/permissify player addgroup [player] [group]",
152147
"&a&l/permissify player listpermissions [player]",
153148
"&a&l/permissify player listgroups [player]",
154-
"&a&l/permissify player removegroup [player] [group]"
155-
), Arrays.asList(
149+
"&a&l/permissify player removegroup [player] [group]",
156150
"&a&l/permissify player setmain [player] [group]",
157151
"&a&l/permissify group default [group?]"
158152
)));

‎Spigot/src/main/java/me/innectic/permissify/spigot/PermissifyMain.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,16 @@ public class PermissifyMain extends JavaPlugin {
6262
@Override
6363
public void onEnable() {
6464
long start = System.currentTimeMillis();
65+
permissifyAPI = new PermissifyAPI();
6566
createConfig();
6667
// Verify the config
6768
configVerifier = new ConfigVerifier();
68-
configVerifier.verifyBasicInformation();
69+
if (!configVerifier.verifyBasicInformation()) {
70+
getLogger().log(Level.SEVERE, ChatColor.RED + "Internal Permissify Error: Could not verify basic information!");
71+
return;
72+
}
6973
Optional<FullHandler> handler = configVerifier.verifyConnectionInformation();
7074
// Initialize the API
71-
permissifyAPI = new PermissifyAPI();
7275
if (!handler.isPresent() || !handler.get().getHandlerType().isPresent()) {
7376
getLogger().log(Level.SEVERE, ChatColor.RED + "Internal Permissify Error: No handler / type present!");
7477
return;

‎Spigot/src/main/java/me/innectic/permissify/spigot/commands/permissify/PlayerCommand.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,8 @@ public String handleListGroups(CommandSender sender, String[] args) {
193193
if (args.length < 1) return PermissifyConstants.NOT_ENOUGH_ARGUMENTS_PLAYER_LIST_GROUP;
194194

195195
OfflinePlayer targetPlayer = Bukkit.getPlayer(args[0]);
196+
System.out.println(args[0]);
197+
System.out.println(targetPlayer.getName());
196198
if (targetPlayer == null || !targetPlayer.hasPlayedBefore()) return PermissifyConstants.INVALID_PLAYER;
197199

198200
List<String> groups = plugin.getPermissifyAPI().getDatabaseHandler().get().getGroups().entrySet().stream()

‎Spigot/src/main/java/me/innectic/permissify/spigot/utils/ConfigVerifier.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,9 @@ public boolean verifyBasicInformation() {
5353
@Override
5454
public Optional<FullHandler> verifyConnectionInformation() {
5555
PermissifyMain plugin = PermissifyMain.getInstance();
56-
Optional<HandlerType> type = HandlerType.findType(plugin.getConfig().getString("storage"));
56+
Optional<HandlerType> type = HandlerType.findType(plugin.getConfig().getString("storage", "sqlite"));
5757
if (!type.isPresent()) return Optional.empty();
5858

59-
if (plugin.getConfig().get("handleChat") == null) return Optional.empty();
60-
6159
Optional<ConnectionInformation> connectionInformation = Optional.empty();
6260
if (type.get().getHandler() == SQLHandler.class) {
6361
if (type.get().getDisplayName().equalsIgnoreCase("mysql")) {

0 commit comments

Comments
 (0)