Make the config more bearable to look at

RhythmicSys · RhythmicSys · commit d61dc905e040 · 2023-12-14T11:48:16.000-08:00
diff --git a/src/main/java/simplexity/simplefly/ConfigValues.java b/src/main/java/simplexity/simplefly/ConfigValues.java
@@ -6,10 +6,10 @@
 
 public class ConfigValues {
     private static final Logger logger =  SimpleFly.getFlyServer().getLogger();
-    public static String papiFlightEnabled, papiFlightDisabled, prefix, enabled, disabled, flyOther,
-            flyOwn, flySetByOther, flySpeedOther, flySpeedOwn, flySpeedSet, flySpeedReset,
+    public static String papiFlightEnabled, papiFlightDisabled, prefix, enabled, disabled, flySetOther,
+            flySetOwn, flySetByOther, flySpeedGetOther, flySpeedGetOwn, flySpeedSetOwn, flySpeedResetOwn,
             flySpeedSetOther, flySpeedResetOther, flySpeedSetByOther, flySpeedResetByOther,
-            notAPlayer, noPermission, mustBePlayer, notEnoughArguments, notANumber, notInRange;
+            invalidPlayer, noPermission, mustBePlayer, notEnoughArguments, invalidNumber, notInRange;
     
     public static float maxFlySpeed, minFlySpeed;
     public static boolean sessionPersistentFlight, worldChangePersistentFlight,
@@ -35,28 +35,28 @@ public static void reloadConfigValues(){
     }
     public static void reloadLangValues(){
         FileConfiguration config = SimpleFly.getInstance().getConfig();
-        papiFlightEnabled = config.getString("papi-flight-enabled");
-        papiFlightDisabled = config.getString("papi-flight-disabled");
-        prefix = config.getString("prefix");
-        enabled = config.getString("enabled");
-        disabled = config.getString("disabled");
-        flyOther = config.getString("fly-other");
-        flyOwn = config.getString("fly-own");
-        flySetByOther = config.getString("fly-set-by-other");
-        flySpeedOther = config.getString("fly-speed-other");
-        flySpeedOwn = config.getString("fly-speed-own");
-        flySpeedSet = config.getString("fly-speed-set");
-        flySpeedReset = config.getString("fly-speed-reset");
-        flySpeedSetOther = config.getString("fly-speed-set-other");
-        flySpeedResetOther = config.getString("fly-speed-reset-other");
-        flySpeedSetByOther = config.getString("fly-speed-set-by-other");
-        flySpeedResetByOther = config.getString("fly-speed-reset-by-other");
-        notAPlayer = config.getString("not-a-player");
-        noPermission = config.getString("no-permission");
-        mustBePlayer = config.getString("must-be-player");
-        notEnoughArguments = config.getString("not-enough-arguments");
-        notANumber = config.getString("not-a-number");
-        notInRange = config.getString("not-in-range");
+        papiFlightEnabled = config.getString("papi-flight.enabled");
+        papiFlightDisabled = config.getString("papi-flight.disabled");
+        prefix = config.getString("insertion.prefix");
+        enabled = config.getString("insertion.enabled");
+        disabled = config.getString("insertion.disabled");
+        flySetOther = config.getString("fly-set.other");
+        flySetOwn = config.getString("fly-set.own");
+        flySetByOther = config.getString("fly-set.by-other");
+        flySpeedGetOther = config.getString("fly-speed-get.other");
+        flySpeedGetOwn = config.getString("fly-speed-get.own");
+        flySpeedSetOwn = config.getString("fly-speed-set.own");
+        flySpeedResetOwn = config.getString("fly-speed-reset.own");
+        flySpeedSetOther = config.getString("fly-speed-set.other");
+        flySpeedResetOther = config.getString("fly-speed-reset.other");
+        flySpeedSetByOther = config.getString("fly-speed-set.by-other");
+        flySpeedResetByOther = config.getString("fly-speed-reset.by-other");
+        invalidPlayer = config.getString("error.invalid-player");
+        noPermission = config.getString("error.no-permission");
+        mustBePlayer = config.getString("error.must-be-player");
+        notEnoughArguments = config.getString("error.not-enough-arguments");
+        invalidNumber = config.getString("error.invalid-number");
+        notInRange = config.getString("error.not-in-range");
     }
 
 }
diff --git a/src/main/java/simplexity/simplefly/Fly.java b/src/main/java/simplexity/simplefly/Fly.java
@@ -15,10 +15,10 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
         if (args.length == 0) {
             if (CommandUtils.checkIfPlayerAndPerms(sender, Util.flyPermission)) {
                 if (FlyLogic.flyEnabled((Player) sender)){
-                    Util.sendUserMessage(sender, ConfigValues.flyOwn, ConfigValues.enabled, null);
+                    Util.sendUserMessage(sender, ConfigValues.flySetOwn, ConfigValues.enabled, null);
                     return true;
                 } else {
-                    Util.sendUserMessage(sender, ConfigValues.flyOwn, ConfigValues.disabled, null);
+                    Util.sendUserMessage(sender, ConfigValues.flySetOwn, ConfigValues.disabled, null);
                     return true;
                 }
             } else {
@@ -28,15 +28,15 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
         if (!sender.hasPermission(Util.flyOthersPermission)) return false;
         Player player = SimpleFly.getFlyServer().getPlayer(args[0]);
         if (player == null) {
-            Util.sendUserMessage(sender, ConfigValues.notAPlayer);
+            Util.sendUserMessage(sender, ConfigValues.invalidPlayer);
             return false;
         }
         if (FlyLogic.flyEnabled(player)){
-            Util.sendUserMessage(sender, ConfigValues.flyOther, ConfigValues.enabled, player);
+            Util.sendUserMessage(sender, ConfigValues.flySetOther, ConfigValues.enabled, player);
             Util.sendUserMessage(player, ConfigValues.flySetByOther, ConfigValues.enabled, sender);
             return true;
         } else {
-            Util.sendUserMessage(sender, ConfigValues.flyOther, ConfigValues.disabled, player);
+            Util.sendUserMessage(sender, ConfigValues.flySetOther, ConfigValues.disabled, player);
             Util.sendUserMessage(player, ConfigValues.flySetByOther, ConfigValues.disabled, sender);
             return true;
         }
diff --git a/src/main/java/simplexity/simplefly/FlyListeners.java b/src/main/java/simplexity/simplefly/FlyListeners.java
@@ -28,7 +28,7 @@ public void onPlayerLogin(PlayerJoinEvent joinEvent) {
                 if (player.getFallDistance() > 0f) {
                     player.setFlying(true);
                 }
-                Util.sendUserMessage(player, ConfigValues.flyOwn, ConfigValues.enabled, null);
+                Util.sendUserMessage(player, ConfigValues.flySetOwn, ConfigValues.enabled, null);
                 return;
             }
             if (flyEnabled && !player.hasPermission(Util.flyPermission)) {
diff --git a/src/main/java/simplexity/simplefly/FlySpeed.java b/src/main/java/simplexity/simplefly/FlySpeed.java
@@ -26,7 +26,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
             case 0 -> {
                 if (CommandUtils.checkIfPlayerAndPerms(sender, Util.flySpeedPermission)) {
                     float flyspeed = ((Player) sender).getFlySpeed() * 10f;
-                    Util.sendUserMessage(sender, ConfigValues.flySpeedOwn,
+                    Util.sendUserMessage(sender, ConfigValues.flySpeedGetOwn,
                             String.valueOf(flyspeed), null);
                     return true;
                 } else {
@@ -38,7 +38,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
                 if (argument.equalsIgnoreCase(resetArg)) {
                     if (CommandUtils.checkIfPlayerAndPerms(sender, Util.flySpeedPermission)) {
                         ((Player) sender).setFlySpeed(0.1f);
-                        Util.sendUserMessage(sender, ConfigValues.flySpeedReset);
+                        Util.sendUserMessage(sender, ConfigValues.flySpeedResetOwn);
                         return true;
                     }
                 }
@@ -63,13 +63,13 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
                             return false;
                         }
                         player.setFlySpeed(flyspeed / 10f);
-                        Util.sendUserMessage(player, ConfigValues.flySpeedSet,
+                        Util.sendUserMessage(player, ConfigValues.flySpeedSetOwn,
                                 firstArgument, null);
                         return true;
                     } catch (NumberFormatException e) {
                         player = SimpleFly.getFlyServer().getPlayer(secondArgument);
                         if (player == null || !sender.hasPermission(Util.flySpeedOthersPermission)) {
-                            Util.sendUserMessage(sender, ConfigValues.notANumber);
+                            Util.sendUserMessage(sender, ConfigValues.invalidNumber);
                             return false;
                         }
                         Util.sendUserMessage(sender, ConfigValues.notEnoughArguments);
@@ -79,7 +79,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
                 if (firstArgument.equalsIgnoreCase(resetArg) && sender.hasPermission(Util.flySpeedOthersPermission)) {
                     player = SimpleFly.getFlyServer().getPlayer(secondArgument);
                     if (player == null) {
-                        Util.sendUserMessage(sender, ConfigValues.notAPlayer);
+                        Util.sendUserMessage(sender, ConfigValues.invalidPlayer);
                         return false;
                     }
                     player.setFlySpeed(0.1f);
@@ -92,11 +92,11 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
                 if (firstArgument.equalsIgnoreCase(getArg) && sender.hasPermission(Util.flySpeedOthersPermission)) {
                     player = SimpleFly.getFlyServer().getPlayer(secondArgument);
                     if (player == null) {
-                        Util.sendUserMessage(sender, ConfigValues.notAPlayer);
+                        Util.sendUserMessage(sender, ConfigValues.invalidPlayer);
                         return false;
                     }
                     flyspeed = player.getFlySpeed() * 10f;
-                    Util.sendUserMessage(sender, ConfigValues.flySpeedOther,
+                    Util.sendUserMessage(sender, ConfigValues.flySpeedGetOther,
                             String.valueOf(flyspeed), player);
                     return true;
                 }
@@ -109,7 +109,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
                 if (firstArgument.equalsIgnoreCase(setArg) && sender.hasPermission(Util.flySpeedOthersPermission)) {
                     Player player = SimpleFly.getFlyServer().getPlayer(secondArgument);
                     if (player == null) {
-                        Util.sendUserMessage(sender, ConfigValues.notAPlayer);
+                        Util.sendUserMessage(sender, ConfigValues.invalidPlayer);
                         return false;
                     }
                     float flyspeed;
@@ -122,7 +122,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
                                 thirdArgument, sender);
                         return true;
                     } catch (NumberFormatException e) {
-                        Util.sendUserMessage(sender, ConfigValues.notANumber);
+                        Util.sendUserMessage(sender, ConfigValues.invalidNumber);
                         return false;
                     }
                 }
@@ -144,6 +144,9 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
             }
             return tabComplete;
         }
+        if (args.length == 3) {
+            return List.of("");
+        }
         return null;
     }
 }
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -9,25 +9,32 @@
 "respawn-persistent-flight" : true
 "gamemode-change-persistent-flight" : true
 # lang
-"papi-flight-enabled" : "[F]"
-"papi-flight-disabled" : ""
-"prefix" : "<green>[<yellow>SF</yellow>]</green> "
-"enabled" : "<green>enabled</green>"
-"disabled" : "<red>disabled</red>"
-"fly-other" : "<target>'s fly has been <value>"
-"fly-own" : "Your fly has been <value>"
-"fly-set-by-other" : "<green>Your fly has been <value> by <initiator></green>"
-"fly-speed-other" : "<grey><target>'s current flyspeed is <value></grey>"
-"fly-speed-own" : "<grey>Your flyspeed is currently set to <value></grey>"
-"fly-speed-set" : "<green>Your flyspeed has been set to <value></green>"
-"fly-speed-reset" : "<green>Your flyspeed has been reset</green>"
-"fly-speed-set-other" : "<green>You set <target>'s flyspeed to <value></green>"
-"fly-speed-reset-other" : "<green><target>'s flyspeed has been reset</green>"
-"fly-speed-set-by-other" : "<green>Your flyspeed has been set to <value> by <initiator></green>"
-"fly-speed-reset-by-other" : "<green>Your flyspeed has been reset by <initiator></green>"
-"not-a-player" : "<red>That is not a valid player. Please check your spelling and try again</red>"
-"no-permission" : "<red>You do not have permission to run this command</red>"
-"must-be-player" : "<red>You must be a player to run this command</red>"
-"not-enough-arguments" : "<red>You did not provide enough arguments. Please check your syntax and try again</red>"
-"not-a-number" : "<red>Sorry, you did not enter a valid flyspeed, please try again"
-"not-in-range" : "<red>Sorry, you must provide a number between <min> and <max>"
+papi-flight:
+  enabled: "[F]"
+  disabled: ""
+fly-set:
+  own: "Your fly has been <value>"
+  other: "<target>'s fly has been <value>"
+  by-other: "<green>Your fly has been <value> by <initiator></green>"
+fly-speed-set:
+  own: "<green>Your flyspeed has been set to <value></green>"
+  other: "<green>You set <target>'s flyspeed to <value></green>"
+  by-other: "<green>Your flyspeed has been set to <value> by <initiator></green>"
+fly-speed-reset:
+  own: "<green>Your flyspeed has been reset</green>"
+  other: "<green><target>'s flyspeed has been reset</green>"
+  by-other: "<green>Your flyspeed has been reset by <initiator></green>"
+fly-speed-get:
+  own: "<grey>Your flyspeed is currently set to <value></grey>"
+  other: "<grey><target>'s current flyspeed is <value></grey>"
+insertion:
+  prefix : "<green>[<yellow>SF</yellow>]</green> "
+  enabled : "<green>enabled</green>"
+  disabled : "<red>disabled</red>"
+error:
+  invalid-player : "<red>That is not a valid player. Please check your spelling and try again</red>"
+  no-permission : "<red>You do not have permission to run this command</red>"
+  must-be-player : "<red>You must be a player to run this command</red>"
+  not-enough-arguments : "<red>You did not provide enough arguments. Please check your syntax and try again</red>"
+  invalid-number : "<red>Sorry, you did not enter a valid flyspeed, please try again"
+  not-in-range : "<red>Sorry, you must provide a number between <min> and <max>"

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public void onPlayerLogin(PlayerJoinEvent joinEvent) {`
`28`	`28`	`if (player.getFallDistance() > 0f) {`
`29`	`29`	`player.setFlying(true);`
`30`	`30`	`}`
`31`		`- Util.sendUserMessage(player, ConfigValues.flyOwn, ConfigValues.enabled, null);`
	`31`	`+ Util.sendUserMessage(player, ConfigValues.flySetOwn, ConfigValues.enabled, null);`
`32`	`32`	`return;`
`33`	`33`	`}`
`34`	`34`	`if (flyEnabled && !player.hasPermission(Util.flyPermission)) {`