Reorganize Prefix / Util, YML Saving Change

Peashooter101 · Peashooter101 · commit 99a3e2145a59 · 2023-01-31T11:41:45.000-08:00
Refactored Prefix, PrefixUtil, and RequirementUtil into package prefix.
Package util was getting pretty big and did not really match with the new Prefix.

YML Saving Format now saves prefix data under "current-prefix" rather than a value tied to the player UUID.
Player UUID is now a Configuration Section.
(May require purging the old YML, plugin is fairly new so there probably will not be a "conversion" operation for this).
diff --git a/src/main/java/adhdmc/simpleprefixes/SimplePrefixes.java b/src/main/java/adhdmc/simpleprefixes/SimplePrefixes.java
@@ -7,8 +7,8 @@
 import adhdmc.simpleprefixes.config.PrefixConfig;
 import adhdmc.simpleprefixes.dependency.PAPIExpansion;
 import adhdmc.simpleprefixes.gui.chest.listener.PrefixMenuListener;
-import adhdmc.simpleprefixes.util.Prefix;
-import adhdmc.simpleprefixes.util.PrefixUtil;
+import adhdmc.simpleprefixes.prefix.Prefix;
+import adhdmc.simpleprefixes.prefix.PrefixUtil;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import net.kyori.adventure.text.minimessage.tag.standard.StandardTags;
diff --git a/src/main/java/adhdmc/simpleprefixes/command/subcommand/InfoCommand.java b/src/main/java/adhdmc/simpleprefixes/command/subcommand/InfoCommand.java
@@ -4,9 +4,8 @@
 import adhdmc.simpleprefixes.command.SubCommand;
 import adhdmc.simpleprefixes.util.Message;
 import adhdmc.simpleprefixes.util.Permission;
-import adhdmc.simpleprefixes.util.Prefix;
+import adhdmc.simpleprefixes.prefix.Prefix;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.bukkit.command.CommandSender;
 
diff --git a/src/main/java/adhdmc/simpleprefixes/command/subcommand/ResetCommand.java b/src/main/java/adhdmc/simpleprefixes/command/subcommand/ResetCommand.java
@@ -3,7 +3,7 @@
 import adhdmc.simpleprefixes.command.SubCommand;
 import adhdmc.simpleprefixes.util.Message;
 import adhdmc.simpleprefixes.util.Permission;
-import adhdmc.simpleprefixes.util.PrefixUtil;
+import adhdmc.simpleprefixes.prefix.PrefixUtil;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
diff --git a/src/main/java/adhdmc/simpleprefixes/command/subcommand/SetCommand.java b/src/main/java/adhdmc/simpleprefixes/command/subcommand/SetCommand.java
@@ -1,13 +1,15 @@
 package adhdmc.simpleprefixes.command.subcommand;
 
 import adhdmc.simpleprefixes.command.SubCommand;
+import adhdmc.simpleprefixes.prefix.Prefix;
+import adhdmc.simpleprefixes.prefix.PrefixUtil;
+import adhdmc.simpleprefixes.prefix.RequirementUtil;
 import adhdmc.simpleprefixes.util.*;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 public class SetCommand extends SubCommand {
     public SetCommand() {
diff --git a/src/main/java/adhdmc/simpleprefixes/dependency/PAPIExpansion.java b/src/main/java/adhdmc/simpleprefixes/dependency/PAPIExpansion.java
@@ -1,12 +1,9 @@
 package adhdmc.simpleprefixes.dependency;
 
 import adhdmc.simpleprefixes.SimplePrefixes;
-import adhdmc.simpleprefixes.util.PrefixUtil;
+import adhdmc.simpleprefixes.prefix.PrefixUtil;
 import me.clip.placeholderapi.PlaceholderAPI;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import net.kyori.adventure.text.minimessage.tag.standard.StandardTags;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.bukkit.OfflinePlayer;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/adhdmc/simpleprefixes/gui/chest/PrefixMenu.java b/src/main/java/adhdmc/simpleprefixes/gui/chest/PrefixMenu.java
@@ -2,8 +2,8 @@
 
 import adhdmc.simpleprefixes.SimplePrefixes;
 import adhdmc.simpleprefixes.util.Message;
-import adhdmc.simpleprefixes.util.Prefix;
-import adhdmc.simpleprefixes.util.RequirementUtil;
+import adhdmc.simpleprefixes.prefix.Prefix;
+import adhdmc.simpleprefixes.prefix.RequirementUtil;
 import me.clip.placeholderapi.PlaceholderAPI;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
diff --git a/src/main/java/adhdmc/simpleprefixes/gui/chest/listener/PrefixMenuListener.java b/src/main/java/adhdmc/simpleprefixes/gui/chest/listener/PrefixMenuListener.java
@@ -2,7 +2,7 @@
 
 import adhdmc.simpleprefixes.gui.chest.PrefixMenu;
 import adhdmc.simpleprefixes.util.Message;
-import adhdmc.simpleprefixes.util.PrefixUtil;
+import adhdmc.simpleprefixes.prefix.PrefixUtil;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
diff --git a/src/main/java/adhdmc/simpleprefixes/prefix/Prefix.java b/src/main/java/adhdmc/simpleprefixes/prefix/Prefix.java
@@ -1,7 +1,8 @@
-package adhdmc.simpleprefixes.util;
+package adhdmc.simpleprefixes.prefix;
 
 import adhdmc.simpleprefixes.SimplePrefixes;
 import adhdmc.simpleprefixes.config.PrefixConfig;
+import adhdmc.simpleprefixes.util.Message;
 import org.bukkit.configuration.ConfigurationSection;
 
 import java.util.*;
diff --git a/src/main/java/adhdmc/simpleprefixes/prefix/PrefixUtil.java b/src/main/java/adhdmc/simpleprefixes/prefix/PrefixUtil.java
@@ -1,4 +1,4 @@
-package adhdmc.simpleprefixes.util;
+package adhdmc.simpleprefixes.prefix;
 
 import adhdmc.simpleprefixes.config.Config;
 import adhdmc.simpleprefixes.util.saving.PlayerPDC;
diff --git a/src/main/java/adhdmc/simpleprefixes/prefix/RequirementUtil.java b/src/main/java/adhdmc/simpleprefixes/prefix/RequirementUtil.java
@@ -1,4 +1,4 @@
-package adhdmc.simpleprefixes.util;
+package adhdmc.simpleprefixes.prefix;
 
 import me.clip.placeholderapi.PlaceholderAPI;
 import org.bukkit.NamespacedKey;
diff --git a/src/main/java/adhdmc/simpleprefixes/util/saving/YMLFile.java b/src/main/java/adhdmc/simpleprefixes/util/saving/YMLFile.java
@@ -2,16 +2,19 @@
 
 import adhdmc.simpleprefixes.SimplePrefixes;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.UUID;
 
 public class YMLFile extends SaveHandler {
     private final File dataFile = new File(SimplePrefixes.getPlugin().getDataFolder(), "prefix_data.yml");
     private final FileConfiguration prefixData = new YamlConfiguration();
+    private final String CURRENT_PREFIX = "current-prefix";
 
     @Override
     public void init() {
@@ -26,12 +29,17 @@ public void init() {
 
     @Override
     public String getPrefixId(OfflinePlayer p) {
-        return prefixData.getString(p.getUniqueId().toString(), null);
+        ConfigurationSection playerData = prefixData.getConfigurationSection(p.getUniqueId().toString());
+        if (playerData == null) { return null; }
+        return playerData.getString(CURRENT_PREFIX, null);
     }
 
     @Override
     public void setPrefixId(OfflinePlayer p, String id) {
-        prefixData.set(p.getUniqueId().toString(), id);
+        String uuid = p.getUniqueId().toString();
+        ConfigurationSection playerData = prefixData.getConfigurationSection(uuid);
+        if (playerData == null) playerData = prefixData.createSection(uuid);
+        playerData.set(CURRENT_PREFIX, id);
         try { prefixData.save(dataFile); }
         catch (IOException e) { e.printStackTrace(); }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package adhdmc.simpleprefixes.util;`
	`1`	`+package adhdmc.simpleprefixes.prefix;`
`2`	`2`
`3`	`3`	`import adhdmc.simpleprefixes.config.Config;`
`4`	`4`	`import adhdmc.simpleprefixes.util.saving.PlayerPDC;`