Plugin: fix support for minecraft version 1.16.5

Flectone · Sep 12, 2023 · 58d26ca · 58d26ca
1 parent a4e680c
commit 58d26ca
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 9 deletions.
diff --git a/src/main/java/net/flectone/messages/MessageBuilder.java b/src/main/java/net/flectone/messages/MessageBuilder.java
@@ -7,9 +7,9 @@
 import net.flectone.misc.components.FURLComponent;
 import net.flectone.misc.entity.FPlayer;
 import net.flectone.utils.ObjectUtil;
+import net.flectone.utils.Pair;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.ComponentBuilder;
-import org.apache.commons.lang3.tuple.Pair;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.attribute.Attribute;
@@ -75,8 +75,8 @@ public MessageBuilder(@NotNull String command, @NotNull String text, @Nullable C
 
             if (matchedPattern != null) {
                 if (patternIndexes.containsKey(matchedPattern)) {
-                    sortedPairs.add(Pair.of(matchedPattern, patternIndexes.get(matchedPattern)));
-                    sortedPairs.add(Pair.of(matchedPattern, charIndex));
+                    sortedPairs.add(new Pair<>(matchedPattern, patternIndexes.get(matchedPattern)));
+                    sortedPairs.add(new Pair<>(matchedPattern, charIndex));
                     patternIndexes.remove(matchedPattern);
                 } else {
                     patternIndexes.put(matchedPattern, charIndex);
@@ -87,7 +87,7 @@ public MessageBuilder(@NotNull String command, @NotNull String text, @Nullable C
             }
         }
 
-        sortedPairs.sort(Comparator.comparingInt(Pair::getRight));
+        sortedPairs.sort(Comparator.comparingInt(Pair::right));
 
         TextParameters lastTextParamaters = new TextParameters("");
 

diff --git a/src/main/java/net/flectone/misc/entity/FPlayer.java b/src/main/java/net/flectone/misc/entity/FPlayer.java
@@ -351,13 +351,19 @@ public void setTeam(@NotNull Team team) {
     @NotNull
     public Team getPlayerTeam() {
 
-        int rank = 0;
+        String sortName;
 
-        if (HookManager.enabledLuckPerms) {
-            rank = FLuckPerms.getPlayerGroupWeight(player);
-        }
+        if (!Bukkit.getBukkitVersion().startsWith("1.16.5")) {
+            int rank = 0;
+
+            if (HookManager.enabledLuckPerms) {
+                rank = FLuckPerms.getPlayerGroupWeight(player);
+            }
 
-        String sortName = ObjectUtil.generateSortString(rank, player.getName());
+            sortName = ObjectUtil.generateSortString(rank, player.getName());
+        } else {
+            sortName = player.getName();
+        }
 
         Team bukkitTeam = FPlayerManager.getScoreBoard().getTeam(sortName);
         Team team = bukkitTeam != null ? bukkitTeam : FPlayerManager.getScoreBoard().registerNewTeam(sortName);

diff --git a/src/main/java/net/flectone/utils/Pair.java b/src/main/java/net/flectone/utils/Pair.java
@@ -0,0 +1,12 @@
+package net.flectone.utils;
+
+public record Pair<L, R>(L left, R right) {
+
+    public L getKey() {
+        return this.left();
+    }
+
+    public R getValue() {
+        return this.right();
+    }
+}