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

Loads of UPlayer --> MPlayer renames

Browse Source
This commit is contained in:
Olof Larsson
2014-09-17 13:29:58 +02:00
parent 529ae45ede
commit 0b60a5ad1a
43 changed files with 303 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java
View File

@@ -43,7 +43,7 @@ public abstract class CmdFactionsAccessAbstract extends FCommand
{
chunk = PS.valueOf(me).getChunk(true);
ta = BoardColl.get().getTerritoryAccessAt(chunk);
hostFaction = ta.getHostFaction(usender);
hostFaction = ta.getHostFaction();
this.innerPerform();
}
@@ -55,8 +55,8 @@ public abstract class CmdFactionsAccessAbstract extends FCommand
sendMessage(Txt.titleize("Access at " + chunk.toString(PSFormatHumanSpace.get())));
msg("<k>Host Faction: %s", hostFaction.describeTo(usender, true));
msg("<k>Host Faction Allowed: %s", ta.isHostFactionAllowed() ? Txt.parse("<lime>TRUE") : Txt.parse("<rose>FALSE"));
msg("<k>Granted Players: %s", describeRelationParticipators(ta.getGrantedUPlayers(usender), usender));
msg("<k>Granted Factions: %s", describeRelationParticipators(ta.getGrantedFactions(usender), usender));
msg("<k>Granted Players: %s", describeRelationParticipators(ta.getGrantedMPlayers(), usender));
msg("<k>Granted Factions: %s", describeRelationParticipators(ta.getGrantedFactions(), usender));
}
public static String describeRelationParticipators(Collection<? extends RelationParticipator> relationParticipators, RelationParticipator observer)

10
src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java
View File

@@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPerm;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.cmd.arg.ARUPlayer;
import com.massivecraft.factions.cmd.arg.ARMPlayer;
import com.massivecraft.factions.entity.BoardColl;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.massivecore.cmd.arg.ARBoolean;
@@ -35,17 +35,17 @@ public class CmdFactionsAccessPlayer extends CmdFactionsAccessAbstract
public void innerPerform()
{
// Args
MPlayer uplayer = this.arg(0, ARUPlayer.getAny());
if (uplayer == null) return;
MPlayer mplayer = this.arg(0, ARMPlayer.getAny());
if (mplayer == null) return;
Boolean newValue = this.arg(1, ARBoolean.get(), !ta.isPlayerIdGranted(uplayer.getId()));
Boolean newValue = this.arg(1, ARBoolean.get(), !ta.isPlayerIdGranted(mplayer.getId()));
if (newValue == null) return;
// FPerm
if (!FPerm.ACCESS.has(usender, hostFaction, true)) return;
// Apply
ta = ta.withPlayerId(uplayer.getId(), newValue);
ta = ta.withPlayerId(mplayer.getId(), newValue);
BoardColl.get().setTerritoryAccessAt(chunk, ta);
// Inform

4
src/main/java/com/massivecraft/factions/cmd/CmdFactionsDemote.java
View File

@@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.cmd.arg.ARUPlayer;
import com.massivecraft.factions.cmd.arg.ARMPlayer;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
@@ -35,7 +35,7 @@ public class CmdFactionsDemote extends FCommand
@Override
public void perform()
{
MPlayer you = this.arg(0, ARUPlayer.getAny());
MPlayer you = this.arg(0, ARMPlayer.getAny());
if (you == null) return;
if (you.getFaction() != usenderFaction)

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsDescription.java
View File

@@ -50,7 +50,7 @@ public class CmdFactionsDescription extends FCommand
usenderFaction.setDescription(newDescription);
// Inform
for (MPlayer follower : usenderFaction.getUPlayers())
for (MPlayer follower : usenderFaction.getMPlayers())
{
follower.msg("<i>%s <i>set your faction description to:\n%s", Mixin.getDisplayName(sender, follower), usenderFaction.getDescription());
}

14
src/main/java/com/massivecraft/factions/cmd/CmdFactionsDisband.java
View File

@@ -64,23 +64,23 @@ public class CmdFactionsDisband extends FCommand
// Merged Apply and Inform
// Run event for each player in the faction
for (MPlayer uplayer : faction.getUPlayers())
for (MPlayer mplayer : faction.getMPlayers())
{
EventFactionsMembershipChange membershipChangeEvent = new EventFactionsMembershipChange(sender, uplayer, FactionColl.get().getNone(), MembershipChangeReason.DISBAND);
EventFactionsMembershipChange membershipChangeEvent = new EventFactionsMembershipChange(sender, mplayer, FactionColl.get().getNone(), MembershipChangeReason.DISBAND);
membershipChangeEvent.run();
}
// Inform all players
for (MPlayer uplayer : MPlayerColl.get().getAllOnline())
for (MPlayer mplayer : MPlayerColl.get().getAllOnline())
{
String who = usender.describeTo(uplayer);
if (uplayer.getFaction() == faction)
String who = usender.describeTo(mplayer);
if (mplayer.getFaction() == faction)
{
uplayer.msg("<h>%s<i> disbanded your faction.", who);
mplayer.msg("<h>%s<i> disbanded your faction.", who);
}
else
{
uplayer.msg("<h>%s<i> disbanded the faction %s.", who, faction.getName(uplayer));
mplayer.msg("<h>%s<i> disbanded the faction %s.", who, faction.getName(mplayer));
}
}

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsFaction.java
View File

@@ -145,7 +145,7 @@ public class CmdFactionsFaction extends FCommand
List<String> followerNamesOnline = new ArrayList<String>();
List<String> followerNamesOffline = new ArrayList<String>();
List<MPlayer> followers = faction.getUPlayers();
List<MPlayer> followers = faction.getMPlayers();
Collections.sort(followers, PlayerRoleComparator.get());
for (MPlayer follower : followers)

24
src/main/java/com/massivecraft/factions/cmd/CmdFactionsInvite.java
View File

@@ -3,7 +3,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPerm;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.cmd.arg.ARUPlayer;
import com.massivecraft.factions.cmd.arg.ARMPlayer;
import com.massivecraft.factions.cmd.req.ReqHasFaction;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.factions.event.EventFactionsInvitedChange;
@@ -40,16 +40,16 @@ public class CmdFactionsInvite extends FCommand
public void perform()
{
// Args
MPlayer uplayer = this.arg(0, ARUPlayer.getAny());
if (uplayer == null) return;
MPlayer mplayer = this.arg(0, ARMPlayer.getAny());
if (mplayer == null) return;
Boolean newInvited = this.arg(1, ARBoolean.get(), !usenderFaction.isInvited(uplayer));
Boolean newInvited = this.arg(1, ARBoolean.get(), !usenderFaction.isInvited(mplayer));
if (newInvited == null) return;
// Allready member?
if (uplayer.getFaction() == usenderFaction)
if (mplayer.getFaction() == usenderFaction)
{
msg("%s<i> is already a member of %s", uplayer.getName(), usenderFaction.getName());
msg("%s<i> is already a member of %s", mplayer.getName(), usenderFaction.getName());
msg("<i>You might want to: " + Factions.get().getOuterCmdFactions().cmdFactionsKick.getUseageTemplate(false));
return;
}
@@ -58,24 +58,24 @@ public class CmdFactionsInvite extends FCommand
if ( ! FPerm.INVITE.has(usender, usenderFaction, true)) return;
// Event
EventFactionsInvitedChange event = new EventFactionsInvitedChange(sender, uplayer, usenderFaction, newInvited);
EventFactionsInvitedChange event = new EventFactionsInvitedChange(sender, mplayer, usenderFaction, newInvited);
event.run();
if (event.isCancelled()) return;
newInvited = event.isNewInvited();
// Apply
usenderFaction.setInvited(uplayer, newInvited);
usenderFaction.setInvited(mplayer, newInvited);
// Inform
if (newInvited)
{
uplayer.msg("%s<i> invited you to %s", usender.describeTo(uplayer, true), usenderFaction.describeTo(uplayer));
usenderFaction.msg("%s<i> invited %s<i> to your faction.", usender.describeTo(usenderFaction, true), uplayer.describeTo(usenderFaction));
mplayer.msg("%s<i> invited you to %s", usender.describeTo(mplayer, true), usenderFaction.describeTo(mplayer));
usenderFaction.msg("%s<i> invited %s<i> to your faction.", usender.describeTo(usenderFaction, true), mplayer.describeTo(usenderFaction));
}
else
{
uplayer.msg("%s<i> revoked your invitation to <h>%s<i>.", usender.describeTo(uplayer), usenderFaction.describeTo(uplayer));
usenderFaction.msg("%s<i> revoked %s's<i> invitation.", usender.describeTo(usenderFaction), uplayer.describeTo(usenderFaction));
mplayer.msg("%s<i> revoked your invitation to <h>%s<i>.", usender.describeTo(mplayer), usenderFaction.describeTo(mplayer));
usenderFaction.msg("%s<i> revoked %s's<i> invitation.", usender.describeTo(usenderFaction), mplayer.describeTo(usenderFaction));
}
}

46
src/main/java/com/massivecraft/factions/cmd/CmdFactionsJoin.java
View File

@@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.cmd.arg.ARUPlayer;
import com.massivecraft.factions.cmd.arg.ARMPlayer;
import com.massivecraft.factions.cmd.arg.ARFaction;
import com.massivecraft.factions.entity.MConf;
import com.massivecraft.factions.entity.MPlayer;
@@ -42,11 +42,11 @@ public class CmdFactionsJoin extends FCommand
Faction faction = this.arg(0, ARFaction.get());
if (faction == null) return;
MPlayer uplayer = this.arg(1, ARUPlayer.getAny(), usender);
if (uplayer == null) return;
Faction uplayerFaction = uplayer.getFaction();
MPlayer mplayer = this.arg(1, ARMPlayer.getAny(), usender);
if (mplayer == null) return;
Faction mplayerFaction = mplayer.getFaction();
boolean samePlayer = uplayer == usender;
boolean samePlayer = mplayer == usender;
// Validate
if (!samePlayer && ! Perm.JOIN_OTHERS.has(sender, false))
@@ -55,36 +55,36 @@ public class CmdFactionsJoin extends FCommand
return;
}
if (faction == uplayerFaction)
if (faction == mplayerFaction)
{
msg("<i>%s <i>%s already a member of %s<i>.", uplayer.describeTo(usender, true), (samePlayer ? "are" : "is"), faction.getName(usender));
msg("<i>%s <i>%s already a member of %s<i>.", mplayer.describeTo(usender, true), (samePlayer ? "are" : "is"), faction.getName(usender));
return;
}
if (MConf.get().factionMemberLimit > 0 && faction.getUPlayers().size() >= MConf.get().factionMemberLimit)
if (MConf.get().factionMemberLimit > 0 && faction.getMPlayers().size() >= MConf.get().factionMemberLimit)
{
msg(" <b>!<white> The faction %s is at the limit of %d members, so %s cannot currently join.", faction.getName(usender), MConf.get().factionMemberLimit, uplayer.describeTo(usender, false));
msg(" <b>!<white> The faction %s is at the limit of %d members, so %s cannot currently join.", faction.getName(usender), MConf.get().factionMemberLimit, mplayer.describeTo(usender, false));
return;
}
if (uplayerFaction.isNormal())
if (mplayerFaction.isNormal())
{
msg("<b>%s must leave %s current faction first.", uplayer.describeTo(usender, true), (samePlayer ? "your" : "their"));
msg("<b>%s must leave %s current faction first.", mplayer.describeTo(usender, true), (samePlayer ? "your" : "their"));
return;
}
if (!MConf.get().canLeaveWithNegativePower && uplayer.getPower() < 0)
if (!MConf.get().canLeaveWithNegativePower && mplayer.getPower() < 0)
{
msg("<b>%s cannot join a faction with a negative power level.", uplayer.describeTo(usender, true));
msg("<b>%s cannot join a faction with a negative power level.", mplayer.describeTo(usender, true));
return;
}
if( ! (faction.isOpen() || faction.isInvited(uplayer) || usender.isUsingAdminMode() || Perm.JOIN_ANY.has(sender, false)))
if( ! (faction.isOpen() || faction.isInvited(mplayer) || usender.isUsingAdminMode() || Perm.JOIN_ANY.has(sender, false)))
{
msg("<i>This faction requires invitation.");
if (samePlayer)
{
faction.msg("%s<i> tried to join your faction.", uplayer.describeTo(faction, true));
faction.msg("%s<i> tried to join your faction.", mplayer.describeTo(faction, true));
}
return;
}
@@ -97,27 +97,27 @@ public class CmdFactionsJoin extends FCommand
// Inform
if (!samePlayer)
{
uplayer.msg("<i>%s <i>moved you into the faction %s<i>.", usender.describeTo(uplayer, true), faction.getName(uplayer));
mplayer.msg("<i>%s <i>moved you into the faction %s<i>.", usender.describeTo(mplayer, true), faction.getName(mplayer));
}
faction.msg("<i>%s <i>joined <lime>your faction<i>.", uplayer.describeTo(faction, true));
usender.msg("<i>%s <i>successfully joined %s<i>.", uplayer.describeTo(usender, true), faction.getName(usender));
faction.msg("<i>%s <i>joined <lime>your faction<i>.", mplayer.describeTo(faction, true));
usender.msg("<i>%s <i>successfully joined %s<i>.", mplayer.describeTo(usender, true), faction.getName(usender));
// Apply
uplayer.resetFactionData();
uplayer.setFaction(faction);
mplayer.resetFactionData();
mplayer.setFaction(faction);
faction.setInvited(uplayer, false);
faction.setInvited(mplayer, false);
// Derplog
if (MConf.get().logFactionJoin)
{
if (samePlayer)
{
Factions.get().log(Txt.parse("%s joined the faction %s.", uplayer.getName(), faction.getName()));
Factions.get().log(Txt.parse("%s joined the faction %s.", mplayer.getName(), faction.getName()));
}
else
{
Factions.get().log(Txt.parse("%s moved the player %s into the faction %s.", usender.getName(), uplayer.getName(), faction.getName()));
Factions.get().log(Txt.parse("%s moved the player %s into the faction %s.", usender.getName(), mplayer.getName(), faction.getName()));
}
}
}

36
src/main/java/com/massivecraft/factions/cmd/CmdFactionsKick.java
View File

@@ -4,7 +4,7 @@ import com.massivecraft.factions.FPerm;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.cmd.arg.ARUPlayer;
import com.massivecraft.factions.cmd.arg.ARMPlayer;
import com.massivecraft.factions.entity.FactionColl;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.factions.entity.Faction;
@@ -40,58 +40,58 @@ public class CmdFactionsKick extends FCommand
public void perform()
{
// Arg
MPlayer uplayer = this.arg(0, ARUPlayer.getAny());
if (uplayer == null) return;
MPlayer mplayer = this.arg(0, ARMPlayer.getAny());
if (mplayer == null) return;
// Validate
if (usender == uplayer)
if (usender == mplayer)
{
msg("<b>You cannot kick yourself.");
msg("<i>You might want to: %s", Factions.get().getOuterCmdFactions().cmdFactionsLeave.getUseageTemplate(false));
return;
}
if (uplayer.getRole() == Rel.LEADER && !(this.senderIsConsole || usender.isUsingAdminMode()))
if (mplayer.getRole() == Rel.LEADER && !(this.senderIsConsole || usender.isUsingAdminMode()))
{
msg("<b>The leader can not be kicked.");
return;
}
if ( ! MConf.get().canLeaveWithNegativePower && uplayer.getPower() < 0)
if ( ! MConf.get().canLeaveWithNegativePower && mplayer.getPower() < 0)
{
msg("<b>You cannot kick that member until their power is positive.");
return;
}
// FPerm
Faction uplayerFaction = uplayer.getFaction();
if (!FPerm.KICK.has(usender, uplayerFaction, true)) return;
Faction mplayerFaction = mplayer.getFaction();
if (!FPerm.KICK.has(usender, mplayerFaction, true)) return;
// Event
EventFactionsMembershipChange event = new EventFactionsMembershipChange(sender, uplayer, FactionColl.get().getNone(), MembershipChangeReason.KICK);
EventFactionsMembershipChange event = new EventFactionsMembershipChange(sender, mplayer, FactionColl.get().getNone(), MembershipChangeReason.KICK);
event.run();
if (event.isCancelled()) return;
// Inform
uplayerFaction.msg("%s<i> kicked %s<i> from the faction! :O", usender.describeTo(uplayerFaction, true), uplayer.describeTo(uplayerFaction, true));
uplayer.msg("%s<i> kicked you from %s<i>! :O", usender.describeTo(uplayer, true), uplayerFaction.describeTo(uplayer));
if (uplayerFaction != usenderFaction)
mplayerFaction.msg("%s<i> kicked %s<i> from the faction! :O", usender.describeTo(mplayerFaction, true), mplayer.describeTo(mplayerFaction, true));
mplayer.msg("%s<i> kicked you from %s<i>! :O", usender.describeTo(mplayer, true), mplayerFaction.describeTo(mplayer));
if (mplayerFaction != usenderFaction)
{
usender.msg("<i>You kicked %s<i> from the faction %s<i>!", uplayer.describeTo(usender), uplayerFaction.describeTo(usender));
usender.msg("<i>You kicked %s<i> from the faction %s<i>!", mplayer.describeTo(usender), mplayerFaction.describeTo(usender));
}
if (MConf.get().logFactionKick)
{
Factions.get().log(usender.getDisplayName(IdUtil.getConsole()) + " kicked " + uplayer.getName() + " from the faction " + uplayerFaction.getName());
Factions.get().log(usender.getDisplayName(IdUtil.getConsole()) + " kicked " + mplayer.getName() + " from the faction " + mplayerFaction.getName());
}
// Apply
if (uplayer.getRole() == Rel.LEADER)
if (mplayer.getRole() == Rel.LEADER)
{
uplayerFaction.promoteNewLeader();
mplayerFaction.promoteNewLeader();
}
uplayerFaction.setInvited(uplayer, false);
uplayer.resetFactionData();
mplayerFaction.setInvited(mplayer, false);
mplayer.resetFactionData();
}
}

10
src/main/java/com/massivecraft/factions/cmd/CmdFactionsLeader.java
View File

@@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.cmd.arg.ARUPlayer;
import com.massivecraft.factions.cmd.arg.ARMPlayer;
import com.massivecraft.factions.cmd.arg.ARFaction;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.factions.entity.Faction;
@@ -38,7 +38,7 @@ public class CmdFactionsLeader extends FCommand
@Override
public void perform()
{
MPlayer newLeader = this.arg(0, ARUPlayer.getAny());
MPlayer newLeader = this.arg(0, ARMPlayer.getAny());
if (newLeader == null) return;
Faction targetFaction = this.arg(1, ARFaction.get(), usenderFaction);
@@ -46,7 +46,7 @@ public class CmdFactionsLeader extends FCommand
MPlayer targetFactionCurrentLeader = targetFaction.getLeader();
// We now have uplayer and the target faction
// We now have mplayer and the target faction
if (this.senderIsConsole || usender.isUsingAdminMode() || Perm.LEADER_ANY.has(sender, false))
{
// Do whatever you wish
@@ -100,9 +100,9 @@ public class CmdFactionsLeader extends FCommand
msg("<i>You have promoted %s<i> to the position of faction leader.", newLeader.describeTo(usender, true));
// Inform all players
for (MPlayer uplayer : MPlayerColl.get().getAllOnline())
for (MPlayer mplayer : MPlayerColl.get().getAllOnline())
{
uplayer.msg("%s<i> gave %s<i> the leadership of %s<i>.", senderIsConsole ? "A server admin" : RelationUtil.describeThatToMe(usender, uplayer, true), newLeader.describeTo(uplayer), targetFaction.describeTo(uplayer));
mplayer.msg("%s<i> gave %s<i> the leadership of %s<i>.", senderIsConsole ? "A server admin" : RelationUtil.describeThatToMe(usender, mplayer, true), newLeader.describeTo(mplayer), targetFaction.describeTo(mplayer));
}
}

6
src/main/java/com/massivecraft/factions/cmd/CmdFactionsList.java
View File

@@ -63,13 +63,13 @@ public class CmdFactionsList extends FCommand
{
if (faction.isNone())
{
lines.add(Txt.parse("<i>Factionless<i> %d online", FactionColl.get().getNone().getUPlayersWhereOnline(true).size()));
lines.add(Txt.parse("<i>Factionless<i> %d online", FactionColl.get().getNone().getMPlayersWhereOnline(true).size()));
continue;
}
lines.add(Txt.parse("%s<i> %d/%d online, %d/%d/%d",
faction.getName(usender),
faction.getUPlayersWhereOnline(true).size(),
faction.getUPlayers().size(),
faction.getMPlayersWhereOnline(true).size(),
faction.getMPlayers().size(),
faction.getLandCount(),
faction.getPowerRounded(),
faction.getPowerMaxRounded())

4
src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java
View File

@@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.cmd.arg.ARUPlayer;
import com.massivecraft.factions.cmd.arg.ARMPlayer;
import com.massivecraft.factions.cmd.arg.ARFaction;
import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled;
import com.massivecraft.factions.entity.MPlayer;
@@ -51,7 +51,7 @@ public class CmdFactionsMoneyTransferFp extends FCommand
Faction from = this.arg(1, ARFaction.get());
if (from == null) return;
MPlayer to = this.arg(2, ARUPlayer.getAny());
MPlayer to = this.arg(2, ARMPlayer.getAny());
if (to == null) return;
boolean success = Econ.transferMoney(usender, from, to, amount);

4
src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java
View File

@@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.cmd.arg.ARUPlayer;
import com.massivecraft.factions.cmd.arg.ARMPlayer;
import com.massivecraft.factions.cmd.arg.ARFaction;
import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled;
import com.massivecraft.factions.entity.MPlayer;
@@ -48,7 +48,7 @@ public class CmdFactionsMoneyTransferPf extends FCommand
Double amount = this.arg(0, ARDouble.get());
if (amount == null) return;
MPlayer from = this.arg(1, ARUPlayer.getAny());
MPlayer from = this.arg(1, ARMPlayer.getAny());
if (from == null) return;
Faction to = this.arg(2, ARFaction.get());

4
src/main/java/com/massivecraft/factions/cmd/CmdFactionsOfficer.java
View File

@@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.cmd.arg.ARUPlayer;
import com.massivecraft.factions.cmd.arg.ARMPlayer;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
@@ -32,7 +32,7 @@ public class CmdFactionsOfficer extends FCommand
@Override
public void perform()
{
MPlayer you = this.arg(0, ARUPlayer.getAny());
MPlayer you = this.arg(0, ARMPlayer.getAny());
if (you == null) return;
boolean permAny = Perm.OFFICER_ANY.has(sender, false);

26
src/main/java/com/massivecraft/factions/cmd/CmdFactionsPlayer.java
View File

@@ -3,7 +3,7 @@ package com.massivecraft.factions.cmd;
import java.util.LinkedHashMap;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.cmd.arg.ARUPlayer;
import com.massivecraft.factions.cmd.arg.ARMPlayer;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.massivecore.Progressbar;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
@@ -37,24 +37,24 @@ public class CmdFactionsPlayer extends FCommand
public void perform()
{
// Args
MPlayer uplayer = this.arg(0, ARUPlayer.getAny(), usender);
if (uplayer == null) return;
MPlayer mplayer = this.arg(0, ARMPlayer.getAny(), usender);
if (mplayer == null) return;
// INFO: Title
msg(Txt.titleize(Txt.upperCaseFirst(uplayer.getUniverse()) + " Player " + uplayer.describeTo(usender)));
msg(Txt.titleize(Txt.upperCaseFirst(mplayer.getUniverse()) + " Player " + mplayer.describeTo(usender)));
// INFO: Power (as progress bar)
double progressbarQuota = uplayer.getPower() / uplayer.getPowerMax();
int progressbarWidth = (int) Math.round(uplayer.getPowerMax() / uplayer.getPowerMaxUniversal() * 100);
double progressbarQuota = mplayer.getPower() / mplayer.getPowerMax();
int progressbarWidth = (int) Math.round(mplayer.getPowerMax() / mplayer.getPowerMaxUniversal() * 100);
msg("<k>Power: <v>%s", Progressbar.HEALTHBAR_CLASSIC.withQuota(progressbarQuota).withWidth(progressbarWidth).render());
// INFO: Power (as digits)
msg("<k>Power: <v>%.2f / %.2f", uplayer.getPower(), uplayer.getPowerMax());
msg("<k>Power: <v>%.2f / %.2f", mplayer.getPower(), mplayer.getPowerMax());
// INFO: Power Boost
if (uplayer.hasPowerBoost())
if (mplayer.hasPowerBoost())
{
double powerBoost = uplayer.getPowerBoost();
double powerBoost = mplayer.getPowerBoost();
String powerBoostType = (powerBoost > 0 ? "bonus" : "penalty");
msg("<k>Power Boost: <v>%f <i>(a manually granted %s)", powerBoost, powerBoostType);
}
@@ -63,20 +63,20 @@ public class CmdFactionsPlayer extends FCommand
// If the player is not at maximum we wan't to display how much time left.
String stringTillMax = "";
double powerTillMax = uplayer.getPowerMax() - uplayer.getPower();
double powerTillMax = mplayer.getPowerMax() - mplayer.getPower();
if (powerTillMax > 0)
{
long millisTillMax = (long) (powerTillMax * TimeUnit.MILLIS_PER_HOUR / uplayer.getPowerPerHour());
long millisTillMax = (long) (powerTillMax * TimeUnit.MILLIS_PER_HOUR / mplayer.getPowerPerHour());
LinkedHashMap<TimeUnit, Long> unitcountsTillMax = TimeDiffUtil.unitcounts(millisTillMax, TimeUnit.getAllButMillis());
unitcountsTillMax = TimeDiffUtil.limit(unitcountsTillMax, 2);
String unitcountsTillMaxFormated = TimeDiffUtil.formatedVerboose(unitcountsTillMax, "<i>");
stringTillMax = Txt.parse(" <i>(%s <i>left till max)", unitcountsTillMaxFormated);
}
msg("<k>Power per Hour: <v>%.2f%s", uplayer.getPowerPerHour(), stringTillMax);
msg("<k>Power per Hour: <v>%.2f%s", mplayer.getPowerPerHour(), stringTillMax);
// INFO: Power per Death
msg("<k>Power per Death: <v>%.2f", uplayer.getPowerPerDeath());
msg("<k>Power per Death: <v>%.2f", mplayer.getPowerPerDeath());
}

4
src/main/java/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java
View File

@@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.cmd.arg.ARUPlayer;
import com.massivecraft.factions.cmd.arg.ARMPlayer;
import com.massivecraft.factions.cmd.arg.ARFaction;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.factions.entity.Faction;
@@ -56,7 +56,7 @@ public class CmdFactionsPowerBoost extends FCommand
if (doPlayer)
{
MPlayer targetPlayer = this.arg(1, ARUPlayer.getAny());
MPlayer targetPlayer = this.arg(1, ARMPlayer.getAny());
if (targetPlayer == null) return;
targetPlayer.setPowerBoost(targetPower);

4
src/main/java/com/massivecraft/factions/cmd/CmdFactionsPromote.java
View File

@@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.cmd.arg.ARUPlayer;
import com.massivecraft.factions.cmd.arg.ARMPlayer;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
@@ -35,7 +35,7 @@ public class CmdFactionsPromote extends FCommand
@Override
public void perform()
{
MPlayer you = this.arg(0, ARUPlayer.getAny());
MPlayer you = this.arg(0, ARMPlayer.getAny());
if (you == null) return;
if (you.getFaction() != usenderFaction)

4
src/main/java/com/massivecraft/factions/cmd/CmdFactionsTitle.java
View File

@@ -4,7 +4,7 @@ import org.bukkit.ChatColor;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.cmd.arg.ARUPlayer;
import com.massivecraft.factions.cmd.arg.ARMPlayer;
import com.massivecraft.factions.cmd.req.ReqRoleIsAtLeast;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.factions.event.EventFactionsTitleChange;
@@ -40,7 +40,7 @@ public class CmdFactionsTitle extends FCommand
public void perform()
{
// Args
MPlayer you = this.arg(0, ARUPlayer.getAny());
MPlayer you = this.arg(0, ARMPlayer.getAny());
if (you == null) return;
String newTitle = this.argConcatFrom(1, ARString.get(), "");

8
src/main/java/com/massivecraft/factions/cmd/arg/ARFaction.java
View File

@@ -36,12 +36,12 @@ public class ARFaction extends ArgReaderAbstract<Faction>
result.setResult(FactionColl.get().getBestNameMatch(str));
if (result.hasResult()) return result;
// UPlayer Name Exact
// MPlayer Name Exact
String id = IdUtil.getId(str);
MPlayer uplayer = MPlayer.get(id);
if (uplayer != null)
MPlayer mplayer = MPlayer.get(id);
if (mplayer != null)
{
result.setResult(uplayer.getFaction());
result.setResult(mplayer.getFaction());
return result;
}

2
src/main/java/com/massivecraft/factions/cmd/arg/ARUPlayer.java → src/main/java/com/massivecraft/factions/cmd/arg/ARMPlayer.java
View File

@@ -4,7 +4,7 @@ import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.factions.entity.MPlayerColl;
import com.massivecraft.massivecore.cmd.arg.ArgReader;
public class ARUPlayer
public class ARMPlayer
{
// -------------------------------------------- //
// INSTANCE

4
src/main/java/com/massivecraft/factions/cmd/req/ReqRoleIsAtLeast.java
View File

@@ -33,8 +33,8 @@ public class ReqRoleIsAtLeast extends ReqAbstract
@Override
public boolean apply(CommandSender sender, MassiveCommand command)
{
MPlayer uplayer = MPlayer.get(sender);
return uplayer.getRole().isAtLeast(this.rel);
MPlayer mplayer = MPlayer.get(sender);
return mplayer.getRole().isAtLeast(this.rel);
}
@Override