Fix merge artifacts

GreenSurvivors · Jan 28, 2024 · ec92d64 · ec92d64
1 parent a59b45e
commit ec92d64
Show file tree

Hide file tree

Showing 99 changed files with 278 additions and 315 deletions.
diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/commands/SelectCommand.java b/Minigames/src/main/java/au/com/mineauz/minigames/commands/SelectCommand.java
@@ -19,52 +19,33 @@ public class SelectCommand implements ICommand {
         return "select";
     }
 
-    @Override
-    public @NotNull String[] getAliases() {
-        return null;
-    }
-
     @Override
     public boolean canBeConsole() {
         return false;
     }
 
     @Override
-    public String getDescription() {
+    public @NotNull Component getDescription() {
         return "select and clear region selections";
     }
 
     @Override
-    public @NotNull String[] getParameters() {
-        return new String[]{
-                "1",
-                "2",
-                "clear"
-        };
-    }
-
-    @Override
-    public @NotNull String[] getUsage() {
+    public @NotNull Component getUsage() {
         return new String[]{
                 "/minigame select 1",
                 "/minigame select 2",
                 "/minigame select clear"
         };
     }
 
-    @Override
-    public String getPermissionMessage() {
-        return "You don't have permission to modify regions";
-    }
-
     @Override
     public @Nullable String getPermission() {
         return "minigame.region.select";
     }
 
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @Nullable Minigame minigame,
-                             String label, @NotNull String @Nullable [] args) {
+                             @NotNull String @Nullable [] args) {
         if (sender instanceof Player player) {
             MinigamePlayer mgPlayer = Minigames.getPlugin().getPlayerManager().getMinigamePlayer(player);
 
@@ -94,7 +75,7 @@ public boolean onCommand(@NotNull CommandSender sender, @Nullable Minigame minig
     }
 
     @Override
-    public @Nullable List<@NotNull String> onTabComplete(CommandSender sender, Minigame minigame, String alias, String[] args) {
+    public @Nullable List<@NotNull String> onTabComplete(@NotNull CommandSender sender, Minigame minigame, String[] args) {
         if (args != null && args.length == 1) {
             return MinigameUtils.tabCompleteMatch(List.of("1", "2", "clear"), args[0]);
         }

diff --git a/...games/src/main/java/au/com/mineauz/minigames/commands/set/SetFloorDegeneratorCommand.java b/...games/src/main/java/au/com/mineauz/minigames/commands/set/SetFloorDegeneratorCommand.java
@@ -45,7 +45,7 @@ public boolean canBeConsole() {
     }
 
     @Override
-    public Component getUsage() { // todo create", "remove", "type", "time
+    public Component getUsage() {
         return MinigameMessageManager.getMgMessage(MgCommandLangKey.COMMAND_SET_FLOORDEGEN_USAGE);
     }
 

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/commands/set/SetRegenAreaCommand.java b/Minigames/src/main/java/au/com/mineauz/minigames/commands/set/SetRegenAreaCommand.java
@@ -40,7 +40,7 @@ public boolean canBeConsole() {
     }
 
     @Override
-    public @NotNull Component getDescription() { //todo delete to remove
+    public @NotNull Component getDescription() {
         return MinigameMessageManager.getMgMessage(MgCommandLangKey.COMMAND_SET_REGENAREA_DESCRIPTION);
     }
 

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItem.java b/Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItem.java
@@ -4,7 +4,6 @@
 import au.com.mineauz.minigames.objects.IndexedMap;
 import au.com.mineauz.minigames.objects.StrIntMapPersistentDataType;
 import net.kyori.adventure.text.Component;
-import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;
@@ -44,9 +43,9 @@ public MenuItem(@NotNull Component name, @Nullable List<@NotNull Component> desc
         this.displayItem.setItemMeta(meta);
     }
 
-    public MenuItem(@NotNull String name, @NotNull ItemStack displayItem) {
+    public MenuItem(@NotNull Component name, @NotNull ItemStack displayItem) {
         ItemMeta meta = displayItem.getItemMeta();
-        meta.setDisplayName(ChatColor.RESET + name);
+        meta.displayName(name);
         displayItem.setItemMeta(meta);
         this.displayItem = displayItem;
     }
@@ -140,7 +139,7 @@ public void setDescriptionPartAtIndex(@NotNull String typeStr, int postion,
                         startingPoint += length;
                     } else {
                         // well crap. invalid data!
-                        Minigames.log().warning("Found empty description data. Ignoring it for now.");
+                        Minigames.getCmpnntLogger().warn("Found empty description data. Ignoring it for now.");
                         //todo we need a iterator of IndexedMap --> code it!
                     }
                 }
@@ -179,7 +178,7 @@ private static void removeDescriptionPart(@NotNull ItemMeta itemMeta, @NotNull I
                             startingPoint += entryBefore.getValue();
                         } else {
                             // well crap. invalid data!
-                            Minigames.log().warning("Found empty description data. Ignoring it for now.");
+                            Minigames.getCmpnntLogger().warn("Found empty description data. Ignoring it for now.");
                             //todo we need a iterator of IndexedMap --> code it!
                         }
                     }
@@ -192,12 +191,12 @@ private static void removeDescriptionPart(@NotNull ItemMeta itemMeta, @NotNull I
                     }
                 } else {
                     // well crap. invalid data!
-                    Minigames.log().severe("Menu item has empty lore but tried to remove a part of it. Clearing all parts mow. Please open an Issue!");
+                    Minigames.getCmpnntLogger().error("Menu item has empty lore but tried to remove a part of it. Clearing all parts mow. Please open an Issue!");
                     descriptionRegistry.clear();
                 }
             } else {
                 // well crap. invalid data!
-                Minigames.log().warning("Menu item trying to remove empty description data.");
+                Minigames.getCmpnntLogger().warn("Menu item trying to remove empty description data.");
                 descriptionRegistry.remove(typeStr);
             }
         }

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemAddFlag.java b/Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemAddFlag.java
@@ -3,6 +3,7 @@
 import au.com.mineauz.minigames.managers.language.MinigameMessageType;
 import au.com.mineauz.minigames.minigame.Minigame;
 import au.com.mineauz.minigames.objects.MinigamePlayer;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
@@ -12,12 +13,12 @@ public class MenuItemAddFlag extends MenuItem {
 
     private final Minigame mgm;
 
-    public MenuItemAddFlag(String name, Material displayItem, Minigame mgm) {
+    public MenuItemAddFlag(Component name, Material displayItem, Minigame mgm) {
         super(name, displayItem);
         this.mgm = mgm;
     }
 
-    public MenuItemAddFlag(String name, List<String> description, Material displayItem, Minigame mgm) {
+    public MenuItemAddFlag(Component name, List<Component> description, Material displayItem, Minigame mgm) {
         super(name, description, displayItem);
         this.mgm = mgm;
     }

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemAddTeam.java b/Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemAddTeam.java
@@ -7,6 +7,7 @@
 import au.com.mineauz.minigames.minigame.TeamColor;
 import au.com.mineauz.minigames.minigame.modules.TeamsModule;
 import au.com.mineauz.minigames.objects.MinigamePlayer;
+import net.kyori.adventure.text.Component;
 import org.apache.commons.text.WordUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -19,7 +20,7 @@ public class MenuItemAddTeam extends MenuItem {
 
     private final TeamsModule tm;
 
-    public MenuItemAddTeam(String name, Minigame minigame) {
+    public MenuItemAddTeam(Component name, Minigame minigame) {
         super(name, MenuUtility.getCreateMaterial());
         tm = TeamsModule.getMinigameModule(minigame);
     }

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemAddWhitelistBlock.java b/Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemAddWhitelistBlock.java
@@ -2,6 +2,7 @@
 
 import au.com.mineauz.minigames.managers.language.MinigameMessageType;
 import au.com.mineauz.minigames.objects.MinigamePlayer;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
@@ -11,9 +12,9 @@
 public class MenuItemAddWhitelistBlock extends MenuItem {
     private final List<Material> whitelist;
 
-    public MenuItemAddWhitelistBlock(String name, List<Material> whitelist) {
+    public MenuItemAddWhitelistBlock(Component name, List<Material> whitelist) {
         super(name, MenuUtility.getCreateMaterial());
-        setDescriptionStr(List.of("Left Click with item to", "add to whitelist/blacklist", "Click without item to", "manually add item."));
+        setDescription(List.of("Left Click with item to", "add to whitelist/blacklist", "Click without item to", "manually add item."));
         this.whitelist = whitelist;
     }
 

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemBack.java b/Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemBack.java
@@ -3,7 +3,6 @@
 import org.bukkit.inventory.ItemStack;
 
 public class MenuItemBack extends MenuItem {
-
     private final Menu prev;
 
     public MenuItemBack(Menu prev) {

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemBlockData.java b/Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemBlockData.java
@@ -2,6 +2,7 @@
 
 import au.com.mineauz.minigames.managers.language.MinigameMessageType;
 import au.com.mineauz.minigames.objects.MinigamePlayer;
+import net.kyori.adventure.text.Component;
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -16,13 +17,13 @@
 public class MenuItemBlockData extends MenuItem {
     private Callback<BlockData> dataCallback;
 
-    public MenuItemBlockData(String name, Material displayItem) {
+    public MenuItemBlockData(Component name, Material displayItem) {
         super(name, displayItem);
         dataCallback.setValue(displayItem.createBlockData());
         setDescription(createDescription(dataCallback.getValue()));
     }
 
-    public MenuItemBlockData(String name, Material displayItem, Callback<BlockData> callback) {
+    public MenuItemBlockData(Component name, Material displayItem, Callback<BlockData> callback) {
         super(name, displayItem);
         this.dataCallback = callback;
         setDescription(createDescription(dataCallback.getValue()));
@@ -36,7 +37,7 @@ public void update() {
     /**
      * minecraft:chest[facing=north,type=single,waterlogged=false]{Items:[{Slot:0b,id:"minecraft:grass_block",Count:1b}],Lock:""}
      */
-    private List<String> createDescription(BlockData data) {
+    private List<Component> createDescription(BlockData data) {
         List<String> result = new ArrayList<>();
         result.add("Material: " + data.getMaterial().name());
         String dataString = data.getAsString();

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemBoolean.java b/Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemBoolean.java
@@ -31,9 +31,9 @@ public void updateDescription() {
         } else {
             col = ChatColor.RED + "false";
         }
-        if (getDescriptionStr() != null) {
-            description = getDescriptionStr();
-            String desc = ChatColor.stripColor(getDescriptionStr().get(0));
+        if (getDescription() != null) {
+            description = getDescription();
+            String desc = ChatColor.stripColor(getDescription().get(0));
 
             if (desc.matches("true|false"))
                 description.set(0, col);

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemComponent.java b/Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemComponent.java
@@ -14,13 +14,13 @@ public class MenuItemComponent extends MenuItem {
     protected Callback<String> stringCallback; // todo I'm not happy having String as callback here. I need it since the SerializeableBridge can't use Components, but this doesn't feel right.
     private boolean allowNull = false;
 
-    public MenuItemComponent(String name, Material displayItem, Callback<String> stringCallback) {
+    public MenuItemComponent(Component name, Material displayItem, Callback<String> stringCallback) {
         super(name, displayItem);
         this.stringCallback = stringCallback;
         updateDescription();
     }
 
-    public MenuItemComponent(String name, List<String> description, Material displayItem, Callback<String> stringCallback) {
+    public MenuItemComponent(Component name, List<Component> description, Material displayItem, Callback<String> stringCallback) {
         super(name, description, displayItem);
         this.stringCallback = stringCallback;
         updateDescription();
@@ -44,7 +44,7 @@ public void updateDescription() {
         //    setting = setting.substring(0, 17) + "...";
         //}
 
-        description = getDescriptionComp();
+        description = getDescription();
         if (description != null) {
             //todo find a way to not overwrite other descriptions
             //Component desc = description.get(0);
@@ -59,7 +59,7 @@ public void updateDescription() {
             description.add(settingComp);
         }
 
-        setDescriptionComp(description);
+        setDescription(description);
     }
 
     @Override

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemDecimal.java b/Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemDecimal.java
@@ -2,6 +2,7 @@
 
 import au.com.mineauz.minigames.managers.language.MinigameMessageType;
 import au.com.mineauz.minigames.objects.MinigamePlayer;
+import net.kyori.adventure.text.Component;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
@@ -11,15 +12,14 @@
 import java.util.List;
 
 public class MenuItemDecimal extends MenuItem {
-
     protected final Callback<Double> value;
     private final double lowerInc;
     private final double upperInc;
     private final Double min;
     private final Double max;
     protected DecimalFormat form = new DecimalFormat("#.##");
 
-    public MenuItemDecimal(String name, Material displayItem, Callback<Double> value,
+    public MenuItemDecimal(Component name, Material displayItem, Callback<Double> value,
                            double lowerInc, double upperInc, Double min, Double max) {
         super(name, displayItem);
         this.value = value;
@@ -30,7 +30,7 @@ public MenuItemDecimal(String name, Material displayItem, Callback<Double> value
         updateDescription();
     }
 
-    public MenuItemDecimal(String name, List<String> description, Material displayItem, Callback<Double> value,
+    public MenuItemDecimal(Component name, List<Component> description, Material displayItem, Callback<Double> value,
                            double lowerInc, double upperInc, Double min, Double max) {
         super(name, description, displayItem);
         this.value = value;
@@ -46,10 +46,10 @@ public void setFormat(DecimalFormat format) {
     }
 
     public void updateDescription() {
-        List<String> description;
-        if (getDescriptionStr() != null) {
-            description = getDescriptionStr();
-            String desc = ChatColor.stripColor(getDescriptionStr().get(0));
+        List<Component> description;
+        if (getDescription() != null) {
+            description = getDescription();
+            String desc = ChatColor.stripColor(getDescription().get(0));
 
             if (desc.matches("-?[0-9]+(?:.[0-9]+)?")) {
                 description.set(0, ChatColor.GREEN + form.format(value.getValue()));
@@ -67,7 +67,7 @@ public void updateDescription() {
             }
         }
 
-        setDescriptionStr(description);
+        setDescription(description);
     }
 
     @Override