Fixes some incompatibility between final and stupid reflection

src/main/java/com/massivecraft/factions/ExtractorFactionAccountId.java

@@ -8,7 +8,7 @@ public class ExtractorFactionAccountId implements Extractor {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final ExtractorFactionAccountId i = new ExtractorFactionAccountId();
+    protected static ExtractorFactionAccountId i = new ExtractorFactionAccountId();
 
     public static ExtractorFactionAccountId get() {
         return i;

src/main/java/com/massivecraft/factions/FactionsIndex.java

@@ -15,7 +15,7 @@ import java.util.WeakHashMap;
  * This Index class contains the MPlayer <--> Faction index.
  * <p>
  * In the background it's powered by WeakHashMaps and all public methods are synchronized.
- * That should increase thread safety but no thread safety is actually guarranteed.
+ * That should increase thread safety but no thread safety is actually guaranteed.
  * That is because the mplayer.getFaction() method is not threadsafe.
  * TODO: Something to fix in the future perhaps?
  */
@@ -24,7 +24,7 @@ public class FactionsIndex {
     // INSTANCE
     // -------------------------------------------- //
 
-    private static final FactionsIndex i = new FactionsIndex();
+    protected static FactionsIndex i = new FactionsIndex();
 
     public static FactionsIndex get() {
         return i;
@@ -35,6 +35,7 @@ public class FactionsIndex {
     // -------------------------------------------- //
 
     private final Map<MPlayer, Faction> mplayer2faction;
+    @SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
     private final Map<Faction, Set<MPlayer>> faction2mplayers;
 
     // -------------------------------------------- //

src/main/java/com/massivecraft/factions/adapter/BoardAdapter.java

@@ -15,7 +15,7 @@ public class BoardAdapter implements JsonDeserializer<Board>, JsonSerializer<Boa
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final BoardAdapter i = new BoardAdapter();
+    protected static BoardAdapter i = new BoardAdapter();
 
     public static BoardAdapter get() {
         return i;

src/main/java/com/massivecraft/factions/adapter/BoardMapAdapter.java

@@ -20,7 +20,7 @@ public class BoardMapAdapter implements JsonDeserializer<Map<PS, TerritoryAccess
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final BoardMapAdapter i = new BoardMapAdapter();
+    protected static BoardMapAdapter i = new BoardMapAdapter();
 
     public static BoardMapAdapter get() {
         return i;

src/main/java/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java

@@ -34,7 +34,7 @@ public class TerritoryAccessAdapter implements JsonDeserializer<TerritoryAccess>
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final TerritoryAccessAdapter i = new TerritoryAccessAdapter();
+    protected static TerritoryAccessAdapter i = new TerritoryAccessAdapter();
 
     public static TerritoryAccessAdapter get() {
         return i;
@@ -56,13 +56,13 @@ public class TerritoryAccessAdapter implements JsonDeserializer<TerritoryAccess>
         JsonObject obj = json.getAsJsonObject();
 
         // Prepare variables
-        String hostFactionId = null;
+        String hostFactionId;
         Boolean hostFactionAllowed = null;
         Set<String> grantedIds = Collections.emptySet();
         String chunkName = null;
 
         // Read variables (test old values first)
-        JsonElement element = null;
+        JsonElement element;
 
         element = obj.get(HOST_FACTION_ID);
         hostFactionId = element.getAsString();

src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLc.java

@@ -12,7 +12,7 @@ public class ChatModifierLc extends ChatModifier {
         super("lc");
     }
 
-    private static final ChatModifierLc i = new ChatModifierLc();
+    protected static ChatModifierLc i = new ChatModifierLc();
 
     public static ChatModifierLc get() {
         return i;

src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLp.java

@@ -13,7 +13,7 @@ public class ChatModifierLp extends ChatModifier {
         super("lp");
     }
 
-    private static final ChatModifierLp i = new ChatModifierLp();
+    protected static ChatModifierLp i = new ChatModifierLp();
 
     public static ChatModifierLp get() {
         return i;

src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierParse.java

@@ -13,7 +13,7 @@ public class ChatModifierParse extends ChatModifier {
         super("parse");
     }
 
-    private static final ChatModifierParse i = new ChatModifierParse();
+    protected static ChatModifierParse i = new ChatModifierParse();
 
     public static ChatModifierParse get() {
         return i;

src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierRp.java

@@ -12,7 +12,7 @@ public class ChatModifierRp extends ChatModifier {
         super("rp");
     }
 
-    private static final ChatModifierRp i = new ChatModifierRp();
+    protected static ChatModifierRp i = new ChatModifierRp();
 
     public static ChatModifierRp get() {
         return i;

src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUc.java

@@ -12,7 +12,7 @@ public class ChatModifierUc extends ChatModifier {
         super("uc");
     }
 
-    private static final ChatModifierUc i = new ChatModifierUc();
+    protected static ChatModifierUc i = new ChatModifierUc();
 
     public static ChatModifierUc get() {
         return i;

src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java

@@ -13,7 +13,7 @@ public class ChatModifierUcf extends ChatModifier {
         super("ucf");
     }
 
-    private static final ChatModifierUcf i = new ChatModifierUcf();
+    protected static ChatModifierUcf i = new ChatModifierUcf();
 
     public static ChatModifierUcf get() {
         return i;

src/main/java/com/massivecraft/factions/chat/tag/ChatTagName.java

@@ -14,7 +14,7 @@ public class ChatTagName extends ChatTag {
         super("factions_name");
     }
 
-    private static final ChatTagName i = new ChatTagName();
+    protected static ChatTagName i = new ChatTagName();
 
     public static ChatTagName get() {
         return i;

src/main/java/com/massivecraft/factions/chat/tag/ChatTagNameforce.java

@@ -14,7 +14,7 @@ public class ChatTagNameforce extends ChatTag {
         super("factions_nameforce");
     }
 
-    private static final ChatTagNameforce i = new ChatTagNameforce();
+    protected static ChatTagNameforce i = new ChatTagNameforce();
 
     public static ChatTagNameforce get() {
         return i;

src/main/java/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java

@@ -13,7 +13,7 @@ public class ChatTagRelcolor extends ChatTag {
         super("factions_relcolor");
     }
 
-    private static final ChatTagRelcolor i = new ChatTagRelcolor();
+    protected static ChatTagRelcolor i = new ChatTagRelcolor();
 
     public static ChatTagRelcolor get() {
         return i;

src/main/java/com/massivecraft/factions/chat/tag/ChatTagRole.java

@@ -14,7 +14,7 @@ public class ChatTagRole extends ChatTag {
         super("factions_role");
     }
 
-    private static final ChatTagRole i = new ChatTagRole();
+    protected static ChatTagRole i = new ChatTagRole();
 
     public static ChatTagRole get() {
         return i;

src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java

@@ -14,7 +14,7 @@ public class ChatTagRoleprefix extends ChatTag {
         super("factions_roleprefix");
     }
 
-    private static final ChatTagRoleprefix i = new ChatTagRoleprefix();
+    protected static ChatTagRoleprefix i = new ChatTagRoleprefix();
 
     public static ChatTagRoleprefix get() {
         return i;

src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java

@@ -13,7 +13,7 @@ public class ChatTagRoleprefixforce extends ChatTag {
         super("factions_roleprefixforce");
     }
 
-    private static final ChatTagRoleprefixforce i = new ChatTagRoleprefixforce();
+    protected static ChatTagRoleprefixforce i = new ChatTagRoleprefixforce();
 
     public static ChatTagRoleprefixforce get() {
         return i;

src/main/java/com/massivecraft/factions/chat/tag/ChatTagTitle.java

@@ -13,7 +13,7 @@ public class ChatTagTitle extends ChatTag {
         super("factions_title");
     }
 
-    private static final ChatTagTitle i = new ChatTagTitle();
+    protected static ChatTagTitle i = new ChatTagTitle();
 
     public static ChatTagTitle get() {
         return i;

src/main/java/com/massivecraft/factions/cmd/CmdFactions.java

@@ -12,7 +12,7 @@ public class CmdFactions extends FactionsCommand {
     // INSTANCE
     // -------------------------------------------- //
 
-    private static final CmdFactions i = new CmdFactions();
+    protected static CmdFactions i = new CmdFactions();
 
     public static CmdFactions get() {
         return i;

src/main/java/com/massivecraft/factions/cmd/CmdFactionsFly.java

@@ -14,7 +14,7 @@ public class CmdFactionsFly extends MassiveCommandToggle {
     // INSTANCE
     // -------------------------------------------- //
 
-    private static final CmdFactionsFly i = new CmdFactionsFly();
+    protected static CmdFactionsFly i = new CmdFactionsFly();
 
     public static CmdFactionsFly get() {
         return i;

src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java

@@ -53,12 +53,11 @@ public class CmdFactionsInviteAdd extends FactionsCommand {
 
             if (!isInvited) {
                 // Event
-                EventFactionsInvitedChange event = new EventFactionsInvitedChange(sender, mplayer, msenderFaction, isInvited);
+                EventFactionsInvitedChange event = new EventFactionsInvitedChange(sender, mplayer, msenderFaction, false);
                 event.run();
                 if (event.isCancelled()) {
                     continue;
                 }
-                isInvited = event.isNewInvited();
 
                 // Inform
                 mplayer.msg("%s<i> invited you to %s<i>.", msender.describeTo(mplayer, true), msenderFaction.describeTo(mplayer));

src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java

@@ -77,12 +77,11 @@ public class CmdFactionsInviteRemove extends FactionsCommand {
 
             if (isInvited) {
                 // Event
-                EventFactionsInvitedChange event = new EventFactionsInvitedChange(sender, mplayer, msenderFaction, isInvited);
+                EventFactionsInvitedChange event = new EventFactionsInvitedChange(sender, mplayer, msenderFaction, true);
                 event.run();
                 if (event.isCancelled()) {
                     continue;
                 }
-                isInvited = event.isNewInvited();
 
                 // Inform Player
                 mplayer.msg("%s<i> revoked your invitation to <h>%s<i>.", msender.describeTo(mplayer, true), msenderFaction.describeTo(mplayer));

src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermViewall.java

@@ -68,7 +68,7 @@ public class CmdFactionsPermViewall extends FactionsCommand {
             permable:
             for (MPermable mpa : permables) {
                 if (!faction.isPermitted(mpa.getId(), mperm.getId())) {
-                    continue permable;
+                    continue;
                 }
                 perms.add(mperm);
                 continue perm;

src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetAll.java

@@ -49,7 +49,7 @@ public class CmdFactionsSetAll extends CmdFactionsSetXAll {
         String word = (this.isClaim() ? "claim" : "unclaim");
 
         // Create Ret
-        Set<PS> chunks = null;
+        Set<PS> chunks;
 
         // Args
         Faction oldFaction = this.getOldFaction();
@@ -59,7 +59,7 @@ public class CmdFactionsSetAll extends CmdFactionsSetXAll {
             this.setFormatOne("<h>%s<i> %s <h>%d <i>chunk using " + word + " all.");
             this.setFormatMany("<h>%s<i> %s <h>%d <i>chunks using " + word + " all.");
         } else {
-            String worldId = null;
+            String worldId;
             if (LIST_MAP.contains(this.argAt(0).toLowerCase())) {
                 if (me != null) {
                     worldId = me.getWorld().getName();

src/main/java/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java

@@ -7,18 +7,21 @@ import com.massivecraft.massivecore.command.requirement.RequirementAbstract;
 import com.massivecraft.massivecore.util.Txt;
 import org.bukkit.command.CommandSender;
 
+import java.io.Serial;
+
 public class ReqBankCommandsEnabled extends RequirementAbstract {
     // -------------------------------------------- //
     // SERIALIZABLE
     // -------------------------------------------- //
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     // -------------------------------------------- //
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final ReqBankCommandsEnabled i = new ReqBankCommandsEnabled();
+    protected static ReqBankCommandsEnabled i = new ReqBankCommandsEnabled();
 
     public static ReqBankCommandsEnabled get() {
         return i;

src/main/java/com/massivecraft/factions/cmd/req/ReqFactionWarpsEnabled.java

@@ -6,18 +6,21 @@ import com.massivecraft.massivecore.command.requirement.RequirementAbstract;
 import com.massivecraft.massivecore.util.Txt;
 import org.bukkit.command.CommandSender;
 
+import java.io.Serial;
+
 public class ReqFactionWarpsEnabled extends RequirementAbstract {
     // -------------------------------------------- //
     // SERIALIZABLE
     // -------------------------------------------- //
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     // -------------------------------------------- //
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final ReqFactionWarpsEnabled i = new ReqFactionWarpsEnabled();
+    protected static ReqFactionWarpsEnabled i = new ReqFactionWarpsEnabled();
 
     public static ReqFactionWarpsEnabled get() {
         return i;

src/main/java/com/massivecraft/factions/cmd/req/ReqHasFaction.java

@@ -7,18 +7,21 @@ import com.massivecraft.massivecore.util.MUtil;
 import com.massivecraft.massivecore.util.Txt;
 import org.bukkit.command.CommandSender;
 
+import java.io.Serial;
+
 public class ReqHasFaction extends RequirementAbstract {
     // -------------------------------------------- //
     // SERIALIZABLE
     // -------------------------------------------- //
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     // -------------------------------------------- //
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final ReqHasFaction i = new ReqHasFaction();
+    protected static ReqHasFaction i = new ReqHasFaction();
 
     public static ReqHasFaction get() {
         return i;

src/main/java/com/massivecraft/factions/cmd/req/ReqHasntFaction.java

@@ -7,18 +7,21 @@ import com.massivecraft.massivecore.util.MUtil;
 import com.massivecraft.massivecore.util.Txt;
 import org.bukkit.command.CommandSender;
 
+import java.io.Serial;
+
 public class ReqHasntFaction extends RequirementAbstract {
     // -------------------------------------------- //
     // SERIALIZABLE
     // -------------------------------------------- //
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     // -------------------------------------------- //
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final ReqHasntFaction i = new ReqHasntFaction();
+    protected static ReqHasntFaction i = new ReqHasntFaction();
 
     public static ReqHasntFaction get() {
         return i;

src/main/java/com/massivecraft/factions/cmd/req/ReqRankIsAtLeast.java

@@ -8,11 +8,14 @@ import com.massivecraft.massivecore.util.MUtil;
 import com.massivecraft.massivecore.util.Txt;
 import org.bukkit.command.CommandSender;
 
+import java.io.Serial;
+
 public class ReqRankIsAtLeast extends RequirementAbstract {
     // -------------------------------------------- //
     // SERIALIZABLE
     // -------------------------------------------- //
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     // -------------------------------------------- //

src/main/java/com/massivecraft/factions/cmd/req/ReqTaxEnabled.java

@@ -6,18 +6,21 @@ import com.massivecraft.massivecore.command.requirement.RequirementAbstract;
 import com.massivecraft.massivecore.util.Txt;
 import org.bukkit.command.CommandSender;
 
+import java.io.Serial;
+
 public class ReqTaxEnabled extends RequirementAbstract {
     // -------------------------------------------- //
     // SERIALIZABLE
     // -------------------------------------------- //
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     // -------------------------------------------- //
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final ReqTaxEnabled i = new ReqTaxEnabled();
+    protected static ReqTaxEnabled i = new ReqTaxEnabled();
 
     public static ReqTaxEnabled get() {
         return i;

src/main/java/com/massivecraft/factions/cmd/type/TypeFaction.java

@@ -21,7 +21,7 @@ public class TypeFaction extends TypeAbstract<Faction> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final TypeFaction i = new TypeFaction();
+    protected static TypeFaction i = new TypeFaction();
 
     public static TypeFaction get() {
         return i;

src/main/java/com/massivecraft/factions/cmd/type/TypeFactionChunkChangeType.java

@@ -8,7 +8,7 @@ public class TypeFactionChunkChangeType extends TypeEnum<EventFactionsChunkChang
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final TypeFactionChunkChangeType i = new TypeFactionChunkChangeType();
+    protected static TypeFactionChunkChangeType i = new TypeFactionChunkChangeType();
 
     public static TypeFactionChunkChangeType get() {
         return i;

src/main/java/com/massivecraft/factions/cmd/type/TypeFactionNameLenient.java

@@ -5,7 +5,7 @@ public class TypeFactionNameLenient extends TypeFactionNameAbstract {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final TypeFactionNameLenient i = new TypeFactionNameLenient();
+    protected static TypeFactionNameLenient i = new TypeFactionNameLenient();
 
     public static TypeFactionNameLenient get() {
         return i;

src/main/java/com/massivecraft/factions/cmd/type/TypeFactionNameStrict.java

@@ -5,7 +5,7 @@ public class TypeFactionNameStrict extends TypeFactionNameAbstract {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final TypeFactionNameStrict i = new TypeFactionNameStrict();
+    protected static TypeFactionNameStrict i = new TypeFactionNameStrict();
 
     public static TypeFactionNameStrict get() {
         return i;

src/main/java/com/massivecraft/factions/cmd/type/TypeMFlag.java

@@ -11,7 +11,7 @@ public class TypeMFlag extends TypeEntity<MFlag> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final TypeMFlag i = new TypeMFlag();
+    protected static TypeMFlag i = new TypeMFlag();
 
     public static TypeMFlag get() {
         return i;

src/main/java/com/massivecraft/factions/cmd/type/TypeMPerm.java

@@ -11,7 +11,7 @@ public class TypeMPerm extends TypeEntity<MPerm> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final TypeMPerm i = new TypeMPerm();
+    protected static TypeMPerm i = new TypeMPerm();
 
     public static TypeMPerm get() {
         return i;

src/main/java/com/massivecraft/factions/cmd/type/TypeMPermable.java

@@ -13,14 +13,13 @@ import org.bukkit.command.CommandSender;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class TypeMPermable extends TypeAbstract<MPerm.MPermable> {
     // -------------------------------------------- //
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final TypeMPermable i = new TypeMPermable();
+    protected static TypeMPermable i = new TypeMPermable();
 
     public static TypeMPermable get() {
         return i;
@@ -126,7 +125,7 @@ public class TypeMPermable extends TypeAbstract<MPerm.MPermable> {
         }
 
         // Always add ranks, relations, other factions and other players
-        ret.addAll(faction.getRanks().getAll().stream().map(Rank::getName).collect(Collectors.toList()));
+        ret.addAll(faction.getRanks().getAll().stream().map(Rank::getName).toList());
         ret.addAll(TypeRelation.get().getTabList(sender, arg));
         ret.addAll(TypeFaction.get().getTabList(sender, arg));
         ret.addAll(TypeMPlayer.get().getTabList(sender, arg));
@@ -142,7 +141,7 @@ public class TypeMPermable extends TypeAbstract<MPerm.MPermable> {
                     continue;
                 }
 
-                ret.addAll(f.getRanks().getAll().stream().map(r -> name + "-" + r.getName()).collect(Collectors.toList()));
+                ret.addAll(f.getRanks().getAll().stream().map(r -> name + "-" + r.getName()).toList());
             }
         }
 
@@ -152,23 +151,19 @@ public class TypeMPermable extends TypeAbstract<MPerm.MPermable> {
             if (compArg.startsWith("rank-") || "rank-".startsWith(compArg)) {
                 ret.addAll(faction.getRanks().getAll().stream()
                         .map(Rank::getName)
-                        .map(n -> "rank-" + n)
-                        .collect(Collectors.toList()));
+                        .map(n -> "rank-" + n).toList());
             }
             if (compArg.startsWith("relation-") || "relation-".startsWith(compArg)) {
                 ret.addAll(TypeRelation.get().getTabList(sender, arg).stream()
-                        .map(s -> "relation-" + s)
-                        .collect(Collectors.toList()));
+                        .map(s -> "relation-" + s).toList());
             }
             if (compArg.startsWith("faction-") || "faction-".startsWith(compArg)) {
                 ret.addAll(TypeFaction.get().getTabList(sender, arg).stream()
-                        .map(s -> "faction-" + s)
-                        .collect(Collectors.toList()));
+                        .map(s -> "faction-" + s).toList());
             }
             if (compArg.startsWith("player-") || "player-".startsWith(compArg)) {
                 ret.addAll(TypeMPlayer.get().getTabList(sender, arg).stream()
-                        .map(s -> "player-" + s)
-                        .collect(Collectors.toList()));
+                        .map(s -> "player-" + s).toList());
             }
         } else {
             // Or at least add the beginning

src/main/java/com/massivecraft/factions/cmd/type/TypeRank.java

@@ -15,7 +15,7 @@ public class TypeRank extends TypeEntityInternalFaction<Rank> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final TypeRank i = new TypeRank();
+    protected static TypeRank i = new TypeRank();
 
     public static TypeRank get() {
         return i;

src/main/java/com/massivecraft/factions/cmd/type/TypeRel.java

@@ -10,7 +10,7 @@ public class TypeRel extends TypeEnum<Rel> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final TypeRel i = new TypeRel();
+    protected static TypeRel i = new TypeRel();
 
     public static TypeRel get() {
         return i;

src/main/java/com/massivecraft/factions/cmd/type/TypeRelation.java

@@ -7,7 +7,7 @@ public class TypeRelation extends TypeRel {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final TypeRelation i = new TypeRelation();
+    protected static TypeRelation i = new TypeRelation();
 
     public static TypeRelation get() {
         return i;

src/main/java/com/massivecraft/factions/cmd/type/TypeSortMPlayer.java

@@ -13,7 +13,7 @@ public class TypeSortMPlayer extends TypeAbstractChoice<Comparator<MPlayer>> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final TypeSortMPlayer i = new TypeSortMPlayer();
+    protected static TypeSortMPlayer i = new TypeSortMPlayer();
 
     public static TypeSortMPlayer get() {
         return i;

src/main/java/com/massivecraft/factions/cmd/type/TypeTaxable.java

@@ -11,7 +11,6 @@ import org.bukkit.command.CommandSender;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.stream.Collectors;
 
 // TODO: This whole thing is a copy/paste of TypeMPermable. Duplicate code.
 public class TypeTaxable extends TypeAbstract<String> {
@@ -19,7 +18,7 @@ public class TypeTaxable extends TypeAbstract<String> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final TypeTaxable i = new TypeTaxable();
+    protected static TypeTaxable i = new TypeTaxable();
 
     public static TypeTaxable get() {
         return i;
@@ -95,7 +94,7 @@ public class TypeTaxable extends TypeAbstract<String> {
         }
 
         // Always add ranks, relations, other factions and other players
-        ret.addAll(faction.getRanks().getAll().stream().map(Rank::getName).collect(Collectors.toList()));
+        ret.addAll(faction.getRanks().getAll().stream().map(Rank::getName).toList());
         ret.addAll(TypeMPlayer.get().getTabList(sender, arg));
 
         // Also add the cases for when type is specified
@@ -104,13 +103,11 @@ public class TypeTaxable extends TypeAbstract<String> {
             if (compArg.startsWith("rank-") || "rank-".startsWith(compArg)) {
                 ret.addAll(faction.getRanks().getAll().stream()
                         .map(Rank::getName)
-                        .map(n -> "rank-" + n)
-                        .collect(Collectors.toList()));
+                        .map(n -> "rank-" + n).toList());
             }
             if (compArg.startsWith("player-") || "player-".startsWith(compArg)) {
                 ret.addAll(TypeMPlayer.get().getTabList(sender, arg).stream()
-                        .map(s -> "player-" + s)
-                        .collect(Collectors.toList()));
+                        .map(s -> "player-" + s).toList());
             }
         } else {
             // Or at least add the beginning

src/main/java/com/massivecraft/factions/cmd/type/TypeVote.java

@@ -10,7 +10,7 @@ public class TypeVote extends TypeEntityInternalFaction<Vote> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final TypeVote i = new TypeVote();
+    protected static TypeVote i = new TypeVote();
 
     public static TypeVote get() {
         return i;

src/main/java/com/massivecraft/factions/cmd/type/TypeWarp.java

@@ -10,7 +10,7 @@ public class TypeWarp extends TypeEntityInternalFaction<Warp> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final TypeWarp i = new TypeWarp();
+    protected static TypeWarp i = new TypeWarp();
 
     public static TypeWarp get() {
         return i;

src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerInactivity.java

@@ -9,7 +9,7 @@ public class ComparatorMPlayerInactivity extends ComparatorAbstract<MPlayer> imp
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final ComparatorMPlayerInactivity i = new ComparatorMPlayerInactivity();
+    protected static ComparatorMPlayerInactivity i = new ComparatorMPlayerInactivity();
 
     public static ComparatorMPlayerInactivity get() {
         return i;

src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerPower.java

@@ -9,7 +9,7 @@ public class ComparatorMPlayerPower extends ComparatorAbstract<MPlayer> implemen
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final ComparatorMPlayerPower i = new ComparatorMPlayerPower();
+    protected static ComparatorMPlayerPower i = new ComparatorMPlayerPower();
 
     public static ComparatorMPlayerPower get() {
         return i;

src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerRole.java

@@ -10,7 +10,7 @@ public class ComparatorMPlayerRole extends ComparatorAbstract<MPlayer> implement
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final ComparatorMPlayerRole i = new ComparatorMPlayerRole();
+    protected static ComparatorMPlayerRole i = new ComparatorMPlayerRole();
 
     public static ComparatorMPlayerRole get() {
         return i;

src/main/java/com/massivecraft/factions/engine/EngineCanCombatHappen.java

@@ -32,7 +32,7 @@ public class EngineCanCombatHappen extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EngineCanCombatHappen i = new EngineCanCombatHappen();
+    protected static EngineCanCombatHappen i = new EngineCanCombatHappen();
 
     public static EngineCanCombatHappen get() {
         return i;
@@ -129,7 +129,7 @@ public class EngineCanCombatHappen extends Engine {
     }
 
     public boolean canCombatDamageHappen(EntityDamageByEntityEvent event, boolean notify) {
-        boolean ret = true;
+        boolean ret;
 
         // If the defender is a player ...
         Entity edefender = event.getEntity();

src/main/java/com/massivecraft/factions/engine/EngineChat.java

@@ -28,7 +28,7 @@ public class EngineChat extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EngineChat i = new EngineChat();
+    protected static EngineChat i = new EngineChat();
 
     public static EngineChat get() {
         return i;

src/main/java/com/massivecraft/factions/engine/EngineChunkChange.java

@@ -30,7 +30,7 @@ public class EngineChunkChange extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EngineChunkChange i = new EngineChunkChange();
+    protected static EngineChunkChange i = new EngineChunkChange();
 
     public static EngineChunkChange get() {
         return i;

src/main/java/com/massivecraft/factions/engine/EngineCleanInactivity.java

@@ -17,7 +17,7 @@ public class EngineCleanInactivity extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EngineCleanInactivity i = new EngineCleanInactivity();
+    protected static EngineCleanInactivity i = new EngineCleanInactivity();
 
     public static EngineCleanInactivity get() {
         return i;

src/main/java/com/massivecraft/factions/engine/EngineDenyCommands.java

@@ -22,7 +22,7 @@ public class EngineDenyCommands extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EngineDenyCommands i = new EngineDenyCommands();
+    protected static EngineDenyCommands i = new EngineDenyCommands();
 
     public static EngineDenyCommands get() {
         return i;

src/main/java/com/massivecraft/factions/engine/EngineDenyTeleport.java

@@ -25,7 +25,7 @@ public class EngineDenyTeleport extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EngineDenyTeleport i = new EngineDenyTeleport();
+    protected static EngineDenyTeleport i = new EngineDenyTeleport();
 
     public static EngineDenyTeleport get() {
         return i;

src/main/java/com/massivecraft/factions/engine/EngineEcon.java

@@ -39,7 +39,7 @@ public class EngineEcon extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EngineEcon i = new EngineEcon();
+    protected static EngineEcon i = new EngineEcon();
 
     public static EngineEcon get() {
         return i;
@@ -167,8 +167,8 @@ public class EngineEcon extends Engine {
 
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void payForAction(EventFactionsMembershipChange event) {
-        Double cost = null;
-        String desc = null;
+        double cost;
+        String desc;
 
         if (event.getReason() == MembershipChangeReason.JOIN) {
             cost = MConf.get().econCostJoin;

src/main/java/com/massivecraft/factions/engine/EngineExploit.java

@@ -26,7 +26,7 @@ public class EngineExploit extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EngineExploit i = new EngineExploit();
+    protected static EngineExploit i = new EngineExploit();
 
     public static EngineExploit get() {
         return i;

src/main/java/com/massivecraft/factions/engine/EngineFlagEndergrief.java

@@ -16,7 +16,7 @@ public class EngineFlagEndergrief extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EngineFlagEndergrief i = new EngineFlagEndergrief();
+    protected static EngineFlagEndergrief i = new EngineFlagEndergrief();
 
     public static EngineFlagEndergrief get() {
         return i;

src/main/java/com/massivecraft/factions/engine/EngineFlagExplosion.java

@@ -32,7 +32,7 @@ public class EngineFlagExplosion extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EngineFlagExplosion i = new EngineFlagExplosion();
+    protected static EngineFlagExplosion i = new EngineFlagExplosion();
 
     public static EngineFlagExplosion get() {
         return i;

src/main/java/com/massivecraft/factions/engine/EngineFlagFireSpread.java

@@ -20,7 +20,7 @@ public class EngineFlagFireSpread extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EngineFlagFireSpread i = new EngineFlagFireSpread();
+    protected static EngineFlagFireSpread i = new EngineFlagFireSpread();
 
     public static EngineFlagFireSpread get() {
         return i;

src/main/java/com/massivecraft/factions/engine/EngineFlagSpawn.java

@@ -21,7 +21,7 @@ public class EngineFlagSpawn extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EngineFlagSpawn i = new EngineFlagSpawn();
+    protected static EngineFlagSpawn i = new EngineFlagSpawn();
 
     public static EngineFlagSpawn get() {
         return i;

src/main/java/com/massivecraft/factions/engine/EngineFlagZombiegrief.java

@@ -16,7 +16,7 @@ public class EngineFlagZombiegrief extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EngineFlagZombiegrief i = new EngineFlagZombiegrief();
+    protected static EngineFlagZombiegrief i = new EngineFlagZombiegrief();
 
     public static EngineFlagZombiegrief get() {
         return i;

src/main/java/com/massivecraft/factions/engine/EngineFly.java

@@ -30,7 +30,7 @@ public class EngineFly extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EngineFly i = new EngineFly();
+    protected static EngineFly i = new EngineFly();
 
     public static EngineFly get() {
         return i;

src/main/java/com/massivecraft/factions/engine/EngineLastActivity.java

@@ -16,7 +16,7 @@ public class EngineLastActivity extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EngineLastActivity i = new EngineLastActivity();
+    protected static EngineLastActivity i = new EngineLastActivity();
 
     public static EngineLastActivity get() {
         return i;

src/main/java/com/massivecraft/factions/engine/EngineMotd.java

@@ -21,7 +21,7 @@ public class EngineMotd extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EngineMotd i = new EngineMotd();
+    protected static EngineMotd i = new EngineMotd();
 
     public static EngineMotd get() {
         return i;

src/main/java/com/massivecraft/factions/engine/EngineMoveChunk.java

@@ -24,7 +24,7 @@ public class EngineMoveChunk extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EngineMoveChunk i = new EngineMoveChunk();
+    protected static EngineMoveChunk i = new EngineMoveChunk();
 
     public static EngineMoveChunk get() {
         return i;

src/main/java/com/massivecraft/factions/engine/EnginePermBuild.java

@@ -53,7 +53,7 @@ public class EnginePermBuild extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EnginePermBuild i = new EnginePermBuild();
+    protected static EnginePermBuild i = new EnginePermBuild();
 
     public static EnginePermBuild get() {
         return i;
@@ -206,7 +206,7 @@ public class EnginePermBuild extends Engine {
     public void build(EntityChangeBlockEvent event) {
         // Handling lilypads being broken by boats
         Entity entity = event.getEntity();
-        if (entity.getType() != EntityType.BOAT || entity.getPassengers().size() <= 0) {
+        if (entity.getType() != EntityType.BOAT || entity.getPassengers().size() == 0) {
             return;
         }
         Entity player = entity.getPassengers().stream().filter(MUtil::isPlayer).findAny().orElse(entity);

src/main/java/com/massivecraft/factions/engine/EnginePlayerData.java

@@ -14,7 +14,7 @@ public class EnginePlayerData extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EnginePlayerData i = new EnginePlayerData();
+    protected static EnginePlayerData i = new EnginePlayerData();
 
     public static EnginePlayerData get() {
         return i;

src/main/java/com/massivecraft/factions/engine/EnginePower.java

@@ -21,7 +21,7 @@ public class EnginePower extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EnginePower i = new EnginePower();
+    protected static EnginePower i = new EnginePower();
 
     public static EnginePower get() {
         return i;

src/main/java/com/massivecraft/factions/engine/EngineSeeChunk.java

@@ -24,7 +24,7 @@ public class EngineSeeChunk extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EngineSeeChunk i = new EngineSeeChunk();
+    protected static EngineSeeChunk i = new EngineSeeChunk();
 
     public static EngineSeeChunk get() {
         return i;

src/main/java/com/massivecraft/factions/engine/EngineShow.java

@@ -56,7 +56,7 @@ public class EngineShow extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EngineShow i = new EngineShow();
+    protected static EngineShow i = new EngineShow();
 
     public static EngineShow get() {
         return i;

src/main/java/com/massivecraft/factions/engine/EngineTeleportHomeOnDeath.java

@@ -19,7 +19,7 @@ public class EngineTeleportHomeOnDeath extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EngineTeleportHomeOnDeath i = new EngineTeleportHomeOnDeath();
+    protected static EngineTeleportHomeOnDeath i = new EngineTeleportHomeOnDeath();
 
     public static EngineTeleportHomeOnDeath get() {
         return i;
@@ -55,7 +55,7 @@ public class EngineTeleportHomeOnDeath extends Engine {
         }
 
         // ... and the faction has a home ...
-        List<Warp> warps = faction.getWarps().getAll((java.util.function.Predicate<Warp>) (warp -> warp.getName().equalsIgnoreCase(MConf.get().warpsTeleportToOnDeathName)));
+        List<Warp> warps = faction.getWarps().getAll(warp -> warp.getName().equalsIgnoreCase(MConf.get().warpsTeleportToOnDeathName));
         if (warps.isEmpty()) {
             return;
         }
@@ -63,7 +63,7 @@ public class EngineTeleportHomeOnDeath extends Engine {
         Warp warp = warps.get(0);
 
         // ... and the home is translatable ...
-        Location respawnLocation = null;
+        Location respawnLocation;
         try {
             respawnLocation = warp.getLocation().asBukkitLocation(true);
         } catch (Exception e) {

src/main/java/com/massivecraft/factions/engine/EngineTerritoryShield.java

@@ -17,7 +17,7 @@ public class EngineTerritoryShield extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EngineTerritoryShield i = new EngineTerritoryShield();
+    protected static EngineTerritoryShield i = new EngineTerritoryShield();
 
     public static EngineTerritoryShield get() {
         return i;

src/main/java/com/massivecraft/factions/engine/EngineVisualizations.java

@@ -12,7 +12,7 @@ public class EngineVisualizations extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EngineVisualizations i = new EngineVisualizations();
+    protected static EngineVisualizations i = new EngineVisualizations();
 
     public static EngineVisualizations get() {
         return i;

src/main/java/com/massivecraft/factions/entity/Board.java

@@ -227,7 +227,7 @@ public class Board extends Entity<Board> implements BoardInterface {
     public boolean isBorderPs(PS ps) {
         ps = ps.getChunk(true);
 
-        PS nearby = null;
+        PS nearby;
         Faction faction = this.getFactionAt(ps);
 
         nearby = ps.withChunkX(ps.getChunkX() + 1);
@@ -259,7 +259,7 @@ public class Board extends Entity<Board> implements BoardInterface {
     public boolean isConnectedPs(PS ps, Faction faction) {
         ps = ps.getChunk(true);
 
-        PS nearby = null;
+        PS nearby;
 
         nearby = ps.withChunkX(ps.getChunkX() + 1);
         if (faction == this.getFactionAt(nearby)) {

src/main/java/com/massivecraft/factions/entity/BoardColl.java

@@ -22,7 +22,7 @@ public class BoardColl extends Coll<Board> implements BoardInterface {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final BoardColl i = new BoardColl();
+    protected static BoardColl i = new BoardColl();
 
     public static BoardColl get() {
         return i;
@@ -416,7 +416,7 @@ public class BoardColl extends Coll<Board> implements BoardInterface {
         outer:
         for (PS ps : pss) {
             if (discovered.contains(ps)) {
-                continue outer;
+                continue;
             }
 
             List<PS> forest = new MassiveList<>();
@@ -428,7 +428,7 @@ public class BoardColl extends Coll<Board> implements BoardInterface {
             while (!stack.empty()) {
                 PS elm = stack.pop();
                 if (discovered.contains(elm)) {
-                    continue inner;
+                    continue;
                 }
                 System.out.println(elm);
                 discovered.add(elm);

src/main/java/com/massivecraft/factions/entity/Faction.java

@@ -50,8 +50,8 @@ public class Faction extends Entity<Faction> implements FactionsParticipator, MP
     // CONSTANTS
     // -------------------------------------------- //
 
-    public static final String NODESCRIPTION = Txt.parse("<em><silver>no description set");
-    public static final String NOMOTD = Txt.parse("<em><silver>no message of the day set");
+    public static String NODESCRIPTION = Txt.parse("<em><silver>no description set");
+    public static String NOMOTD = Txt.parse("<em><silver>no message of the day set");
 
     // -------------------------------------------- //
     // META
@@ -988,7 +988,7 @@ public class Faction extends Entity<Faction> implements FactionsParticipator, MP
             throw new IllegalArgumentException("Player " + mplayer.getId() + " not in " + this.getId());
         }
 
-        Double ret = null;
+        Double ret;
 
         ret = this.getTaxFor(mplayer);
         if (ret != null) {

src/main/java/com/massivecraft/factions/entity/FactionColl.java

@@ -18,7 +18,7 @@ public class FactionColl extends Coll<Faction> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final FactionColl i = new FactionColl();
+    protected static FactionColl i = new FactionColl();
 
     public static FactionColl get() {
         return i;

src/main/java/com/massivecraft/factions/entity/MConfColl.java

@@ -8,7 +8,7 @@ public class MConfColl extends Coll<MConf> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final MConfColl i = new MConfColl();
+    protected static MConfColl i = new MConfColl();
 
     public static MConfColl get() {
         return i;

src/main/java/com/massivecraft/factions/entity/MFlag.java

@@ -19,41 +19,41 @@ public class MFlag extends Entity<MFlag> implements Prioritized, Registerable, N
     // CONSTANTS
     // -------------------------------------------- //
 
-    public final static String ID_OPEN = "open";
-    public final static String ID_MONSTERS = "monsters";
-    public final static String ID_ANIMALS = "animals";
-    public final static String ID_POWERLOSS = "powerloss";
-    public final static String ID_POWERGAIN = "powergain";
-    public final static String ID_PVP = "pvp";
-    public final static String ID_FRIENDLYFIRE = "friendlyfire";
-    public final static String ID_EXPLOSIONS = "explosions";
-    public final static String ID_OFFLINEEXPLOSIONS = "offlineexplosions";
-    public final static String ID_FIRESPREAD = "firespread";
-    public final static String ID_ENDERGRIEF = "endergrief";
-    public final static String ID_ZOMBIEGRIEF = "zombiegrief";
-    public final static String ID_PERMANENT = "permanent";
-    public final static String ID_PEACEFUL = "peaceful";
-    public final static String ID_INFPOWER = "infpower";
-    public final static String ID_FLY = "fly";
-    public final static String ID_TAXKICK = "taxkick";
+    public static String ID_OPEN = "open";
+    public static String ID_MONSTERS = "monsters";
+    public static String ID_ANIMALS = "animals";
+    public static String ID_POWERLOSS = "powerloss";
+    public static String ID_POWERGAIN = "powergain";
+    public static String ID_PVP = "pvp";
+    public static String ID_FRIENDLYFIRE = "friendlyfire";
+    public static String ID_EXPLOSIONS = "explosions";
+    public static String ID_OFFLINEEXPLOSIONS = "offlineexplosions";
+    public static String ID_FIRESPREAD = "firespread";
+    public static String ID_ENDERGRIEF = "endergrief";
+    public static String ID_ZOMBIEGRIEF = "zombiegrief";
+    public static String ID_PERMANENT = "permanent";
+    public static String ID_PEACEFUL = "peaceful";
+    public static String ID_INFPOWER = "infpower";
+    public static String ID_FLY = "fly";
+    public static String ID_TAXKICK = "taxkick";
 
-    public final static int PRIORITY_OPEN = 1_000;
-    public final static int PRIORITY_MONSTERS = 2_000;
-    public final static int PRIORITY_ANIMALS = 3_000;
-    public final static int PRIORITY_POWERLOSS = 4_000;
-    public final static int PRIORITY_POWERGAIN = 5_000;
-    public final static int PRIORITY_PVP = 6_000;
-    public final static int PRIORITY_FRIENDLYFIRE = 7_000;
-    public final static int PRIORITY_EXPLOSIONS = 8_000;
-    public final static int PRIORITY_OFFLINEEXPLOSIONS = 9_000;
-    public final static int PRIORITY_FIRESPREAD = 10_000;
-    public final static int PRIORITY_ENDERGRIEF = 11_000;
-    public final static int PRIORITY_ZOMBIEGRIEF = 12_000;
-    public final static int PRIORITY_PERMANENT = 13_000;
-    public final static int PRIORITY_PEACEFUL = 14_000;
-    public final static int PRIORITY_INFPOWER = 15_000;
-    public final static int PRIORITY_FLY = 16_000;
-    public final static int PRIORITY_TAXKICK = 17_000;
+    public static int PRIORITY_OPEN = 1_000;
+    public static int PRIORITY_MONSTERS = 2_000;
+    public static int PRIORITY_ANIMALS = 3_000;
+    public static int PRIORITY_POWERLOSS = 4_000;
+    public static int PRIORITY_POWERGAIN = 5_000;
+    public static int PRIORITY_PVP = 6_000;
+    public static int PRIORITY_FRIENDLYFIRE = 7_000;
+    public static int PRIORITY_EXPLOSIONS = 8_000;
+    public static int PRIORITY_OFFLINEEXPLOSIONS = 9_000;
+    public static int PRIORITY_FIRESPREAD = 10_000;
+    public static int PRIORITY_ENDERGRIEF = 11_000;
+    public static int PRIORITY_ZOMBIEGRIEF = 12_000;
+    public static int PRIORITY_PERMANENT = 13_000;
+    public static int PRIORITY_PEACEFUL = 14_000;
+    public static int PRIORITY_INFPOWER = 15_000;
+    public static int PRIORITY_FLY = 16_000;
+    public static int PRIORITY_TAXKICK = 17_000;
 
     // -------------------------------------------- //
     // META: CORE

src/main/java/com/massivecraft/factions/entity/MFlagColl.java

@@ -10,7 +10,7 @@ public class MFlagColl extends Coll<MFlag> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final MFlagColl i = new MFlagColl();
+    protected static MFlagColl i = new MFlagColl();
 
     public static MFlagColl get() {
         return i;

src/main/java/com/massivecraft/factions/entity/MPerm.java

@@ -33,66 +33,66 @@ public class MPerm extends Entity<MPerm> implements Prioritized, Registerable, N
     // CONSTANTS
     // -------------------------------------------- //
 
-    public final static String ID_BUILD = "build";
-    public final static String ID_PAINBUILD = "painbuild";
-    public final static String ID_DOOR = "door";
-    public final static String ID_BUTTON = "button";
-    public final static String ID_LEVER = "lever";
-    public final static String ID_CONTAINER = "container";
-    public final static String ID_LECTERN = "lectern";
+    public static String ID_BUILD = "build";
+    public static String ID_PAINBUILD = "painbuild";
+    public static String ID_DOOR = "door";
+    public static String ID_BUTTON = "button";
+    public static String ID_LEVER = "lever";
+    public static String ID_CONTAINER = "container";
+    public static String ID_LECTERN = "lectern";
 
-    public final static String ID_NAME = "name";
-    public final static String ID_DESC = "desc";
-    public final static String ID_MOTD = "motd";
-    public final static String ID_INVITE = "invite";
-    public final static String ID_KICK = "kick";
-    public final static String ID_RANK = "rank";
-    public final static String ID_TITLE = "title";
-    public final static String ID_WARP = "warp";
-    public final static String ID_SETWARP = "setwarp";
-    public final static String ID_DEPOSIT = "deposit";
-    public final static String ID_WITHDRAW = "withdraw";
-    public final static String ID_TERRITORY = "territory";
-    public final static String ID_ACCESS = "access";
-    public final static String ID_VOTE = "VOTE"; // Why is this capitalised? Can that be easily changed?
-    public final static String ID_CREATEVOTE = "createvote";
-    public final static String ID_CLAIMNEAR = "claimnear";
-    public final static String ID_TAX = "tax";
-    public final static String ID_REL = "rel";
-    public final static String ID_DISBAND = "disband";
-    public final static String ID_FLAGS = "flags";
-    public final static String ID_PERMS = "perms";
+    public static String ID_NAME = "name";
+    public static String ID_DESC = "desc";
+    public static String ID_MOTD = "motd";
+    public static String ID_INVITE = "invite";
+    public static String ID_KICK = "kick";
+    public static String ID_RANK = "rank";
+    public static String ID_TITLE = "title";
+    public static String ID_WARP = "warp";
+    public static String ID_SETWARP = "setwarp";
+    public static String ID_DEPOSIT = "deposit";
+    public static String ID_WITHDRAW = "withdraw";
+    public static String ID_TERRITORY = "territory";
+    public static String ID_ACCESS = "access";
+    public static String ID_VOTE = "VOTE"; // Why is this capitalised? Can that be easily changed?
+    public static String ID_CREATEVOTE = "createvote";
+    public static String ID_CLAIMNEAR = "claimnear";
+    public static String ID_TAX = "tax";
+    public static String ID_REL = "rel";
+    public static String ID_DISBAND = "disband";
+    public static String ID_FLAGS = "flags";
+    public static String ID_PERMS = "perms";
 
-    public final static int PRIORITY_BUILD = 1000;
-    public final static int PRIORITY_PAINBUILD = 2000;
-    public final static int PRIORITY_DOOR = 3000;
-    public final static int PRIORITY_BUTTON = 4000;
-    public final static int PRIORITY_LEVER = 5000;
-    public final static int PRIORITY_CONTAINER = 6000;
+    public static int PRIORITY_BUILD = 1000;
+    public static int PRIORITY_PAINBUILD = 2000;
+    public static int PRIORITY_DOOR = 3000;
+    public static int PRIORITY_BUTTON = 4000;
+    public static int PRIORITY_LEVER = 5000;
+    public static int PRIORITY_CONTAINER = 6000;
 
-    public final static int PRIORITY_LECTERN = 1500;
+    public static int PRIORITY_LECTERN = 1500;
 
-    public final static int PRIORITY_NAME = 7000;
-    public final static int PRIORITY_DESC = 8000;
-    public final static int PRIORITY_MOTD = 9000;
-    public final static int PRIORITY_INVITE = 10000;
-    public final static int PRIORITY_KICK = 11000;
-    public final static int PRIORITY_RANK = 11500;
-    public final static int PRIORITY_TITLE = 12000;
-    public final static int PRIORITY_WARP = 13000;
-    public final static int PRIORITY_SETWARP = 14000;
-    public final static int PRIORITY_DEPOSIT = 15000;
-    public final static int PRIORITY_WITHDRAW = 16000;
-    public final static int PRIORITY_TERRITORY = 17000;
-    public final static int PRIORITY_ACCESS = 18000;
-    public final static int PRIORITY_VOTE = 18200;
-    public final static int PRIORITY_CREATEVOTE = 18600;
-    public final static int PRIORITY_CLAIMNEAR = 19000;
-    public final static int PRIORITY_TAX = 19500;
-    public final static int PRIORITY_REL = 20000;
-    public final static int PRIORITY_DISBAND = 21000;
-    public final static int PRIORITY_FLAGS = 22000;
-    public final static int PRIORITY_PERMS = 23000;
+    public static int PRIORITY_NAME = 7000;
+    public static int PRIORITY_DESC = 8000;
+    public static int PRIORITY_MOTD = 9000;
+    public static int PRIORITY_INVITE = 10000;
+    public static int PRIORITY_KICK = 11000;
+    public static int PRIORITY_RANK = 11500;
+    public static int PRIORITY_TITLE = 12000;
+    public static int PRIORITY_WARP = 13000;
+    public static int PRIORITY_SETWARP = 14000;
+    public static int PRIORITY_DEPOSIT = 15000;
+    public static int PRIORITY_WITHDRAW = 16000;
+    public static int PRIORITY_TERRITORY = 17000;
+    public static int PRIORITY_ACCESS = 18000;
+    public static int PRIORITY_VOTE = 18200;
+    public static int PRIORITY_CREATEVOTE = 18600;
+    public static int PRIORITY_CLAIMNEAR = 19000;
+    public static int PRIORITY_TAX = 19500;
+    public static int PRIORITY_REL = 20000;
+    public static int PRIORITY_DISBAND = 21000;
+    public static int PRIORITY_FLAGS = 22000;
+    public static int PRIORITY_PERMS = 23000;
 
     // -------------------------------------------- //
     // META: CORE

src/main/java/com/massivecraft/factions/entity/MPermColl.java

@@ -13,7 +13,7 @@ public class MPermColl extends Coll<MPerm> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final MPermColl i = new MPermColl();
+    protected static MPermColl i = new MPermColl();
 
     public static MPermColl get() {
         return i;

src/main/java/com/massivecraft/factions/entity/MPlayer.java

@@ -39,7 +39,7 @@ public class MPlayer extends SenderEntity<MPlayer> implements FactionsParticipat
     // META
     // -------------------------------------------- //
 
-    public static final String NOTITLE = Txt.parse("<em><silver>no title set");
+    public static String NOTITLE = Txt.parse("<em><silver>no title set");
 
     // -------------------------------------------- //
     // META

src/main/java/com/massivecraft/factions/entity/MPlayerColl.java

@@ -7,7 +7,7 @@ public class MPlayerColl extends SenderColl<MPlayer> {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final MPlayerColl i = new MPlayerColl();
+    protected static MPlayerColl i = new MPlayerColl();
 
     public static MPlayerColl get() {
         return i;

src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction001Invitations.java

@@ -12,7 +12,7 @@ public class MigratorFaction001Invitations extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final com.massivecraft.factions.entity.migrator.MigratorFaction001Invitations i = new com.massivecraft.factions.entity.migrator.MigratorFaction001Invitations();
+    protected static com.massivecraft.factions.entity.migrator.MigratorFaction001Invitations i = new com.massivecraft.factions.entity.migrator.MigratorFaction001Invitations();
 
     public static com.massivecraft.factions.entity.migrator.MigratorFaction001Invitations get() {
         return i;

src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction002Ranks.java

@@ -22,7 +22,7 @@ public class MigratorFaction002Ranks extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final MigratorFaction002Ranks i = new MigratorFaction002Ranks();
+    protected static MigratorFaction002Ranks i = new MigratorFaction002Ranks();
 
     public static MigratorFaction002Ranks get() {
         return i;

src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction003Warps.java

@@ -18,7 +18,7 @@ public class MigratorFaction003Warps extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final MigratorFaction003Warps i = new MigratorFaction003Warps();
+    protected static MigratorFaction003Warps i = new MigratorFaction003Warps();
 
     public static MigratorFaction003Warps get() {
         return i;

src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction004WarpsPerms.java

@@ -10,7 +10,7 @@ public class MigratorFaction004WarpsPerms extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final MigratorFaction004WarpsPerms i = new MigratorFaction004WarpsPerms();
+    protected static MigratorFaction004WarpsPerms i = new MigratorFaction004WarpsPerms();
 
     public static MigratorFaction004WarpsPerms get() {
         return i;

src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf001EnumerationUtil.java

@@ -16,7 +16,7 @@ public class MigratorMConf001EnumerationUtil extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final MigratorMConf001EnumerationUtil i = new MigratorMConf001EnumerationUtil();
+    protected static MigratorMConf001EnumerationUtil i = new MigratorMConf001EnumerationUtil();
 
     public static MigratorMConf001EnumerationUtil get() {
         return i;

src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf002CleanInactivity.java

@@ -9,7 +9,7 @@ public class MigratorMConf002CleanInactivity extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final MigratorMConf002CleanInactivity i = new MigratorMConf002CleanInactivity();
+    protected static MigratorMConf002CleanInactivity i = new MigratorMConf002CleanInactivity();
 
     public static MigratorMConf002CleanInactivity get() {
         return i;

src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf003CleanInactivity.java

@@ -9,7 +9,7 @@ public class MigratorMConf003CleanInactivity extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final MigratorMConf003CleanInactivity i = new MigratorMConf003CleanInactivity();
+    protected static MigratorMConf003CleanInactivity i = new MigratorMConf003CleanInactivity();
 
     public static MigratorMConf003CleanInactivity get() {
         return i;

src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf004Rank.java

@@ -13,7 +13,7 @@ public class MigratorMConf004Rank extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final MigratorMConf004Rank i = new MigratorMConf004Rank();
+    protected static MigratorMConf004Rank i = new MigratorMConf004Rank();
 
     public static MigratorMConf004Rank get() {
         return i;

src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf005Warps.java

@@ -9,7 +9,7 @@ public class MigratorMConf005Warps extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final MigratorMConf005Warps i = new MigratorMConf005Warps();
+    protected static MigratorMConf005Warps i = new MigratorMConf005Warps();
 
     public static MigratorMConf005Warps get() {
         return i;

src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPerm001Warps.java

@@ -10,7 +10,7 @@ public class MigratorMPerm001Warps extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final MigratorMPerm001Warps i = new MigratorMPerm001Warps();
+    protected static MigratorMPerm001Warps i = new MigratorMPerm001Warps();
 
     public static MigratorMPerm001Warps get() {
         return i;

src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPerm002MoveStandard.java

@@ -15,7 +15,7 @@ public class MigratorMPerm002MoveStandard extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final MigratorMPerm002MoveStandard i = new MigratorMPerm002MoveStandard();
+    protected static MigratorMPerm002MoveStandard i = new MigratorMPerm002MoveStandard();
 
     public static MigratorMPerm002MoveStandard get() {
         return i;

src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPlayer001Ranks.java

@@ -17,7 +17,7 @@ public class MigratorMPlayer001Ranks extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final MigratorMPlayer001Ranks i = new MigratorMPlayer001Ranks();
+    protected static MigratorMPlayer001Ranks i = new MigratorMPlayer001Ranks();
 
     public static MigratorMPlayer001Ranks get() {
         return i;

src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPlayer002UsingAdminMode.java

@@ -9,7 +9,7 @@ public class MigratorMPlayer002UsingAdminMode extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final MigratorMPlayer002UsingAdminMode i = new MigratorMPlayer002UsingAdminMode();
+    protected static MigratorMPlayer002UsingAdminMode i = new MigratorMPlayer002UsingAdminMode();
 
     public static MigratorMPlayer002UsingAdminMode get() {
         return i;

src/main/java/com/massivecraft/factions/entity/migrator/MigratorTerritoryAccess001Restructure.java

@@ -12,7 +12,7 @@ public class MigratorTerritoryAccess001Restructure extends MigratorRoot {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final MigratorTerritoryAccess001Restructure i = new MigratorTerritoryAccess001Restructure();
+    protected static MigratorTerritoryAccess001Restructure i = new MigratorTerritoryAccess001Restructure();
 
     public static MigratorTerritoryAccess001Restructure get() {
         return i;

src/main/java/com/massivecraft/factions/integration/dynmap/EngineDynmap.java

@@ -43,7 +43,7 @@ public class EngineDynmap extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EngineDynmap i = new EngineDynmap();
+    protected static EngineDynmap i = new EngineDynmap();
 
     public static EngineDynmap get() {
         return i;

src/main/java/com/massivecraft/factions/integration/dynmap/IntegrationDynmap.java

@@ -33,7 +33,7 @@ public class IntegrationDynmap extends Integration {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final IntegrationDynmap i = new IntegrationDynmap();
+    protected static IntegrationDynmap i = new IntegrationDynmap();
 
     public static IntegrationDynmap get() {
         return i;

src/main/java/com/massivecraft/factions/integration/lockette/EngineLockette.java

@@ -20,7 +20,7 @@ public class EngineLockette extends Engine {
     // INSTANCE & CONSTRUCT
     // -------------------------------------------- //
 
-    private static final EngineLockette i = new EngineLockette();
+    protected static EngineLockette i = new EngineLockette();
 
     public static EngineLockette get() {
         return i;