3.15 update

Author: okx-code

build.gradle

@@ -1,9 +1,8 @@
 plugins {
     id 'java'
-    id 'com.github.johnrengelman.shadow' version '6.1.0'
-    id "io.freefair.lombok" version "6.0.0-m2"
-    id "maven-publish"
     id 'info.solidsoft.pitest' version '1.7.0'
+    id 'com.gradleup.shadow' version '9.0.0-beta8'
+    id 'io.freefair.lombok' version "8.12.1"
 }
 
 pitest {
@@ -14,11 +13,11 @@ pitest {
 }
 
 group 'sh.okx'
-version '3.14.4'
+version '3.15'
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 repositories {
@@ -38,34 +37,37 @@ repositories {
     maven {
         url 'https://nexus.neetgames.com/repository/maven-releases/'
     }
+    maven {
+        url 'https://repo.papermc.io/repository/maven-public/'
+    }
 }
 
 dependencies {
     testImplementation 'org.junit.platform:junit-platform-launcher:1.8.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
-    testImplementation 'com.github.MockBukkit:MockBukkit:04889261630cd6f5aaebd86a576bbcd12c442ea7'
+    testImplementation 'com.github.MockBukkit:MockBukkit:v4.31.1'
 
     implementation group: 'org.slf4j', name: 'slf4j-nop', version: '1.7.30'
     implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.30'
 
     compileOnly 'org.jetbrains:annotations:22.0.0'
-    compileOnly 'org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot-api:1.21.4-R0.1-SNAPSHOT'
     compileOnly('com.github.Realizedd:TokenManager:3.2.4') {
         transitive = false
     }
 
     compileOnly('com.github.MilkBowl:VaultAPI:1.7') {
         exclude group: 'org.bukkit'
     }
-    compileOnly ('me.clip:placeholderapi:2.10.9') {
+    compileOnly('me.clip:placeholderapi:2.10.9') {
         exclude group: 'org.bstats'
     }
     compileOnly 'com.github.pyvesb:advanced-achievements:8.0.2'
     compileOnly 'com.github.astei:Superbvote:700fca43659b438cb9bb36c218a7646d2f2ef315'
     compileOnly('com.gmail.nossr50.mcMMO:mcMMO:2.2.004') {
         exclude group: 'com.sk89q.worldguard'
     }
-    compileOnly ('com.bencodez:votingplugin:6.14.1') {
+    compileOnly('com.bencodez:votingplugin:6.14.1') {
         transitive = false
     }
 
@@ -74,7 +76,7 @@ dependencies {
     compileOnly 'com.github.LlmDl:Towny:25fc18a'
     testImplementation 'com.github.LlmDl:Towny:25fc18a'
 
-    implementation ('io.pebbletemplates:pebble:3.1.5') {
+    implementation('io.pebbletemplates:pebble:3.1.5') {
         exclude group: 'org.slf4j'
     }
     implementation 'com.electronwill.night-config:toml:3.6.4'
@@ -120,13 +122,3 @@ test {
         events "passed", "skipped", "failed"
     }
 }
-
-
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from components.java
-        }
-    }
-}
-

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/sh/okx/rankup/RankupHelper.java

@@ -1,8 +1,5 @@
 package sh.okx.rankup;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
@@ -16,6 +13,10 @@
 import sh.okx.rankup.ranks.RankElement;
 import sh.okx.rankup.ranks.Rankups;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
 /**
  * Actually performs the ranking up and prestiging for the plugin and also manages the cooldowns
  * between ranking up.
@@ -38,9 +39,10 @@ public RankupHelper(RankupPlugin plugin) {
 
   public void doRankup(Player player, RankElement<Rank> rank) {
     if (rank.getRank() != null) {
-      permissions.removeGroup(player.getUniqueId(), rank.getRank().getRank());
+      permissions.transferGroup(player.getUniqueId(), rank.getRank().getRank(), rank.getNext().getRank().getRank());
+    } else {
+      permissions.transferGroup(player.getUniqueId(), null, rank.getNext().getRank().getRank());
     }
-    permissions.addGroup(player.getUniqueId(), rank.getNext().getRank().getRank());
 
     rank.getRank().runCommands(player, rank.getNext().getRank());
 
@@ -65,13 +67,9 @@ public void sendRankupMessages(Player player, RankElement<Rank> rank) {
   public void doPrestige(Player player, RankElement<Prestige> prestige) {
     Prestige rank = prestige.getRank();
 
-    permissions.removeGroup(player.getUniqueId(), rank.getFrom());
-    permissions.addGroup(player.getUniqueId(), rank.getTo());
+    permissions.transferGroup(player.getUniqueId(), rank.getFrom(), rank.getTo());
 
-    if (rank.getRank() != null) {
-      permissions.removeGroup(player.getUniqueId(), rank.getRank());
-    }
-    permissions.addGroup(player.getUniqueId(), prestige.getNext().getRank().getRank());
+    permissions.transferGroup(player.getUniqueId(), rank.getRank(), prestige.getNext().getRank().getRank());
 
     rank.runCommands(player, prestige.getNext().getRank());
 

src/main/java/sh/okx/rankup/RankupPlugin.java

@@ -11,11 +11,14 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.InventoryView;
-import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.plugin.java.JavaPluginLoader;
-import sh.okx.rankup.commands.*;
+import sh.okx.rankup.commands.InfoCommand;
+import sh.okx.rankup.commands.MaxRankupCommand;
+import sh.okx.rankup.commands.PrestigeCommand;
+import sh.okx.rankup.commands.PrestigesCommand;
+import sh.okx.rankup.commands.RanksCommand;
+import sh.okx.rankup.commands.RankupCommand;
 import sh.okx.rankup.economy.Economy;
 import sh.okx.rankup.economy.EconomyProvider;
 import sh.okx.rankup.economy.VaultEconomyProvider;
@@ -38,15 +41,37 @@
 import sh.okx.rankup.ranksgui.RanksGuiListener;
 import sh.okx.rankup.requirements.Requirement;
 import sh.okx.rankup.requirements.RequirementRegistry;
-import sh.okx.rankup.requirements.requirement.*;
+import sh.okx.rankup.requirements.requirement.AdvancementRequirement;
+import sh.okx.rankup.requirements.requirement.BlockBreakRequirement;
+import sh.okx.rankup.requirements.requirement.CraftItemRequirement;
+import sh.okx.rankup.requirements.requirement.GroupRequirement;
+import sh.okx.rankup.requirements.requirement.ItemDeductibleRequirement;
+import sh.okx.rankup.requirements.requirement.ItemRequirement;
+import sh.okx.rankup.requirements.requirement.MobKillsRequirement;
+import sh.okx.rankup.requirements.requirement.MoneyDeductibleRequirement;
+import sh.okx.rankup.requirements.requirement.MoneyRequirement;
+import sh.okx.rankup.requirements.requirement.PermissionRequirement;
+import sh.okx.rankup.requirements.requirement.PlaceholderRequirement;
+import sh.okx.rankup.requirements.requirement.PlayerKillsRequirement;
+import sh.okx.rankup.requirements.requirement.PlaytimeMinutesRequirement;
+import sh.okx.rankup.requirements.requirement.TotalMobKillsRequirement;
+import sh.okx.rankup.requirements.requirement.UseItemRequirement;
+import sh.okx.rankup.requirements.requirement.WorldRequirement;
+import sh.okx.rankup.requirements.requirement.XpLevelDeductibleRequirement;
+import sh.okx.rankup.requirements.requirement.XpLevelRequirement;
 import sh.okx.rankup.requirements.requirement.advancedachievements.AdvancedAchievementsAchievementRequirement;
 import sh.okx.rankup.requirements.requirement.advancedachievements.AdvancedAchievementsTotalRequirement;
 import sh.okx.rankup.requirements.requirement.mcmmo.McMMOPowerLevelRequirement;
 import sh.okx.rankup.requirements.requirement.mcmmo.McMMOSkillRequirement;
 import sh.okx.rankup.requirements.requirement.superbvote.SuperbVoteVotesRequirement;
 import sh.okx.rankup.requirements.requirement.tokenmanager.TokensDeductibleRequirement;
 import sh.okx.rankup.requirements.requirement.tokenmanager.TokensRequirement;
-import sh.okx.rankup.requirements.requirement.towny.*;
+import sh.okx.rankup.requirements.requirement.towny.TownyKingNumberResidentsRequirement;
+import sh.okx.rankup.requirements.requirement.towny.TownyKingNumberTownsRequirement;
+import sh.okx.rankup.requirements.requirement.towny.TownyKingRequirement;
+import sh.okx.rankup.requirements.requirement.towny.TownyMayorNumberResidentsRequirement;
+import sh.okx.rankup.requirements.requirement.towny.TownyMayorRequirement;
+import sh.okx.rankup.requirements.requirement.towny.TownyResidentRequirement;
 import sh.okx.rankup.requirements.requirement.votingplugin.VotingPluginPointsDeductibleRequirement;
 import sh.okx.rankup.requirements.requirement.votingplugin.VotingPluginPointsRequirement;
 import sh.okx.rankup.requirements.requirement.votingplugin.VotingPluginVotesRequirement;
@@ -97,8 +122,7 @@ public RankupPlugin() {
     super();
   }
 
-  protected RankupPlugin(JavaPluginLoader loader, PluginDescriptionFile description, File dataFolder, File file, PermissionManager permissionManager, EconomyProvider economyProvider) {
-    super(loader, description, dataFolder, file);
+  protected RankupPlugin(PermissionManager permissionManager, EconomyProvider economyProvider) {
     this.permissionManager = permissionManager;
     this.economyProvider = economyProvider;
   }

src/main/java/sh/okx/rankup/commands/InfoCommand.java

@@ -146,9 +146,10 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
         Rank prevRank = prevRankElement.getRank();
 
         if (prevRankElement.getRank() != null) {
-          plugin.getPermissions().removeGroup(player.getUniqueId(), currentRank.getRank());
+          plugin.getPermissions().transferGroup(player.getUniqueId(), currentRank.getRank(), prevRank.getRank());
+        } else {
+          plugin.getPermissions().transferGroup(player.getUniqueId(), null, prevRank.getRank());
         }
-        plugin.getPermissions().addGroup(player.getUniqueId(), prevRank.getRank());
 
         sender.sendMessage(ChatColor.GREEN + "Successfully forced "
                 + ChatColor.GOLD + player.getName()

src/main/java/sh/okx/rankup/gui/Gui.java

@@ -1,8 +1,5 @@
 package sh.okx.rankup.gui;
 
-import java.util.Arrays;
-import java.util.Objects;
-import java.util.stream.Collectors;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -24,6 +21,10 @@
 import sh.okx.rankup.util.Colour;
 import sh.okx.rankup.util.ItemUtil;
 
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
 public class Gui implements InventoryHolder {
 
@@ -97,6 +98,11 @@ public static ItemStack getItem(RankupPlugin plugin, ConfigurationSection sectio
     if (section == null) {
       return null;
     }
+    ItemStack serializedItem = section.getItemStack("item");
+    if (serializedItem != null) {
+        return serializedItem;
+    }
+
     String materialName = section.getString("material").toUpperCase();
 
     ItemStack item;

src/main/java/sh/okx/rankup/hook/GroupProvider.java

@@ -4,6 +4,5 @@
 
 public interface GroupProvider {
   boolean inGroup(UUID uuid, String group);
-  void addGroup(UUID uuid, String group);
-  void removeGroup(UUID uuid, String group);
+  void transferGroup(UUID uuid, String oldGroup, String group);
 }

src/main/java/sh/okx/rankup/hook/LuckPermsGroupProvider.java

@@ -1,13 +1,14 @@
 package sh.okx.rankup.hook;
 
-import java.util.UUID;
 import net.luckperms.api.LuckPerms;
 import net.luckperms.api.context.ContextSet;
 import net.luckperms.api.context.ImmutableContextSet;
 import net.luckperms.api.model.group.Group;
 import net.luckperms.api.model.user.User;
 import net.luckperms.api.node.types.InheritanceNode;
 
+import java.util.UUID;
+
 public class LuckPermsGroupProvider implements GroupProvider {
 
   private final LuckPerms luckPerms;
@@ -39,26 +40,21 @@ public static LuckPermsGroupProvider createFromString(LuckPerms luckPerms, Strin
   public boolean inGroup(UUID uuid, String group) {
     User user = luckPerms.getUserManager().getUser(uuid);
     for (Group lpGroup : user.getInheritedGroups(user.getQueryOptions().toBuilder().context(contextSet).build())) {
-      if (lpGroup.getName().equals(group)) {
+      if (lpGroup.getName().equalsIgnoreCase(group)) {
         return true;
       }
     }
     return false;
   }
 
   @Override
-  public void addGroup(UUID uuid, String group) {
+  public void transferGroup(UUID uuid, String oldGroup, String group) {
     User user = luckPerms.getUserManager().getUser(uuid);
+    if (oldGroup != null) {
+      user.data().remove(InheritanceNode.builder(oldGroup).context(contextSet).build());
+    }
     user.data().add(InheritanceNode.builder(group).context(contextSet).build());
 
     luckPerms.getUserManager().saveUser(user);
   }
-
-  @Override
-  public void removeGroup(UUID uuid, String group) {
-    User user = luckPerms.getUserManager().getUser(uuid);
-    user.data().remove(InheritanceNode.builder(group).context(contextSet).build());
-
-    luckPerms.getUserManager().saveUser(user);
-  }
 }

src/main/java/sh/okx/rankup/hook/PermissionGroupProvider.java

@@ -1,9 +1,10 @@
 package sh.okx.rankup.hook;
 
-import java.util.UUID;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
+import java.util.UUID;
+
 public class PermissionGroupProvider implements GroupProvider {
 
   @Override
@@ -13,12 +14,7 @@ public boolean inGroup(UUID uuid, String group) {
   }
 
   @Override
-  public void addGroup(UUID uuid, String group) {
-    // no-op
-  }
-
-  @Override
-  public void removeGroup(UUID uuid, String group) {
+  public void transferGroup(UUID uuid, String oldGroup, String group) {
     // no-op
   }
 

src/main/java/sh/okx/rankup/hook/VaultGroupProvider.java

@@ -28,18 +28,14 @@ public boolean inGroup(UUID uuid, String group) {
   }
 
   @Override
-  public void addGroup(UUID uuid, String group) {
+  public void transferGroup(UUID uuid, String oldGroup, String group) {
     Objects.requireNonNull(uuid);
     Objects.requireNonNull(group);
 
-    permission.playerAddGroup(null, Bukkit.getOfflinePlayer(uuid), group);
-  }
-
-  @Override
-  public void removeGroup(UUID uuid, String group) {
-    Objects.requireNonNull(uuid);
-    Objects.requireNonNull(group);
+    if (oldGroup != null) {
+      permission.playerRemoveGroup(null, Bukkit.getOfflinePlayer(uuid), oldGroup);
+    }
 
-    permission.playerRemoveGroup(null, Bukkit.getOfflinePlayer(uuid), group);
+    permission.playerAddGroup(null, Bukkit.getOfflinePlayer(uuid), group);
   }
 }