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

Rename Factions --> FactionColl

Browse Source
This commit is contained in:
Olof Larsson
2013-04-09 12:58:39 +02:00
parent ff4b85fcf4
commit 8a4b26cbd9
18 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,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.Factions;
import com.massivecraft.factions.FactionColl;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.event.FPlayerJoinEvent;
@ -45,13 +45,13 @@ public class CmdCreate extends FCommand
return;
}
if (Factions.i.isTagTaken(tag))
if (FactionColl.i.isTagTaken(tag))
{
msg("<b>That tag is already in use.");
return;
}
ArrayList<String> tagValidationErrors = Factions.validateTag(tag);
ArrayList<String> tagValidationErrors = FactionColl.validateTag(tag);
if (tagValidationErrors.size() > 0)
{
sendMessage(tagValidationErrors);
@ -69,7 +69,7 @@ public class CmdCreate extends FCommand
// then make 'em pay (if applicable)
if ( ! payForCommand(Conf.econCostCreate, "to create a new faction", "for creating a new faction")) return;
Faction faction = Factions.i.create();
Faction faction = FactionColl.i.create();
// TODO: Why would this even happen??? Auto increment clash??
if (faction == null)

10
src/com/massivecraft/factions/cmd/CmdList.java
View File

@ -6,7 +6,7 @@ import java.util.Comparator;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.FactionColl;
import com.massivecraft.factions.Perm;
@ -37,9 +37,9 @@ public class CmdList extends FCommand
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
if ( ! payForCommand(Conf.econCostList, "to list the factions", "for listing the factions")) return;
ArrayList<Faction> factionList = new ArrayList<Faction>(Factions.i.get());
ArrayList<Faction> factionList = new ArrayList<Faction>(FactionColl.i.get());
factionList.remove(Factions.i.getNone());
factionList.remove(FactionColl.i.getNone());
// TODO: Add flag SECRET To factions instead.
//factionList.remove(Factions.i.getSafeZone());
//factionList.remove(Factions.i.getWarZone());
@ -91,7 +91,7 @@ public class CmdList extends FCommand
sendMessage(p.txt.getPage(lines, this.argAsInt(0, 1), "Faction List"));
*/
factionList.add(0, Factions.i.getNone());
factionList.add(0, FactionColl.i.getNone());
final int pageheight = 9;
int pagenumber = this.argAsInt(0, 1);
@ -111,7 +111,7 @@ public class CmdList extends FCommand
{
if (faction.isNone())
{
lines.add(p.txt.parse("<i>Factionless<i> %d online", Factions.i.getNone().getFPlayersWhereOnline(true).size()));
lines.add(p.txt.parse("<i>Factionless<i> %d online", FactionColl.i.getNone().getFPlayersWhereOnline(true).size()));
continue;
}
lines.add(p.txt.parse("%s<i> %d/%d online, %d/%d/%d",

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

@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.FactionColl;
import com.massivecraft.factions.Perm;
public class CmdOpen extends FCommand
@ -36,7 +36,7 @@ public class CmdOpen extends FCommand
// Inform
myFaction.msg("%s<i> changed the faction to <h>%s<i>.", fme.describeTo(myFaction, true), open);
for (Faction faction : Factions.i.get())
for (Faction faction : FactionColl.i.get())
{
if (faction == myFaction)
{

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

@ -3,7 +3,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.FactionColl;
import com.massivecraft.factions.P;
import com.massivecraft.factions.Perm;
@ -47,7 +47,7 @@ public class CmdReload extends FCommand
}
else if (file.startsWith("f"))
{
Factions.i.loadFromDisc();
FactionColl.i.loadFromDisc();
fileName = "factions.json";
}
else if (file.startsWith("p"))
@ -60,7 +60,7 @@ public class CmdReload extends FCommand
fileName = "all";
Conf.load();
FPlayers.i.loadFromDisc();
Factions.i.loadFromDisc();
FactionColl.i.loadFromDisc();
Board.load();
}
else

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

@ -3,7 +3,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.FactionColl;
import com.massivecraft.factions.Perm;
public class CmdSaveAll extends FCommand
@ -31,7 +31,7 @@ public class CmdSaveAll extends FCommand
public void perform()
{
FPlayers.i.saveToDisc();
Factions.i.saveToDisc();
FactionColl.i.saveToDisc();
Board.save();
Conf.save();
msg("<i>Factions saved to disk!");

8
src/com/massivecraft/factions/cmd/CmdTag.java
View File

@ -6,7 +6,7 @@ import org.bukkit.Bukkit;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.FactionColl;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.event.FactionRenameEvent;
import com.massivecraft.factions.integration.SpoutFeatures;
@ -37,14 +37,14 @@ public class CmdTag extends FCommand
String tag = this.argAsString(0);
// TODO does not first test cover selfcase?
if (Factions.i.isTagTaken(tag) && ! MiscUtil.getComparisonString(tag).equals(myFaction.getComparisonTag()))
if (FactionColl.i.isTagTaken(tag) && ! MiscUtil.getComparisonString(tag).equals(myFaction.getComparisonTag()))
{
msg("<b>That tag is already taken");
return;
}
ArrayList<String> errors = new ArrayList<String>();
errors.addAll(Factions.validateTag(tag));
errors.addAll(FactionColl.validateTag(tag));
if (errors.size() > 0)
{
sendMessage(errors);
@ -67,7 +67,7 @@ public class CmdTag extends FCommand
// Inform
myFaction.msg("%s<i> changed your faction tag to %s", fme.describeTo(myFaction, true), myFaction.getTag(myFaction));
for (Faction faction : Factions.i.get())
for (Faction faction : FactionColl.i.get())
{
if (faction == myFaction)
{

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

@ -10,7 +10,7 @@ import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.FactionColl;
import com.massivecraft.factions.P;
import com.massivecraft.factions.struct.FFlag;
import com.massivecraft.factions.struct.FPerm;
@ -230,13 +230,13 @@ public abstract class FCommand extends MCommand<P>
// First we try an exact match
if (faction == null)
{
faction = Factions.i.getByTag(name);
faction = FactionColl.i.getByTag(name);
}
// Next we match faction tags
if (faction == null)
{
faction = Factions.i.getBestTagMatch(name);
faction = FactionColl.i.getBestTagMatch(name);
}
// Next we match player names