From fb3204ddb16d52b1169ff1ca82c522d4bc7e9fb3 Mon Sep 17 00:00:00 2001 From: AigleDev Date: Sun, 15 Sep 2019 20:53:27 +0200 Subject: [PATCH 01/12] fix an NPE and other changes --- .../factions/cmd/CmdAutoHelp.java | 2 +- .../massivecraft/factions/cmd/CmdCreate.java | 2 +- .../factions/cmd/CmdDeinvite.java | 2 +- .../massivecraft/factions/cmd/CmdHelp.java | 100 +++++++++--------- .../massivecraft/factions/cmd/CmdHome.java | 2 +- .../massivecraft/factions/cmd/CmdInvite.java | 2 +- .../massivecraft/factions/cmd/CmdKick.java | 2 +- .../factions/cmd/CmdPaypalSee.java | 8 +- .../factions/cmd/CmdPaypalSet.java | 2 +- .../massivecraft/factions/cmd/CmdSethome.java | 2 +- .../massivecraft/factions/cmd/FCommand.java | 10 +- .../listeners/EssentialsHomeHandler.java | 2 +- .../listeners/FactionsBlockListener.java | 1 - .../massivecraft/factions/zcore/MPlugin.java | 2 +- 14 files changed, 70 insertions(+), 69 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdAutoHelp.java b/src/main/java/com/massivecraft/factions/cmd/CmdAutoHelp.java index 87884a5c..7812a3d2 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdAutoHelp.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdAutoHelp.java @@ -29,7 +29,7 @@ public class CmdAutoHelp extends FCommand { for (FCommand scmd : pcmd.subCommands) { if (scmd.visibility == CommandVisibility.VISIBLE) { - lines.add(scmd.getUseageTemplate(context, true)); + lines.add(scmd.getUsageTemplate(context, true)); } // TODO deal with other visibilities } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java b/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java index a38b5833..db91043e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java @@ -90,7 +90,7 @@ public class CmdCreate extends FCommand { follower.msg(TL.COMMAND_CREATE_CREATED, context.fPlayer.getName(), faction.getTag(follower)); } } - context.msg(TL.COMMAND_CREATE_YOUSHOULD, FactionsPlugin.getInstance().cmdBase.cmdDescription.getUseageTemplate(context)); + context.msg(TL.COMMAND_CREATE_YOUSHOULD, FactionsPlugin.getInstance().cmdBase.cmdDescription.getUsageTemplate(context)); if (Conf.econEnabled) Econ.setBalance(faction.getAccountId(), Conf.econFactionStartingBalance); if (Conf.logFactionCreate) FactionsPlugin.getInstance().log(context.fPlayer.getName() + TL.COMMAND_CREATE_CREATEDLOG.toString() + tag); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java b/src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java index 284e5283..cc269337 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java @@ -64,7 +64,7 @@ public class CmdDeinvite extends FCommand { if (you.getFaction() == context.faction) { context.msg(TL.COMMAND_DEINVITE_ALREADYMEMBER, you.getName(), context.faction.getTag()); - context.msg(TL.COMMAND_DEINVITE_MIGHTWANT, FactionsPlugin.getInstance().cmdBase.cmdKick.getUseageTemplate(context)); + context.msg(TL.COMMAND_DEINVITE_MIGHTWANT, FactionsPlugin.getInstance().cmdBase.cmdKick.getUsageTemplate(context)); return; } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdHelp.java b/src/main/java/com/massivecraft/factions/cmd/CmdHelp.java index e1081b04..774217be 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdHelp.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdHelp.java @@ -75,28 +75,28 @@ public class CmdHelp extends FCommand { ArrayList pageLines; pageLines = new ArrayList<>(); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdHelp.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdList.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdShow.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdPower.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdJoin.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdLeave.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdChat.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdToggleAllianceChat.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdHome.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdHelp.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdList.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdShow.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdPower.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdJoin.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdLeave.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdChat.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdToggleAllianceChat.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdHome.getUsageTemplate(context)); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_NEXTCREATE.toString())); helpPages.add(pageLines); pageLines = new ArrayList<>(); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdCreate.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdDescription.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdTag.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdCreate.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdDescription.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdTag.getUsageTemplate(context)); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_INVITATIONS.toString())); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdOpen.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdInvite.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdDeinvite.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdOpen.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdInvite.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdDeinvite.getUsageTemplate(context)); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_HOME.toString())); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdSethome.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdSethome.getUsageTemplate(context)); helpPages.add(pageLines); if (Econ.isSetup() && Conf.econEnabled && Conf.bankEnabled) { @@ -106,7 +106,7 @@ public class CmdHelp extends FCommand { pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_BANK_2.toString())); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_BANK_3.toString())); pageLines.add(""); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdMoney.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdMoney.getUsageTemplate(context)); pageLines.add(""); pageLines.add(""); pageLines.add(""); @@ -114,36 +114,36 @@ public class CmdHelp extends FCommand { } pageLines = new ArrayList<>(); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdClaim.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdAutoClaim.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdUnclaim.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdUnclaimall.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdKick.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdMod.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdAdmin.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdTitle.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdSB.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdSeeChunk.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdStatus.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdClaim.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdAutoClaim.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdUnclaim.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdUnclaimall.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdKick.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdMod.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdAdmin.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdTitle.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdSB.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdSeeChunk.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdStatus.getUsageTemplate(context)); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_PLAYERTITLES.toString())); helpPages.add(pageLines); pageLines = new ArrayList<>(); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdMap.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdBoom.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdOwner.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdOwnerList.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdMap.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdBoom.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdOwner.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdOwnerList.getUsageTemplate(context)); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_OWNERSHIP_1.toString())); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_OWNERSHIP_2.toString())); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_OWNERSHIP_3.toString())); helpPages.add(pageLines); pageLines = new ArrayList<>(); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdDisband.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdDisband.getUsageTemplate(context)); pageLines.add(""); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdRelationAlly.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdRelationNeutral.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdRelationEnemy.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdRelationAlly.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdRelationNeutral.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdRelationEnemy.getUsageTemplate(context)); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_RELATIONS_1.toString())); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_RELATIONS_2.toString())); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_RELATIONS_3.toString())); @@ -176,32 +176,32 @@ public class CmdHelp extends FCommand { pageLines = new ArrayList<>(); pageLines.add(TL.COMMAND_HELP_MOAR_1.toString()); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdBypass.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdBypass.getUsageTemplate(context)); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_ADMIN_1.toString())); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_ADMIN_2.toString())); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_ADMIN_3.toString())); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdSafeunclaimall.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdWarunclaimall.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdSafeunclaimall.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdWarunclaimall.getUsageTemplate(context)); //TODO:TL - pageLines.add(FactionsPlugin.getInstance().txt.parse("Note: " + FactionsPlugin.getInstance().cmdBase.cmdUnclaim.getUseageTemplate(context) + FactionsPlugin.getInstance().txt.parse("") + " works on safe/war zones as well.")); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdPeaceful.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().txt.parse("Note: " + FactionsPlugin.getInstance().cmdBase.cmdUnclaim.getUsageTemplate(context) + FactionsPlugin.getInstance().txt.parse("") + " works on safe/war zones as well.")); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdPeaceful.getUsageTemplate(context)); helpPages.add(pageLines); pageLines = new ArrayList<>(); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_MOAR_2.toString())); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdChatSpy.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdPermanent.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdPermanentPower.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdPowerBoost.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdConfig.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdChatSpy.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdPermanent.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdPermanentPower.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdPowerBoost.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdConfig.getUsageTemplate(context)); helpPages.add(pageLines); pageLines = new ArrayList<>(); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_MOAR_3.toString())); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdLock.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdReload.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdSaveAll.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdVersion.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdLock.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdReload.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdSaveAll.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdVersion.getUsageTemplate(context)); helpPages.add(pageLines); } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdHome.java b/src/main/java/com/massivecraft/factions/cmd/CmdHome.java index 36d838ad..30e919bf 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdHome.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdHome.java @@ -46,7 +46,7 @@ public class CmdHome extends FCommand { if (!context.faction.hasHome()) { context.msg(TL.COMMAND_HOME_NOHOME.toString() + (context.fPlayer.getRole().value < Role.MODERATOR.value ? TL.GENERIC_ASKYOURLEADER.toString() : TL.GENERIC_YOUSHOULD.toString())); - context.sendMessage(FactionsPlugin.getInstance().cmdBase.cmdSethome.getUseageTemplate(context)); + context.sendMessage(FactionsPlugin.getInstance().cmdBase.cmdSethome.getUsageTemplate(context)); return; } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdInvite.java b/src/main/java/com/massivecraft/factions/cmd/CmdInvite.java index fdaf6e57..8352e6c6 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdInvite.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdInvite.java @@ -33,7 +33,7 @@ public class CmdInvite extends FCommand { if (target.getFaction() == context.faction) { context.msg(TL.COMMAND_INVITE_ALREADYMEMBER, target.getName(), context.faction.getTag()); - context.msg(TL.GENERIC_YOUMAYWANT.toString() + FactionsPlugin.getInstance().cmdBase.cmdKick.getUseageTemplate(context)); + context.msg(TL.GENERIC_YOUMAYWANT.toString() + FactionsPlugin.getInstance().cmdBase.cmdKick.getUsageTemplate(context)); return; } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdKick.java b/src/main/java/com/massivecraft/factions/cmd/CmdKick.java index b7662261..4e92666c 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdKick.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdKick.java @@ -58,7 +58,7 @@ public class CmdKick extends FCommand { if (context.fPlayer == toKick) { context.msg(TL.COMMAND_KICK_SELF); - context.msg(TL.GENERIC_YOUMAYWANT.toString() + FactionsPlugin.getInstance().cmdBase.cmdLeave.getUseageTemplate(context)); + context.msg(TL.GENERIC_YOUMAYWANT.toString() + FactionsPlugin.getInstance().cmdBase.cmdLeave.getUsageTemplate(context)); return; } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java b/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java index cf06d90a..8f39a4d0 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java @@ -24,8 +24,10 @@ public class CmdPaypalSee extends FCommand { return; } + + if (context.args.size() == 0) { - if (context.fPlayer.getFaction().getPaypal().isEmpty()) { + if (context.fPlayer.getFaction().getPaypal() == null) { context.msg(TL.COMMAND_PAYPAL_NOTSET); } else { context.msg(TL.PAYPALSEE_PLAYER_PAYPAL, context.fPlayer.getFaction().getPaypal()); @@ -34,7 +36,7 @@ public class CmdPaypalSee extends FCommand { if (context.fPlayer.isAdminBypassing()) { Faction faction = context.argAsFaction(0); if (faction != null) { - if (faction.getPaypal().isEmpty()) { + if (faction.getPaypal() == null) { context.msg(TL.COMMAND_PAYPALSEE_FACTION_NOTSET, faction.getTag()); } else { context.msg(TL.COMMAND_PAYPALSEE_FACTION_PAYPAL.toString(), faction.getTag(), faction.getPaypal()); @@ -44,7 +46,7 @@ public class CmdPaypalSee extends FCommand { context.msg(TL.GENERIC_NOPERMISSION, "see another factions paypal."); } } else { - context.msg(FactionsPlugin.getInstance().cmdBase.cmdPaypalSee.getUseageTemplate(context)); + context.msg(FactionsPlugin.getInstance().cmdBase.cmdPaypalSee.getUsageTemplate(context)); } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java b/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java index 0fd58f83..9b839a56 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java @@ -50,7 +50,7 @@ public class CmdPaypalSet extends FCommand { context.msg(TL.GENERIC_NOPERMISSION, "set another factions paypal!"); } } else { - context.msg(FactionsPlugin.getInstance().cmdBase.cmdPaypalSet.getUseageTemplate(context)); + context.msg(FactionsPlugin.getInstance().cmdBase.cmdPaypalSet.getUsageTemplate(context)); } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdSethome.java b/src/main/java/com/massivecraft/factions/cmd/CmdSethome.java index 4e9785c8..b53c7708 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdSethome.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdSethome.java @@ -46,7 +46,7 @@ public class CmdSethome extends FCommand { faction.setHome(context.player.getLocation()); faction.msg(TL.COMMAND_SETHOME_SET, context.fPlayer.describeTo(context.faction, true)); - faction.sendMessage(FactionsPlugin.getInstance().cmdBase.cmdHome.getUseageTemplate(context)); + faction.sendMessage(FactionsPlugin.getInstance().cmdBase.cmdHome.getUsageTemplate(context)); if (faction != context.faction) { context.msg(TL.COMMAND_SETHOME_SETOTHER, faction.getTag(context.fPlayer)); } diff --git a/src/main/java/com/massivecraft/factions/cmd/FCommand.java b/src/main/java/com/massivecraft/factions/cmd/FCommand.java index f2553930..67091183 100644 --- a/src/main/java/com/massivecraft/factions/cmd/FCommand.java +++ b/src/main/java/com/massivecraft/factions/cmd/FCommand.java @@ -96,7 +96,7 @@ public abstract class FCommand { if (context.args.size() < this.requiredArgs.size()) { if (context.sender != null) { context.msg(TL.GENERIC_ARGS_TOOFEW); - context.sender.sendMessage(this.getUseageTemplate(context)); + context.sender.sendMessage(this.getUsageTemplate(context)); } return false; } @@ -106,7 +106,7 @@ public abstract class FCommand { // Get the to many string slice List theToMany = context.args.subList(this.requiredArgs.size() + this.optionalArgs.size(), context.args.size()); context.msg(TL.GENERIC_ARGS_TOOMANY, TextUtil.implode(theToMany, " ")); - context.sender.sendMessage(this.getUseageTemplate(context)); + context.sender.sendMessage(this.getUsageTemplate(context)); } return false; } @@ -200,7 +200,7 @@ public abstract class FCommand { /* Help and Usage information */ - public String getUseageTemplate(CommandContext context, boolean addShortHelp) { + public String getUsageTemplate(CommandContext context, boolean addShortHelp) { StringBuilder ret = new StringBuilder(); ret.append(FactionsPlugin.getInstance().color(TL.COMMAND_USEAGE_TEMPLATE_COLOR.toString())); ret.append('/'); @@ -241,8 +241,8 @@ public abstract class FCommand { return ret.toString(); } - public String getUseageTemplate(CommandContext context) { - return getUseageTemplate(context, false); + public String getUsageTemplate(CommandContext context) { + return getUsageTemplate(context, false); } } diff --git a/src/main/java/com/massivecraft/factions/listeners/EssentialsHomeHandler.java b/src/main/java/com/massivecraft/factions/listeners/EssentialsHomeHandler.java index 61ea94f5..4de7d638 100644 --- a/src/main/java/com/massivecraft/factions/listeners/EssentialsHomeHandler.java +++ b/src/main/java/com/massivecraft/factions/listeners/EssentialsHomeHandler.java @@ -37,7 +37,7 @@ public class EssentialsHomeHandler implements Listener { Faction factionAt = Board.getInstance().getFactionAt(floc); if (factionAt.equals(faction) && factionAt.isNormal()) { user.delHome(homeName); - FactionsPlugin.getInstance().log(Level.INFO, "FactionLeaveEvent: Removing home %s, player %s, in territory of %s", homeName, event.getfPlayer().getName(), faction.getTag()); + FactionsPlugin.getInstance().log(Level.INFO, "Removing home %s, player %s, in territory of %s", homeName, event.getfPlayer().getName(), faction.getTag()); } } } diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java index 9832f739..ab46a0a4 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java @@ -259,7 +259,6 @@ public class FactionsBlockListener implements Listener { @EventHandler public void onHopperPlace(BlockPlaceEvent e) { - if (e.getItemInHand().getType() != Material.HOPPER && !FactionsPlugin.getInstance().getConfig().getBoolean("fvault.No-Hoppers-near-vault")) { return; } diff --git a/src/main/java/com/massivecraft/factions/zcore/MPlugin.java b/src/main/java/com/massivecraft/factions/zcore/MPlugin.java index 2e688f0e..914ba015 100644 --- a/src/main/java/com/massivecraft/factions/zcore/MPlugin.java +++ b/src/main/java/com/massivecraft/factions/zcore/MPlugin.java @@ -329,6 +329,6 @@ public abstract class MPlugin extends JavaPlugin { } public void log(Level level, Object msg) { - getLogger().log(level, "[" + this.getDescription().getFullName() + "] " + msg); + getLogger().log(level, "[" + this.getDescription().getVersion() + "] " + msg); // Full name is really ugly } } From 2fe4d29c0e301ad865a7209170c45980efe40841 Mon Sep 17 00:00:00 2001 From: Driftay Date: Sun, 15 Sep 2019 16:33:22 -0400 Subject: [PATCH 02/12] Spelling POG --- pom.xml | 2 +- .../factions/cmd/CmdAutoHelp.java | 2 +- .../massivecraft/factions/cmd/CmdCreate.java | 2 +- .../factions/cmd/CmdDeinvite.java | 2 +- .../massivecraft/factions/cmd/CmdHelp.java | 100 +++++++++--------- .../massivecraft/factions/cmd/CmdHome.java | 2 +- .../massivecraft/factions/cmd/CmdInvite.java | 2 +- .../massivecraft/factions/cmd/CmdKick.java | 2 +- .../factions/cmd/CmdPaypalSee.java | 6 +- .../factions/cmd/CmdPaypalSet.java | 2 +- .../massivecraft/factions/cmd/CmdSethome.java | 2 +- .../massivecraft/factions/cmd/FCommand.java | 10 +- .../listeners/EssentialsHomeHandler.java | 2 +- .../massivecraft/factions/zcore/MPlugin.java | 2 +- 14 files changed, 69 insertions(+), 69 deletions(-) diff --git a/pom.xml b/pom.xml index 09591c4a..c43f3bc6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.massivecraft Factions - 1.6.9.5-U0.2.1-1.9.0-BETA + 1.6.9.5-U0.2.1-1.9.1-BETA jar SaberFactions diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdAutoHelp.java b/src/main/java/com/massivecraft/factions/cmd/CmdAutoHelp.java index 87884a5c..7812a3d2 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdAutoHelp.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdAutoHelp.java @@ -29,7 +29,7 @@ public class CmdAutoHelp extends FCommand { for (FCommand scmd : pcmd.subCommands) { if (scmd.visibility == CommandVisibility.VISIBLE) { - lines.add(scmd.getUseageTemplate(context, true)); + lines.add(scmd.getUsageTemplate(context, true)); } // TODO deal with other visibilities } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java b/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java index a38b5833..db91043e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java @@ -90,7 +90,7 @@ public class CmdCreate extends FCommand { follower.msg(TL.COMMAND_CREATE_CREATED, context.fPlayer.getName(), faction.getTag(follower)); } } - context.msg(TL.COMMAND_CREATE_YOUSHOULD, FactionsPlugin.getInstance().cmdBase.cmdDescription.getUseageTemplate(context)); + context.msg(TL.COMMAND_CREATE_YOUSHOULD, FactionsPlugin.getInstance().cmdBase.cmdDescription.getUsageTemplate(context)); if (Conf.econEnabled) Econ.setBalance(faction.getAccountId(), Conf.econFactionStartingBalance); if (Conf.logFactionCreate) FactionsPlugin.getInstance().log(context.fPlayer.getName() + TL.COMMAND_CREATE_CREATEDLOG.toString() + tag); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java b/src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java index 284e5283..cc269337 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java @@ -64,7 +64,7 @@ public class CmdDeinvite extends FCommand { if (you.getFaction() == context.faction) { context.msg(TL.COMMAND_DEINVITE_ALREADYMEMBER, you.getName(), context.faction.getTag()); - context.msg(TL.COMMAND_DEINVITE_MIGHTWANT, FactionsPlugin.getInstance().cmdBase.cmdKick.getUseageTemplate(context)); + context.msg(TL.COMMAND_DEINVITE_MIGHTWANT, FactionsPlugin.getInstance().cmdBase.cmdKick.getUsageTemplate(context)); return; } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdHelp.java b/src/main/java/com/massivecraft/factions/cmd/CmdHelp.java index e1081b04..774217be 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdHelp.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdHelp.java @@ -75,28 +75,28 @@ public class CmdHelp extends FCommand { ArrayList pageLines; pageLines = new ArrayList<>(); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdHelp.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdList.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdShow.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdPower.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdJoin.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdLeave.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdChat.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdToggleAllianceChat.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdHome.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdHelp.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdList.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdShow.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdPower.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdJoin.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdLeave.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdChat.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdToggleAllianceChat.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdHome.getUsageTemplate(context)); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_NEXTCREATE.toString())); helpPages.add(pageLines); pageLines = new ArrayList<>(); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdCreate.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdDescription.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdTag.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdCreate.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdDescription.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdTag.getUsageTemplate(context)); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_INVITATIONS.toString())); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdOpen.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdInvite.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdDeinvite.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdOpen.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdInvite.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdDeinvite.getUsageTemplate(context)); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_HOME.toString())); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdSethome.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdSethome.getUsageTemplate(context)); helpPages.add(pageLines); if (Econ.isSetup() && Conf.econEnabled && Conf.bankEnabled) { @@ -106,7 +106,7 @@ public class CmdHelp extends FCommand { pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_BANK_2.toString())); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_BANK_3.toString())); pageLines.add(""); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdMoney.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdMoney.getUsageTemplate(context)); pageLines.add(""); pageLines.add(""); pageLines.add(""); @@ -114,36 +114,36 @@ public class CmdHelp extends FCommand { } pageLines = new ArrayList<>(); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdClaim.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdAutoClaim.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdUnclaim.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdUnclaimall.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdKick.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdMod.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdAdmin.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdTitle.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdSB.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdSeeChunk.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdStatus.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdClaim.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdAutoClaim.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdUnclaim.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdUnclaimall.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdKick.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdMod.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdAdmin.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdTitle.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdSB.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdSeeChunk.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdStatus.getUsageTemplate(context)); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_PLAYERTITLES.toString())); helpPages.add(pageLines); pageLines = new ArrayList<>(); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdMap.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdBoom.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdOwner.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdOwnerList.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdMap.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdBoom.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdOwner.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdOwnerList.getUsageTemplate(context)); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_OWNERSHIP_1.toString())); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_OWNERSHIP_2.toString())); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_OWNERSHIP_3.toString())); helpPages.add(pageLines); pageLines = new ArrayList<>(); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdDisband.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdDisband.getUsageTemplate(context)); pageLines.add(""); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdRelationAlly.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdRelationNeutral.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdRelationEnemy.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdRelationAlly.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdRelationNeutral.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdRelationEnemy.getUsageTemplate(context)); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_RELATIONS_1.toString())); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_RELATIONS_2.toString())); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_RELATIONS_3.toString())); @@ -176,32 +176,32 @@ public class CmdHelp extends FCommand { pageLines = new ArrayList<>(); pageLines.add(TL.COMMAND_HELP_MOAR_1.toString()); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdBypass.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdBypass.getUsageTemplate(context)); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_ADMIN_1.toString())); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_ADMIN_2.toString())); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_ADMIN_3.toString())); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdSafeunclaimall.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdWarunclaimall.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdSafeunclaimall.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdWarunclaimall.getUsageTemplate(context)); //TODO:TL - pageLines.add(FactionsPlugin.getInstance().txt.parse("Note: " + FactionsPlugin.getInstance().cmdBase.cmdUnclaim.getUseageTemplate(context) + FactionsPlugin.getInstance().txt.parse("") + " works on safe/war zones as well.")); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdPeaceful.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().txt.parse("Note: " + FactionsPlugin.getInstance().cmdBase.cmdUnclaim.getUsageTemplate(context) + FactionsPlugin.getInstance().txt.parse("") + " works on safe/war zones as well.")); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdPeaceful.getUsageTemplate(context)); helpPages.add(pageLines); pageLines = new ArrayList<>(); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_MOAR_2.toString())); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdChatSpy.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdPermanent.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdPermanentPower.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdPowerBoost.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdConfig.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdChatSpy.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdPermanent.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdPermanentPower.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdPowerBoost.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdConfig.getUsageTemplate(context)); helpPages.add(pageLines); pageLines = new ArrayList<>(); pageLines.add(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_HELP_MOAR_3.toString())); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdLock.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdReload.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdSaveAll.getUseageTemplate(context)); - pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdVersion.getUseageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdLock.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdReload.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdSaveAll.getUsageTemplate(context)); + pageLines.add(FactionsPlugin.getInstance().cmdBase.cmdVersion.getUsageTemplate(context)); helpPages.add(pageLines); } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdHome.java b/src/main/java/com/massivecraft/factions/cmd/CmdHome.java index 36d838ad..30e919bf 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdHome.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdHome.java @@ -46,7 +46,7 @@ public class CmdHome extends FCommand { if (!context.faction.hasHome()) { context.msg(TL.COMMAND_HOME_NOHOME.toString() + (context.fPlayer.getRole().value < Role.MODERATOR.value ? TL.GENERIC_ASKYOURLEADER.toString() : TL.GENERIC_YOUSHOULD.toString())); - context.sendMessage(FactionsPlugin.getInstance().cmdBase.cmdSethome.getUseageTemplate(context)); + context.sendMessage(FactionsPlugin.getInstance().cmdBase.cmdSethome.getUsageTemplate(context)); return; } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdInvite.java b/src/main/java/com/massivecraft/factions/cmd/CmdInvite.java index fdaf6e57..8352e6c6 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdInvite.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdInvite.java @@ -33,7 +33,7 @@ public class CmdInvite extends FCommand { if (target.getFaction() == context.faction) { context.msg(TL.COMMAND_INVITE_ALREADYMEMBER, target.getName(), context.faction.getTag()); - context.msg(TL.GENERIC_YOUMAYWANT.toString() + FactionsPlugin.getInstance().cmdBase.cmdKick.getUseageTemplate(context)); + context.msg(TL.GENERIC_YOUMAYWANT.toString() + FactionsPlugin.getInstance().cmdBase.cmdKick.getUsageTemplate(context)); return; } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdKick.java b/src/main/java/com/massivecraft/factions/cmd/CmdKick.java index b7662261..4e92666c 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdKick.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdKick.java @@ -58,7 +58,7 @@ public class CmdKick extends FCommand { if (context.fPlayer == toKick) { context.msg(TL.COMMAND_KICK_SELF); - context.msg(TL.GENERIC_YOUMAYWANT.toString() + FactionsPlugin.getInstance().cmdBase.cmdLeave.getUseageTemplate(context)); + context.msg(TL.GENERIC_YOUMAYWANT.toString() + FactionsPlugin.getInstance().cmdBase.cmdLeave.getUsageTemplate(context)); return; } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java b/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java index cf06d90a..d6a82e12 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java @@ -25,7 +25,7 @@ public class CmdPaypalSee extends FCommand { } if (context.args.size() == 0) { - if (context.fPlayer.getFaction().getPaypal().isEmpty()) { + if (context.fPlayer.getFaction().getPaypal() == null) { context.msg(TL.COMMAND_PAYPAL_NOTSET); } else { context.msg(TL.PAYPALSEE_PLAYER_PAYPAL, context.fPlayer.getFaction().getPaypal()); @@ -34,7 +34,7 @@ public class CmdPaypalSee extends FCommand { if (context.fPlayer.isAdminBypassing()) { Faction faction = context.argAsFaction(0); if (faction != null) { - if (faction.getPaypal().isEmpty()) { + if (faction.getPaypal() == null) { context.msg(TL.COMMAND_PAYPALSEE_FACTION_NOTSET, faction.getTag()); } else { context.msg(TL.COMMAND_PAYPALSEE_FACTION_PAYPAL.toString(), faction.getTag(), faction.getPaypal()); @@ -44,7 +44,7 @@ public class CmdPaypalSee extends FCommand { context.msg(TL.GENERIC_NOPERMISSION, "see another factions paypal."); } } else { - context.msg(FactionsPlugin.getInstance().cmdBase.cmdPaypalSee.getUseageTemplate(context)); + context.msg(FactionsPlugin.getInstance().cmdBase.cmdPaypalSee.getUsageTemplate(context)); } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java b/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java index 0fd58f83..9b839a56 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java @@ -50,7 +50,7 @@ public class CmdPaypalSet extends FCommand { context.msg(TL.GENERIC_NOPERMISSION, "set another factions paypal!"); } } else { - context.msg(FactionsPlugin.getInstance().cmdBase.cmdPaypalSet.getUseageTemplate(context)); + context.msg(FactionsPlugin.getInstance().cmdBase.cmdPaypalSet.getUsageTemplate(context)); } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdSethome.java b/src/main/java/com/massivecraft/factions/cmd/CmdSethome.java index 4e9785c8..b53c7708 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdSethome.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdSethome.java @@ -46,7 +46,7 @@ public class CmdSethome extends FCommand { faction.setHome(context.player.getLocation()); faction.msg(TL.COMMAND_SETHOME_SET, context.fPlayer.describeTo(context.faction, true)); - faction.sendMessage(FactionsPlugin.getInstance().cmdBase.cmdHome.getUseageTemplate(context)); + faction.sendMessage(FactionsPlugin.getInstance().cmdBase.cmdHome.getUsageTemplate(context)); if (faction != context.faction) { context.msg(TL.COMMAND_SETHOME_SETOTHER, faction.getTag(context.fPlayer)); } diff --git a/src/main/java/com/massivecraft/factions/cmd/FCommand.java b/src/main/java/com/massivecraft/factions/cmd/FCommand.java index f2553930..67091183 100644 --- a/src/main/java/com/massivecraft/factions/cmd/FCommand.java +++ b/src/main/java/com/massivecraft/factions/cmd/FCommand.java @@ -96,7 +96,7 @@ public abstract class FCommand { if (context.args.size() < this.requiredArgs.size()) { if (context.sender != null) { context.msg(TL.GENERIC_ARGS_TOOFEW); - context.sender.sendMessage(this.getUseageTemplate(context)); + context.sender.sendMessage(this.getUsageTemplate(context)); } return false; } @@ -106,7 +106,7 @@ public abstract class FCommand { // Get the to many string slice List theToMany = context.args.subList(this.requiredArgs.size() + this.optionalArgs.size(), context.args.size()); context.msg(TL.GENERIC_ARGS_TOOMANY, TextUtil.implode(theToMany, " ")); - context.sender.sendMessage(this.getUseageTemplate(context)); + context.sender.sendMessage(this.getUsageTemplate(context)); } return false; } @@ -200,7 +200,7 @@ public abstract class FCommand { /* Help and Usage information */ - public String getUseageTemplate(CommandContext context, boolean addShortHelp) { + public String getUsageTemplate(CommandContext context, boolean addShortHelp) { StringBuilder ret = new StringBuilder(); ret.append(FactionsPlugin.getInstance().color(TL.COMMAND_USEAGE_TEMPLATE_COLOR.toString())); ret.append('/'); @@ -241,8 +241,8 @@ public abstract class FCommand { return ret.toString(); } - public String getUseageTemplate(CommandContext context) { - return getUseageTemplate(context, false); + public String getUsageTemplate(CommandContext context) { + return getUsageTemplate(context, false); } } diff --git a/src/main/java/com/massivecraft/factions/listeners/EssentialsHomeHandler.java b/src/main/java/com/massivecraft/factions/listeners/EssentialsHomeHandler.java index 61ea94f5..4de7d638 100644 --- a/src/main/java/com/massivecraft/factions/listeners/EssentialsHomeHandler.java +++ b/src/main/java/com/massivecraft/factions/listeners/EssentialsHomeHandler.java @@ -37,7 +37,7 @@ public class EssentialsHomeHandler implements Listener { Faction factionAt = Board.getInstance().getFactionAt(floc); if (factionAt.equals(faction) && factionAt.isNormal()) { user.delHome(homeName); - FactionsPlugin.getInstance().log(Level.INFO, "FactionLeaveEvent: Removing home %s, player %s, in territory of %s", homeName, event.getfPlayer().getName(), faction.getTag()); + FactionsPlugin.getInstance().log(Level.INFO, "Removing home %s, player %s, in territory of %s", homeName, event.getfPlayer().getName(), faction.getTag()); } } } diff --git a/src/main/java/com/massivecraft/factions/zcore/MPlugin.java b/src/main/java/com/massivecraft/factions/zcore/MPlugin.java index 2e688f0e..914ba015 100644 --- a/src/main/java/com/massivecraft/factions/zcore/MPlugin.java +++ b/src/main/java/com/massivecraft/factions/zcore/MPlugin.java @@ -329,6 +329,6 @@ public abstract class MPlugin extends JavaPlugin { } public void log(Level level, Object msg) { - getLogger().log(level, "[" + this.getDescription().getFullName() + "] " + msg); + getLogger().log(level, "[" + this.getDescription().getVersion() + "] " + msg); // Full name is really ugly } } From b0ca56fc71c53680bdbe6417272516cf7347a360 Mon Sep 17 00:00:00 2001 From: Driftay Date: Sun, 15 Sep 2019 18:48:47 -0400 Subject: [PATCH 03/12] Spelling POG --- src/main/java/com/massivecraft/factions/cmd/CmdUnban.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdUnban.java b/src/main/java/com/massivecraft/factions/cmd/CmdUnban.java index fc293630..5246742f 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdUnban.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdUnban.java @@ -31,7 +31,7 @@ public class CmdUnban extends FCommand { if (target.getFaction() != context.fPlayer.getFaction()) { if (target.getFaction().getAccess(context.fPlayer, PermissableAction.BAN) != Access.ALLOW) { if (!context.fPlayer.isAdminBypassing()) { - context.fPlayer.msg(TL.COMMAND_UNBAN_TARGET_IN_OTHER_FACTION); + context.fPlayer.msg(TL.COMMAND_UNBAN_TARGET_IN_OTHER_FACTION, target.getName()); } } } From 8df75a59d486dec5e6182d907a61c44a6c09ac11 Mon Sep 17 00:00:00 2001 From: Driftay Date: Sun, 15 Sep 2019 18:49:12 -0400 Subject: [PATCH 04/12] version change --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c43f3bc6..e46d9fa5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.massivecraft Factions - 1.6.9.5-U0.2.1-1.9.1-BETA + 1.6.9.5-U0.2.1-1.9.2-BETA jar SaberFactions From 41fb4dd7ad9d3299105126191c45c466ad7a66e3 Mon Sep 17 00:00:00 2001 From: Driftay Date: Mon, 16 Sep 2019 07:36:42 -0400 Subject: [PATCH 05/12] Added Spawner Lock Command, And Formatted Grace Differently --- .../java/com/massivecraft/factions/Conf.java | 1 + .../factions/cmd/CmdSpawnerLock.java | 29 +++++++++++++++++++ .../massivecraft/factions/cmd/FCmdRoot.java | 2 ++ .../factions/cmd/grace/CmdGrace.java | 3 +- .../listeners/FactionsBlockListener.java | 8 +++++ .../factions/struct/Permission.java | 1 + .../massivecraft/factions/zcore/util/TL.java | 4 +++ src/main/resources/plugin.yml | 2 ++ 8 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/massivecraft/factions/cmd/CmdSpawnerLock.java diff --git a/src/main/java/com/massivecraft/factions/Conf.java b/src/main/java/com/massivecraft/factions/Conf.java index 637d0e86..c4cd2fd3 100644 --- a/src/main/java/com/massivecraft/factions/Conf.java +++ b/src/main/java/com/massivecraft/factions/Conf.java @@ -84,6 +84,7 @@ public class Conf { public static int stealthFlyCheckRadius = 32; public static int factionBufferSize = 20; public static boolean useCheckSystem = true; + public static boolean spawnerLock = false; public static boolean gracePeriod = false; public static boolean noEnderpearlsInFly = false; public static boolean broadcastDescriptionChanges = false; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdSpawnerLock.java b/src/main/java/com/massivecraft/factions/cmd/CmdSpawnerLock.java new file mode 100644 index 00000000..e4a41815 --- /dev/null +++ b/src/main/java/com/massivecraft/factions/cmd/CmdSpawnerLock.java @@ -0,0 +1,29 @@ +package com.massivecraft.factions.cmd; + +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.FactionsPlugin; +import com.massivecraft.factions.struct.Permission; +import com.massivecraft.factions.zcore.util.TL; + +public class CmdSpawnerLock extends FCommand { + + public CmdSpawnerLock(){ + super(); + this.aliases.add("lockspawners"); + this.aliases.add("spawnerlock"); + + this.requirements = new CommandRequirements.Builder(Permission.LOCKSPAWNERS) + .build(); + } + + @Override + public void perform(CommandContext context){ + Conf.spawnerLock = !Conf.spawnerLock; + context.msg(TL.COMMAND_SPAWNER_LOCK_TOGGLED, Conf.spawnerLock ? FactionsPlugin.getInstance().color("&aEnabled") : FactionsPlugin.getInstance().color("&4Disabled")); + } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_SPAWNER_LOCK_DESCRIPTION; + } +} diff --git a/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java b/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java index f43d274d..b854ea20 100644 --- a/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java +++ b/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java @@ -146,6 +146,7 @@ public class FCmdRoot extends FCommand implements CommandExecutor { public CmdCheck cmdCheck = new CmdCheck(); public CmdWeeWoo cmdWeeWoo = new CmdWeeWoo(); public CmdConvertConfig cmdConvertConfig = new CmdConvertConfig(); + public CmdSpawnerLock cmdSpawnerLock = new CmdSpawnerLock(); public FCmdRoot() { super(); @@ -255,6 +256,7 @@ public class FCmdRoot extends FCommand implements CommandExecutor { this.addSubCommand(this.cmdFGlobal); this.addSubCommand(this.cmdViewChest); this.addSubCommand(this.cmdConvertConfig); + this.addSubCommand(this.cmdSpawnerLock); if (Conf.useCheckSystem) { this.addSubCommand(this.cmdCheck); diff --git a/src/main/java/com/massivecraft/factions/cmd/grace/CmdGrace.java b/src/main/java/com/massivecraft/factions/cmd/grace/CmdGrace.java index d64a456e..8b520cff 100644 --- a/src/main/java/com/massivecraft/factions/cmd/grace/CmdGrace.java +++ b/src/main/java/com/massivecraft/factions/cmd/grace/CmdGrace.java @@ -1,6 +1,7 @@ package com.massivecraft.factions.cmd.grace; import com.massivecraft.factions.Conf; +import com.massivecraft.factions.FactionsPlugin; import com.massivecraft.factions.cmd.CommandContext; import com.massivecraft.factions.cmd.CommandRequirements; import com.massivecraft.factions.cmd.FCommand; @@ -21,7 +22,7 @@ public class CmdGrace extends FCommand { @Override public void perform(CommandContext context) { Conf.gracePeriod = !Conf.gracePeriod; - context.msg(TL.COMMAND_GRACE_TOGGLE, Conf.gracePeriod ? TL.GENERIC_ENABLED : TL.GENERIC_DISABLED); + context.msg(TL.COMMAND_GRACE_TOGGLE, Conf.gracePeriod ? FactionsPlugin.getInstance().color("&aEnabled") : FactionsPlugin.getInstance().color("&4Disabled")); } diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java index ab46a0a4..017cca06 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java @@ -155,6 +155,14 @@ public class FactionsBlockListener implements Listener { if (!playerCanBuildDestroyBlock(event.getPlayer(), event.getBlock().getLocation(), "build", false)) { event.setCancelled(true); + return; + } + + if (event.getBlock().getType().equals(XMaterial.SPAWNER.parseMaterial())) { + if (Conf.spawnerLock) { + event.setCancelled(true); + event.getPlayer().sendMessage(FactionsPlugin.getInstance().color(TL.COMMAND_SPAWNER_LOCK_CANNOT_PLACE.toString())); + } } } diff --git a/src/main/java/com/massivecraft/factions/struct/Permission.java b/src/main/java/com/massivecraft/factions/struct/Permission.java index 38311d80..952fb4b5 100755 --- a/src/main/java/com/massivecraft/factions/struct/Permission.java +++ b/src/main/java/com/massivecraft/factions/struct/Permission.java @@ -50,6 +50,7 @@ public enum Permission { LEAVE("leave"), LIST("list"), LOCK("lock"), + LOCKSPAWNERS("lockspawners"), LOGOUT("logout"), MAP("map"), MAPHEIGHT("mapheight"), diff --git a/src/main/java/com/massivecraft/factions/zcore/util/TL.java b/src/main/java/com/massivecraft/factions/zcore/util/TL.java index 59246a4e..abe726a4 100644 --- a/src/main/java/com/massivecraft/factions/zcore/util/TL.java +++ b/src/main/java/com/massivecraft/factions/zcore/util/TL.java @@ -706,6 +706,10 @@ public enum TL { COMMAND_SETMAXVAULTS_SUCCESS("&aSet max vaults for &e%s &ato &b%d"), COMMAND_ONCOOOLDOWN("&c&l[!] &7You cannot use this command for another &b%1$s &7seconds."), + COMMAND_SPAWNER_LOCK_TOGGLED("&c&l[!] &7You have set placement of spawners to %1$s"), + COMMAND_SPAWNER_LOCK_DESCRIPTION("enable/disable placement of spawners"), + COMMAND_SPAWNER_LOCK_CANNOT_PLACE("&c&l[!] &7Placement of spawners has been temporarily disabled!"), + COMMAND_STRIKES_CHANGED("&c&l[!] &7You have set &c%1$s's &7strikes to &c%2$s"), COMMAND_STRIKES_INFO("&c&l[!] &7%1$s has %2$s strikes"), COMMAND_STRIKES_TARGET_INVALID("&c&l[!] &7The faction %1$s is invalid."), diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index ce00422c..e83388f5 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -188,6 +188,8 @@ permissions: description: see a list of the factions factions.lock: description: lock all write stuff + factions.lockspawners: + description: toggle placement of spawners factions.managesafezone: description: claim land as a safe zone and build/destroy within safe zones factions.managewarzone: From c0a9eeca877345345814f03a5e359221ac5c9c95 Mon Sep 17 00:00:00 2001 From: Driftay Date: Mon, 16 Sep 2019 07:56:11 -0400 Subject: [PATCH 06/12] PlaceHolders and better configurability --- .../com/massivecraft/factions/Faction.java | 2 ++ .../massivecraft/factions/tag/FactionTag.java | 22 +++++++++++-------- .../massivecraft/factions/tag/PlayerTag.java | 15 +++++++++++++ .../factions/zcore/persist/MemoryFaction.java | 6 +++++ .../zcore/persist/json/JSONFactions.java | 1 + src/main/resources/config.yml | 1 + 6 files changed, 38 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/Faction.java b/src/main/java/com/massivecraft/factions/Faction.java index c7974f98..1ee3d30f 100644 --- a/src/main/java/com/massivecraft/factions/Faction.java +++ b/src/main/java/com/massivecraft/factions/Faction.java @@ -23,6 +23,8 @@ import java.util.concurrent.ConcurrentHashMap; public interface Faction extends EconomyParticipator { + void checkPerms(); + double getReinforcedArmor(); void setReinforcedArmor(double percent); diff --git a/src/main/java/com/massivecraft/factions/tag/FactionTag.java b/src/main/java/com/massivecraft/factions/tag/FactionTag.java index 1224444e..0e643ae3 100644 --- a/src/main/java/com/massivecraft/factions/tag/FactionTag.java +++ b/src/main/java/com/massivecraft/factions/tag/FactionTag.java @@ -67,7 +67,14 @@ public enum FactionTag implements Tag { return String.valueOf(fac.getFPlayersWhereOnline(true).size()); } }), - OFFLINE_COUNT("{offline}", (fac) -> String.valueOf(fac.getFPlayers().size() - fac.getOnlinePlayers().size())), + OFFLINE_COUNT("offline", (fac, fp) -> { + if (fp != null && fp.isOnline()) { + return String.valueOf(fac.getFPlayers().size() - fac.getFPlayersWhereOnline(true, fp).size()); + } else { + // Only console should ever get here. + return String.valueOf(fac.getFPlayersWhereOnline(false).size()); + } + }), FACTION_SIZE("{members}", (fac) -> String.valueOf(fac.getFPlayers().size())), FACTION_KILLS("{faction-kills}", (fac) -> String.valueOf(fac.getKills())), FACTION_DEATHS("{faction-deaths}", (fac) -> String.valueOf(fac.getDeaths())), @@ -118,18 +125,15 @@ public enum FactionTag implements Tag { if (!this.foundInString(text)) { return text; } - if (this.biFunction == null) { - return this.replace(text, faction); + String result = null; + if (this.biFunction != null) { + result = this.function == null ? this.biFunction.apply(faction, player) : this.function.apply(faction); } - String result = this.biFunction.apply(faction, player); return result == null ? null : text.replace(this.tag, result); } public String replace(String text, Faction faction) { - if (this.function == null || !this.foundInString(text)) { - return text; - } - String result = this.function.apply(faction); - return result == null ? null : text.replace(this.tag, result); + return this.replace(text, faction, null); + } } diff --git a/src/main/java/com/massivecraft/factions/tag/PlayerTag.java b/src/main/java/com/massivecraft/factions/tag/PlayerTag.java index d51cca19..f6d396f8 100644 --- a/src/main/java/com/massivecraft/factions/tag/PlayerTag.java +++ b/src/main/java/com/massivecraft/factions/tag/PlayerTag.java @@ -4,7 +4,9 @@ import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.zcore.util.TL; import org.apache.commons.lang.time.DurationFormatUtils; +import org.bukkit.Bukkit; import org.bukkit.ChatColor; +import org.bukkit.entity.Player; import java.util.function.Function; @@ -19,6 +21,19 @@ public enum PlayerTag implements Tag { PLAYER_KILLS("{player-kills}", (fp) -> String.valueOf(fp.getKills())), PLAYER_DEATHS("{player-deaths}", (fp) -> String.valueOf(fp.getDeaths())), PLAYER_NAME("{name}", FPlayer::getName), + TOTAL_ONLINE_VISIBLE("total-online-visible", (fp) -> { + if (fp == null) { + return String.valueOf(Bukkit.getOnlinePlayers().size()); + } + int count = 0; + Player me = fp.getPlayer(); + for (Player player : Bukkit.getOnlinePlayers()) { + if (me.canSee(player)) { + count++; + } + } + return String.valueOf(count); + }), ; private final String tag; diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java index 1698f58e..cf9cfbe7 100644 --- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java +++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java @@ -592,6 +592,12 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator { return this.tag; } + public void checkPerms() { + if (this.permissions == null || this.permissions.isEmpty()) { + this.resetPerms(); + } + } + public void setTag(String str) { if (Conf.factionTagForceUpperCase) { str = str.toUpperCase(); diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/json/JSONFactions.java b/src/main/java/com/massivecraft/factions/zcore/persist/json/JSONFactions.java index a3bfe2a5..23df3f8d 100644 --- a/src/main/java/com/massivecraft/factions/zcore/persist/json/JSONFactions.java +++ b/src/main/java/com/massivecraft/factions/zcore/persist/json/JSONFactions.java @@ -91,6 +91,7 @@ public class JSONFactions extends MemoryFactions { for (Entry entry : data.entrySet()) { String id = entry.getKey(); Faction f = entry.getValue(); + f.checkPerms(); f.setId(id); this.updateNextIdForId(id); needsUpdate += whichKeysNeedMigration(f.getInvites()).size(); diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index fe9ab408..3ce2c56c 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1323,6 +1323,7 @@ Tntfill: # - {player-maxpower} : Player max power # - {player-kills} : # of kills the player has # - {player-deaths}: # of deaths the player has +# - {total-online-visible}: # of players online from the perspective of the current player # Faction variables. Can be used in tooltips.list, scoreboards, or /f show # - {header} : Default factions header (ex. /f show) # - {faction} : Factions tag (if none, uses lang.yml for factionless name) From bd4e6cb6a81906c147c3f9e1406b3acd86d366b3 Mon Sep 17 00:00:00 2001 From: Driftay Date: Tue, 17 Sep 2019 19:08:23 -0400 Subject: [PATCH 07/12] Shop GUI Cleaned up :D --- .../massivecraft/factions/FactionsPlugin.java | 2 - .../massivecraft/factions/shop/CmdShop.java | 2 +- .../factions/shop/ShopClickPersistence.java | 93 -------------- .../massivecraft/factions/shop/ShopGUI.java | 100 --------------- .../factions/shop/ShopGUIFrame.java | 115 ++++++++++++++++++ .../massivecraft/factions/zcore/util/TL.java | 2 +- src/main/resources/config.yml | 15 +-- 7 files changed, 123 insertions(+), 206 deletions(-) delete mode 100644 src/main/java/com/massivecraft/factions/shop/ShopClickPersistence.java delete mode 100644 src/main/java/com/massivecraft/factions/shop/ShopGUI.java create mode 100644 src/main/java/com/massivecraft/factions/shop/ShopGUIFrame.java diff --git a/src/main/java/com/massivecraft/factions/FactionsPlugin.java b/src/main/java/com/massivecraft/factions/FactionsPlugin.java index 637a81b4..bce174a6 100755 --- a/src/main/java/com/massivecraft/factions/FactionsPlugin.java +++ b/src/main/java/com/massivecraft/factions/FactionsPlugin.java @@ -16,7 +16,6 @@ import com.massivecraft.factions.integration.Worldguard; import com.massivecraft.factions.integration.dynmap.EngineDynmap; import com.massivecraft.factions.listeners.*; import com.massivecraft.factions.missions.MissionHandler; -import com.massivecraft.factions.shop.ShopClickPersistence; import com.massivecraft.factions.shop.ShopConfig; import com.massivecraft.factions.struct.ChatMode; import com.massivecraft.factions.struct.Relation; @@ -267,7 +266,6 @@ public class FactionsPlugin extends MPlugin { new FactionsExploitListener(), new FactionsBlockListener(), new FUpgradesGUI(), - new ShopClickPersistence(), new UpgradesListener(), new MissionHandler(this), new ChestLogsHandler() diff --git a/src/main/java/com/massivecraft/factions/shop/CmdShop.java b/src/main/java/com/massivecraft/factions/shop/CmdShop.java index a795308d..7add1c30 100644 --- a/src/main/java/com/massivecraft/factions/shop/CmdShop.java +++ b/src/main/java/com/massivecraft/factions/shop/CmdShop.java @@ -24,7 +24,7 @@ public class CmdShop extends FCommand { if (!FactionsPlugin.getInstance().getConfig().getBoolean("F-Shop.Enabled")) { return; } - ShopGUI.openShop(context.fPlayer); + new ShopGUIFrame(context.faction).buildGUI(context.fPlayer); } @Override diff --git a/src/main/java/com/massivecraft/factions/shop/ShopClickPersistence.java b/src/main/java/com/massivecraft/factions/shop/ShopClickPersistence.java deleted file mode 100644 index 9387b0c9..00000000 --- a/src/main/java/com/massivecraft/factions/shop/ShopClickPersistence.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.massivecraft.factions.shop; - -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.FPlayers; -import com.massivecraft.factions.FactionsPlugin; -import com.massivecraft.factions.zcore.util.TL; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.inventory.InventoryClickEvent; -import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.ItemStack; - -import java.util.List; - -public class ShopClickPersistence implements Listener { - - public static String color(String line) { - line = ChatColor.translateAlternateColorCodes('&', line); - return line; - } - - public static List colorList(List lore) { - for (int i = 0; i <= lore.size() - 1; i++) { - lore.set(i, color(lore.get(i))); - } - return lore; - } - - public void runCommands(List list, Player p) { - for (String cmd : list) { - cmd = cmd.replace("%player%", p.getName()); - Bukkit.dispatchCommand(Bukkit.getConsoleSender(), cmd); - } - } - - @EventHandler - public void click(InventoryClickEvent e) { - Inventory i = e.getClickedInventory(); - Player p = (Player) e.getWhoClicked(); - FileConfiguration config = FactionsPlugin.getInstance().getConfig(); - FPlayer fplayer = FPlayers.getInstance().getByPlayer(p); - - if (e.getView().getTitle().equalsIgnoreCase(color(config.getString("F-Shop.GUI.Name")))) { - ItemStack item = e.getCurrentItem(); - if (item == null) return; - String name = color(item.getItemMeta().getDisplayName()); - e.setCancelled(true); - int t = e.getSlot(); - int items = ShopConfig.getShop().getConfigurationSection("items").getKeys(false).size(); - for (int a = 1; a <= items; a++) { - String s = a + ""; - int slot = ShopConfig.getShop().getInt("items." + s + ".slot"); - if (t == slot) { - String n = ShopConfig.getShop().getString("items." + s + ".name"); - if (name.contains(color(n))) { - String c = ChatColor.stripColor(color(name)); - c = c.replace(ChatColor.stripColor(color(n)), ""); - c = c.replace(color(" ("), ""); - c = c.replace(color(" Points)"), ""); - int cost = Integer.parseInt(c); - if (fplayer.getFaction().getPoints() >= cost) { - - fplayer.getFaction().setPoints(fplayer.getFaction().getPoints() - cost); - runCommands(ShopConfig.getShop().getStringList("items." + s + ".cmds"), fplayer.getPlayer()); - for (FPlayer fplayerBuy : fplayer.getFaction().getFPlayers()) { - // if (fplayer == fme) { continue; } //Idk if I wanna not send the title to the player - fplayerBuy.getPlayer().sendMessage(TL.SHOP_BOUGHT_BROADCAST_FACTION.toString() - .replace("{player}", fplayer.getPlayer().getName()) - .replace("{item}", name)); - } - fplayer.sendMessage(color(ShopConfig.getShop().getString("prefix").replace("%item%", n).replace("%points%", cost + ""))); - p.closeInventory(); - - } else { - fplayer.sendMessage(TL.SHOP_NOT_ENOUGH_POINTS.toString()); - p.closeInventory(); - } - } else { - e.setCancelled(true); - return; - } - } - } - } - } -} - - - diff --git a/src/main/java/com/massivecraft/factions/shop/ShopGUI.java b/src/main/java/com/massivecraft/factions/shop/ShopGUI.java deleted file mode 100644 index d5db5891..00000000 --- a/src/main/java/com/massivecraft/factions/shop/ShopGUI.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.massivecraft.factions.shop; - -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.Faction; -import com.massivecraft.factions.FactionsPlugin; -import com.massivecraft.factions.util.XMaterial; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.enchantments.Enchantment; -import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.ItemFlag; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.ItemMeta; - -import java.util.LinkedList; -import java.util.List; - -public class ShopGUI { - /* - TODO: OOP Shop, and Clean it Up. - Made simplistic format for shop for the time being until I get time. - */ - - public static void openShop(FPlayer p) { - FileConfiguration config = FactionsPlugin.getInstance().getConfig(); - Faction fac = p.getFaction(); - - Inventory i = Bukkit.createInventory(null, FactionsPlugin.getInstance().getConfig().getInt("F-Shop.GUI.Size"), color(config.getString("F-Shop.GUI.Name"))); - ItemStack glass = new ItemStack(XMaterial.BLACK_STAINED_GLASS_PANE.parseMaterial(), 1, (short) 7); - ItemMeta glassmeta = glass.getItemMeta(); - glassmeta.setDisplayName(ChatColor.GOLD + " "); - glass.setItemMeta(glassmeta); - - for (int fill = 0; fill < FactionsPlugin.getInstance().getConfig().getInt("F-Shop.GUI.Size"); ++fill) { - i.setItem(fill, glass); - } - - int items = ShopConfig.getShop().getConfigurationSection("items").getKeys(false).size(); - for (int shopitems = 1; shopitems <= items; shopitems++) { - String s = shopitems + ""; - int slot = ShopConfig.getShop().getInt("items." + s + ".slot"); - ItemStack material = XMaterial.matchXMaterial(ShopConfig.getShop().getString("items." + s + ".block")).parseItem(); - // int size = ShopConfig.getShop().getInt("items." + s + ".size"); - int cost = ShopConfig.getShop().getInt("items." + s + ".cost"); - String name = ShopConfig.getShop().getString("items." + s + ".name") + " &f(" + cost + " Points)"; - List lore = ShopConfig.getShop().getStringList("items." + s + ".lore"); - String command = ShopConfig.getShop().getString("items." + s + ".cmd"); - String type = ShopConfig.getShop().getString("items." + s + ".type"); - boolean glowing = ShopConfig.getShop().getBoolean("items." + s + ".glowing"); - - - ItemStack count = new ItemStack(XMaterial.PAPER.parseMaterial(), 1); - ItemMeta countmeta = count.getItemMeta(); - countmeta.setDisplayName(color(config.getString("F-Shop.GUI.Information.name"))); - List PointInfo = new LinkedList<>(); - for (String list : config.getStringList("F-Shop.GUI.Information.lore")) { - PointInfo.add(list.replace("%points%", fac.getPoints() + "")); - } - countmeta.setLore(colorList(PointInfo)); - count.setItemMeta(countmeta); - i.setItem(FactionsPlugin.getInstance().getConfig().getInt("F-Shop.GUI.Information.slot"), count); - - ItemStack item = new ItemStack(material); - ItemMeta meta = item.getItemMeta(); - meta.setDisplayName(color(name)); - meta.addItemFlags(); - - if (glowing) { - meta.addItemFlags(ItemFlag.HIDE_ENCHANTS); - meta.addEnchant(Enchantment.DURABILITY, 1, true); - } - if (!glowing) { - meta.removeEnchant(Enchantment.DURABILITY); - } - - if (lore.contains("")) { - meta.setLore(null); - } else { - meta.setLore(FactionsPlugin.getInstance().colorList(lore)); - } - item.setItemMeta(meta); - i.setItem(slot, item); - } - p.getPlayer().openInventory(i); - } - - public static String color(String line) { - line = ChatColor.translateAlternateColorCodes('&', line); - return line; - } - - public static List colorList(List lore) { - for (int i = 0; i <= lore.size() - 1; i++) { - lore.set(i, color(lore.get(i))); - } - return lore; - } - -} diff --git a/src/main/java/com/massivecraft/factions/shop/ShopGUIFrame.java b/src/main/java/com/massivecraft/factions/shop/ShopGUIFrame.java new file mode 100644 index 00000000..9e94e814 --- /dev/null +++ b/src/main/java/com/massivecraft/factions/shop/ShopGUIFrame.java @@ -0,0 +1,115 @@ +package com.massivecraft.factions.shop; + +import com.github.stefvanschie.inventoryframework.Gui; +import com.github.stefvanschie.inventoryframework.GuiItem; +import com.github.stefvanschie.inventoryframework.pane.PaginatedPane; +import com.massivecraft.factions.FPlayer; +import com.massivecraft.factions.FPlayers; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.FactionsPlugin; +import com.massivecraft.factions.util.XMaterial; +import com.massivecraft.factions.zcore.util.TL; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.enchantments.Enchantment; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemFlag; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.ItemMeta; + +import java.util.ArrayList; +import java.util.List; + +public class ShopGUIFrame { + + private Gui gui; + + public ShopGUIFrame(Faction f) { + gui = new Gui(FactionsPlugin.getInstance(), + FactionsPlugin.getInstance().getConfig().getInt("F-Shop.GUI.Rows", 4), + FactionsPlugin.getInstance().color(FactionsPlugin.getInstance().getConfig().getString("F-Shop.GUI.Name"))); + } + + public void buildGUI(FPlayer fplayer) { + PaginatedPane pane = new PaginatedPane(0, 0, 9, gui.getRows()); + List GUIItems = new ArrayList<>(); + ItemStack dummy = buildDummyItem(fplayer.getFaction()); + for (int x = 0; x <= (gui.getRows() * 9) - 1; x++) GUIItems.add(new GuiItem(dummy, e -> e.setCancelled(true))); + + int items = ShopConfig.getShop().getConfigurationSection("items").getKeys(false).size(); + for (int shopitems = 1; shopitems <= items; shopitems++) { + String s = shopitems + ""; + String name = ShopConfig.getShop().getString("items." + s + ".name"); + int slot = ShopConfig.getShop().getInt("items." + s + ".slot"); + + GUIItems.set(slot, new GuiItem(buildShopAssets(fplayer.getFaction()), e -> { + e.setCancelled(true); + + FPlayer fme = FPlayers.getInstance().getByPlayer((Player) e.getWhoClicked()); + int cost = ShopConfig.getShop().getInt("items." + s + ".cost"); + if (fplayer.getFaction().getPoints() >= cost) { + fplayer.getFaction().setPoints(fplayer.getFaction().getPoints() - cost); + runCommands(ShopConfig.getShop().getStringList("items." + s + ".cmds"), fplayer.getPlayer()); + for (FPlayer fplayerBuy : fplayer.getFaction().getFPlayers()) { + fplayerBuy.getPlayer().sendMessage(TL.SHOP_BOUGHT_BROADCAST_FACTION.toString() + .replace("{player}", fplayer.getPlayer().getName()) + .replace("{item}", ChatColor.stripColor(FactionsPlugin.getInstance().color(name))).replace("{cost}", cost + "")); + } + buildGUI(fme); + } else { + fplayer.msg(TL.SHOP_NOT_ENOUGH_POINTS); + } + })); + pane.populateWithGuiItems(GUIItems); + gui.addPane(pane); + gui.update(); + gui.show(fplayer.getPlayer()); + } + } + + private ItemStack buildShopAssets(Faction f) { + int items = ShopConfig.getShop().getConfigurationSection("items").getKeys(false).size(); + ItemStack item = null; + for (int shopitems = 1; shopitems <= items; shopitems++) { + String s = shopitems + ""; + ConfigurationSection config = ShopConfig.getShop().getConfigurationSection("items." + s); + boolean glowing = config.getBoolean("glowing"); + item = XMaterial.matchXMaterial(config.getString("block")).parseItem(); + ItemMeta meta = item.getItemMeta(); + if (meta != null) { + meta.setLore(FactionsPlugin.getInstance().colorList(config.getStringList("lore"))); + meta.setDisplayName(FactionsPlugin.getInstance().color(config.getString("name"))); + if (glowing) { + meta.addItemFlags(ItemFlag.HIDE_ENCHANTS); + meta.addEnchant(Enchantment.DURABILITY, 1, true); + } + if (!glowing) { + meta.removeEnchant(Enchantment.DURABILITY); + } + item.setItemMeta(meta); + } + } + return item; + } + + + private ItemStack buildDummyItem(Faction f) { + ConfigurationSection config = FactionsPlugin.getInstance().getConfig().getConfigurationSection("F-Shop.GUI.dummy-item"); + ItemStack item = XMaterial.matchXMaterial(config.getString("Type")).parseItem(); + ItemMeta meta = item.getItemMeta(); + if (meta != null) { + meta.setLore(FactionsPlugin.getInstance().colorList(config.getStringList("Lore"))); + meta.setDisplayName(FactionsPlugin.getInstance().color(config.getString("Name").replace("{points}", f.getPoints() + ""))); + item.setItemMeta(meta); + } + return item; + } + + public void runCommands(List list, Player p) { + for (String cmd : list) { + cmd = cmd.replace("%player%", p.getName()); + Bukkit.dispatchCommand(Bukkit.getConsoleSender(), cmd); + } + } +} diff --git a/src/main/java/com/massivecraft/factions/zcore/util/TL.java b/src/main/java/com/massivecraft/factions/zcore/util/TL.java index abe726a4..f7a33bbb 100644 --- a/src/main/java/com/massivecraft/factions/zcore/util/TL.java +++ b/src/main/java/com/massivecraft/factions/zcore/util/TL.java @@ -721,7 +721,7 @@ public enum TL { COMMAND_STRIKESINFO_DESCRIPTION("Get a faction's strikes"), SHOP_NOT_ENOUGH_POINTS("&c&l[!] &7Your faction does not have enough points to purchase this!"), - SHOP_BOUGHT_BROADCAST_FACTION("\n&c&l[!] &e&lFactionShop » &b{player} &7bought &b{item}&7!\n"), + SHOP_BOUGHT_BROADCAST_FACTION("\n&c&l[!] &e&lFactionShop » &b{player} &7bought &b{item}&7 for &b{cost} &7points!\n"), COMMAND_VIEWCHEST_DESCRIPTION("view a factions chest/pv"), diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 3ce2c56c..a452fd1d 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -683,15 +683,12 @@ F-Shop: Enabled: true GUI: Name: '&b&lFaction Shop' - Size: 36 - Information: - name: '&b&lInformation' - lore: - - '&bPoints &7are gained by capturing koths/conquests.' - - '' - - '&b&l[!] &bFaction Points: &f%points%' - slot: 22 - + Rows: 4 + dummy-item: + Type: BLACK_STAINED_GLASS_PANE + Name: '&cFaction Points: &b{points}' + Lore: + - ' ' ############################################################ # +------------------------------------------------------+ # # | Faction Command Cooldowns | # From 3d45684c6f7c6ac5e18a3ad19f75667e29635fa4 Mon Sep 17 00:00:00 2001 From: Driftay Date: Tue, 17 Sep 2019 19:29:40 -0400 Subject: [PATCH 08/12] Version Change --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e46d9fa5..879d1e78 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.massivecraft Factions - 1.6.9.5-U0.2.1-1.9.2-BETA + 1.6.9.5-U0.2.1-1.9.3-BETA jar SaberFactions From 0ac6112437252f5012b0fdc3c913aaf8def8c96f Mon Sep 17 00:00:00 2001 From: Driftay Date: Wed, 18 Sep 2019 05:22:05 -0400 Subject: [PATCH 09/12] Added Anti-Creeper Glitch To avoid issues with freecam cegging --- .../factions/listeners/FactionsEntityListener.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java index 1d8daa28..36857df6 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java @@ -32,6 +32,16 @@ public class FactionsEntityListener implements Listener { private static final Set badPotionEffects = new LinkedHashSet<>(Arrays.asList(PotionEffectType.BLINDNESS, PotionEffectType.CONFUSION, PotionEffectType.HARM, PotionEffectType.HUNGER, PotionEffectType.POISON, PotionEffectType.SLOW, PotionEffectType.SLOW_DIGGING, PotionEffectType.WEAKNESS, PotionEffectType.WITHER)); + @EventHandler + public void onCreeperGlitch(EntityDamageEvent e) { + if (!e.getEntity().getType().equals(EntityType.CREEPER)) { + return; + } + if (e.getCause().equals(EntityDamageEvent.DamageCause.DROWNING) || e.getCause().equals(EntityDamageEvent.DamageCause.SUFFOCATION)) { + e.getEntity().remove(); + } + } + @EventHandler(priority = EventPriority.NORMAL) public void onEntityDeath(EntityDeathEvent event) { Entity entity = event.getEntity(); From 8ec16505c4c313b32acfa53f86e43cccd3309c14 Mon Sep 17 00:00:00 2001 From: Driftay Date: Wed, 18 Sep 2019 07:43:18 -0400 Subject: [PATCH 10/12] Fixed Shop Items Sowwy :) --- .../massivecraft/factions/cmd/CmdReload.java | 2 + .../factions/shop/ShopConfig.java | 1 + .../factions/shop/ShopGUIFrame.java | 66 ++++++++++--------- 3 files changed, 38 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdReload.java b/src/main/java/com/massivecraft/factions/cmd/CmdReload.java index 0ae7517e..9e6c4f3c 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdReload.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdReload.java @@ -2,6 +2,7 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.Conf; import com.massivecraft.factions.FactionsPlugin; +import com.massivecraft.factions.shop.ShopConfig; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.zcore.util.TL; @@ -19,6 +20,7 @@ public class CmdReload extends FCommand { long timeInitStart = System.currentTimeMillis(); Conf.load(); Conf.save(); + ShopConfig.loadShop(); FactionsPlugin.getInstance().reloadConfig(); FactionsPlugin.getInstance().loadLang(); diff --git a/src/main/java/com/massivecraft/factions/shop/ShopConfig.java b/src/main/java/com/massivecraft/factions/shop/ShopConfig.java index c867b0a8..492d2cbb 100644 --- a/src/main/java/com/massivecraft/factions/shop/ShopConfig.java +++ b/src/main/java/com/massivecraft/factions/shop/ShopConfig.java @@ -40,6 +40,7 @@ public class ShopConfig { getShop().set("items.1.name", "&aTest Shop"); ArrayList lore = new ArrayList(); lore.add("&cFully Customizable Lore!"); + lore.add("&b&l{cost} &7Points"); getShop().set("items.1.lore", lore); ArrayList t = new ArrayList(); t.add("broadcast %player% bought Test Shop!"); diff --git a/src/main/java/com/massivecraft/factions/shop/ShopGUIFrame.java b/src/main/java/com/massivecraft/factions/shop/ShopGUIFrame.java index 9e94e814..fe0fa335 100644 --- a/src/main/java/com/massivecraft/factions/shop/ShopGUIFrame.java +++ b/src/main/java/com/massivecraft/factions/shop/ShopGUIFrame.java @@ -3,6 +3,7 @@ package com.massivecraft.factions.shop; import com.github.stefvanschie.inventoryframework.Gui; import com.github.stefvanschie.inventoryframework.GuiItem; import com.github.stefvanschie.inventoryframework.pane.PaginatedPane; +import com.google.common.collect.ImmutableList; import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayers; import com.massivecraft.factions.Faction; @@ -11,6 +12,7 @@ import com.massivecraft.factions.util.XMaterial; import com.massivecraft.factions.zcore.util.TL; import org.bukkit.Bukkit; import org.bukkit.ChatColor; +import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; @@ -19,16 +21,20 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import java.util.ArrayList; +import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; public class ShopGUIFrame { private Gui gui; + private String s; public ShopGUIFrame(Faction f) { gui = new Gui(FactionsPlugin.getInstance(), FactionsPlugin.getInstance().getConfig().getInt("F-Shop.GUI.Rows", 4), FactionsPlugin.getInstance().color(FactionsPlugin.getInstance().getConfig().getString("F-Shop.GUI.Name"))); + this.s = s; } public void buildGUI(FPlayer fplayer) { @@ -38,23 +44,46 @@ public class ShopGUIFrame { for (int x = 0; x <= (gui.getRows() * 9) - 1; x++) GUIItems.add(new GuiItem(dummy, e -> e.setCancelled(true))); int items = ShopConfig.getShop().getConfigurationSection("items").getKeys(false).size(); - for (int shopitems = 1; shopitems <= items; shopitems++) { - String s = shopitems + ""; - String name = ShopConfig.getShop().getString("items." + s + ".name"); + for (int a = 1; a <= items; a++) { + String s = a + ""; int slot = ShopConfig.getShop().getInt("items." + s + ".slot"); + Material material = XMaterial.matchXMaterial(ShopConfig.getShop().getString("items." + s + ".block")).parseMaterial(); + int cost = ShopConfig.getShop().getInt("items." + s + ".cost"); + String name = ShopConfig.getShop().getString("items." + s + ".name"); + boolean glowing = ShopConfig.getShop().getBoolean("items." + s + ".glowing"); + List lore = ShopConfig.getShop().getStringList("items." + s + ".lore"); - GUIItems.set(slot, new GuiItem(buildShopAssets(fplayer.getFaction()), e -> { + + ItemStack item = new ItemStack(material); + ItemMeta meta = item.getItemMeta(); + meta.setDisplayName(FactionsPlugin.instance.color(name)); + meta.addItemFlags(); + if (glowing) { + meta.addItemFlags(ItemFlag.HIDE_ENCHANTS); + meta.addEnchant(Enchantment.DURABILITY, 1, true); + } + if (!glowing) { + meta.removeEnchant(Enchantment.DURABILITY); + } + + List replacedLore = lore.stream().map(t -> t.replace("{cost}", cost + "")).collect(Collectors.toList()); + + meta.setLore(FactionsPlugin.instance.colorList(replacedLore)); + + item.setItemMeta(meta); + + GUIItems.set(slot, new GuiItem(item, e -> { e.setCancelled(true); FPlayer fme = FPlayers.getInstance().getByPlayer((Player) e.getWhoClicked()); - int cost = ShopConfig.getShop().getInt("items." + s + ".cost"); if (fplayer.getFaction().getPoints() >= cost) { fplayer.getFaction().setPoints(fplayer.getFaction().getPoints() - cost); runCommands(ShopConfig.getShop().getStringList("items." + s + ".cmds"), fplayer.getPlayer()); for (FPlayer fplayerBuy : fplayer.getFaction().getFPlayers()) { fplayerBuy.getPlayer().sendMessage(TL.SHOP_BOUGHT_BROADCAST_FACTION.toString() .replace("{player}", fplayer.getPlayer().getName()) - .replace("{item}", ChatColor.stripColor(FactionsPlugin.getInstance().color(name))).replace("{cost}", cost + "")); + .replace("{item}", ChatColor.stripColor(FactionsPlugin.getInstance().color(name))) + .replace("{cost}", cost + "")); } buildGUI(fme); } else { @@ -68,31 +97,6 @@ public class ShopGUIFrame { } } - private ItemStack buildShopAssets(Faction f) { - int items = ShopConfig.getShop().getConfigurationSection("items").getKeys(false).size(); - ItemStack item = null; - for (int shopitems = 1; shopitems <= items; shopitems++) { - String s = shopitems + ""; - ConfigurationSection config = ShopConfig.getShop().getConfigurationSection("items." + s); - boolean glowing = config.getBoolean("glowing"); - item = XMaterial.matchXMaterial(config.getString("block")).parseItem(); - ItemMeta meta = item.getItemMeta(); - if (meta != null) { - meta.setLore(FactionsPlugin.getInstance().colorList(config.getStringList("lore"))); - meta.setDisplayName(FactionsPlugin.getInstance().color(config.getString("name"))); - if (glowing) { - meta.addItemFlags(ItemFlag.HIDE_ENCHANTS); - meta.addEnchant(Enchantment.DURABILITY, 1, true); - } - if (!glowing) { - meta.removeEnchant(Enchantment.DURABILITY); - } - item.setItemMeta(meta); - } - } - return item; - } - private ItemStack buildDummyItem(Faction f) { ConfigurationSection config = FactionsPlugin.getInstance().getConfig().getConfigurationSection("F-Shop.GUI.dummy-item"); From 3ce77fe7e1a8d7f3802b42bd9000dbbcc3230fd6 Mon Sep 17 00:00:00 2001 From: Driftay Date: Wed, 18 Sep 2019 07:47:03 -0400 Subject: [PATCH 11/12] Fixed Shop Items Sowwy :) --- .../factions/shop/ShopConfig.java | 3 ++ src/main/resources/shop.yml | 28 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 src/main/resources/shop.yml diff --git a/src/main/java/com/massivecraft/factions/shop/ShopConfig.java b/src/main/java/com/massivecraft/factions/shop/ShopConfig.java index 492d2cbb..6cbe1173 100644 --- a/src/main/java/com/massivecraft/factions/shop/ShopConfig.java +++ b/src/main/java/com/massivecraft/factions/shop/ShopConfig.java @@ -34,6 +34,7 @@ public class ShopConfig { if (!shop.exists()) { try { shop.createNewFile(); + getShop().set("prefix", "&4&lFactionShop&8» &7Purchased &f%item% &7for &b%points% Points&7!"); getShop().set("items.1.slot", 1); getShop().set("items.1.block", "STONE"); @@ -51,6 +52,8 @@ public class ShopConfig { } catch (IOException e) { e.printStackTrace(); } + } else { + s.options().copyDefaults(true); } } } diff --git a/src/main/resources/shop.yml b/src/main/resources/shop.yml new file mode 100644 index 00000000..da121aeb --- /dev/null +++ b/src/main/resources/shop.yml @@ -0,0 +1,28 @@ +####################################################################################### +####################################################################################### +####################################################################################### +##### ##### +##### SaberFactions Shop Configuration File ##### +##### ##### +##### ##### +####################################################################################### +####################################################################################### +####################################################################################### +#<-------------------------------------->NOTES<--------------------------------------># +#All Color Codes Can Be Used! +#Refer to: https://wiki.ess3.net/mc/ +#Enable and Disable Any Feature by Simply Switching Variable to true or false! +#<-------------------------------------->NOTES<--------------------------------------># +prefix: '&4&lFactionShop&8» &7Purchased &f%item% &7for &b%points% Points&7!' +items: + '1': + slot: 1 + block: STONE + name: '&aTest Shop' + lore: #{cost} is the placeholder for the cost of the item. + - '&cFully Customizable Lore!' + - '&b{cost} &7Points' + cmds: + - broadcast %player% bought Test Shop! + cost: 5 + glowing: true \ No newline at end of file From 81636c64480f9c79256f920f76b14e5cd4f50bb6 Mon Sep 17 00:00:00 2001 From: Driftay Date: Wed, 18 Sep 2019 08:01:05 -0400 Subject: [PATCH 12/12] Version Change --- pom.xml | 2 +- .../factions/shop/ShopConfig.java | 3 -- src/main/resources/shop.yml | 28 ------------------- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 src/main/resources/shop.yml diff --git a/pom.xml b/pom.xml index 879d1e78..65d1c52f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.massivecraft Factions - 1.6.9.5-U0.2.1-1.9.3-BETA + 1.6.9.5-U0.2.1-1.9.4-BETA jar SaberFactions diff --git a/src/main/java/com/massivecraft/factions/shop/ShopConfig.java b/src/main/java/com/massivecraft/factions/shop/ShopConfig.java index 6cbe1173..492d2cbb 100644 --- a/src/main/java/com/massivecraft/factions/shop/ShopConfig.java +++ b/src/main/java/com/massivecraft/factions/shop/ShopConfig.java @@ -34,7 +34,6 @@ public class ShopConfig { if (!shop.exists()) { try { shop.createNewFile(); - getShop().set("prefix", "&4&lFactionShop&8» &7Purchased &f%item% &7for &b%points% Points&7!"); getShop().set("items.1.slot", 1); getShop().set("items.1.block", "STONE"); @@ -52,8 +51,6 @@ public class ShopConfig { } catch (IOException e) { e.printStackTrace(); } - } else { - s.options().copyDefaults(true); } } } diff --git a/src/main/resources/shop.yml b/src/main/resources/shop.yml deleted file mode 100644 index da121aeb..00000000 --- a/src/main/resources/shop.yml +++ /dev/null @@ -1,28 +0,0 @@ -####################################################################################### -####################################################################################### -####################################################################################### -##### ##### -##### SaberFactions Shop Configuration File ##### -##### ##### -##### ##### -####################################################################################### -####################################################################################### -####################################################################################### -#<-------------------------------------->NOTES<--------------------------------------># -#All Color Codes Can Be Used! -#Refer to: https://wiki.ess3.net/mc/ -#Enable and Disable Any Feature by Simply Switching Variable to true or false! -#<-------------------------------------->NOTES<--------------------------------------># -prefix: '&4&lFactionShop&8» &7Purchased &f%item% &7for &b%points% Points&7!' -items: - '1': - slot: 1 - block: STONE - name: '&aTest Shop' - lore: #{cost} is the placeholder for the cost of the item. - - '&cFully Customizable Lore!' - - '&b{cost} &7Points' - cmds: - - broadcast %player% bought Test Shop! - cost: 5 - glowing: true \ No newline at end of file