EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes some incompatibility between final and stupid reflection

Browse Source
This commit is contained in:
Kristian Knarvik
2023-06-24 03:48:33 +02:00
parent 75140cf97b
commit 8900d01f56
114 changed files with 246 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/massivecraft/factions/cmd/CmdFactions.java
View File

@@ -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;

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsFly.java
View File

@@ -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;

3
src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java
View File

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

3
src/main/java/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java
View File

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

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsPermViewall.java
View File

@@ -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;

4
src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetAll.java
View File

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

5
src/main/java/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java
View File

@@ -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;

5
src/main/java/com/massivecraft/factions/cmd/req/ReqFactionWarpsEnabled.java
View File

@@ -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;

5
src/main/java/com/massivecraft/factions/cmd/req/ReqHasFaction.java
View File

@@ -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;

5
src/main/java/com/massivecraft/factions/cmd/req/ReqHasntFaction.java
View File

@@ -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;

3
src/main/java/com/massivecraft/factions/cmd/req/ReqRankIsAtLeast.java
View File

@@ -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;
// -------------------------------------------- //

5
src/main/java/com/massivecraft/factions/cmd/req/ReqTaxEnabled.java
View File

@@ -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;

2
src/main/java/com/massivecraft/factions/cmd/type/TypeFaction.java
View File

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

2
src/main/java/com/massivecraft/factions/cmd/type/TypeFactionChunkChangeType.java
View File

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

2
src/main/java/com/massivecraft/factions/cmd/type/TypeFactionNameLenient.java
View File

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

2
src/main/java/com/massivecraft/factions/cmd/type/TypeFactionNameStrict.java
View File

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

2
src/main/java/com/massivecraft/factions/cmd/type/TypeMFlag.java
View File

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

2
src/main/java/com/massivecraft/factions/cmd/type/TypeMPerm.java
View File

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

19
src/main/java/com/massivecraft/factions/cmd/type/TypeMPermable.java
View File

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

2
src/main/java/com/massivecraft/factions/cmd/type/TypeRank.java
View File

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

2
src/main/java/com/massivecraft/factions/cmd/type/TypeRel.java
View File

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

2
src/main/java/com/massivecraft/factions/cmd/type/TypeRelation.java
View File

@@ -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;

2
src/main/java/com/massivecraft/factions/cmd/type/TypeSortMPlayer.java
View File

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

11
src/main/java/com/massivecraft/factions/cmd/type/TypeTaxable.java
View File

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

2
src/main/java/com/massivecraft/factions/cmd/type/TypeVote.java
View File

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

2
src/main/java/com/massivecraft/factions/cmd/type/TypeWarp.java
View File

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