diff --git a/src/main/java/com/massivecraft/factions/ExtractorFactionAccountId.java b/src/main/java/com/massivecraft/factions/ExtractorFactionAccountId.java index bc7d14a3..0a50b31a 100644 --- a/src/main/java/com/massivecraft/factions/ExtractorFactionAccountId.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/FactionsIndex.java b/src/main/java/com/massivecraft/factions/FactionsIndex.java index bfffb589..bc1ea1a1 100644 --- a/src/main/java/com/massivecraft/factions/FactionsIndex.java +++ b/src/main/java/com/massivecraft/factions/FactionsIndex.java @@ -15,7 +15,7 @@ import java.util.WeakHashMap; * This Index class contains the MPlayer <--> Faction index. *

* 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 mplayer2faction; + @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") private final Map> faction2mplayers; // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/adapter/BoardAdapter.java b/src/main/java/com/massivecraft/factions/adapter/BoardAdapter.java index d67b71c0..ffab7f6a 100644 --- a/src/main/java/com/massivecraft/factions/adapter/BoardAdapter.java +++ b/src/main/java/com/massivecraft/factions/adapter/BoardAdapter.java @@ -15,7 +15,7 @@ public class BoardAdapter implements JsonDeserializer, JsonSerializer // 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 JsonObject obj = json.getAsJsonObject(); // Prepare variables - String hostFactionId = null; + String hostFactionId; Boolean hostFactionAllowed = null; Set 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(); diff --git a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLc.java b/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLc.java index aec43385..f41622c2 100644 --- a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLc.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLp.java b/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLp.java index 8581bfe8..1d0831e5 100644 --- a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierLp.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierParse.java b/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierParse.java index bfd3bafe..975cc71c 100644 --- a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierParse.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierRp.java b/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierRp.java index 8fcc6247..9ef24aae 100644 --- a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierRp.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUc.java b/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUc.java index 03e710ab..2e844fcb 100644 --- a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUc.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java b/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java index d60336ab..b8eb8c5e 100644 --- a/src/main/java/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagName.java b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagName.java index 1a83d8dd..52f4d25c 100644 --- a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagName.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagNameforce.java b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagNameforce.java index 2ab48b5d..834c9313 100644 --- a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagNameforce.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java index 92233214..400c512f 100644 --- a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRole.java b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRole.java index be5de5df..335fd87b 100644 --- a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRole.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java index 7af93b2d..608fa86e 100644 --- a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java index 5da7eaae..276b51d4 100644 --- a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagTitle.java b/src/main/java/com/massivecraft/factions/chat/tag/ChatTagTitle.java index 434e5686..dcf55602 100644 --- a/src/main/java/com/massivecraft/factions/chat/tag/ChatTagTitle.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactions.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactions.java index c1bec29e..5a7b435c 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactions.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFly.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFly.java index e1fe7c31..9552766e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFly.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java index 51ea4f8c..0b91971d 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java +++ b/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 invited you to %s.", msender.describeTo(mplayer, true), msenderFaction.describeTo(mplayer)); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java index c397d1b4..606ef8f9 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java +++ b/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 revoked your invitation to %s.", msender.describeTo(mplayer, true), msenderFaction.describeTo(mplayer)); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermViewall.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermViewall.java index b5cec66c..4b54704f 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermViewall.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetAll.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetAll.java index 561a92ad..2ed781d6 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetAll.java +++ b/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 chunks = null; + Set chunks; // Args Faction oldFaction = this.getOldFaction(); @@ -59,7 +59,7 @@ public class CmdFactionsSetAll extends CmdFactionsSetXAll { this.setFormatOne("%s %s %d chunk using " + word + " all."); this.setFormatMany("%s %s %d 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(); diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java b/src/main/java/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java index 1c15622e..937c2ad7 100644 --- a/src/main/java/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqFactionWarpsEnabled.java b/src/main/java/com/massivecraft/factions/cmd/req/ReqFactionWarpsEnabled.java index d688a485..cf6a31e2 100644 --- a/src/main/java/com/massivecraft/factions/cmd/req/ReqFactionWarpsEnabled.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqHasFaction.java b/src/main/java/com/massivecraft/factions/cmd/req/ReqHasFaction.java index b6b30f66..9716fc7f 100644 --- a/src/main/java/com/massivecraft/factions/cmd/req/ReqHasFaction.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqHasntFaction.java b/src/main/java/com/massivecraft/factions/cmd/req/ReqHasntFaction.java index bf0321d2..e9dbb81f 100644 --- a/src/main/java/com/massivecraft/factions/cmd/req/ReqHasntFaction.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqRankIsAtLeast.java b/src/main/java/com/massivecraft/factions/cmd/req/ReqRankIsAtLeast.java index 93e2bc6b..5611bf55 100644 --- a/src/main/java/com/massivecraft/factions/cmd/req/ReqRankIsAtLeast.java +++ b/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; // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqTaxEnabled.java b/src/main/java/com/massivecraft/factions/cmd/req/ReqTaxEnabled.java index e8688720..34edd94a 100644 --- a/src/main/java/com/massivecraft/factions/cmd/req/ReqTaxEnabled.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeFaction.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeFaction.java index 92be1ad0..7d20f344 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeFaction.java +++ b/src/main/java/com/massivecraft/factions/cmd/type/TypeFaction.java @@ -21,7 +21,7 @@ public class TypeFaction extends TypeAbstract { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final TypeFaction i = new TypeFaction(); + protected static TypeFaction i = new TypeFaction(); public static TypeFaction get() { return i; diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeFactionChunkChangeType.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeFactionChunkChangeType.java index 14c4e47f..b20a1d74 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeFactionChunkChangeType.java +++ b/src/main/java/com/massivecraft/factions/cmd/type/TypeFactionChunkChangeType.java @@ -8,7 +8,7 @@ public class TypeFactionChunkChangeType extends TypeEnum { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final TypeMFlag i = new TypeMFlag(); + protected static TypeMFlag i = new TypeMFlag(); public static TypeMFlag get() { return i; diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeMPerm.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeMPerm.java index ac3cadf5..1c5d85d2 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeMPerm.java +++ b/src/main/java/com/massivecraft/factions/cmd/type/TypeMPerm.java @@ -11,7 +11,7 @@ public class TypeMPerm extends TypeEntity { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final TypeMPerm i = new TypeMPerm(); + protected static TypeMPerm i = new TypeMPerm(); public static TypeMPerm get() { return i; diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeMPermable.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeMPermable.java index 92bb832c..823fbb8f 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeMPermable.java +++ b/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 { // -------------------------------------------- // // 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 { } // 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 { 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 { 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 diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeRank.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeRank.java index f87d9c34..f559a950 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeRank.java +++ b/src/main/java/com/massivecraft/factions/cmd/type/TypeRank.java @@ -15,7 +15,7 @@ public class TypeRank extends TypeEntityInternalFaction { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final TypeRank i = new TypeRank(); + protected static TypeRank i = new TypeRank(); public static TypeRank get() { return i; diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeRel.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeRel.java index e9fce0a4..937fb18e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeRel.java +++ b/src/main/java/com/massivecraft/factions/cmd/type/TypeRel.java @@ -10,7 +10,7 @@ public class TypeRel extends TypeEnum { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final TypeRel i = new TypeRel(); + protected static TypeRel i = new TypeRel(); public static TypeRel get() { return i; diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeRelation.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeRelation.java index 72d0cca5..44469dab 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeRelation.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeSortMPlayer.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeSortMPlayer.java index 515c797b..f29a37e8 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeSortMPlayer.java +++ b/src/main/java/com/massivecraft/factions/cmd/type/TypeSortMPlayer.java @@ -13,7 +13,7 @@ public class TypeSortMPlayer extends TypeAbstractChoice> { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final TypeSortMPlayer i = new TypeSortMPlayer(); + protected static TypeSortMPlayer i = new TypeSortMPlayer(); public static TypeSortMPlayer get() { return i; diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeTaxable.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeTaxable.java index 122c03fb..a71c30a2 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeTaxable.java +++ b/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 { @@ -19,7 +18,7 @@ public class TypeTaxable extends TypeAbstract { // 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 { } // 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 { 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 diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeVote.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeVote.java index 54624f66..e3ba5f7c 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeVote.java +++ b/src/main/java/com/massivecraft/factions/cmd/type/TypeVote.java @@ -10,7 +10,7 @@ public class TypeVote extends TypeEntityInternalFaction { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final TypeVote i = new TypeVote(); + protected static TypeVote i = new TypeVote(); public static TypeVote get() { return i; diff --git a/src/main/java/com/massivecraft/factions/cmd/type/TypeWarp.java b/src/main/java/com/massivecraft/factions/cmd/type/TypeWarp.java index 926896f0..05117561 100644 --- a/src/main/java/com/massivecraft/factions/cmd/type/TypeWarp.java +++ b/src/main/java/com/massivecraft/factions/cmd/type/TypeWarp.java @@ -10,7 +10,7 @@ public class TypeWarp extends TypeEntityInternalFaction { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final TypeWarp i = new TypeWarp(); + protected static TypeWarp i = new TypeWarp(); public static TypeWarp get() { return i; diff --git a/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerInactivity.java b/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerInactivity.java index 71791858..2a8f56a5 100644 --- a/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerInactivity.java +++ b/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerInactivity.java @@ -9,7 +9,7 @@ public class ComparatorMPlayerInactivity extends ComparatorAbstract imp // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final ComparatorMPlayerInactivity i = new ComparatorMPlayerInactivity(); + protected static ComparatorMPlayerInactivity i = new ComparatorMPlayerInactivity(); public static ComparatorMPlayerInactivity get() { return i; diff --git a/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerPower.java b/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerPower.java index 4b4ef442..539e5377 100644 --- a/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerPower.java +++ b/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerPower.java @@ -9,7 +9,7 @@ public class ComparatorMPlayerPower extends ComparatorAbstract implemen // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final ComparatorMPlayerPower i = new ComparatorMPlayerPower(); + protected static ComparatorMPlayerPower i = new ComparatorMPlayerPower(); public static ComparatorMPlayerPower get() { return i; diff --git a/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerRole.java b/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerRole.java index f3fc0261..8c02324c 100644 --- a/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerRole.java +++ b/src/main/java/com/massivecraft/factions/comparator/ComparatorMPlayerRole.java @@ -10,7 +10,7 @@ public class ComparatorMPlayerRole extends ComparatorAbstract implement // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final ComparatorMPlayerRole i = new ComparatorMPlayerRole(); + protected static ComparatorMPlayerRole i = new ComparatorMPlayerRole(); public static ComparatorMPlayerRole get() { return i; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineCanCombatHappen.java b/src/main/java/com/massivecraft/factions/engine/EngineCanCombatHappen.java index 62a0997f..5c9e9328 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineCanCombatHappen.java +++ b/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(); diff --git a/src/main/java/com/massivecraft/factions/engine/EngineChat.java b/src/main/java/com/massivecraft/factions/engine/EngineChat.java index 90605627..b916e880 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineChat.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineChunkChange.java b/src/main/java/com/massivecraft/factions/engine/EngineChunkChange.java index 75daf5cb..331827fa 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineChunkChange.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineCleanInactivity.java b/src/main/java/com/massivecraft/factions/engine/EngineCleanInactivity.java index dd900a13..e4b056e4 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineCleanInactivity.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineDenyCommands.java b/src/main/java/com/massivecraft/factions/engine/EngineDenyCommands.java index d91a49d8..f367a7aa 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineDenyCommands.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineDenyTeleport.java b/src/main/java/com/massivecraft/factions/engine/EngineDenyTeleport.java index dfbabdc6..fa9672de 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineDenyTeleport.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineEcon.java b/src/main/java/com/massivecraft/factions/engine/EngineEcon.java index 998ec64e..4a283ac4 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineEcon.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineExploit.java b/src/main/java/com/massivecraft/factions/engine/EngineExploit.java index 0fb5dbf7..2ee39a98 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineExploit.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineFlagEndergrief.java b/src/main/java/com/massivecraft/factions/engine/EngineFlagEndergrief.java index 95044fd6..3e8b7eae 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineFlagEndergrief.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineFlagExplosion.java b/src/main/java/com/massivecraft/factions/engine/EngineFlagExplosion.java index fc560601..bc9c8d0d 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineFlagExplosion.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineFlagFireSpread.java b/src/main/java/com/massivecraft/factions/engine/EngineFlagFireSpread.java index ecba69d4..6c7d2ae5 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineFlagFireSpread.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineFlagSpawn.java b/src/main/java/com/massivecraft/factions/engine/EngineFlagSpawn.java index 5774d02d..fc7a4632 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineFlagSpawn.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineFlagZombiegrief.java b/src/main/java/com/massivecraft/factions/engine/EngineFlagZombiegrief.java index 5e6e7a18..d155f3ad 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineFlagZombiegrief.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineFly.java b/src/main/java/com/massivecraft/factions/engine/EngineFly.java index d7eed2b4..710e6c5f 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineFly.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineLastActivity.java b/src/main/java/com/massivecraft/factions/engine/EngineLastActivity.java index ce17a546..7d7ee60c 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineLastActivity.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineMotd.java b/src/main/java/com/massivecraft/factions/engine/EngineMotd.java index c02bb57e..b10e7847 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineMotd.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineMoveChunk.java b/src/main/java/com/massivecraft/factions/engine/EngineMoveChunk.java index c19dfef9..7bf8eca6 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineMoveChunk.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/engine/EnginePermBuild.java b/src/main/java/com/massivecraft/factions/engine/EnginePermBuild.java index 4a93bf08..ab6842f0 100644 --- a/src/main/java/com/massivecraft/factions/engine/EnginePermBuild.java +++ b/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); diff --git a/src/main/java/com/massivecraft/factions/engine/EnginePlayerData.java b/src/main/java/com/massivecraft/factions/engine/EnginePlayerData.java index 10f5a508..7deb8649 100644 --- a/src/main/java/com/massivecraft/factions/engine/EnginePlayerData.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/engine/EnginePower.java b/src/main/java/com/massivecraft/factions/engine/EnginePower.java index 96414a9d..5400c0cb 100644 --- a/src/main/java/com/massivecraft/factions/engine/EnginePower.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineSeeChunk.java b/src/main/java/com/massivecraft/factions/engine/EngineSeeChunk.java index 6c4b7fb7..c209696a 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineSeeChunk.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineShow.java b/src/main/java/com/massivecraft/factions/engine/EngineShow.java index 31b43a03..e6219b3c 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineShow.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineTeleportHomeOnDeath.java b/src/main/java/com/massivecraft/factions/engine/EngineTeleportHomeOnDeath.java index 46193cf0..4ae32d99 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineTeleportHomeOnDeath.java +++ b/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 warps = faction.getWarps().getAll((java.util.function.Predicate) (warp -> warp.getName().equalsIgnoreCase(MConf.get().warpsTeleportToOnDeathName))); + List 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) { diff --git a/src/main/java/com/massivecraft/factions/engine/EngineTerritoryShield.java b/src/main/java/com/massivecraft/factions/engine/EngineTerritoryShield.java index 37f1f59e..a7be5c5c 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineTerritoryShield.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/engine/EngineVisualizations.java b/src/main/java/com/massivecraft/factions/engine/EngineVisualizations.java index 7c686660..15b4462e 100644 --- a/src/main/java/com/massivecraft/factions/engine/EngineVisualizations.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/entity/Board.java b/src/main/java/com/massivecraft/factions/entity/Board.java index 83dc539f..c5efb3ec 100644 --- a/src/main/java/com/massivecraft/factions/entity/Board.java +++ b/src/main/java/com/massivecraft/factions/entity/Board.java @@ -227,7 +227,7 @@ public class Board extends Entity 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 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)) { diff --git a/src/main/java/com/massivecraft/factions/entity/BoardColl.java b/src/main/java/com/massivecraft/factions/entity/BoardColl.java index fed45736..f588556a 100644 --- a/src/main/java/com/massivecraft/factions/entity/BoardColl.java +++ b/src/main/java/com/massivecraft/factions/entity/BoardColl.java @@ -22,7 +22,7 @@ public class BoardColl extends Coll 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 implements BoardInterface { outer: for (PS ps : pss) { if (discovered.contains(ps)) { - continue outer; + continue; } List forest = new MassiveList<>(); @@ -428,7 +428,7 @@ public class BoardColl extends Coll implements BoardInterface { while (!stack.empty()) { PS elm = stack.pop(); if (discovered.contains(elm)) { - continue inner; + continue; } System.out.println(elm); discovered.add(elm); diff --git a/src/main/java/com/massivecraft/factions/entity/Faction.java b/src/main/java/com/massivecraft/factions/entity/Faction.java index 6ddb5748..08129a18 100644 --- a/src/main/java/com/massivecraft/factions/entity/Faction.java +++ b/src/main/java/com/massivecraft/factions/entity/Faction.java @@ -50,8 +50,8 @@ public class Faction extends Entity implements FactionsParticipator, MP // CONSTANTS // -------------------------------------------- // - public static final String NODESCRIPTION = Txt.parse("no description set"); - public static final String NOMOTD = Txt.parse("no message of the day set"); + public static String NODESCRIPTION = Txt.parse("no description set"); + public static String NOMOTD = Txt.parse("no message of the day set"); // -------------------------------------------- // // META @@ -988,7 +988,7 @@ public class Faction extends Entity 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) { diff --git a/src/main/java/com/massivecraft/factions/entity/FactionColl.java b/src/main/java/com/massivecraft/factions/entity/FactionColl.java index 62f20b6e..5cdb2e47 100644 --- a/src/main/java/com/massivecraft/factions/entity/FactionColl.java +++ b/src/main/java/com/massivecraft/factions/entity/FactionColl.java @@ -18,7 +18,7 @@ public class FactionColl extends Coll { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final FactionColl i = new FactionColl(); + protected static FactionColl i = new FactionColl(); public static FactionColl get() { return i; diff --git a/src/main/java/com/massivecraft/factions/entity/MConfColl.java b/src/main/java/com/massivecraft/factions/entity/MConfColl.java index e0167986..d055f410 100644 --- a/src/main/java/com/massivecraft/factions/entity/MConfColl.java +++ b/src/main/java/com/massivecraft/factions/entity/MConfColl.java @@ -8,7 +8,7 @@ public class MConfColl extends Coll { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final MConfColl i = new MConfColl(); + protected static MConfColl i = new MConfColl(); public static MConfColl get() { return i; diff --git a/src/main/java/com/massivecraft/factions/entity/MFlag.java b/src/main/java/com/massivecraft/factions/entity/MFlag.java index 570f32a0..cfc89d99 100644 --- a/src/main/java/com/massivecraft/factions/entity/MFlag.java +++ b/src/main/java/com/massivecraft/factions/entity/MFlag.java @@ -19,41 +19,41 @@ public class MFlag extends Entity 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 diff --git a/src/main/java/com/massivecraft/factions/entity/MFlagColl.java b/src/main/java/com/massivecraft/factions/entity/MFlagColl.java index 2d638d43..047d254d 100644 --- a/src/main/java/com/massivecraft/factions/entity/MFlagColl.java +++ b/src/main/java/com/massivecraft/factions/entity/MFlagColl.java @@ -10,7 +10,7 @@ public class MFlagColl extends Coll { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final MFlagColl i = new MFlagColl(); + protected static MFlagColl i = new MFlagColl(); public static MFlagColl get() { return i; diff --git a/src/main/java/com/massivecraft/factions/entity/MPerm.java b/src/main/java/com/massivecraft/factions/entity/MPerm.java index ace0db16..213997f9 100644 --- a/src/main/java/com/massivecraft/factions/entity/MPerm.java +++ b/src/main/java/com/massivecraft/factions/entity/MPerm.java @@ -33,66 +33,66 @@ public class MPerm extends Entity 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 diff --git a/src/main/java/com/massivecraft/factions/entity/MPermColl.java b/src/main/java/com/massivecraft/factions/entity/MPermColl.java index d11c7822..1707ef69 100644 --- a/src/main/java/com/massivecraft/factions/entity/MPermColl.java +++ b/src/main/java/com/massivecraft/factions/entity/MPermColl.java @@ -13,7 +13,7 @@ public class MPermColl extends Coll { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final MPermColl i = new MPermColl(); + protected static MPermColl i = new MPermColl(); public static MPermColl get() { return i; diff --git a/src/main/java/com/massivecraft/factions/entity/MPlayer.java b/src/main/java/com/massivecraft/factions/entity/MPlayer.java index 7b221e46..b395ee57 100644 --- a/src/main/java/com/massivecraft/factions/entity/MPlayer.java +++ b/src/main/java/com/massivecraft/factions/entity/MPlayer.java @@ -39,7 +39,7 @@ public class MPlayer extends SenderEntity implements FactionsParticipat // META // -------------------------------------------- // - public static final String NOTITLE = Txt.parse("no title set"); + public static String NOTITLE = Txt.parse("no title set"); // -------------------------------------------- // // META diff --git a/src/main/java/com/massivecraft/factions/entity/MPlayerColl.java b/src/main/java/com/massivecraft/factions/entity/MPlayerColl.java index 09f5a5ae..662ffd1e 100644 --- a/src/main/java/com/massivecraft/factions/entity/MPlayerColl.java +++ b/src/main/java/com/massivecraft/factions/entity/MPlayerColl.java @@ -7,7 +7,7 @@ public class MPlayerColl extends SenderColl { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final MPlayerColl i = new MPlayerColl(); + protected static MPlayerColl i = new MPlayerColl(); public static MPlayerColl get() { return i; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction001Invitations.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction001Invitations.java index 80fc6a40..789c34dc 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction001Invitations.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction002Ranks.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction002Ranks.java index cfcafc20..f93e7825 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction002Ranks.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction003Warps.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction003Warps.java index f4eb97e3..048245d7 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction003Warps.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction004WarpsPerms.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction004WarpsPerms.java index ab22c071..2fee71fa 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorFaction004WarpsPerms.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf001EnumerationUtil.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf001EnumerationUtil.java index 6e27e502..dba9e489 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf001EnumerationUtil.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf002CleanInactivity.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf002CleanInactivity.java index 20dcc98f..0bc86c46 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf002CleanInactivity.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf003CleanInactivity.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf003CleanInactivity.java index 60b7b0c3..44b6e254 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf003CleanInactivity.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf004Rank.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf004Rank.java index f8e1d1c6..20c35c43 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf004Rank.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf005Warps.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf005Warps.java index 0d2e20fc..9021a4d1 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMConf005Warps.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPerm001Warps.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPerm001Warps.java index ea49efbf..66838029 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPerm001Warps.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPerm002MoveStandard.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPerm002MoveStandard.java index b15bf04f..d1ed4af3 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPerm002MoveStandard.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPlayer001Ranks.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPlayer001Ranks.java index 9c282f3d..68681fca 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPlayer001Ranks.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPlayer002UsingAdminMode.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPlayer002UsingAdminMode.java index 163b3b9d..94cb6c77 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorMPlayer002UsingAdminMode.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorTerritoryAccess001Restructure.java b/src/main/java/com/massivecraft/factions/entity/migrator/MigratorTerritoryAccess001Restructure.java index dc7eaf50..23b00d12 100644 --- a/src/main/java/com/massivecraft/factions/entity/migrator/MigratorTerritoryAccess001Restructure.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/integration/dynmap/EngineDynmap.java b/src/main/java/com/massivecraft/factions/integration/dynmap/EngineDynmap.java index 30ee1876..fe8b1289 100644 --- a/src/main/java/com/massivecraft/factions/integration/dynmap/EngineDynmap.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/integration/dynmap/IntegrationDynmap.java b/src/main/java/com/massivecraft/factions/integration/dynmap/IntegrationDynmap.java index f89b0f26..2549f224 100644 --- a/src/main/java/com/massivecraft/factions/integration/dynmap/IntegrationDynmap.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/integration/lockette/EngineLockette.java b/src/main/java/com/massivecraft/factions/integration/lockette/EngineLockette.java index 62db290c..532ffc7a 100644 --- a/src/main/java/com/massivecraft/factions/integration/lockette/EngineLockette.java +++ b/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; diff --git a/src/main/java/com/massivecraft/factions/integration/lockette/IntegrationLockette.java b/src/main/java/com/massivecraft/factions/integration/lockette/IntegrationLockette.java index 7df7b864..9c626cbb 100644 --- a/src/main/java/com/massivecraft/factions/integration/lockette/IntegrationLockette.java +++ b/src/main/java/com/massivecraft/factions/integration/lockette/IntegrationLockette.java @@ -8,7 +8,7 @@ public class IntegrationLockette extends Integration { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final IntegrationLockette i = new IntegrationLockette(); + protected static IntegrationLockette i = new IntegrationLockette(); public static IntegrationLockette get() { return i; diff --git a/src/main/java/com/massivecraft/factions/integration/lwc/EngineLwc.java b/src/main/java/com/massivecraft/factions/integration/lwc/EngineLwc.java index 77ec4f86..1b8131b9 100644 --- a/src/main/java/com/massivecraft/factions/integration/lwc/EngineLwc.java +++ b/src/main/java/com/massivecraft/factions/integration/lwc/EngineLwc.java @@ -27,7 +27,7 @@ public class EngineLwc extends Engine { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final EngineLwc i = new EngineLwc(); + protected static EngineLwc i = new EngineLwc(); public static EngineLwc get() { return i; diff --git a/src/main/java/com/massivecraft/factions/integration/lwc/IntegrationLwc.java b/src/main/java/com/massivecraft/factions/integration/lwc/IntegrationLwc.java index e28a2c28..397a47aa 100644 --- a/src/main/java/com/massivecraft/factions/integration/lwc/IntegrationLwc.java +++ b/src/main/java/com/massivecraft/factions/integration/lwc/IntegrationLwc.java @@ -8,7 +8,7 @@ public class IntegrationLwc extends Integration { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final IntegrationLwc i = new IntegrationLwc(); + protected static IntegrationLwc i = new IntegrationLwc(); public static IntegrationLwc get() { return i; diff --git a/src/main/java/com/massivecraft/factions/integration/placeholderapi/IntegrationPlaceholderAPI.java b/src/main/java/com/massivecraft/factions/integration/placeholderapi/IntegrationPlaceholderAPI.java index 96ecfdad..d9a28a5e 100644 --- a/src/main/java/com/massivecraft/factions/integration/placeholderapi/IntegrationPlaceholderAPI.java +++ b/src/main/java/com/massivecraft/factions/integration/placeholderapi/IntegrationPlaceholderAPI.java @@ -11,7 +11,7 @@ public class IntegrationPlaceholderAPI extends Integration { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final IntegrationPlaceholderAPI i = new IntegrationPlaceholderAPI(); + protected static IntegrationPlaceholderAPI i = new IntegrationPlaceholderAPI(); public static IntegrationPlaceholderAPI get() { return i; diff --git a/src/main/java/com/massivecraft/factions/integration/placeholderapi/PlaceholderFactions.java b/src/main/java/com/massivecraft/factions/integration/placeholderapi/PlaceholderFactions.java index 8ec1d441..b5459cc9 100644 --- a/src/main/java/com/massivecraft/factions/integration/placeholderapi/PlaceholderFactions.java +++ b/src/main/java/com/massivecraft/factions/integration/placeholderapi/PlaceholderFactions.java @@ -14,7 +14,7 @@ public class PlaceholderFactions extends PlaceholderExpansion { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final PlaceholderFactions i = new PlaceholderFactions(); + protected static PlaceholderFactions i = new PlaceholderFactions(); public static PlaceholderFactions get() { return i; diff --git a/src/main/java/com/massivecraft/factions/integration/venturechat/EngineVentureChat.java b/src/main/java/com/massivecraft/factions/integration/venturechat/EngineVentureChat.java index 29e6df0a..e936cf50 100644 --- a/src/main/java/com/massivecraft/factions/integration/venturechat/EngineVentureChat.java +++ b/src/main/java/com/massivecraft/factions/integration/venturechat/EngineVentureChat.java @@ -20,7 +20,7 @@ public class EngineVentureChat extends Engine { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final EngineVentureChat i = new EngineVentureChat(); + protected static EngineVentureChat i = new EngineVentureChat(); public static EngineVentureChat get() { return i; diff --git a/src/main/java/com/massivecraft/factions/integration/venturechat/IntegrationVentureChat.java b/src/main/java/com/massivecraft/factions/integration/venturechat/IntegrationVentureChat.java index 85e3150a..d2e37e1d 100644 --- a/src/main/java/com/massivecraft/factions/integration/venturechat/IntegrationVentureChat.java +++ b/src/main/java/com/massivecraft/factions/integration/venturechat/IntegrationVentureChat.java @@ -8,7 +8,7 @@ public class IntegrationVentureChat extends Integration { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final IntegrationVentureChat i = new IntegrationVentureChat(); + protected static IntegrationVentureChat i = new IntegrationVentureChat(); public static IntegrationVentureChat get() { return i; diff --git a/src/main/java/com/massivecraft/factions/integration/worldguard/EngineWorldGuard.java b/src/main/java/com/massivecraft/factions/integration/worldguard/EngineWorldGuard.java index cba8e4ed..55d8bbdc 100644 --- a/src/main/java/com/massivecraft/factions/integration/worldguard/EngineWorldGuard.java +++ b/src/main/java/com/massivecraft/factions/integration/worldguard/EngineWorldGuard.java @@ -28,7 +28,7 @@ public class EngineWorldGuard extends Engine { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final EngineWorldGuard i = new EngineWorldGuard(); + protected static EngineWorldGuard i = new EngineWorldGuard(); public static EngineWorldGuard get() { return i; diff --git a/src/main/java/com/massivecraft/factions/integration/worldguard/IntegrationWorldGuard.java b/src/main/java/com/massivecraft/factions/integration/worldguard/IntegrationWorldGuard.java index af004070..c27b3a57 100644 --- a/src/main/java/com/massivecraft/factions/integration/worldguard/IntegrationWorldGuard.java +++ b/src/main/java/com/massivecraft/factions/integration/worldguard/IntegrationWorldGuard.java @@ -8,7 +8,7 @@ public class IntegrationWorldGuard extends Integration { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final IntegrationWorldGuard i = new IntegrationWorldGuard(); + protected static IntegrationWorldGuard i = new IntegrationWorldGuard(); public static IntegrationWorldGuard get() { return i; diff --git a/src/main/java/com/massivecraft/factions/mixin/PowerMixin.java b/src/main/java/com/massivecraft/factions/mixin/PowerMixin.java index f0a57517..f4e03c67 100644 --- a/src/main/java/com/massivecraft/factions/mixin/PowerMixin.java +++ b/src/main/java/com/massivecraft/factions/mixin/PowerMixin.java @@ -9,8 +9,8 @@ public class PowerMixin extends Mixin { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static PowerMixin d = new PowerMixin(); - private static final PowerMixin i = d; + protected static PowerMixin d = new PowerMixin(); + protected static PowerMixin i = d; public static PowerMixin get() { return i; diff --git a/src/main/java/com/massivecraft/factions/predicate/PredicateCommandSenderFaction.java b/src/main/java/com/massivecraft/factions/predicate/PredicateCommandSenderFaction.java index 97fe0b23..4e413ce3 100644 --- a/src/main/java/com/massivecraft/factions/predicate/PredicateCommandSenderFaction.java +++ b/src/main/java/com/massivecraft/factions/predicate/PredicateCommandSenderFaction.java @@ -5,10 +5,12 @@ import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.massivecore.util.MUtil; import org.bukkit.command.CommandSender; +import java.io.Serial; import java.io.Serializable; import java.util.function.Predicate; public class PredicateCommandSenderFaction implements Predicate, Serializable { + @Serial private static final long serialVersionUID = 1L; // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/task/TaskFlagPermCreate.java b/src/main/java/com/massivecraft/factions/task/TaskFlagPermCreate.java index caaa7de3..d6b9a6ea 100644 --- a/src/main/java/com/massivecraft/factions/task/TaskFlagPermCreate.java +++ b/src/main/java/com/massivecraft/factions/task/TaskFlagPermCreate.java @@ -16,7 +16,7 @@ public class TaskFlagPermCreate extends ModuloRepeatTask { // INSTANCE & CONSTRUCT // -------------------------------------------- // - private static final TaskFlagPermCreate i = new TaskFlagPermCreate(); + protected static TaskFlagPermCreate i = new TaskFlagPermCreate(); public static TaskFlagPermCreate get() { return i; diff --git a/src/main/java/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java b/src/main/java/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java index 75aeca2e..90198bf8 100644 --- a/src/main/java/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java +++ b/src/main/java/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java @@ -19,7 +19,7 @@ public class TaskPlayerPowerUpdate extends ModuloRepeatTask { // INSTANCE // -------------------------------------------- // - private static final TaskPlayerPowerUpdate i = new TaskPlayerPowerUpdate(); + protected static TaskPlayerPowerUpdate i = new TaskPlayerPowerUpdate(); public static TaskPlayerPowerUpdate get() { return i; diff --git a/src/main/java/com/massivecraft/factions/task/TaskTax.java b/src/main/java/com/massivecraft/factions/task/TaskTax.java index e4385102..a213680b 100644 --- a/src/main/java/com/massivecraft/factions/task/TaskTax.java +++ b/src/main/java/com/massivecraft/factions/task/TaskTax.java @@ -28,7 +28,7 @@ public class TaskTax extends Task { // INSTANCE // -------------------------------------------- // - private static final TaskTax i = new TaskTax(); + protected static TaskTax i = new TaskTax(); public static TaskTax get() { return i;