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

Rename admin mode to override. Improve Rel names system.

Browse Source
This commit is contained in:
Olof Larsson
2016-02-02 19:03:11 +01:00
parent cb8aa093db
commit c8433a4770
23 changed files with 137 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,9 @@ public class CmdFactions extends FactionsCommand
public CmdFactionsTitle cmdFactionsTitle = new CmdFactionsTitle();
public CmdFactionsRank cmdFactionsRank = new CmdFactionsRank();
public CmdFactionsRankOld cmdFactionsRankOldLeader = new CmdFactionsRankOld("leader");
public CmdFactionsRankOld cmdFactionsRankOldOwner = new CmdFactionsRankOld("owner");
public CmdFactionsRankOld cmdFactionsRankOldOfficer = new CmdFactionsRankOld("officer");
public CmdFactionsRankOld cmdFactionsRankOldModerator = new CmdFactionsRankOld("moderator");
public CmdFactionsRankOld cmdFactionsRankOldPromote = new CmdFactionsRankOld("promote");
public CmdFactionsRankOld cmdFactionsRankOldDemote = new CmdFactionsRankOld("demote");
public CmdFactionsMoney cmdFactionsMoney = new CmdFactionsMoney();
@@ -53,7 +55,7 @@ public class CmdFactions extends FactionsCommand
public CmdFactionsExpansions cmdFactionsExpansions = new CmdFactionsExpansions();
public CmdFactionsXPlaceholder cmdFactionsTax = new CmdFactionsXPlaceholder("FactionsTax", "tax");
public CmdFactionsXPlaceholder cmdFactionsDynmap = new CmdFactionsXPlaceholder("FactionsDynmap", "dynmap");
public CmdFactionsAdmin cmdFactionsAdmin = new CmdFactionsAdmin();
public CmdFactionsOverride cmdFactionsOverride = new CmdFactionsOverride();
public CmdFactionsDisband cmdFactionsDisband = new CmdFactionsDisband();
public CmdFactionsPowerBoost cmdFactionsPowerBoost = new CmdFactionsPowerBoost();
public CmdFactionsSetpower cmdFactionsSetpower = new CmdFactionsSetpower();
@@ -85,7 +87,9 @@ public class CmdFactions extends FactionsCommand
this.addChild(this.cmdFactionsTitle);
this.addChild(this.cmdFactionsRank);
this.addChild(this.cmdFactionsRankOldLeader);
this.addChild(this.cmdFactionsRankOldOwner);
this.addChild(this.cmdFactionsRankOldOfficer);
this.addChild(this.cmdFactionsRankOldModerator);
this.addChild(this.cmdFactionsRankOldPromote);
this.addChild(this.cmdFactionsRankOldDemote);
this.addChild(this.cmdFactionsMoney);
@@ -105,7 +109,7 @@ public class CmdFactions extends FactionsCommand
this.addChild(this.cmdFactionsExpansions);
this.addChild(this.cmdFactionsTax);
this.addChild(this.cmdFactionsDynmap);
this.addChild(this.cmdFactionsAdmin);
this.addChild(this.cmdFactionsOverride);
this.addChild(this.cmdFactionsDisband);
this.addChild(this.cmdFactionsPowerBoost);
this.addChild(this.cmdFactionsSetpower);

2
src/com/massivecraft/factions/cmd/CmdFactionsFlagList.java
View File

@@ -43,7 +43,7 @@ public class CmdFactionsFlagList extends FactionsCommand
for (MFlag flag : MFlag.getAll())
{
if ( ! flag.isVisible() && ! msender.isUsingAdminMode()) continue;
if ( ! flag.isVisible() && ! msender.isOverriding()) continue;
messages.add(flag.getStateDesc(false, false, true, true, true, false));
}

2
src/com/massivecraft/factions/cmd/CmdFactionsFlagSet.java
View File

@@ -47,7 +47,7 @@ public class CmdFactionsFlagSet extends FactionsCommand
if ( ! MPerm.getPermFlags().has(msender, faction, true)) return;
// Is this flag editable?
if (!msender.isUsingAdminMode() && ! flag.isEditable())
if (!msender.isOverriding() && ! flag.isEditable())
{
msg("<b>The flag <h>%s <b>is not editable.", flag.getName());
return;

2
src/com/massivecraft/factions/cmd/CmdFactionsJoin.java
View File

@@ -98,7 +98,7 @@ public class CmdFactionsJoin extends FactionsCommand
return;
}
if( ! (faction.getFlag(MFlag.getFlagOpen()) || faction.isInvited(mplayer) || msender.isUsingAdminMode()))
if( ! (faction.getFlag(MFlag.getFlagOpen()) || faction.isInvited(mplayer) || msender.isOverriding()))
{
msg("<i>This faction requires invitation.");
if (samePlayer)

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

@@ -54,19 +54,19 @@ public class CmdFactionsKick extends FactionsCommand
return;
}
if (mplayer.getRole() == Rel.LEADER && !(this.senderIsConsole || msender.isUsingAdminMode()))
if (mplayer.getRole() == Rel.LEADER && !(this.senderIsConsole || msender.isOverriding()))
{
msg("<b>The leader can not be kicked.");
return;
}
if (mplayer.getRole().compareTo(msender.getRole()) < 0 && !(this.senderIsConsole || msender.isUsingAdminMode()))
if (mplayer.getRole().compareTo(msender.getRole()) < 0 && !(this.senderIsConsole || msender.isOverriding()))
{
msg("<b>You can't kick people of higher rank than yourself.");
return;
}
if ( ! MConf.get().canLeaveWithNegativePower && mplayer.getPower() < 0 && ! msender.isUsingAdminMode())
if ( ! MConf.get().canLeaveWithNegativePower && mplayer.getPower() < 0 && ! msender.isOverriding())
{
msg("<b>You can't kick that person until their power is positive.");
return;

18
src/com/massivecraft/factions/cmd/CmdFactionsAdmin.java → src/com/massivecraft/factions/cmd/CmdFactionsOverride.java
View File

@@ -8,22 +8,22 @@ import com.massivecraft.massivecore.command.type.primitive.TypeBoolean;
import com.massivecraft.massivecore.util.IdUtil;
import com.massivecraft.massivecore.util.Txt;
public class CmdFactionsAdmin extends FactionsCommand
public class CmdFactionsOverride extends FactionsCommand
{
// -------------------------------------------- //
// CONSTRUCT
// -------------------------------------------- //
public CmdFactionsAdmin()
public CmdFactionsOverride()
{
// Aliases
this.addAliases("admin");
this.addAliases("override", "admin");
// Parameters
this.addParameter(TypeBoolean.getOn(), "on/off", "flip");
// Requirements
this.addRequirements(RequirementHasPerm.get(Perm.ADMIN.node));
this.addRequirements(RequirementHasPerm.get(Perm.OVERRIDE.node));
}
// -------------------------------------------- //
@@ -34,16 +34,16 @@ public class CmdFactionsAdmin extends FactionsCommand
public void perform() throws MassiveException
{
// Args
boolean target = this.readArg(!msender.isUsingAdminMode());
boolean target = this.readArg( ! msender.isOverriding());
// Apply
msender.setUsingAdminMode(target);
msender.setOverriding(target);
// Inform
String desc = Txt.parse(msender.isUsingAdminMode() ? "<g>ENABLED" : "<b>DISABLED");
String desc = Txt.parse(msender.isOverriding() ? "<g>ENABLED" : "<b>DISABLED");
String messageYou = Txt.parse("<i>%s %s <i>admin bypass mode.", msender.getDisplayName(msender), desc);
String messageLog = Txt.parse("<i>%s %s <i>admin bypass mode.", msender.getDisplayName(IdUtil.getConsole()), desc);
String messageYou = Txt.parse("<i>%s %s <i>override mode.", msender.getDisplayName(msender), desc);
String messageLog = Txt.parse("<i>%s %s <i>override mode.", msender.getDisplayName(IdUtil.getConsole()), desc);
msender.message(messageYou);
Factions.get().log(messageLog);

2
src/com/massivecraft/factions/cmd/CmdFactionsPermList.java
View File

@@ -43,7 +43,7 @@ public class CmdFactionsPermList extends FactionsCommand
for (MPerm perm : MPerm.getAll())
{
if ( ! perm.isVisible() && ! msender.isUsingAdminMode()) continue;
if ( ! perm.isVisible() && ! msender.isOverriding()) continue;
messages.add(perm.getDesc(true, true));
}

2
src/com/massivecraft/factions/cmd/CmdFactionsPermSet.java
View File

@@ -55,7 +55,7 @@ public class CmdFactionsPermSet extends FactionsCommand
if ( ! MPerm.getPermPerms().has(msender, faction, true)) return;
// Is this perm editable?
if ( ! msender.isUsingAdminMode() && ! perm.isEditable())
if ( ! msender.isOverriding() && ! perm.isEditable())
{
msg("<b>The perm <h>%s <b>is not editable.", perm.getName());
return;

2
src/com/massivecraft/factions/cmd/CmdFactionsRank.java
View File

@@ -165,7 +165,7 @@ public class CmdFactionsRank extends FactionsCommand
private void ensureAllowed() throws MassiveException
{
// People with permission don't follow the normal rules.
if (msender.isUsingAdminMode()) return;
if (msender.isOverriding()) return;
// If somone gets the leadership of wilderness (Which has happened before).
// We can at least try to limit their powers.

2
src/com/massivecraft/factions/cmd/CmdFactionsSetXRadius.java
View File

@@ -42,7 +42,7 @@ public abstract class CmdFactionsSetXRadius extends CmdFactionsSetX
}
// Radius Claim Max
if (radius > MConf.get().setRadiusMax && ! msender.isUsingAdminMode())
if (radius > MConf.get().setRadiusMax && ! msender.isOverriding())
{
msg("<b>The maximum radius allowed is <h>%s<b>.", MConf.get().setRadiusMax);
return null;

2
src/com/massivecraft/factions/cmd/CmdFactionsSethome.java
View File

@@ -46,7 +46,7 @@ public class CmdFactionsSethome extends FactionsCommandHome
if ( ! MPerm.getPermSethome().has(msender, faction, true)) return;
// Verify
if (!msender.isUsingAdminMode() && !faction.isValidHome(newHome))
if (!msender.isOverriding() && !faction.isValidHome(newHome))
{
msender.msg("<b>Sorry, your faction home can only be set inside your own claimed territory.");
return;

2
src/com/massivecraft/factions/cmd/CmdFactionsTitle.java
View File

@@ -52,7 +52,7 @@ public class CmdFactionsTitle extends FactionsCommand
if ( ! MPerm.getPermTitle().has(msender, you.getFaction(), true)) return;
// Rank Check
if (!msender.isUsingAdminMode() && you.getRole().isMoreThan(msender.getRole()))
if (!msender.isOverriding() && you.getRole().isMoreThan(msender.getRole()))
{
msg("<b>You can not edit titles for higher ranks.");
return;

22
src/com/massivecraft/factions/cmd/type/TypeRank.java
View File

@@ -91,26 +91,20 @@ public class TypeRank extends TypeEnum<Rel>
return "rank";
}
@Override
public String getNameInner(Rel value)
{
return value.getName();
}
@Override
public Set<String> getNamesInner(Rel value)
{
// Create
Set<String> ret = new MassiveSet<String>(super.getNamesInner(value));
Set<String> ret = new MassiveSet<String>();
// Fill Exact
if (value == Rel.LEADER)
{
ret.add("admin");
}
else if (value == Rel.OFFICER)
{
ret.add("moderator");
}
else if (value == Rel.MEMBER)
{
ret.add("member");
ret.add("normal");
}
ret.addAll(value.getNames());
// Fill Relative
Rel start = this.getStartRank();

24
src/com/massivecraft/factions/cmd/type/TypeRel.java
View File

@@ -3,7 +3,6 @@ package com.massivecraft.factions.cmd.type;
import java.util.Set;
import com.massivecraft.factions.Rel;
import com.massivecraft.massivecore.collections.MassiveSet;
import com.massivecraft.massivecore.command.type.enumeration.TypeEnum;
public class TypeRel extends TypeEnum<Rel>
@@ -26,25 +25,16 @@ public class TypeRel extends TypeEnum<Rel>
return "role";
}
@Override
public String getNameInner(Rel value)
{
return value.getName();
}
@Override
public Set<String> getNamesInner(Rel value)
{
Set<String> ret = new MassiveSet<String>(super.getNamesInner(value));
if (value == Rel.LEADER)
{
ret.add("admin");
}
else if (value == Rel.OFFICER)
{
ret.add("moderator");
}
else if (value == Rel.MEMBER)
{
ret.add("normal");
}
return ret;
return value.getNames();
}
}