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

Removes transient static

Browse Source
This commit is contained in:
Kristian Knarvik 2023-06-23 21:40:33 +02:00
parent a52f736c74
commit 9986e940c5
7 changed files with 103 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/massivecraft/factions/entity/Board.java
View File

@ -16,7 +16,7 @@ import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class Board extends Entity<Board> implements BoardInterface { public class Board extends Entity<Board> implements BoardInterface {
public static final transient Type MAP_TYPE = new TypeToken<Map<PS, TerritoryAccess>>() { public static final Type MAP_TYPE = new TypeToken<Map<PS, TerritoryAccess>>() {
}.getType(); }.getType();
// -------------------------------------------- // // -------------------------------------------- //

6
src/main/java/com/massivecraft/factions/entity/Faction.java
View File

@ -50,8 +50,8 @@ public class Faction extends Entity<Faction> implements FactionsParticipator, MP
// CONSTANTS // CONSTANTS
// -------------------------------------------- // // -------------------------------------------- //
public static final transient String NODESCRIPTION = Txt.parse("<em><silver>no description set"); public static final String NODESCRIPTION = Txt.parse("<em><silver>no description set");
public static final transient String NOMOTD = Txt.parse("<em><silver>no message of the day set"); public static final String NOMOTD = Txt.parse("<em><silver>no message of the day set");
// -------------------------------------------- // // -------------------------------------------- //
// META // META
@ -165,7 +165,7 @@ public class Faction extends Entity<Faction> implements FactionsParticipator, MP
// What is the base tax on members of the faction? // What is the base tax on members of the faction?
// Specific taxes on ranks or players. // Specific taxes on ranks or players.
public static transient String IDENTIFIER_TAX_BASE = "base"; public static String IDENTIFIER_TAX_BASE = "base";
private Map<String, Double> tax = new MassiveMap<>(); private Map<String, Double> tax = new MassiveMap<>();

2
src/main/java/com/massivecraft/factions/entity/MConf.java
View File

@ -33,7 +33,7 @@ public class MConf extends Entity<MConf> {
// META // META
// -------------------------------------------- // // -------------------------------------------- //
protected static transient MConf i; protected static MConf i;
public static MConf get() { public static MConf get() {
return i; return i;

68
src/main/java/com/massivecraft/factions/entity/MFlag.java
View File

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

112
src/main/java/com/massivecraft/factions/entity/MPerm.java
View File

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

2
src/main/java/com/massivecraft/factions/entity/MPlayer.java
View File

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

14
src/main/java/com/massivecraft/factions/integration/dynmap/IntegrationDynmap.java
View File

@ -21,13 +21,13 @@ public class IntegrationDynmap extends Integration {
public final static String FACTIONS_AREA = FACTIONS_ + "area"; public final static String FACTIONS_AREA = FACTIONS_ + "area";
public final static String FACTIONS_AREA_ = FACTIONS_AREA + "_"; public final static String FACTIONS_AREA_ = FACTIONS_AREA + "_";
public final static transient String DYNMAP_STYLE_LINE_COLOR = "#00FF00"; public final static String DYNMAP_STYLE_LINE_COLOR = "#00FF00";
public final static transient double DYNMAP_STYLE_LINE_OPACITY = 0.8D; public final static double DYNMAP_STYLE_LINE_OPACITY = 0.8D;
public final static transient int DYNMAP_STYLE_LINE_WEIGHT = 3; public final static int DYNMAP_STYLE_LINE_WEIGHT = 3;
public final static transient String DYNMAP_STYLE_FILL_COLOR = "#00FF00"; public final static String DYNMAP_STYLE_FILL_COLOR = "#00FF00";
public final static transient double DYNMAP_STYLE_FILL_OPACITY = 0.35D; public final static double DYNMAP_STYLE_FILL_OPACITY = 0.35D;
public final static transient String DYNMAP_STYLE_HOME_MARKER = "greenflag"; public final static String DYNMAP_STYLE_HOME_MARKER = "greenflag";
public final static transient boolean DYNMAP_STYLE_BOOST = false; public final static boolean DYNMAP_STYLE_BOOST = false;
// -------------------------------------------- // // -------------------------------------------- //
// INSTANCE & CONSTRUCT // INSTANCE & CONSTRUCT