From 20889576ab6765edf4fd9d02651185d0b674b8f9 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Wed, 8 Jun 2016 13:00:15 +0200 Subject: [PATCH] MassiveCore - Editor Improvements. Only single singletons. Shared annotation for inner types. --- .../massivecraft/factions/cmd/CmdFactionsAccessFaction.java | 4 ++-- .../massivecraft/factions/cmd/CmdFactionsAccessPlayer.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdFactionsFlagSet.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdFactionsMap.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdFactionsOverride.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdFactionsPermSet.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java | 4 ++-- .../massivecraft/factions/cmd/CmdFactionsTerritorytitles.java | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAccessFaction.java b/src/com/massivecraft/factions/cmd/CmdFactionsAccessFaction.java index 2e79a449..67f82f8b 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsAccessFaction.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsAccessFaction.java @@ -7,7 +7,7 @@ import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MPerm; import com.massivecraft.massivecore.MassiveException; 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 { @@ -22,7 +22,7 @@ public class CmdFactionsAccessFaction extends CmdFactionsAccessAbstract // Parameters this.addParameter(TypeFaction.get(), "faction"); - this.addParameter(TypeBoolean.getYes(), "yes/no", "toggle"); + this.addParameter(TypeBooleanYes.get(), "yes/no", "toggle"); // Requirements this.addRequirements(RequirementHasPerm.get(Perm.ACCESS_FACTION)); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java b/src/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java index 5ab88501..a5c091ff 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java @@ -7,7 +7,7 @@ import com.massivecraft.factions.entity.MPerm; import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.massivecore.MassiveException; 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 { @@ -22,7 +22,7 @@ public class CmdFactionsAccessPlayer extends CmdFactionsAccessAbstract // Parameters this.addParameter(TypeMPlayer.get(), "player"); - this.addParameter(TypeBoolean.getYes(), "yes/no", "toggle"); + this.addParameter(TypeBooleanYes.get(), "yes/no", "toggle"); // Requirements this.addRequirements(RequirementHasPerm.get(Perm.ACCESS_PLAYER)); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsFlagSet.java b/src/com/massivecraft/factions/cmd/CmdFactionsFlagSet.java index f3335dd3..8e6b776c 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsFlagSet.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsFlagSet.java @@ -9,7 +9,7 @@ import com.massivecraft.factions.entity.MPerm; import com.massivecraft.factions.event.EventFactionsFlagChange; import com.massivecraft.massivecore.MassiveException; 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 { @@ -24,7 +24,7 @@ public class CmdFactionsFlagSet extends FactionsCommand // Parameters this.addParameter(TypeMFlag.get(), "flag"); - this.addParameter(TypeBoolean.getYes(), "yes/no"); + this.addParameter(TypeBooleanYes.get(), "yes/no"); this.addParameter(TypeFaction.get(), "faction", "you"); // Requirements diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMap.java b/src/com/massivecraft/factions/cmd/CmdFactionsMap.java index a849b54d..ee9cba54 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMap.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMap.java @@ -10,7 +10,7 @@ import com.massivecraft.factions.entity.BoardColl; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; 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; public class CmdFactionsMap extends FactionsCommand @@ -25,7 +25,7 @@ public class CmdFactionsMap extends FactionsCommand this.addAliases("map"); // Parameters - this.addParameter(TypeBoolean.getOn(), "on/off", "once"); + this.addParameter(TypeBooleanYes.get(), "on/off", "once"); // Requirements this.addRequirements(RequirementHasPerm.get(Perm.MAP)); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsOverride.java b/src/com/massivecraft/factions/cmd/CmdFactionsOverride.java index 5b4f575d..cc38f6c7 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsOverride.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsOverride.java @@ -4,7 +4,7 @@ import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; import com.massivecraft.massivecore.MassiveException; 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.Txt; @@ -20,7 +20,7 @@ public class CmdFactionsOverride extends FactionsCommand this.addAliases("override", "admin"); // Parameters - this.addParameter(TypeBoolean.getOn(), "on/off", "flip"); + this.addParameter(TypeBooleanYes.get(), "on/off", "flip"); // Requirements this.addRequirements(RequirementHasPerm.get(Perm.OVERRIDE)); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPermSet.java b/src/com/massivecraft/factions/cmd/CmdFactionsPermSet.java index 357b440e..719bd61d 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPermSet.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPermSet.java @@ -14,7 +14,7 @@ import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.factions.event.EventFactionsPermChange; import com.massivecraft.massivecore.MassiveException; 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; public class CmdFactionsPermSet extends FactionsCommand @@ -31,7 +31,7 @@ public class CmdFactionsPermSet extends FactionsCommand // Parameters this.addParameter(TypeMPerm.get(), "perm"); this.addParameter(TypeRel.get(), "relation"); - this.addParameter(TypeBoolean.getYes(), "yes/no"); + this.addParameter(TypeBooleanYes.get(), "yes/no"); this.addParameter(TypeFaction.get(), "faction", "you"); // Requirements diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java b/src/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java index c0c30fe9..9d6e212f 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java @@ -4,7 +4,7 @@ import com.massivecraft.factions.Perm; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; 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; public class CmdFactionsSeeChunk extends FactionsCommand @@ -19,7 +19,7 @@ public class CmdFactionsSeeChunk extends FactionsCommand this.addAliases("sc", "seechunk"); // Parameters - this.addParameter(TypeBoolean.getOn(), "active", "toggle"); + this.addParameter(TypeBooleanOn.get(), "active", "toggle"); // Requirements this.addRequirements(RequirementHasPerm.get(Perm.SEECHUNK)); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsTerritorytitles.java b/src/com/massivecraft/factions/cmd/CmdFactionsTerritorytitles.java index fb2533a1..5ab209d6 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsTerritorytitles.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsTerritorytitles.java @@ -5,7 +5,7 @@ import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.Visibility; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; 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.util.Txt; @@ -21,7 +21,7 @@ public class CmdFactionsTerritorytitles extends FactionsCommand this.addAliases("tt", "territorytitles"); // Parameters - this.addParameter(TypeBoolean.getOn(), "on|off", "toggle"); + this.addParameter(TypeBooleanOn.get(), "on|off", "toggle"); // Requirements this.addRequirements(RequirementHasPerm.get(Perm.TERRITORYTITLES));