Ongoing deprecation cleanup

Author: mbax

bukkit/src/main/java/dev/kitteh/factions/Faction.java

@@ -15,7 +15,6 @@
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
@@ -565,7 +564,7 @@ default int memberLimit() {
     void defaultRole(Role role);
 
     @Override
-    default void sendMessage(@NonNull Component component) {
+    default void sendMessage(Component component) {
         for (FPlayer fplayer : this.membersOnline(true)) {
             fplayer.sendMessage(component);
         }

bukkit/src/main/java/dev/kitteh/factions/command/defaults/CmdBan.java

@@ -68,7 +68,7 @@ private void handle(CommandContext<Sender> context) {
 
             if (event.isCancelled()) {
                 // if someone cancels a ban, we'll get people complaining here. So lets log it.
-                AbstractFactionsPlugin.instance().log(Level.WARNING, "Attempted to ban {0} but a plugin cancelled the kick event.", target.name());
+                AbstractFactionsPlugin.instance().log(Level.WARNING, "Attempted to ban " + target.name() + " but a plugin cancelled the kick event.");
                 return;
             }
 

bukkit/src/main/java/dev/kitteh/factions/command/defaults/admin/force/CmdForceDisband.java

@@ -17,7 +17,6 @@
 import dev.kitteh.factions.tagresolver.FPlayerResolver;
 import dev.kitteh.factions.tagresolver.FactionResolver;
 import dev.kitteh.factions.util.Permission;
-import dev.kitteh.factions.util.TL;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.bukkit.Bukkit;
 import org.incendo.cloud.Command;

bukkit/src/main/java/dev/kitteh/factions/config/file/MainConfig.java

@@ -1364,7 +1364,7 @@ public boolean isRelationToTeleportOut(Relation relation, Faction faction) {
                     return relations.contains(relation);
                 }
 
-                @Deprecated
+                @Deprecated(forRemoval = true, since = "4.0.0")
                 public boolean isRelationToTeleportOut(Relation relation) {
                     if (relations == null) {
                         relations = new HashSet<>();

bukkit/src/main/java/dev/kitteh/factions/data/MemoryFPlayer.java

@@ -43,7 +43,6 @@
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
@@ -973,7 +972,7 @@ public boolean attemptClaim(Faction forFaction, FLocation flocation, boolean not
         Board.board().claim(flocation, forFaction);
 
         if (FactionsPlugin.instance().conf().logging().isLandClaims()) {
-            AbstractFactionsPlugin.instance().log(TL.CLAIM_CLAIMEDLOG.toString(), this.name(), flocation.asCoordString(), forFaction.tag());
+            AbstractFactionsPlugin.instance().log(String.format(TL.CLAIM_CLAIMEDLOG.toString(), this.name(), flocation.asCoordString(), forFaction.tag()));
         }
 
         return true;
@@ -1103,7 +1102,7 @@ public boolean shouldBeSaved() {
     }
 
     @Override
-    public void msgLegacy(@NonNull String str, @NonNull Object @NonNull ... args) {
+    public void msgLegacy(String str, Object... args) {
         this.sendMessageLegacy(TextUtil.parse(str, args));
     }
 
@@ -1253,7 +1252,7 @@ public void flyTrailEffect(String effect) {
     }
 
     @Override
-    public void sendMessage(@NonNull Component component) {
+    public void sendMessage(Component component) {
         if (this.asPlayer() instanceof Player player) {
             ComponentDispatcher.send(player, component);
         }

bukkit/src/main/java/dev/kitteh/factions/integration/Essentials.java

@@ -110,8 +110,8 @@ public void onLeave(FPlayerLeaveEvent event) throws Exception {
                 // We're only going to remove homes in territory that belongs to THEIR faction.
                 if (factionAt == faction && factionAt.isNormal()) {
                     user.delHome(homeName);
-                    AbstractFactionsPlugin.instance().log(Level.INFO, "FactionLeaveEvent: Removing EssX home %s, player %s, in territory of %s",
-                            homeName, event.getFPlayer().name(), faction.tag());
+                    AbstractFactionsPlugin.instance().log(Level.INFO, String.format("FactionLeaveEvent: Removing EssX home %s, player %s, in territory of %s",
+                            homeName, event.getFPlayer().name(), faction.tag()));
                 }
             }
         }

bukkit/src/main/java/dev/kitteh/factions/listener/ListenEnterExit.java

@@ -197,12 +197,12 @@ private void initPlayer(Player player) {
 
         if (me.spyingChat() && !player.hasPermission(Permission.CHATSPY.node)) {
             me.spyingChat(false);
-            this.plugin.log(Level.INFO, "Found %s spying chat without permission on login. Disabled their chat spying.", player.getName());
+            this.plugin.log(Level.INFO, "Found " + player.getName() + " spying chat without permission on login. Disabled their chat spying.");
         }
 
         if (me.adminBypass() && !player.hasPermission(Permission.BYPASS.node)) {
             me.adminBypass(false);
-            this.plugin.log(Level.INFO, "Found %s on admin Bypass without permission on login. Disabled it for them.", player.getName());
+            this.plugin.log(Level.INFO, "Found " + player.getName() + " on admin Bypass without permission on login. Disabled it for them.");
         }
 
         if (WorldUtil.isEnabled(player)) {

bukkit/src/main/java/dev/kitteh/factions/upgrade/LeveledValueProvider.java

@@ -50,7 +50,7 @@ public BigDecimal get(int level) {
      * @param levels levels available
      */
     record LevelMap(Int2ObjectArrayMap<BigDecimal> levels) implements LeveledValueProvider {
-        @Deprecated(since = "4.2.2", forRemoval = true)
+        @Deprecated(forRemoval = true, since = "4.2.2")
         public static LevelMap of(int level1, BigDecimal val1) {
             Int2ObjectArrayMap<BigDecimal> levels = new Int2ObjectArrayMap<>();
             levels.put(level1, val1);
@@ -69,7 +69,7 @@ public static LevelMap of(BigDecimal val1) {
             return new LevelMap(levels);
         }
 
-        @Deprecated(since = "4.2.2", forRemoval = true)
+        @Deprecated(forRemoval = true, since = "4.2.2")
         public static LevelMap of(int level1, BigDecimal val1, int level2, BigDecimal val2) {
             Int2ObjectArrayMap<BigDecimal> levels = new Int2ObjectArrayMap<>();
             levels.put(level1, val1);
@@ -91,7 +91,7 @@ public static LevelMap of(BigDecimal val1, BigDecimal val2) {
             return new LevelMap(levels);
         }
 
-        @Deprecated(since = "4.2.2", forRemoval = true)
+        @Deprecated(forRemoval = true, since = "4.2.2")
         public static LevelMap of(int level1, BigDecimal val1, int level2, BigDecimal val2, int level3, BigDecimal val3) {
             Int2ObjectArrayMap<BigDecimal> levels = new Int2ObjectArrayMap<>();
             levels.put(level1, val1);
@@ -116,7 +116,7 @@ public static LevelMap of(BigDecimal val1, BigDecimal val2, BigDecimal val3) {
             return new LevelMap(levels);
         }
 
-        @Deprecated(since = "4.2.2", forRemoval = true)
+        @Deprecated(forRemoval = true, since = "4.2.2")
         public static LevelMap of(int level1, BigDecimal val1, int level2, BigDecimal val2, int level3, BigDecimal val3, int level4, BigDecimal val4) {
             Int2ObjectArrayMap<BigDecimal> levels = new Int2ObjectArrayMap<>();
             levels.put(level1, val1);

paper/src/main/java/dev/kitteh/factions/command/paper/CmdWarp.java

@@ -30,6 +30,7 @@
 
 import java.util.List;
 
+@SuppressWarnings("UnstableApiUsage")
 public class CmdWarp implements Cmd {
     private static final ClickCallback.Options OPT = ClickCallback.Options.builder().build();