diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFGlobal.java b/src/main/java/com/massivecraft/factions/cmd/CmdFGlobal.java index 8fee8817..c9f0d2b8 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFGlobal.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdFGlobal.java @@ -9,6 +9,10 @@ import java.util.UUID; public class CmdFGlobal extends FCommand { + /** + * @author Trent + */ + public static List toggled = new ArrayList<>(); public CmdFGlobal() { diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFocus.java b/src/main/java/com/massivecraft/factions/cmd/CmdFocus.java index 56ce1f18..0ccde73d 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFocus.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdFocus.java @@ -7,6 +7,11 @@ import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.zcore.util.TL; public class CmdFocus extends FCommand { + + /** + * @author Driftay + */ + public CmdFocus() { aliases.add("focus"); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdInventorySee.java b/src/main/java/com/massivecraft/factions/cmd/CmdInventorySee.java index 6b431f09..d4017bb7 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdInventorySee.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdInventorySee.java @@ -16,6 +16,10 @@ import java.util.Objects; public class CmdInventorySee extends FCommand { + /** + * @author Driftay + */ + public CmdInventorySee() { super(); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java b/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java index 8f39a4d0..251367ec 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java @@ -6,6 +6,11 @@ import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.zcore.util.TL; public class CmdPaypalSee extends FCommand { + + /** + * @author Driftay + */ + public CmdPaypalSee() { this.aliases.add("seepaypal"); this.aliases.add("paypal"); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java b/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java index 074ba4a9..2f6bd70f 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java @@ -8,6 +8,10 @@ import com.massivecraft.factions.zcore.util.TL; public class CmdPaypalSet extends FCommand { + /** + * @author Driftay + */ + public CmdPaypalSet() { this.aliases.add("setpaypal"); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdSeeDiscord.java b/src/main/java/com/massivecraft/factions/cmd/CmdSeeDiscord.java index b37bc4a7..4522466d 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdSeeDiscord.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdSeeDiscord.java @@ -7,6 +7,10 @@ import com.massivecraft.factions.zcore.util.TL; public class CmdSeeDiscord extends FCommand{ + /** + * @author Driftay + */ + public CmdSeeDiscord() { this.aliases.add("seediscord"); this.aliases.add("discord"); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdSetDiscord.java b/src/main/java/com/massivecraft/factions/cmd/CmdSetDiscord.java index 658f6069..9597878d 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdSetDiscord.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdSetDiscord.java @@ -8,6 +8,10 @@ import com.massivecraft.factions.zcore.util.TL; public class CmdSetDiscord extends FCommand { + /** + * @author Driftay + */ + public CmdSetDiscord(){ super(); this.aliases.add("setdiscord"); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdStealth.java b/src/main/java/com/massivecraft/factions/cmd/CmdStealth.java index 89c560dd..cecc011d 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdStealth.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdStealth.java @@ -4,6 +4,11 @@ import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.zcore.util.TL; public class CmdStealth extends FCommand { + + /** + * @author Driftay + */ + public CmdStealth() { this.aliases.add("ninja"); this.aliases.add("stealth"); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdStrikes.java b/src/main/java/com/massivecraft/factions/cmd/CmdStrikes.java index 27f8589c..e4c1edc0 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdStrikes.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdStrikes.java @@ -6,6 +6,9 @@ import com.massivecraft.factions.zcore.util.TL; public class CmdStrikes extends FCommand { + /** + * @author Driftay + */ public CmdStrikesGive cmdStrikesGive = new CmdStrikesGive(); public CmdStrikesInfo cmdStrikesInfo = new CmdStrikesInfo(); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdStrikesGive.java b/src/main/java/com/massivecraft/factions/cmd/CmdStrikesGive.java index dff72694..ae5b9ae1 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdStrikesGive.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdStrikesGive.java @@ -6,6 +6,9 @@ import com.massivecraft.factions.zcore.util.TL; public class CmdStrikesGive extends FCommand { + /** + * @author Driftay + */ public CmdStrikesGive() { super(); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdStrikesInfo.java b/src/main/java/com/massivecraft/factions/cmd/CmdStrikesInfo.java index f6d61a5b..8ac8b610 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdStrikesInfo.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdStrikesInfo.java @@ -6,6 +6,10 @@ import com.massivecraft.factions.zcore.util.TL; public class CmdStrikesInfo extends FCommand { + /** + * @author Driftay + */ + public CmdStrikesInfo() { super(); this.aliases.add("info"); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdStrikesSet.java b/src/main/java/com/massivecraft/factions/cmd/CmdStrikesSet.java index e7937a8c..8290791b 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdStrikesSet.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdStrikesSet.java @@ -6,6 +6,10 @@ import com.massivecraft.factions.zcore.util.TL; public class CmdStrikesSet extends FCommand { + /** + * @author Driftay + */ + public CmdStrikesSet() { super(); this.aliases.add("set"); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdStrikesTake.java b/src/main/java/com/massivecraft/factions/cmd/CmdStrikesTake.java index e405a37b..ab5e7e6c 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdStrikesTake.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdStrikesTake.java @@ -6,6 +6,9 @@ import com.massivecraft.factions.zcore.util.TL; public class CmdStrikesTake extends FCommand { + /** + * @author Driftay + */ public CmdStrikesTake() { super(); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdViewChest.java b/src/main/java/com/massivecraft/factions/cmd/CmdViewChest.java index d7af8c36..4cbd7456 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdViewChest.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdViewChest.java @@ -7,6 +7,10 @@ import com.massivecraft.factions.zcore.util.TL; public class CmdViewChest extends FCommand { + /** + * @author Driftay + */ + public CmdViewChest() { super(); this.aliases.add("viewchest"); diff --git a/src/main/java/com/massivecraft/factions/cmd/alts/CmdAltsList.java b/src/main/java/com/massivecraft/factions/cmd/alts/CmdAltsList.java index 33f2e4a7..94c6a4b4 100644 --- a/src/main/java/com/massivecraft/factions/cmd/alts/CmdAltsList.java +++ b/src/main/java/com/massivecraft/factions/cmd/alts/CmdAltsList.java @@ -13,7 +13,6 @@ import java.util.stream.Collectors; public class CmdAltsList extends FCommand { - /** * @author Driftay */ diff --git a/src/main/java/com/massivecraft/factions/cmd/claim/CmdCorner.java b/src/main/java/com/massivecraft/factions/cmd/claim/CmdCorner.java index bb51020b..6a243c29 100644 --- a/src/main/java/com/massivecraft/factions/cmd/claim/CmdCorner.java +++ b/src/main/java/com/massivecraft/factions/cmd/claim/CmdCorner.java @@ -18,6 +18,10 @@ import java.util.List; public class CmdCorner extends FCommand { + /** + * @author Driftay + */ + public CmdCorner() { this.aliases.add("corner"); diff --git a/src/main/java/com/massivecraft/factions/cmd/points/CmdPoints.java b/src/main/java/com/massivecraft/factions/cmd/points/CmdPoints.java index 762a06d8..58ab2028 100644 --- a/src/main/java/com/massivecraft/factions/cmd/points/CmdPoints.java +++ b/src/main/java/com/massivecraft/factions/cmd/points/CmdPoints.java @@ -9,6 +9,10 @@ import com.massivecraft.factions.zcore.util.TL; public class CmdPoints extends FCommand { + /** + * @author Driftay + */ + public CmdPointsRemove cmdPointsRemove = new CmdPointsRemove(); public CmdPointsSet cmdPointsSet = new CmdPointsSet(); public CmdPointsAdd cmdPointsAdd = new CmdPointsAdd(); diff --git a/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsAdd.java b/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsAdd.java index f1964ae3..032612ff 100644 --- a/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsAdd.java +++ b/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsAdd.java @@ -11,6 +11,10 @@ import com.massivecraft.factions.zcore.util.TL; public class CmdPointsAdd extends FCommand { + /** + * @author Driftay + */ + public CmdPointsAdd() { super(); this.aliases.add("add"); diff --git a/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsRemove.java b/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsRemove.java index 6320a256..3415f28a 100644 --- a/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsRemove.java +++ b/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsRemove.java @@ -11,6 +11,10 @@ import com.massivecraft.factions.zcore.util.TL; public class CmdPointsRemove extends FCommand { + /** + * @author Driftay + */ + public CmdPointsRemove() { super(); this.aliases.add("remove"); diff --git a/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsSet.java b/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsSet.java index e3fde0f5..dbcfd190 100644 --- a/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsSet.java +++ b/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsSet.java @@ -11,6 +11,10 @@ import com.massivecraft.factions.zcore.util.TL; public class CmdPointsSet extends FCommand { + /** + * @author Driftay + */ + public CmdPointsSet() { super(); this.aliases.add("set"); diff --git a/src/main/java/com/massivecraft/factions/discord/CmdInviteBot.java b/src/main/java/com/massivecraft/factions/discord/CmdInviteBot.java index bf991a62..0ae4a7de 100644 --- a/src/main/java/com/massivecraft/factions/discord/CmdInviteBot.java +++ b/src/main/java/com/massivecraft/factions/discord/CmdInviteBot.java @@ -10,6 +10,10 @@ import net.dv8tion.jda.core.Permission; public class CmdInviteBot extends FCommand { + /** + * @author Driftay + */ + public CmdInviteBot(){ super(); this.aliases.add("invitebot"); diff --git a/src/main/java/com/massivecraft/factions/discord/CmdSetGuild.java b/src/main/java/com/massivecraft/factions/discord/CmdSetGuild.java index c8ed2bc1..7ba6732d 100644 --- a/src/main/java/com/massivecraft/factions/discord/CmdSetGuild.java +++ b/src/main/java/com/massivecraft/factions/discord/CmdSetGuild.java @@ -17,6 +17,11 @@ import org.bukkit.ChatColor; import java.util.concurrent.TimeUnit; public class CmdSetGuild extends FCommand { + + /** + * @author Driftay + */ + private EventWaiter eventWaiter; private boolean waiterAdded; diff --git a/src/main/java/com/massivecraft/factions/discord/DiscordListener.java b/src/main/java/com/massivecraft/factions/discord/DiscordListener.java index 09cd9f73..28350c3c 100644 --- a/src/main/java/com/massivecraft/factions/discord/DiscordListener.java +++ b/src/main/java/com/massivecraft/factions/discord/DiscordListener.java @@ -22,6 +22,11 @@ import java.util.*; import java.util.stream.Collectors; public class DiscordListener extends ListenerAdapter { + + /** + * @author Driftay + */ + private static File file = new File(FactionsPlugin.getInstance().getDataFolder(), "discord_guilds.json"); public static JSONGuilds guilds = loadGuilds(); private final DecimalFormat decimalFormat; diff --git a/src/main/java/com/massivecraft/factions/discord/FactionChatHandler.java b/src/main/java/com/massivecraft/factions/discord/FactionChatHandler.java index 7f0e3b5d..cb8ffacd 100644 --- a/src/main/java/com/massivecraft/factions/discord/FactionChatHandler.java +++ b/src/main/java/com/massivecraft/factions/discord/FactionChatHandler.java @@ -27,6 +27,11 @@ import java.util.List; import java.util.UUID; public class FactionChatHandler extends ListenerAdapter { + + /** + * @author Driftay + */ + public static JDA jda; private FactionsPlugin plugin; diff --git a/src/main/java/com/massivecraft/factions/discord/json/JSONGuild.java b/src/main/java/com/massivecraft/factions/discord/json/JSONGuild.java index 65561646..1cdcfe50 100644 --- a/src/main/java/com/massivecraft/factions/discord/json/JSONGuild.java +++ b/src/main/java/com/massivecraft/factions/discord/json/JSONGuild.java @@ -1,13 +1,17 @@ package com.massivecraft.factions.discord.json; public class JSONGuild { + + /** + * @author Driftay + */ + private String prefix; public JSONGuild() { this.prefix = null; } - public String getPrefix() { return this.prefix; } diff --git a/src/main/java/com/massivecraft/factions/discord/json/JSONGuilds.java b/src/main/java/com/massivecraft/factions/discord/json/JSONGuilds.java index 9a4048e7..75e464d5 100644 --- a/src/main/java/com/massivecraft/factions/discord/json/JSONGuilds.java +++ b/src/main/java/com/massivecraft/factions/discord/json/JSONGuilds.java @@ -5,6 +5,11 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class JSONGuilds { + + /** + * @author Driftay + */ + private Map guilds; public JSONGuilds() { diff --git a/src/main/java/com/massivecraft/factions/listeners/EssentialsHomeHandler.java b/src/main/java/com/massivecraft/factions/listeners/EssentialsHomeHandler.java index 4de7d638..859e701c 100644 --- a/src/main/java/com/massivecraft/factions/listeners/EssentialsHomeHandler.java +++ b/src/main/java/com/massivecraft/factions/listeners/EssentialsHomeHandler.java @@ -17,6 +17,10 @@ import java.util.logging.Level; public class EssentialsHomeHandler implements Listener { + /** + * @author Driftay + */ + private IEssentials ess; public EssentialsHomeHandler(IEssentials essentials) { diff --git a/src/main/java/com/massivecraft/factions/missions/CmdMissions.java b/src/main/java/com/massivecraft/factions/missions/CmdMissions.java index 35976186..7027fbb9 100644 --- a/src/main/java/com/massivecraft/factions/missions/CmdMissions.java +++ b/src/main/java/com/massivecraft/factions/missions/CmdMissions.java @@ -9,6 +9,10 @@ import com.massivecraft.factions.zcore.util.TL; public class CmdMissions extends FCommand { + /** + * @author Driftay + */ + public CmdMissions() { this.aliases.add("missions"); this.aliases.add("mission"); diff --git a/src/main/java/com/massivecraft/factions/missions/Mission.java b/src/main/java/com/massivecraft/factions/missions/Mission.java index 55e2cc3d..768f51d9 100644 --- a/src/main/java/com/massivecraft/factions/missions/Mission.java +++ b/src/main/java/com/massivecraft/factions/missions/Mission.java @@ -1,6 +1,11 @@ package com.massivecraft.factions.missions; public class Mission { + + /** + * @author Driftay + */ + private long progress; private String name; private String type; diff --git a/src/main/java/com/massivecraft/factions/missions/MissionGUI.java b/src/main/java/com/massivecraft/factions/missions/MissionGUI.java index d76c6dc9..48978b96 100644 --- a/src/main/java/com/massivecraft/factions/missions/MissionGUI.java +++ b/src/main/java/com/massivecraft/factions/missions/MissionGUI.java @@ -16,6 +16,11 @@ import org.bukkit.inventory.meta.ItemMeta; import java.util.*; public class MissionGUI implements FactionGUI { + + /** + * @author Driftay + */ + private FactionsPlugin plugin; private FPlayer fPlayer; private Inventory inventory; diff --git a/src/main/java/com/massivecraft/factions/missions/MissionHandler.java b/src/main/java/com/massivecraft/factions/missions/MissionHandler.java index 7fc7d8f9..c2cc6644 100644 --- a/src/main/java/com/massivecraft/factions/missions/MissionHandler.java +++ b/src/main/java/com/massivecraft/factions/missions/MissionHandler.java @@ -22,6 +22,10 @@ import java.util.stream.Collectors; public class MissionHandler implements Listener { + /** + * @author Driftay + */ + private FactionsPlugin plugin; public MissionHandler(FactionsPlugin plugin) { diff --git a/src/main/java/com/massivecraft/factions/shop/CmdShop.java b/src/main/java/com/massivecraft/factions/shop/CmdShop.java index 7add1c30..1e7bfdc0 100644 --- a/src/main/java/com/massivecraft/factions/shop/CmdShop.java +++ b/src/main/java/com/massivecraft/factions/shop/CmdShop.java @@ -9,6 +9,10 @@ import com.massivecraft.factions.zcore.util.TL; public class CmdShop extends FCommand { + /** + * @author Driftay + */ + public CmdShop() { super(); this.aliases.add("shop"); diff --git a/src/main/java/com/massivecraft/factions/shop/ShopConfig.java b/src/main/java/com/massivecraft/factions/shop/ShopConfig.java index 492d2cbb..d6a4a568 100644 --- a/src/main/java/com/massivecraft/factions/shop/ShopConfig.java +++ b/src/main/java/com/massivecraft/factions/shop/ShopConfig.java @@ -9,6 +9,10 @@ import java.util.ArrayList; public class ShopConfig { + /** + * @author Driftay + */ + //TODO: Shop YAML Converter mySQL public static File shop = new File("plugins/Factions/shop.yml"); diff --git a/src/main/java/com/massivecraft/factions/shop/ShopGUIFrame.java b/src/main/java/com/massivecraft/factions/shop/ShopGUIFrame.java index 4f83ccb4..320e3509 100644 --- a/src/main/java/com/massivecraft/factions/shop/ShopGUIFrame.java +++ b/src/main/java/com/massivecraft/factions/shop/ShopGUIFrame.java @@ -25,6 +25,10 @@ import java.util.stream.Collectors; public class ShopGUIFrame { + /** + * @author Driftay + */ + private Gui gui; private String s; diff --git a/src/main/java/com/massivecraft/factions/skript/expressions/player/PlayerChunkLocationExpression.java b/src/main/java/com/massivecraft/factions/skript/expressions/player/PlayerChunkLocationExpression.java index ca65fe11..5711302d 100644 --- a/src/main/java/com/massivecraft/factions/skript/expressions/player/PlayerChunkLocationExpression.java +++ b/src/main/java/com/massivecraft/factions/skript/expressions/player/PlayerChunkLocationExpression.java @@ -12,6 +12,10 @@ import org.bukkit.event.Event; public class PlayerChunkLocationExpression extends SimpleExpression { + /** + * @author Driftay + */ + static { Skript.registerExpression(PlayerChunkLocationExpression.class, String.class, ExpressionType.SIMPLE, "[the] faction chunk at %player%", "[the] %player%['s] chunk"); } diff --git a/src/main/java/com/massivecraft/factions/struct/BanInfo.java b/src/main/java/com/massivecraft/factions/struct/BanInfo.java index 365d7a31..4146503e 100644 --- a/src/main/java/com/massivecraft/factions/struct/BanInfo.java +++ b/src/main/java/com/massivecraft/factions/struct/BanInfo.java @@ -2,6 +2,10 @@ package com.massivecraft.factions.struct; public class BanInfo { + /** + * @author FactionsUUID Team + */ + // FPlayer IDs private final String banner; private final String banned; diff --git a/src/main/java/com/massivecraft/factions/struct/ChatMode.java b/src/main/java/com/massivecraft/factions/struct/ChatMode.java index 34536416..90403dc3 100644 --- a/src/main/java/com/massivecraft/factions/struct/ChatMode.java +++ b/src/main/java/com/massivecraft/factions/struct/ChatMode.java @@ -3,6 +3,11 @@ package com.massivecraft.factions.struct; import com.massivecraft.factions.zcore.util.TL; public enum ChatMode { + + /** + * @author FactionsUUID Team + */ + MOD(4, TL.CHAT_MOD), FACTION(3, TL.CHAT_FACTION), ALLIANCE(2, TL.CHAT_ALLIANCE), diff --git a/src/main/java/com/massivecraft/factions/struct/Permission.java b/src/main/java/com/massivecraft/factions/struct/Permission.java index e8828a09..e5c6244a 100755 --- a/src/main/java/com/massivecraft/factions/struct/Permission.java +++ b/src/main/java/com/massivecraft/factions/struct/Permission.java @@ -4,6 +4,12 @@ import com.massivecraft.factions.FactionsPlugin; import org.bukkit.command.CommandSender; public enum Permission { + + /** + * @author FactionsUUID Team + */ + + MANAGE_SAFE_ZONE("managesafezone"), MANAGE_WAR_ZONE("managewarzone"), OWNERSHIP_BYPASS("ownershipbypass"), diff --git a/src/main/java/com/massivecraft/factions/struct/Placeholder.java b/src/main/java/com/massivecraft/factions/struct/Placeholder.java index a1b9a6cc..115a13ec 100644 --- a/src/main/java/com/massivecraft/factions/struct/Placeholder.java +++ b/src/main/java/com/massivecraft/factions/struct/Placeholder.java @@ -3,6 +3,11 @@ package com.massivecraft.factions.struct; public class Placeholder { + /** + * @author Illyria Team + */ + + private String tag; private String replace; diff --git a/src/main/java/com/massivecraft/factions/struct/Relation.java b/src/main/java/com/massivecraft/factions/struct/Relation.java index de812042..b482e722 100644 --- a/src/main/java/com/massivecraft/factions/struct/Relation.java +++ b/src/main/java/com/massivecraft/factions/struct/Relation.java @@ -16,6 +16,12 @@ import java.util.List; public enum Relation implements Permissable { + + /** + * @author Illyria Team + */ + + MEMBER(4, TL.RELATION_MEMBER_SINGULAR.toString()), ALLY(3, TL.RELATION_ALLY_SINGULAR.toString()), TRUCE(2, TL.RELATION_TRUCE_SINGULAR.toString()), diff --git a/src/main/java/com/massivecraft/factions/struct/Role.java b/src/main/java/com/massivecraft/factions/struct/Role.java index cbf33bde..baea28b7 100644 --- a/src/main/java/com/massivecraft/factions/struct/Role.java +++ b/src/main/java/com/massivecraft/factions/struct/Role.java @@ -16,6 +16,12 @@ import java.util.ArrayList; import java.util.List; public enum Role implements Permissable { + + /** + * @author Illyria Team + */ + + LEADER(4, TL.ROLE_LEADER), COLEADER(3, TL.ROLE_COLEADER), MODERATOR(2, TL.ROLE_MODERATOR), diff --git a/src/main/java/com/massivecraft/factions/tag/FactionTag.java b/src/main/java/com/massivecraft/factions/tag/FactionTag.java index 0e643ae3..5fddeb46 100644 --- a/src/main/java/com/massivecraft/factions/tag/FactionTag.java +++ b/src/main/java/com/massivecraft/factions/tag/FactionTag.java @@ -12,6 +12,11 @@ import java.util.function.BiFunction; import java.util.function.Function; public enum FactionTag implements Tag { + + /** + * @author FactionsUUID Team + */ + HOME_X("{x}", (fac) -> fac.hasHome() ? String.valueOf(fac.getHome().getBlockX()) : Tag.isMinimalShow() ? null : "{ig}"), HOME_Y("{y}", (fac) -> fac.hasHome() ? String.valueOf(fac.getHome().getBlockY()) : Tag.isMinimalShow() ? null : "{ig}"), HOME_Z("{z}", (fac) -> fac.hasHome() ? String.valueOf(fac.getHome().getBlockZ()) : Tag.isMinimalShow() ? null : "{ig}"), diff --git a/src/main/java/com/massivecraft/factions/tag/FancyTag.java b/src/main/java/com/massivecraft/factions/tag/FancyTag.java index 49e6beaf..421b355b 100644 --- a/src/main/java/com/massivecraft/factions/tag/FancyTag.java +++ b/src/main/java/com/massivecraft/factions/tag/FancyTag.java @@ -13,6 +13,11 @@ import org.bukkit.ChatColor; import java.util.*; public enum FancyTag implements Tag { + + /** + * @author FactionsUUID Team + */ + ALLIES_LIST("{allies-list}", (target, fme, prefix, gm) -> processRelation(prefix, target, fme, Relation.ALLY)), ENEMIES_LIST("{enemies-list}", (target, fme, prefix, gm) -> processRelation(prefix, target, fme, Relation.ENEMY)), TRUCES_LIST("{truces-list}", (target, fme, prefix, gm) -> processRelation(prefix, target, fme, Relation.TRUCE)), diff --git a/src/main/java/com/massivecraft/factions/tag/GeneralTag.java b/src/main/java/com/massivecraft/factions/tag/GeneralTag.java index d7eb5aa3..b419838c 100644 --- a/src/main/java/com/massivecraft/factions/tag/GeneralTag.java +++ b/src/main/java/com/massivecraft/factions/tag/GeneralTag.java @@ -9,6 +9,11 @@ import org.bukkit.Bukkit; import java.util.function.Supplier; public enum GeneralTag implements Tag { + + /** + * @author FactionsUUID Team + */ + MAX_WARPS("{max-warps}", () -> String.valueOf(FactionsPlugin.getInstance().getConfig().getInt("max-warps", 5))), MAX_ALLIES("{max-allies}", () -> getRelation("ally")), MAX_ENEMIES("{max-enemies}", () -> getRelation("enemy")), diff --git a/src/main/java/com/massivecraft/factions/tag/PlayerTag.java b/src/main/java/com/massivecraft/factions/tag/PlayerTag.java index f6d396f8..3ad132ef 100644 --- a/src/main/java/com/massivecraft/factions/tag/PlayerTag.java +++ b/src/main/java/com/massivecraft/factions/tag/PlayerTag.java @@ -11,6 +11,11 @@ import org.bukkit.entity.Player; import java.util.function.Function; public enum PlayerTag implements Tag { + + /** + * @author FactionsUUID Team + */ + LAST_SEEN("{lastSeen}", (fp) -> { String humanized = DurationFormatUtils.formatDurationWords(System.currentTimeMillis() - fp.getLastLoginTime(), true, true) + TL.COMMAND_STATUS_AGOSUFFIX; return fp.isOnline() ? ChatColor.GREEN + TL.COMMAND_STATUS_ONLINE.toString() : (System.currentTimeMillis() - fp.getLastLoginTime() < 432000000 ? ChatColor.YELLOW + humanized : ChatColor.RED + humanized); diff --git a/src/main/java/com/massivecraft/factions/tag/Tag.java b/src/main/java/com/massivecraft/factions/tag/Tag.java index 39b573e5..982ec02e 100644 --- a/src/main/java/com/massivecraft/factions/tag/Tag.java +++ b/src/main/java/com/massivecraft/factions/tag/Tag.java @@ -7,6 +7,11 @@ import me.clip.placeholderapi.PlaceholderAPI; import org.bukkit.entity.Player; public interface Tag { + + /** + * @author FactionsUUID Team + */ + int ARBITRARY_LIMIT = 25000; /**