Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MassiveCore - Editor Improvements. Only single singletons. Shared annotation for inner types.

Browse Source
This commit is contained in:
Olof Larsson 2016-06-08 13:00:15 +02:00
parent 011a59eb47
commit 20889576ab
No known key found for this signature in database
GPG Key ID: BBEF14F97DA52474
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.MPerm; import com.massivecraft.factions.entity.MPerm;
import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
import com.massivecraft.massivecore.command.type.primitive.TypeBoolean; import com.massivecraft.massivecore.command.type.primitive.TypeBooleanYes;
public class CmdFactionsAccessFaction extends CmdFactionsAccessAbstract public class CmdFactionsAccessFaction extends CmdFactionsAccessAbstract
{ {
@ -22,7 +22,7 @@ public class CmdFactionsAccessFaction extends CmdFactionsAccessAbstract
// Parameters // Parameters
this.addParameter(TypeFaction.get(), "faction"); this.addParameter(TypeFaction.get(), "faction");
this.addParameter(TypeBoolean.getYes(), "yes/no", "toggle"); this.addParameter(TypeBooleanYes.get(), "yes/no", "toggle");
// Requirements // Requirements
this.addRequirements(RequirementHasPerm.get(Perm.ACCESS_FACTION)); this.addRequirements(RequirementHasPerm.get(Perm.ACCESS_FACTION));

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

@ -7,7 +7,7 @@ import com.massivecraft.factions.entity.MPerm;
import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
import com.massivecraft.massivecore.command.type.primitive.TypeBoolean; import com.massivecraft.massivecore.command.type.primitive.TypeBooleanYes;
public class CmdFactionsAccessPlayer extends CmdFactionsAccessAbstract public class CmdFactionsAccessPlayer extends CmdFactionsAccessAbstract
{ {
@ -22,7 +22,7 @@ public class CmdFactionsAccessPlayer extends CmdFactionsAccessAbstract
// Parameters // Parameters
this.addParameter(TypeMPlayer.get(), "player"); this.addParameter(TypeMPlayer.get(), "player");
this.addParameter(TypeBoolean.getYes(), "yes/no", "toggle"); this.addParameter(TypeBooleanYes.get(), "yes/no", "toggle");
// Requirements // Requirements
this.addRequirements(RequirementHasPerm.get(Perm.ACCESS_PLAYER)); this.addRequirements(RequirementHasPerm.get(Perm.ACCESS_PLAYER));

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

@ -9,7 +9,7 @@ import com.massivecraft.factions.entity.MPerm;
import com.massivecraft.factions.event.EventFactionsFlagChange; import com.massivecraft.factions.event.EventFactionsFlagChange;
import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
import com.massivecraft.massivecore.command.type.primitive.TypeBoolean; import com.massivecraft.massivecore.command.type.primitive.TypeBooleanYes;
public class CmdFactionsFlagSet extends FactionsCommand public class CmdFactionsFlagSet extends FactionsCommand
{ {
@ -24,7 +24,7 @@ public class CmdFactionsFlagSet extends FactionsCommand
// Parameters // Parameters
this.addParameter(TypeMFlag.get(), "flag"); this.addParameter(TypeMFlag.get(), "flag");
this.addParameter(TypeBoolean.getYes(), "yes/no"); this.addParameter(TypeBooleanYes.get(), "yes/no");
this.addParameter(TypeFaction.get(), "faction", "you"); this.addParameter(TypeFaction.get(), "faction", "you");
// Requirements // Requirements

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

@ -10,7 +10,7 @@ import com.massivecraft.factions.entity.BoardColl;
import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer;
import com.massivecraft.massivecore.command.type.primitive.TypeBoolean; import com.massivecraft.massivecore.command.type.primitive.TypeBooleanYes;
import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.ps.PS;
public class CmdFactionsMap extends FactionsCommand public class CmdFactionsMap extends FactionsCommand
@ -25,7 +25,7 @@ public class CmdFactionsMap extends FactionsCommand
this.addAliases("map"); this.addAliases("map");
// Parameters // Parameters
this.addParameter(TypeBoolean.getOn(), "on/off", "once"); this.addParameter(TypeBooleanYes.get(), "on/off", "once");
// Requirements // Requirements
this.addRequirements(RequirementHasPerm.get(Perm.MAP)); this.addRequirements(RequirementHasPerm.get(Perm.MAP));

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

@ -4,7 +4,7 @@ import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm; import com.massivecraft.factions.Perm;
import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
import com.massivecraft.massivecore.command.type.primitive.TypeBoolean; import com.massivecraft.massivecore.command.type.primitive.TypeBooleanYes;
import com.massivecraft.massivecore.util.IdUtil; import com.massivecraft.massivecore.util.IdUtil;
import com.massivecraft.massivecore.util.Txt; import com.massivecraft.massivecore.util.Txt;
@ -20,7 +20,7 @@ public class CmdFactionsOverride extends FactionsCommand
this.addAliases("override", "admin"); this.addAliases("override", "admin");
// Parameters // Parameters
this.addParameter(TypeBoolean.getOn(), "on/off", "flip"); this.addParameter(TypeBooleanYes.get(), "on/off", "flip");
// Requirements // Requirements
this.addRequirements(RequirementHasPerm.get(Perm.OVERRIDE)); this.addRequirements(RequirementHasPerm.get(Perm.OVERRIDE));

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

@ -14,7 +14,7 @@ import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.factions.event.EventFactionsPermChange; import com.massivecraft.factions.event.EventFactionsPermChange;
import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
import com.massivecraft.massivecore.command.type.primitive.TypeBoolean; import com.massivecraft.massivecore.command.type.primitive.TypeBooleanYes;
import com.massivecraft.massivecore.util.Txt; import com.massivecraft.massivecore.util.Txt;
public class CmdFactionsPermSet extends FactionsCommand public class CmdFactionsPermSet extends FactionsCommand
@ -31,7 +31,7 @@ public class CmdFactionsPermSet extends FactionsCommand
// Parameters // Parameters
this.addParameter(TypeMPerm.get(), "perm"); this.addParameter(TypeMPerm.get(), "perm");
this.addParameter(TypeRel.get(), "relation"); this.addParameter(TypeRel.get(), "relation");
this.addParameter(TypeBoolean.getYes(), "yes/no"); this.addParameter(TypeBooleanYes.get(), "yes/no");
this.addParameter(TypeFaction.get(), "faction", "you"); this.addParameter(TypeFaction.get(), "faction", "you");
// Requirements // Requirements

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

@ -4,7 +4,7 @@ import com.massivecraft.factions.Perm;
import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer; import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer;
import com.massivecraft.massivecore.command.type.primitive.TypeBoolean; import com.massivecraft.massivecore.command.type.primitive.TypeBooleanOn;
import com.massivecraft.massivecore.util.Txt; import com.massivecraft.massivecore.util.Txt;
public class CmdFactionsSeeChunk extends FactionsCommand public class CmdFactionsSeeChunk extends FactionsCommand
@ -19,7 +19,7 @@ public class CmdFactionsSeeChunk extends FactionsCommand
this.addAliases("sc", "seechunk"); this.addAliases("sc", "seechunk");
// Parameters // Parameters
this.addParameter(TypeBoolean.getOn(), "active", "toggle"); this.addParameter(TypeBooleanOn.get(), "active", "toggle");
// Requirements // Requirements
this.addRequirements(RequirementHasPerm.get(Perm.SEECHUNK)); this.addRequirements(RequirementHasPerm.get(Perm.SEECHUNK));

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

@ -5,7 +5,7 @@ import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.command.Visibility; import com.massivecraft.massivecore.command.Visibility;
import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
import com.massivecraft.massivecore.command.requirement.RequirementTitlesAvailable; import com.massivecraft.massivecore.command.requirement.RequirementTitlesAvailable;
import com.massivecraft.massivecore.command.type.primitive.TypeBoolean; import com.massivecraft.massivecore.command.type.primitive.TypeBooleanOn;
import com.massivecraft.massivecore.mixin.MixinTitle; import com.massivecraft.massivecore.mixin.MixinTitle;
import com.massivecraft.massivecore.util.Txt; import com.massivecraft.massivecore.util.Txt;
@ -21,7 +21,7 @@ public class CmdFactionsTerritorytitles extends FactionsCommand
this.addAliases("tt", "territorytitles"); this.addAliases("tt", "territorytitles");
// Parameters // Parameters
this.addParameter(TypeBoolean.getOn(), "on|off", "toggle"); this.addParameter(TypeBooleanOn.get(), "on|off", "toggle");
// Requirements // Requirements
this.addRequirements(RequirementHasPerm.get(Perm.TERRITORYTITLES)); this.addRequirements(RequirementHasPerm.get(Perm.TERRITORYTITLES));