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

Rename P --> Factions.

Browse Source
This commit is contained in:
Olof Larsson
2013-04-09 13:00:09 +02:00
parent 8a4b26cbd9
commit c88847bd3e
54 changed files with 171 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/massivecraft/factions/cmd/CmdAdmin.java
View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
public class CmdAdmin extends FCommand
@ -30,12 +30,12 @@ public class CmdAdmin extends FCommand
if ( fme.hasAdminMode())
{
fme.msg("<i>You have enabled admin bypass mode.");
P.p.log(fme.getName() + " has ENABLED admin bypass mode.");
Factions.p.log(fme.getName() + " has ENABLED admin bypass mode.");
}
else
{
fme.msg("<i>You have disabled admin bypass mode.");
P.p.log(fme.getName() + " DISABLED admin bypass mode.");
Factions.p.log(fme.getName() + " DISABLED admin bypass mode.");
}
}
}

6
src/com/massivecraft/factions/cmd/CmdAutoHelp.java
View File

@ -2,15 +2,15 @@ package com.massivecraft.factions.cmd;
import java.util.ArrayList;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.zcore.CommandVisibility;
import com.massivecraft.factions.zcore.MCommand;
public class CmdAutoHelp extends MCommand<P>
public class CmdAutoHelp extends MCommand<Factions>
{
public CmdAutoHelp()
{
super(P.p);
super(Factions.p);
this.aliases.add("?");
this.aliases.add("h");
this.aliases.add("help");

4
src/com/massivecraft/factions/cmd/CmdCape.java
View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
public class CmdCape extends FCommand
@ -30,7 +30,7 @@ public class CmdCape extends FCommand
public void perform()
{
this.commandChain.add(this);
P.p.cmdAutoHelp.execute(this.sender, this.args, this.commandChain);
Factions.p.cmdAutoHelp.execute(this.sender, this.args, this.commandChain);
}
}

4
src/com/massivecraft/factions/cmd/CmdConfig.java
View File

@ -13,7 +13,7 @@ import org.bukkit.Material;
import org.bukkit.entity.Player;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.integration.SpoutFeatures;
import com.massivecraft.factions.struct.FFlag;
@ -386,7 +386,7 @@ public class CmdConfig extends FCommand
sendMessage(success);
if (sender instanceof Player)
{
P.p.log(success + " Command was run by "+fme.getName()+".");
Factions.p.log(success + " Command was run by "+fme.getName()+".");
}
}
// save change to disk

4
src/com/massivecraft/factions/cmd/CmdCreate.java
View File

@ -9,7 +9,7 @@ import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FactionColl;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.event.FPlayerJoinEvent;
import com.massivecraft.factions.event.FactionCreateEvent;
@ -98,7 +98,7 @@ public class CmdCreate extends FCommand
msg("<i>You should now: %s", p.cmdBase.cmdDescription.getUseageTemplate());
if (Conf.logFactionCreate)
P.p.log(fme.getName()+" created a new faction: "+tag);
Factions.p.log(fme.getName()+" created a new faction: "+tag);
}
}

6
src/com/massivecraft/factions/cmd/CmdDisband.java
View File

@ -8,7 +8,7 @@ import com.massivecraft.factions.event.FactionDisbandEvent;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.integration.SpoutFeatures;
@ -73,7 +73,7 @@ public class CmdDisband extends FCommand
}
}
if (Conf.logFactionDisband)
P.p.log("The faction "+faction.getTag()+" ("+faction.getId()+") was disbanded by "+(senderIsConsole ? "console command" : fme.getName())+".");
Factions.p.log("The faction "+faction.getTag()+" ("+faction.getId()+") was disbanded by "+(senderIsConsole ? "console command" : fme.getName())+".");
if (Econ.shouldBeUsed() && ! senderIsConsole)
{
@ -85,7 +85,7 @@ public class CmdDisband extends FCommand
{
String amountString = Econ.moneyString(amount);
msg("<i>You have been given the disbanded faction's bank, totaling %s.", amountString);
P.p.log(fme.getName() + " has been given bank holdings of "+amountString+" from disbanding "+faction.getTag()+".");
Factions.p.log(fme.getName() + " has been given bank holdings of "+amountString+" from disbanding "+faction.getTag()+".");
}
}

4
src/com/massivecraft/factions/cmd/CmdHelp.java
View File

@ -3,7 +3,7 @@ package com.massivecraft.factions.cmd;
import java.util.ArrayList;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.integration.Econ;
@ -162,7 +162,7 @@ public class CmdHelp extends FCommand
pageLines.add(p.txt.parse("<c>/f claim safezone <i>claim land for the Safe Zone"));
pageLines.add(p.txt.parse("<c>/f claim warzone <i>claim land for the War Zone"));
pageLines.add(p.txt.parse("<c>/f autoclaim [safezone|warzone] <i>take a guess"));
pageLines.add(p.txt.parse("<i>Note: " + p.cmdBase.cmdUnclaim.getUseageTemplate(false) + P.p.txt.parse("<i>") + " works on safe/war zones as well."));
pageLines.add(p.txt.parse("<i>Note: " + p.cmdBase.cmdUnclaim.getUseageTemplate(false) + Factions.p.txt.parse("<i>") + " works on safe/war zones as well."));
helpPages.add(pageLines);
pageLines = new ArrayList<String>();

6
src/com/massivecraft/factions/cmd/CmdJoin.java
View File

@ -6,7 +6,7 @@ import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.event.FPlayerJoinEvent;
@ -103,9 +103,9 @@ public class CmdJoin extends FCommand
if (Conf.logFactionJoin)
{
if (samePlayer)
P.p.log("%s joined the faction %s.", fplayer.getName(), faction.getTag());
Factions.p.log("%s joined the faction %s.", fplayer.getName(), faction.getTag());
else
P.p.log("%s moved the player %s into the faction %s.", fme.getName(), fplayer.getName(), faction.getTag());
Factions.p.log("%s moved the player %s into the faction %s.", fme.getName(), fplayer.getName(), faction.getTag());
}
}
}

4
src/com/massivecraft/factions/cmd/CmdKick.java
View File

@ -5,7 +5,7 @@ import org.bukkit.Bukkit;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.event.FPlayerLeaveEvent;
import com.massivecraft.factions.struct.FPerm;
@ -79,7 +79,7 @@ public class CmdKick extends FCommand
}
if (Conf.logFactionKick)
P.p.log((senderIsConsole ? "A console command" : fme.getName())+" kicked "+you.getName()+" from the faction: "+yourFaction.getTag());
Factions.p.log((senderIsConsole ? "A console command" : fme.getName())+" kicked "+you.getName()+" from the faction: "+yourFaction.getTag());
if (you.getRole() == Rel.LEADER)
yourFaction.promoteNewLeader();

4
src/com/massivecraft/factions/cmd/CmdMoney.java
View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
public class CmdMoney extends FCommand
{
@ -41,7 +41,7 @@ public class CmdMoney extends FCommand
public void perform()
{
this.commandChain.add(this);
P.p.cmdAutoHelp.execute(this.sender, this.args, this.commandChain);
Factions.p.cmdAutoHelp.execute(this.sender, this.args, this.commandChain);
}
}

4
src/com/massivecraft/factions/cmd/CmdMoneyDeposit.java
View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.integration.Econ;
@ -39,7 +39,7 @@ public class CmdMoneyDeposit extends FCommand
boolean success = Econ.transferMoney(fme, fme, faction, amount);
if (success && Conf.logMoneyTransactions)
P.p.log(ChatColor.stripColor(P.p.txt.parse("%s deposited %s in the faction bank: %s", fme.getName(), Econ.moneyString(amount), faction.describeTo(null))));
Factions.p.log(ChatColor.stripColor(Factions.p.txt.parse("%s deposited %s in the faction bank: %s", fme.getName(), Econ.moneyString(amount), faction.describeTo(null))));
}
}

4
src/com/massivecraft/factions/cmd/CmdMoneyTransferFf.java
View File

@ -3,7 +3,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.integration.Econ;
import org.bukkit.ChatColor;
@ -42,6 +42,6 @@ public class CmdMoneyTransferFf extends FCommand
boolean success = Econ.transferMoney(fme, from, to, amount);
if (success && Conf.logMoneyTransactions)
P.p.log(ChatColor.stripColor(P.p.txt.parse("%s transferred %s from the faction \"%s\" to the faction \"%s\"", fme.getName(), Econ.moneyString(amount), from.describeTo(null), to.describeTo(null))));
Factions.p.log(ChatColor.stripColor(Factions.p.txt.parse("%s transferred %s from the faction \"%s\" to the faction \"%s\"", fme.getName(), Econ.moneyString(amount), from.describeTo(null), to.describeTo(null))));
}
}

4
src/com/massivecraft/factions/cmd/CmdMoneyTransferFp.java
View File

@ -3,7 +3,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.integration.Econ;
import org.bukkit.ChatColor;
@ -42,6 +42,6 @@ public class CmdMoneyTransferFp extends FCommand
boolean success = Econ.transferMoney(fme, from, to, amount);
if (success && Conf.logMoneyTransactions)
P.p.log(ChatColor.stripColor(P.p.txt.parse("%s transferred %s from the faction \"%s\" to the player \"%s\"", fme.getName(), Econ.moneyString(amount), from.describeTo(null), to.describeTo(null))));
Factions.p.log(ChatColor.stripColor(Factions.p.txt.parse("%s transferred %s from the faction \"%s\" to the player \"%s\"", fme.getName(), Econ.moneyString(amount), from.describeTo(null), to.describeTo(null))));
}
}

4
src/com/massivecraft/factions/cmd/CmdMoneyTransferPf.java
View File

@ -3,7 +3,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.integration.Econ;
import org.bukkit.ChatColor;
@ -42,6 +42,6 @@ public class CmdMoneyTransferPf extends FCommand
boolean success = Econ.transferMoney(fme, from, to, amount);
if (success && Conf.logMoneyTransactions)
P.p.log(ChatColor.stripColor(P.p.txt.parse("%s transferred %s from the player \"%s\" to the faction \"%s\"", fme.getName(), Econ.moneyString(amount), from.describeTo(null), to.describeTo(null))));
Factions.p.log(ChatColor.stripColor(Factions.p.txt.parse("%s transferred %s from the player \"%s\" to the faction \"%s\"", fme.getName(), Econ.moneyString(amount), from.describeTo(null), to.describeTo(null))));
}
}

4
src/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java
View File

@ -3,7 +3,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.integration.Econ;
import org.bukkit.ChatColor;
@ -37,6 +37,6 @@ public class CmdMoneyWithdraw extends FCommand
boolean success = Econ.transferMoney(fme, faction, fme, amount);
if (success && Conf.logMoneyTransactions)
P.p.log(ChatColor.stripColor(P.p.txt.parse("%s withdrew %s from the faction bank: %s", fme.getName(), Econ.moneyString(amount), faction.describeTo(null))));
Factions.p.log(ChatColor.stripColor(Factions.p.txt.parse("%s withdrew %s from the faction bank: %s", fme.getName(), Econ.moneyString(amount), faction.describeTo(null))));
}
}

4
src/com/massivecraft/factions/cmd/CmdPowerBoost.java
View File

@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
public class CmdPowerBoost extends FCommand
@ -67,6 +67,6 @@ public class CmdPowerBoost extends FCommand
msg("<i>"+target+" now has a power bonus/penalty of "+targetPower+" to min and max power levels.");
if (!senderIsConsole)
P.p.log(fme.getName()+" has set the power bonus/penalty for "+target+" to "+targetPower+".");
Factions.p.log(fme.getName()+" has set the power bonus/penalty for "+target+" to "+targetPower+".");
}
}

4
src/com/massivecraft/factions/cmd/CmdReload.java
View File

@ -4,7 +4,7 @@ import com.massivecraft.factions.Board;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.FactionColl;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
public class CmdReload extends FCommand
@ -65,7 +65,7 @@ public class CmdReload extends FCommand
}
else
{
P.p.log("RELOAD CANCELLED - SPECIFIED FILE INVALID");
Factions.p.log("RELOAD CANCELLED - SPECIFIED FILE INVALID");
msg("<b>Invalid file specified. <i>Valid files: all, conf, board, factions, players");
return;
}

4
src/com/massivecraft/factions/cmd/CmdUnclaim.java
View File

@ -9,7 +9,7 @@ import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.integration.SpoutFeatures;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.struct.FPerm;
@ -64,7 +64,7 @@ public class CmdUnclaim extends FCommand
myFaction.msg("%s<i> unclaimed some land.", fme.describeTo(myFaction, true));
if (Conf.logLandUnclaims)
P.p.log(fme.getName()+" unclaimed land at ("+flocation.getCoordString()+") from the faction: "+otherFaction.getTag());
Factions.p.log(fme.getName()+" unclaimed land at ("+flocation.getCoordString()+") from the faction: "+otherFaction.getTag());
}
}

4
src/com/massivecraft/factions/cmd/CmdUnclaimall.java
View File

@ -4,7 +4,7 @@ import org.bukkit.Bukkit;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.event.LandUnclaimAllEvent;
import com.massivecraft.factions.integration.Econ;
@ -54,7 +54,7 @@ public class CmdUnclaimall extends FCommand
SpoutFeatures.updateTerritoryDisplayLoc(null);
if (Conf.logLandUnclaims)
P.p.log(fme.getName()+" unclaimed everything for the faction: "+myFaction.getTag());
Factions.p.log(fme.getName()+" unclaimed everything for the faction: "+myFaction.getTag());
}
}

4
src/com/massivecraft/factions/cmd/CmdVersion.java
View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
@ -25,6 +25,6 @@ public class CmdVersion extends FCommand
@Override
public void perform()
{
msg("<i>You are running "+P.p.getDescription().getFullName());
msg("<i>You are running "+Factions.p.getDescription().getFullName());
}
}

6
src/com/massivecraft/factions/cmd/FCmdRoot.java
View File

@ -3,7 +3,7 @@ package com.massivecraft.factions.cmd;
import java.util.Collections;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
public class FCmdRoot extends FCommand
{
@ -69,7 +69,7 @@ public class FCmdRoot extends FCommand
this.setHelpShort("The faction base command");
this.helpLong.add(p.txt.parseTags("<i>This command contains all faction stuff."));
this.addSubCommand(P.p.cmdAutoHelp);
this.addSubCommand(Factions.p.cmdAutoHelp);
this.addSubCommand(this.cmdList);
this.addSubCommand(this.cmdShow);
this.addSubCommand(this.cmdPower);
@ -118,7 +118,7 @@ public class FCmdRoot extends FCommand
public void perform()
{
this.commandChain.add(this);
P.p.cmdAutoHelp.execute(this.sender, this.args, this.commandChain);
Factions.p.cmdAutoHelp.execute(this.sender, this.args, this.commandChain);
}
}

6
src/com/massivecraft/factions/cmd/FCommand.java
View File

@ -11,14 +11,14 @@ import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FactionColl;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.struct.FFlag;
import com.massivecraft.factions.struct.FPerm;
import com.massivecraft.factions.struct.Rel;
import com.massivecraft.factions.zcore.MCommand;
public abstract class FCommand extends MCommand<P>
public abstract class FCommand extends MCommand<Factions>
{
public boolean disableOnLock;
@ -32,7 +32,7 @@ public abstract class FCommand extends MCommand<P>
public FCommand()
{
super(P.p);
super(Factions.p);
// Due to safety reasons it defaults to disable on lock.
disableOnLock = true;