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

In the middle of refactoring to merged role and relation as one enum

Browse Source
This commit is contained in:
Olof Larsson
2011-10-23 17:30:41 +02:00
parent 4f7fd6dd96
commit d280f9409d
26 changed files with 278 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/massivecraft/factions/Board.java
View File

@@ -12,7 +12,7 @@ import java.util.TreeMap;
import org.bukkit.ChatColor;
import com.google.gson.reflect.TypeToken;
import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Rel;
import com.massivecraft.factions.util.AsciiCompass;
import com.massivecraft.factions.zcore.util.DiscUtil;
@@ -213,7 +213,7 @@ public class Board
{
FLocation flocationHere = topLeft.getRelative(dx, dz);
Faction factionHere = getFactionAt(flocationHere);
Relation relation = faction.getRelationTo(factionHere);
Rel relation = faction.getRelationTo(factionHere);
if (factionHere.isNone())
{
row += ChatColor.GRAY+"-";
@@ -232,11 +232,11 @@ public class Board
||
factionHere == factionLoc
||
relation.isAtLeast(Relation.ALLY)
relation.isAtLeast(Rel.ALLY)
||
(Conf.showNeutralFactionsOnMap && relation.equals(Relation.NEUTRAL))
(Conf.showNeutralFactionsOnMap && relation.equals(Rel.NEUTRAL))
||
(Conf.showEnemyFactionsOnMap && relation.equals(Relation.ENEMY))
(Conf.showEnemyFactionsOnMap && relation.equals(Rel.ENEMY))
)
{
if (!fList.containsKey(factionHere.getTag()))

31
src/com/massivecraft/factions/FPlayer.java
View File

@@ -15,8 +15,7 @@ import com.massivecraft.factions.integration.SpoutFeatures;
import com.massivecraft.factions.integration.Worldguard;
import com.massivecraft.factions.struct.ChatMode;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.struct.Rel;
import com.massivecraft.factions.util.RelationUtil;
import com.massivecraft.factions.zcore.persist.PlayerEntity;
import com.nijikokun.register.payment.Method.MethodAccount;
@@ -50,9 +49,9 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
}
// FIELD: role
private Role role;
public Role getRole() { return this.role; }
public void setRole(Role role) { this.role = role; SpoutFeatures.updateAppearances(this.getPlayer()); }
private Rel role;
public Rel getRole() { return this.role; }
public void setRole(Rel role) { this.role = role; SpoutFeatures.updateAppearances(this.getPlayer()); }
// FIELD: title
private String title;
@@ -179,7 +178,7 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
this.factionId = "0"; // The default neutral faction
this.chatMode = ChatMode.PUBLIC;
this.role = Role.NORMAL;
this.role = Rel.MEMBER;
this.title = "";
this.autoClaimFor = null;
@@ -400,18 +399,18 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
}
@Override
public Relation getRelationTo(RelationParticipator rp)
public Rel getRelationTo(RelationParticipator rp)
{
return RelationUtil.getRelationTo(this, rp);
}
@Override
public Relation getRelationTo(RelationParticipator rp, boolean ignorePeaceful)
public Rel getRelationTo(RelationParticipator rp, boolean ignorePeaceful)
{
return RelationUtil.getRelationTo(this, rp, ignorePeaceful);
}
public Relation getRelationToLocation()
public Rel getRelationToLocation()
{
return Board.getFactionAt(new FLocation(this)).getRelationTo(this);
}
@@ -540,17 +539,17 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
public boolean isInAllyTerritory()
{
return Board.getFactionAt(new FLocation(this)).getRelationTo(this).isAlly();
return Board.getFactionAt(new FLocation(this)).getRelationTo(this) == Rel.ALLY;
}
public boolean isInNeutralTerritory()
{
return Board.getFactionAt(new FLocation(this)).getRelationTo(this).isNeutral();
return Board.getFactionAt(new FLocation(this)).getRelationTo(this) == Rel.NEUTRAL;
}
public boolean isInEnemyTerritory()
{
return Board.getFactionAt(new FLocation(this)).getRelationTo(this).isEnemy();
return Board.getFactionAt(new FLocation(this)).getRelationTo(this) == Rel.ENEMY;
}
public void sendFactionHereMessage()
@@ -577,7 +576,7 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
Faction myFaction = this.getFaction();
boolean perm = myFaction.isPermanent();
if (!perm && this.getRole() == Role.ADMIN && myFaction.getFPlayers().size() > 1)
if (!perm && this.getRole() == Rel.LEADER && myFaction.getFPlayers().size() > 1)
{
msg("<b>You must give the admin role to someone else first.");
return;
@@ -664,9 +663,9 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
{
error = P.p.txt.parse("%s<i> already own this land.", forFaction.describeTo(this, true));
}
else if (this.getRole().value < Role.MODERATOR.value)
else if ( ! this.getRole().isAtLeast(Rel.OFFICER))
{
error = P.p.txt.parse("<b>You must be <h>%s<b> to claim land.", Role.MODERATOR.toString());
error = P.p.txt.parse("<b>You must be <h>%s<b> to claim land.", Rel.OFFICER.toString());
}
else if (forFaction.getFPlayers().size() < Conf.claimsRequireMinFactionMembers)
{
@@ -684,7 +683,7 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
{
error = P.p.txt.parse("<b>You can't claim more land! You need more power!");
}
else if (currentFaction.getRelationTo(forFaction) == Relation.ALLY)
else if (currentFaction.getRelationTo(forFaction) == Rel.ALLY)
{
error = P.p.txt.parse("<b>You can't claim the land of your allies.");
}

25
src/com/massivecraft/factions/Faction.java
View File

@@ -12,8 +12,7 @@ import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.iface.RelationParticipator;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.struct.Rel;
import com.massivecraft.factions.util.*;
import com.massivecraft.factions.zcore.persist.Entity;
import com.nijikokun.register.payment.Method.MethodAccount;
@@ -22,7 +21,7 @@ import com.nijikokun.register.payment.Method.MethodAccount;
public class Faction extends Entity implements EconomyParticipator
{
// FIELD: relationWish
private Map<String, Relation> relationWish;
private Map<String, Rel> relationWish;
// FIELD: claimOwnership
private Map<FLocation, Set<String>> claimOwnership = new ConcurrentHashMap<FLocation, Set<String>>();
@@ -141,7 +140,7 @@ public class Faction extends Entity implements EconomyParticipator
public Faction()
{
this.relationWish = new HashMap<String, Relation>();
this.relationWish = new HashMap<String, Rel>();
this.invites = new HashSet<String>();
this.open = Conf.newFactionsDefaultOpen;
this.tag = "???";
@@ -210,13 +209,13 @@ public class Faction extends Entity implements EconomyParticipator
}
@Override
public Relation getRelationTo(RelationParticipator rp)
public Rel getRelationTo(RelationParticipator rp)
{
return RelationUtil.getRelationTo(this, rp);
}
@Override
public Relation getRelationTo(RelationParticipator rp, boolean ignorePeaceful)
public Rel getRelationTo(RelationParticipator rp, boolean ignorePeaceful)
{
return RelationUtil.getRelationTo(this, rp, ignorePeaceful);
}
@@ -227,18 +226,18 @@ public class Faction extends Entity implements EconomyParticipator
return RelationUtil.getColorOfThatToMe(this, rp);
}
public Relation getRelationWish(Faction otherFaction)
public Rel getRelationWish(Faction otherFaction)
{
if (this.relationWish.containsKey(otherFaction.getId()))
{
return this.relationWish.get(otherFaction.getId());
}
return Relation.NEUTRAL;
return Rel.NEUTRAL;
}
public void setRelationWish(Faction otherFaction, Relation relation)
public void setRelationWish(Faction otherFaction, Rel relation)
{
if (this.relationWish.containsKey(otherFaction.getId()) && relation.equals(Relation.NEUTRAL))
if (this.relationWish.containsKey(otherFaction.getId()) && relation.equals(Rel.NEUTRAL))
{
this.relationWish.remove(otherFaction.getId());
}
@@ -355,7 +354,7 @@ public class Faction extends Entity implements EconomyParticipator
for (FPlayer fplayer : FPlayers.i.get())
{
if (fplayer.getFaction() == this && fplayer.getRole() == Role.ADMIN)
if (fplayer.getFaction() == this && fplayer.getRole() == Rel.LEADER)
{
return fplayer;
}
@@ -363,7 +362,7 @@ public class Faction extends Entity implements EconomyParticipator
return null;
}
public ArrayList<FPlayer> getFPlayersWhereRole(Role role)
public ArrayList<FPlayer> getFPlayersWhereRole(Rel role)
{
ArrayList<FPlayer> ret = new ArrayList<FPlayer>();
if ( ! this.isNormal()) return ret;
@@ -595,7 +594,7 @@ public class Faction extends Entity implements EconomyParticipator
fplayer.getFaction() == this
&&
(
fplayer.getRole().isAtLeast(Conf.ownedAreaModeratorsBypass ? Role.MODERATOR : Role.ADMIN)
fplayer.getRole().isAtLeast(Conf.ownedAreaModeratorsBypass ? Rel.OFFICER : Rel.LEADER)
||
Permission.OWNERSHIP_BYPASS.has(fplayer.getPlayer())
)

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

@@ -3,7 +3,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.struct.Rel;
public class CmdAdmin extends FCommand
{
@@ -42,8 +42,8 @@ public class CmdAdmin extends FCommand
return;
}
fme.setRole(Role.MODERATOR);
fyou.setRole(Role.ADMIN);
fme.setRole(Rel.OFFICER);
fyou.setRole(Rel.LEADER);
// Inform all players
for (FPlayer fplayer : FPlayers.i.getOnline())

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

@@ -8,8 +8,7 @@ import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.struct.Rel;
public class CmdCreate extends FCommand
{
@@ -67,7 +66,7 @@ public class CmdCreate extends FCommand
}
faction.setTag(tag);
fme.setRole(Role.ADMIN);
fme.setRole(Rel.LEADER);
fme.setFaction(faction);
for (FPlayer follower : FPlayers.i.getOnline())

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

@@ -7,8 +7,7 @@ import com.massivecraft.factions.P;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.integration.SpoutFeatures;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.struct.Rel;
public class CmdDisband extends FCommand
{
@@ -40,7 +39,7 @@ public class CmdDisband extends FCommand
if (isMyFaction)
{
if ( ! assertMinRole(Role.ADMIN)) return;
if ( ! assertMinRole(Rel.LEADER)) return;
}
else
{

7
src/com/massivecraft/factions/cmd/CmdHome.java
View File

@@ -14,8 +14,7 @@ import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.struct.Rel;
import com.massivecraft.factions.zcore.util.SmokeUtil;
public class CmdHome extends FCommand
@@ -56,7 +55,7 @@ public class CmdHome extends FCommand
if ( ! myFaction.hasHome())
{
fme.msg("<b>You faction does not have a home. " + (fme.getRole().value < Role.MODERATOR.value ? "<i> Ask your leader to:" : "<i>You should:"));
fme.msg("<b>You faction does not have a home. " + (fme.getRole().isLessThan(Rel.OFFICER) ? "<i> Ask your leader to:" : "<i>You should:"));
fme.sendMessage(p.cmdBase.cmdSethome.getUseageTemplate());
return;
}
@@ -105,7 +104,7 @@ public class CmdHome extends FCommand
continue;
FPlayer fp = FPlayers.i.get(p);
if (fme.getRelationTo(fp) != Relation.ENEMY)
if (fme.getRelationTo(fp) != Rel.ENEMY)
continue;
Location l = p.getLocation();

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

@@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.struct.Rel;
public class CmdMod extends FCommand
{
@@ -42,16 +42,16 @@ public class CmdMod extends FCommand
return;
}
if (you.getRole() == Role.MODERATOR)
if (you.getRole() == Rel.OFFICER)
{
// Revoke
you.setRole(Role.NORMAL);
you.setRole(Rel.MEMBER);
myFaction.msg("%s<i> is no longer moderator in your faction.", you.describeTo(myFaction, true));
}
else
{
// Give
you.setRole(Role.MODERATOR);
you.setRole(Rel.OFFICER);
myFaction.msg("%s<i> was promoted to moderator in your faction.", you.describeTo(myFaction, true));
}
}

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

@@ -6,7 +6,7 @@ import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.struct.Rel;
public class CmdOwner extends FCommand
@@ -52,7 +52,7 @@ public class CmdOwner extends FCommand
return;
}
if ( ! hasBypass && !assertMinRole(Conf.ownedAreasModeratorsCanSet ? Role.MODERATOR : Role.ADMIN))
if ( ! hasBypass && !assertMinRole(Conf.ownedAreasModeratorsCanSet ? Rel.OFFICER : Rel.LEADER))
{
return;
}

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

@@ -1,12 +1,12 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Rel;
public class CmdRelationAlly extends FRelationCommand
{
public CmdRelationAlly()
{
aliases.add("ally");
targetRelation = Relation.ALLY;
targetRelation = Rel.ALLY;
}
}

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

@@ -1,12 +1,12 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Rel;
public class CmdRelationEnemy extends FRelationCommand
{
public CmdRelationEnemy()
{
aliases.add("enemy");
targetRelation = Relation.ENEMY;
targetRelation = Rel.ENEMY;
}
}

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

@@ -1,12 +1,12 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Rel;
public class CmdRelationNeutral extends FRelationCommand
{
public CmdRelationNeutral()
{
aliases.add("neutral");
targetRelation = Relation.NEUTRAL;
targetRelation = Rel.NEUTRAL;
}
}

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

@@ -5,7 +5,7 @@ import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.struct.Rel;
public class CmdSethome extends FCommand
{
@@ -40,7 +40,7 @@ public class CmdSethome extends FCommand
// Can the player set the home for this faction?
if (faction == myFaction)
{
if ( ! Permission.SETHOME_ANY.has(sender) && ! assertMinRole(Role.MODERATOR)) return;
if ( ! Permission.SETHOME_ANY.has(sender) && ! assertMinRole(Rel.OFFICER)) return;
}
else
{

12
src/com/massivecraft/factions/cmd/CmdShow.java
View File

@@ -8,7 +8,7 @@ import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.struct.Rel;
public class CmdShow extends FCommand
{
@@ -43,9 +43,9 @@ public class CmdShow 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.econCostShow, "to show faction information", "for showing faction information")) return;
Collection<FPlayer> admins = faction.getFPlayersWhereRole(Role.ADMIN);
Collection<FPlayer> mods = faction.getFPlayersWhereRole(Role.MODERATOR);
Collection<FPlayer> normals = faction.getFPlayersWhereRole(Role.NORMAL);
Collection<FPlayer> admins = faction.getFPlayersWhereRole(Rel.LEADER);
Collection<FPlayer> mods = faction.getFPlayersWhereRole(Rel.OFFICER);
Collection<FPlayer> normals = faction.getFPlayersWhereRole(Rel.MEMBER);
msg(p.txt.titleize(faction.getTag(fme)));
msg("<a>Description: <i>%s", faction.getDescription());
@@ -98,11 +98,11 @@ public class CmdShow extends FCommand
continue;
}
listpart = otherFaction.getTag(fme)+p.txt.parse("<i>")+", ";
if (otherFaction.getRelationTo(faction).isAlly())
if (otherFaction.getRelationTo(faction) == Rel.ALLY)
{
allyList += listpart;
}
else if (otherFaction.getRelationTo(faction).isEnemy())
else if (otherFaction.getRelationTo(faction) == Rel.ENEMY)
{
enemyList += listpart;
}

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

@@ -6,7 +6,7 @@ import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.struct.Rel;
public class CmdUnclaim extends FCommand
{
@@ -74,7 +74,7 @@ public class CmdUnclaim extends FCommand
return;
}
if ( ! assertMinRole(Role.MODERATOR))
if ( ! assertMinRole(Rel.OFFICER))
{
return;
}

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

@@ -12,7 +12,7 @@ import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.P;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.struct.Rel;
import com.massivecraft.factions.zcore.MCommand;
@@ -101,13 +101,13 @@ public abstract class FCommand extends MCommand<P>
return false;
}
if (this.senderMustBeModerator && ! fplayer.getRole().isAtLeast(Role.MODERATOR))
if (this.senderMustBeModerator && ! fplayer.getRole().isAtLeast(Rel.OFFICER))
{
sender.sendMessage(p.txt.parse("<b>Only faction moderators can %s.", this.getHelpShort()));
return false;
}
if (this.senderMustBeAdmin && ! fplayer.getRole().isAtLeast(Role.ADMIN))
if (this.senderMustBeAdmin && ! fplayer.getRole().isAtLeast(Rel.LEADER))
{
sender.sendMessage(p.txt.parse("<b>Only faction admins can %s.", this.getHelpShort()));
return false;
@@ -132,7 +132,7 @@ public abstract class FCommand extends MCommand<P>
return true;
}
public boolean assertMinRole(Role role)
public boolean assertMinRole(Rel role)
{
if (me == null) return true;
@@ -285,16 +285,16 @@ public abstract class FCommand extends MCommand<P>
return false;
}
if (i.getRole().value > you.getRole().value || i.getRole().equals(Role.ADMIN) )
if (i.getRole().value > you.getRole().value || i.getRole().equals(Rel.LEADER) )
{
return true;
}
if (you.getRole().equals(Role.ADMIN))
if (you.getRole().equals(Rel.LEADER))
{
i.sendMessage(p.txt.parse("<b>Only the faction admin can do that."));
}
else if (i.getRole().equals(Role.MODERATOR))
else if (i.getRole().equals(Rel.OFFICER))
{
if ( i == you )
{

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

@@ -6,11 +6,11 @@ import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.integration.SpoutFeatures;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Rel;
public abstract class FRelationCommand extends FCommand
{
public Relation targetRelation;
public Rel targetRelation;
public FRelationCommand()
{
@@ -49,7 +49,7 @@ public abstract class FRelationCommand extends FCommand
if ( ! payForCommand(targetRelation.getRelationCost(), "to change a relation wish", "for changing a relation wish")) return;
myFaction.setRelationWish(them, targetRelation);
Relation currentRelation = myFaction.getRelationTo(them, true);
Rel currentRelation = myFaction.getRelationTo(them, true);
ChatColor currentRelationColor = currentRelation.getColor();
if (targetRelation.value == currentRelation.value)
{
@@ -63,13 +63,13 @@ public abstract class FRelationCommand extends FCommand
myFaction.msg(currentRelationColor+them.getTag()+"<i> were informed that you wish to be "+targetRelation.getColor()+targetRelation);
}
if ( ! targetRelation.isNeutral() && them.isPeaceful())
if ( targetRelation != Rel.NEUTRAL && them.isPeaceful())
{
them.msg("<i>This will have no effect while your faction is peaceful.");
myFaction.msg("<i>This will have no effect while their faction is peaceful.");
}
if ( ! targetRelation.isNeutral() && myFaction.isPeaceful())
if ( targetRelation != Rel.NEUTRAL && myFaction.isPeaceful())
{
them.msg("<i>This will have no effect while their faction is peaceful.");
myFaction.msg("<i>This will have no effect while your faction is peaceful.");

6
src/com/massivecraft/factions/iface/RelationParticipator.java
View File

@@ -2,15 +2,15 @@ package com.massivecraft.factions.iface;
import org.bukkit.ChatColor;
import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Rel;
public interface RelationParticipator
{
public String describeTo(RelationParticipator that);
public String describeTo(RelationParticipator that, boolean ucfirst);
public Relation getRelationTo(RelationParticipator that);
public Relation getRelationTo(RelationParticipator that, boolean ignorePeaceful);
public Rel getRelationTo(RelationParticipator that);
public Rel getRelationTo(RelationParticipator that, boolean ignorePeaceful);
public ChatColor getColorTo(RelationParticipator to);
}

4
src/com/massivecraft/factions/integration/Econ.java
View File

@@ -17,7 +17,7 @@ import com.massivecraft.factions.Factions;
import com.massivecraft.factions.P;
import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.struct.Rel;
import com.massivecraft.factions.util.RelationUtil;
public class Econ
@@ -107,7 +107,7 @@ public class Econ
if (i == fI && fI == fYou) return true;
// Factions can be controlled by members that are moderators... or any member if any member can withdraw.
if (you instanceof Faction && fI == fYou && (Conf.bankMembersCanWithdraw || ((FPlayer)i).getRole().value >= Role.MODERATOR.value)) return true;
if (you instanceof Faction && fI == fYou && (Conf.bankMembersCanWithdraw || ((FPlayer)i).getRole().isAtLeast(Rel.OFFICER))) return true;
// Otherwise you may not! ;,,;
i.msg("<h>%s<i> lack permission to controll <h>%s's<i> money.", i.describeTo(i, true), you.describeTo(i));

46
src/com/massivecraft/factions/struct/FactionFlag.java Normal file
View File

@@ -0,0 +1,46 @@
package com.massivecraft.factions.struct;
/**
* Flags that describe the nature of a faction and it's territory.
* Can monsters spawn there? May fire spread etc? Is the faction permanent?
* These flags have nothing to do with player-permission.
*
* The flags are either true or false.
*/
public enum FactionFlag
{
// Faction flags
PERMANENT,
PEACEFUL, // This faction is friends with everyone
INFPOWER, // This faction has infinite power: TODO: Add faction has enough method. Replace the permanentpower level
// (Faction) Territory flags
POWERLOSS, // Regardless of death-reason players loose power on death IF powerloss is true in this territory
PVP,
FRIENDLYFIRE, // Can members/allies/friends damage eachother in this territory?
MONSTERS,
EXPLOSIONS,
FIRESPREAD,
LIGHTNING,
;
/**
* The state for newly created factions.
*/
public boolean getDefault()
{
// Use config file for this later.
return true;
}
/**
* Is this flag changeable by the faction leaders or not?
* The normal faction members can never change these flags.
* Note that server operators and admin bypassers can change all flags.
*/
public boolean isChangeable()
{
// TODO: Use config file
return true;
}
}

17
src/com/massivecraft/factions/struct/FactionPlayerPerm.java Normal file
View File

@@ -0,0 +1,17 @@
package com.massivecraft.factions.struct;
/**
* Permissions that you (a player) may or may not have in the territory of a certain faction.
*
* You need a certain rel to be able
*/
public enum FactionPlayerPerm
{
BUILD, // This player can build in the faction
PAINBUILD, // This player can build in the faction BUT will take damage each time. This is overridden by BUILD if player has both
DOOR,
WORKBENCH,
CONTAINER,
BUTTON,
LEVER,
}

119
src/com/massivecraft/factions/struct/Rel.java Normal file
View File

@@ -0,0 +1,119 @@
package com.massivecraft.factions.struct;
import org.bukkit.ChatColor;
import com.massivecraft.factions.Conf;
public enum Rel
{
LEADER (70, "leader"),
OFFICER(60, "officer"),
MEMBER (50, "member"),
ALLY (40, "ally"),
TRUCE (30, "truce"),
NEUTRAL(20, "neutral"),
ENEMY (10, "enemy"),
;
public final int value;
public final String nicename;
private Rel(final int value, final String nicename)
{
this.value = value;
this.nicename = nicename;
}
public static Rel parse(String str)
{
if (str == null || str.length() < 1) return null;
str = str.toLowerCase();
// These are to allow conversion from the old system.
if (str.equals("admin"))
{
return LEADER;
}
if (str.equals("moderator"))
{
return OFFICER;
}
if (str.equals("normal"))
{
return MEMBER;
}
// This is how we check: Based on first char.
char c = str.charAt(0);
if (c == 'l') return LEADER;
if (c == 'o') return OFFICER;
if (c == 'm') return MEMBER;
if (c == 'a') return ALLY;
if (c == 't') return TRUCE;
if (c == 'n') return NEUTRAL;
if (c == 'e') return ENEMY;
return null;
}
@Override
public String toString()
{
return this.nicename;
}
public boolean isAtLeast(Rel rel)
{
return this.value >= rel.value;
}
public boolean isAtMost(Rel rel)
{
return this.value <= rel.value;
}
public boolean isLessThan(Rel rel)
{
return this.value < rel.value;
}
public ChatColor getColor()
{
if (this == MEMBER)
return Conf.colorMember;
else if (this == ALLY)
return Conf.colorAlly;
else if (this == NEUTRAL)
return Conf.colorNeutral;
else
return Conf.colorEnemy;
}
public String getPrefix()
{
if (this == LEADER)
{
return Conf.prefixAdmin;
}
if (this == OFFICER)
{
return Conf.prefixMod;
}
return "";
}
// TODO: ADD TRUCE!!!!
public double getRelationCost()
{
if (this == ENEMY)
return Conf.econCostEnemy;
else if (this == ALLY)
return Conf.econCostAlly;
else
return Conf.econCostNeutral;
}
}

7
src/com/massivecraft/factions/struct/Relation.java → src/com/massivecraft/factions/struct/RelationDEPR.java
View File

@@ -5,17 +5,18 @@ import org.bukkit.ChatColor;
import com.massivecraft.factions.Conf;
public enum Relation
public enum RelationDEPR
{
MEMBER(3, "member"),
ALLY(2, "ally"),
NEUTRAL(1, "neutral"),
ENEMY(0, "enemy");
ENEMY(0, "enemy"),
;
public final int value;
public final String nicename;
private Relation(final int value, final String nicename)
private RelationDEPR(final int value, final String nicename)
{
this.value = value;
this.nicename = nicename;

4
src/com/massivecraft/factions/struct/Role.java → src/com/massivecraft/factions/struct/RoleDEPR.java
View File

@@ -2,7 +2,7 @@ package com.massivecraft.factions.struct;
import com.massivecraft.factions.Conf;
public enum Role
public enum RoleDEPR
{
ADMIN(2, "admin"),
MODERATOR(1, "moderator"),
@@ -11,7 +11,7 @@ public enum Role
public final int value;
public final String nicename;
private Role(final int value, final String nicename)
private RoleDEPR(final int value, final String nicename)
{
this.value = value;
this.nicename = nicename;

16
src/com/massivecraft/factions/util/RelationUtil.java
View File

@@ -6,7 +6,7 @@ import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.iface.RelationParticipator;
import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Rel;
import com.massivecraft.factions.zcore.util.TextUtil;
public class RelationUtil
@@ -62,32 +62,32 @@ public class RelationUtil
return describeThatToMe(that, me, false);
}
public static Relation getRelationTo(RelationParticipator me, RelationParticipator that)
public static Rel getRelationTo(RelationParticipator me, RelationParticipator that)
{
return getRelationTo(that, me, false);
}
public static Relation getRelationTo(RelationParticipator me, RelationParticipator that, boolean ignorePeaceful)
public static Rel getRelationTo(RelationParticipator me, RelationParticipator that, boolean ignorePeaceful)
{
Faction fthat = getFaction(that);
if (fthat == null) return Relation.NEUTRAL; // ERROR
if (fthat == null) return Rel.NEUTRAL; // ERROR
Faction fme = getFaction(me);
if (fme == null) return Relation.NEUTRAL; // ERROR
if (fme == null) return Rel.NEUTRAL; // ERROR
if (!fthat.isNormal() || !fme.isNormal())
{
return Relation.NEUTRAL;
return Rel.NEUTRAL;
}
if (fthat.equals(fme))
{
return Relation.MEMBER;
return Rel.MEMBER;
}
if (!ignorePeaceful && (fme.isPeaceful() || fthat.isPeaceful()))
{
return Relation.NEUTRAL;
return Rel.NEUTRAL;
}
if (fme.getRelationWish(fthat).value >= fthat.getRelationWish(fme).value)