More Credit

This commit is contained in:
Driftay 2019-12-02 14:03:27 -05:00
parent f437144fba
commit d03ca58105
46 changed files with 200 additions and 2 deletions

View File

@ -9,6 +9,10 @@ import java.util.UUID;
public class CmdFGlobal extends FCommand { public class CmdFGlobal extends FCommand {
/**
* @author Trent
*/
public static List<UUID> toggled = new ArrayList<>(); public static List<UUID> toggled = new ArrayList<>();
public CmdFGlobal() { public CmdFGlobal() {

View File

@ -7,6 +7,11 @@ import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
public class CmdFocus extends FCommand { public class CmdFocus extends FCommand {
/**
* @author Driftay
*/
public CmdFocus() { public CmdFocus() {
aliases.add("focus"); aliases.add("focus");

View File

@ -16,6 +16,10 @@ import java.util.Objects;
public class CmdInventorySee extends FCommand { public class CmdInventorySee extends FCommand {
/**
* @author Driftay
*/
public CmdInventorySee() { public CmdInventorySee() {
super(); super();

View File

@ -6,6 +6,11 @@ import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
public class CmdPaypalSee extends FCommand { public class CmdPaypalSee extends FCommand {
/**
* @author Driftay
*/
public CmdPaypalSee() { public CmdPaypalSee() {
this.aliases.add("seepaypal"); this.aliases.add("seepaypal");
this.aliases.add("paypal"); this.aliases.add("paypal");

View File

@ -8,6 +8,10 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdPaypalSet extends FCommand { public class CmdPaypalSet extends FCommand {
/**
* @author Driftay
*/
public CmdPaypalSet() { public CmdPaypalSet() {
this.aliases.add("setpaypal"); this.aliases.add("setpaypal");

View File

@ -7,6 +7,10 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdSeeDiscord extends FCommand{ public class CmdSeeDiscord extends FCommand{
/**
* @author Driftay
*/
public CmdSeeDiscord() { public CmdSeeDiscord() {
this.aliases.add("seediscord"); this.aliases.add("seediscord");
this.aliases.add("discord"); this.aliases.add("discord");

View File

@ -8,6 +8,10 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdSetDiscord extends FCommand { public class CmdSetDiscord extends FCommand {
/**
* @author Driftay
*/
public CmdSetDiscord(){ public CmdSetDiscord(){
super(); super();
this.aliases.add("setdiscord"); this.aliases.add("setdiscord");

View File

@ -4,6 +4,11 @@ import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
public class CmdStealth extends FCommand { public class CmdStealth extends FCommand {
/**
* @author Driftay
*/
public CmdStealth() { public CmdStealth() {
this.aliases.add("ninja"); this.aliases.add("ninja");
this.aliases.add("stealth"); this.aliases.add("stealth");

View File

@ -6,6 +6,9 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdStrikes extends FCommand { public class CmdStrikes extends FCommand {
/**
* @author Driftay
*/
public CmdStrikesGive cmdStrikesGive = new CmdStrikesGive(); public CmdStrikesGive cmdStrikesGive = new CmdStrikesGive();
public CmdStrikesInfo cmdStrikesInfo = new CmdStrikesInfo(); public CmdStrikesInfo cmdStrikesInfo = new CmdStrikesInfo();

View File

@ -6,6 +6,9 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdStrikesGive extends FCommand { public class CmdStrikesGive extends FCommand {
/**
* @author Driftay
*/
public CmdStrikesGive() { public CmdStrikesGive() {
super(); super();

View File

@ -6,6 +6,10 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdStrikesInfo extends FCommand { public class CmdStrikesInfo extends FCommand {
/**
* @author Driftay
*/
public CmdStrikesInfo() { public CmdStrikesInfo() {
super(); super();
this.aliases.add("info"); this.aliases.add("info");

View File

@ -6,6 +6,10 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdStrikesSet extends FCommand { public class CmdStrikesSet extends FCommand {
/**
* @author Driftay
*/
public CmdStrikesSet() { public CmdStrikesSet() {
super(); super();
this.aliases.add("set"); this.aliases.add("set");

View File

@ -6,6 +6,9 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdStrikesTake extends FCommand { public class CmdStrikesTake extends FCommand {
/**
* @author Driftay
*/
public CmdStrikesTake() { public CmdStrikesTake() {
super(); super();

View File

@ -7,6 +7,10 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdViewChest extends FCommand { public class CmdViewChest extends FCommand {
/**
* @author Driftay
*/
public CmdViewChest() { public CmdViewChest() {
super(); super();
this.aliases.add("viewchest"); this.aliases.add("viewchest");

View File

@ -13,7 +13,6 @@ import java.util.stream.Collectors;
public class CmdAltsList extends FCommand { public class CmdAltsList extends FCommand {
/** /**
* @author Driftay * @author Driftay
*/ */

View File

@ -18,6 +18,10 @@ import java.util.List;
public class CmdCorner extends FCommand { public class CmdCorner extends FCommand {
/**
* @author Driftay
*/
public CmdCorner() { public CmdCorner() {
this.aliases.add("corner"); this.aliases.add("corner");

View File

@ -9,6 +9,10 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdPoints extends FCommand { public class CmdPoints extends FCommand {
/**
* @author Driftay
*/
public CmdPointsRemove cmdPointsRemove = new CmdPointsRemove(); public CmdPointsRemove cmdPointsRemove = new CmdPointsRemove();
public CmdPointsSet cmdPointsSet = new CmdPointsSet(); public CmdPointsSet cmdPointsSet = new CmdPointsSet();
public CmdPointsAdd cmdPointsAdd = new CmdPointsAdd(); public CmdPointsAdd cmdPointsAdd = new CmdPointsAdd();

View File

@ -11,6 +11,10 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdPointsAdd extends FCommand { public class CmdPointsAdd extends FCommand {
/**
* @author Driftay
*/
public CmdPointsAdd() { public CmdPointsAdd() {
super(); super();
this.aliases.add("add"); this.aliases.add("add");

View File

@ -11,6 +11,10 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdPointsRemove extends FCommand { public class CmdPointsRemove extends FCommand {
/**
* @author Driftay
*/
public CmdPointsRemove() { public CmdPointsRemove() {
super(); super();
this.aliases.add("remove"); this.aliases.add("remove");

View File

@ -11,6 +11,10 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdPointsSet extends FCommand { public class CmdPointsSet extends FCommand {
/**
* @author Driftay
*/
public CmdPointsSet() { public CmdPointsSet() {
super(); super();
this.aliases.add("set"); this.aliases.add("set");

View File

@ -10,6 +10,10 @@ import net.dv8tion.jda.core.Permission;
public class CmdInviteBot extends FCommand { public class CmdInviteBot extends FCommand {
/**
* @author Driftay
*/
public CmdInviteBot(){ public CmdInviteBot(){
super(); super();
this.aliases.add("invitebot"); this.aliases.add("invitebot");

View File

@ -17,6 +17,11 @@ import org.bukkit.ChatColor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
public class CmdSetGuild extends FCommand { public class CmdSetGuild extends FCommand {
/**
* @author Driftay
*/
private EventWaiter eventWaiter; private EventWaiter eventWaiter;
private boolean waiterAdded; private boolean waiterAdded;

View File

@ -22,6 +22,11 @@ import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class DiscordListener extends ListenerAdapter { public class DiscordListener extends ListenerAdapter {
/**
* @author Driftay
*/
private static File file = new File(FactionsPlugin.getInstance().getDataFolder(), "discord_guilds.json"); private static File file = new File(FactionsPlugin.getInstance().getDataFolder(), "discord_guilds.json");
public static JSONGuilds guilds = loadGuilds(); public static JSONGuilds guilds = loadGuilds();
private final DecimalFormat decimalFormat; private final DecimalFormat decimalFormat;

View File

@ -27,6 +27,11 @@ import java.util.List;
import java.util.UUID; import java.util.UUID;
public class FactionChatHandler extends ListenerAdapter { public class FactionChatHandler extends ListenerAdapter {
/**
* @author Driftay
*/
public static JDA jda; public static JDA jda;
private FactionsPlugin plugin; private FactionsPlugin plugin;

View File

@ -1,13 +1,17 @@
package com.massivecraft.factions.discord.json; package com.massivecraft.factions.discord.json;
public class JSONGuild { public class JSONGuild {
/**
* @author Driftay
*/
private String prefix; private String prefix;
public JSONGuild() { public JSONGuild() {
this.prefix = null; this.prefix = null;
} }
public String getPrefix() { public String getPrefix() {
return this.prefix; return this.prefix;
} }

View File

@ -5,6 +5,11 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
public class JSONGuilds { public class JSONGuilds {
/**
* @author Driftay
*/
private Map<String, JSONGuild> guilds; private Map<String, JSONGuild> guilds;
public JSONGuilds() { public JSONGuilds() {

View File

@ -17,6 +17,10 @@ import java.util.logging.Level;
public class EssentialsHomeHandler implements Listener { public class EssentialsHomeHandler implements Listener {
/**
* @author Driftay
*/
private IEssentials ess; private IEssentials ess;
public EssentialsHomeHandler(IEssentials essentials) { public EssentialsHomeHandler(IEssentials essentials) {

View File

@ -9,6 +9,10 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdMissions extends FCommand { public class CmdMissions extends FCommand {
/**
* @author Driftay
*/
public CmdMissions() { public CmdMissions() {
this.aliases.add("missions"); this.aliases.add("missions");
this.aliases.add("mission"); this.aliases.add("mission");

View File

@ -1,6 +1,11 @@
package com.massivecraft.factions.missions; package com.massivecraft.factions.missions;
public class Mission { public class Mission {
/**
* @author Driftay
*/
private long progress; private long progress;
private String name; private String name;
private String type; private String type;

View File

@ -16,6 +16,11 @@ import org.bukkit.inventory.meta.ItemMeta;
import java.util.*; import java.util.*;
public class MissionGUI implements FactionGUI { public class MissionGUI implements FactionGUI {
/**
* @author Driftay
*/
private FactionsPlugin plugin; private FactionsPlugin plugin;
private FPlayer fPlayer; private FPlayer fPlayer;
private Inventory inventory; private Inventory inventory;

View File

@ -22,6 +22,10 @@ import java.util.stream.Collectors;
public class MissionHandler implements Listener { public class MissionHandler implements Listener {
/**
* @author Driftay
*/
private FactionsPlugin plugin; private FactionsPlugin plugin;
public MissionHandler(FactionsPlugin plugin) { public MissionHandler(FactionsPlugin plugin) {

View File

@ -9,6 +9,10 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdShop extends FCommand { public class CmdShop extends FCommand {
/**
* @author Driftay
*/
public CmdShop() { public CmdShop() {
super(); super();
this.aliases.add("shop"); this.aliases.add("shop");

View File

@ -9,6 +9,10 @@ import java.util.ArrayList;
public class ShopConfig { public class ShopConfig {
/**
* @author Driftay
*/
//TODO: Shop YAML Converter mySQL //TODO: Shop YAML Converter mySQL
public static File shop = new File("plugins/Factions/shop.yml"); public static File shop = new File("plugins/Factions/shop.yml");

View File

@ -25,6 +25,10 @@ import java.util.stream.Collectors;
public class ShopGUIFrame { public class ShopGUIFrame {
/**
* @author Driftay
*/
private Gui gui; private Gui gui;
private String s; private String s;

View File

@ -12,6 +12,10 @@ import org.bukkit.event.Event;
public class PlayerChunkLocationExpression extends SimpleExpression<String> { public class PlayerChunkLocationExpression extends SimpleExpression<String> {
/**
* @author Driftay
*/
static { static {
Skript.registerExpression(PlayerChunkLocationExpression.class, String.class, ExpressionType.SIMPLE, "[the] faction chunk at %player%", "[the] %player%['s] chunk"); Skript.registerExpression(PlayerChunkLocationExpression.class, String.class, ExpressionType.SIMPLE, "[the] faction chunk at %player%", "[the] %player%['s] chunk");
} }

View File

@ -2,6 +2,10 @@ package com.massivecraft.factions.struct;
public class BanInfo { public class BanInfo {
/**
* @author FactionsUUID Team
*/
// FPlayer IDs // FPlayer IDs
private final String banner; private final String banner;
private final String banned; private final String banned;

View File

@ -3,6 +3,11 @@ package com.massivecraft.factions.struct;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
public enum ChatMode { public enum ChatMode {
/**
* @author FactionsUUID Team
*/
MOD(4, TL.CHAT_MOD), MOD(4, TL.CHAT_MOD),
FACTION(3, TL.CHAT_FACTION), FACTION(3, TL.CHAT_FACTION),
ALLIANCE(2, TL.CHAT_ALLIANCE), ALLIANCE(2, TL.CHAT_ALLIANCE),

View File

@ -4,6 +4,12 @@ import com.massivecraft.factions.FactionsPlugin;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
public enum Permission { public enum Permission {
/**
* @author FactionsUUID Team
*/
MANAGE_SAFE_ZONE("managesafezone"), MANAGE_SAFE_ZONE("managesafezone"),
MANAGE_WAR_ZONE("managewarzone"), MANAGE_WAR_ZONE("managewarzone"),
OWNERSHIP_BYPASS("ownershipbypass"), OWNERSHIP_BYPASS("ownershipbypass"),

View File

@ -3,6 +3,11 @@ package com.massivecraft.factions.struct;
public class Placeholder { public class Placeholder {
/**
* @author Illyria Team
*/
private String tag; private String tag;
private String replace; private String replace;

View File

@ -16,6 +16,12 @@ import java.util.List;
public enum Relation implements Permissable { public enum Relation implements Permissable {
/**
* @author Illyria Team
*/
MEMBER(4, TL.RELATION_MEMBER_SINGULAR.toString()), MEMBER(4, TL.RELATION_MEMBER_SINGULAR.toString()),
ALLY(3, TL.RELATION_ALLY_SINGULAR.toString()), ALLY(3, TL.RELATION_ALLY_SINGULAR.toString()),
TRUCE(2, TL.RELATION_TRUCE_SINGULAR.toString()), TRUCE(2, TL.RELATION_TRUCE_SINGULAR.toString()),

View File

@ -16,6 +16,12 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public enum Role implements Permissable { public enum Role implements Permissable {
/**
* @author Illyria Team
*/
LEADER(4, TL.ROLE_LEADER), LEADER(4, TL.ROLE_LEADER),
COLEADER(3, TL.ROLE_COLEADER), COLEADER(3, TL.ROLE_COLEADER),
MODERATOR(2, TL.ROLE_MODERATOR), MODERATOR(2, TL.ROLE_MODERATOR),

View File

@ -12,6 +12,11 @@ import java.util.function.BiFunction;
import java.util.function.Function; import java.util.function.Function;
public enum FactionTag implements Tag { public enum FactionTag implements Tag {
/**
* @author FactionsUUID Team
*/
HOME_X("{x}", (fac) -> fac.hasHome() ? String.valueOf(fac.getHome().getBlockX()) : Tag.isMinimalShow() ? null : "{ig}"), 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_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}"), HOME_Z("{z}", (fac) -> fac.hasHome() ? String.valueOf(fac.getHome().getBlockZ()) : Tag.isMinimalShow() ? null : "{ig}"),

View File

@ -13,6 +13,11 @@ import org.bukkit.ChatColor;
import java.util.*; import java.util.*;
public enum FancyTag implements Tag { public enum FancyTag implements Tag {
/**
* @author FactionsUUID Team
*/
ALLIES_LIST("{allies-list}", (target, fme, prefix, gm) -> processRelation(prefix, target, fme, Relation.ALLY)), 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)), 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)), TRUCES_LIST("{truces-list}", (target, fme, prefix, gm) -> processRelation(prefix, target, fme, Relation.TRUCE)),

View File

@ -9,6 +9,11 @@ import org.bukkit.Bukkit;
import java.util.function.Supplier; import java.util.function.Supplier;
public enum GeneralTag implements Tag { public enum GeneralTag implements Tag {
/**
* @author FactionsUUID Team
*/
MAX_WARPS("{max-warps}", () -> String.valueOf(FactionsPlugin.getInstance().getConfig().getInt("max-warps", 5))), MAX_WARPS("{max-warps}", () -> String.valueOf(FactionsPlugin.getInstance().getConfig().getInt("max-warps", 5))),
MAX_ALLIES("{max-allies}", () -> getRelation("ally")), MAX_ALLIES("{max-allies}", () -> getRelation("ally")),
MAX_ENEMIES("{max-enemies}", () -> getRelation("enemy")), MAX_ENEMIES("{max-enemies}", () -> getRelation("enemy")),

View File

@ -11,6 +11,11 @@ import org.bukkit.entity.Player;
import java.util.function.Function; import java.util.function.Function;
public enum PlayerTag implements Tag { public enum PlayerTag implements Tag {
/**
* @author FactionsUUID Team
*/
LAST_SEEN("{lastSeen}", (fp) -> { LAST_SEEN("{lastSeen}", (fp) -> {
String humanized = DurationFormatUtils.formatDurationWords(System.currentTimeMillis() - fp.getLastLoginTime(), true, true) + TL.COMMAND_STATUS_AGOSUFFIX; 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); return fp.isOnline() ? ChatColor.GREEN + TL.COMMAND_STATUS_ONLINE.toString() : (System.currentTimeMillis() - fp.getLastLoginTime() < 432000000 ? ChatColor.YELLOW + humanized : ChatColor.RED + humanized);

View File

@ -7,6 +7,11 @@ import me.clip.placeholderapi.PlaceholderAPI;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public interface Tag { public interface Tag {
/**
* @author FactionsUUID Team
*/
int ARBITRARY_LIMIT = 25000; int ARBITRARY_LIMIT = 25000;
/** /**