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

MassiveCore - MassivePlugin and Active

Browse Source
This commit is contained in:
Olof Larsson
2016-02-25 22:28:09 +01:00
parent ce6a98e27d
commit 1f5e591ce6
38 changed files with 234 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,13 @@ import com.massivecraft.massivecore.command.VersionCommand;
public class CmdFactions extends FactionsCommand
{
// -------------------------------------------- //
// INSTANCE
// -------------------------------------------- //
private static CmdFactions i = new CmdFactions();
public static CmdFactions get() { return i; }
// -------------------------------------------- //
// FIELDS
// -------------------------------------------- //

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

@@ -84,7 +84,7 @@ public class CmdFactionsCreate extends FactionsCommand
// Inform
msg("<i>You created the faction %s", faction.getName(msender));
message(Mson.mson(mson("You should now: ").color(ChatColor.YELLOW), Factions.get().getOuterCmdFactions().cmdFactionsDescription.getTemplate()));
message(Mson.mson(mson("You should now: ").color(ChatColor.YELLOW), CmdFactions.get().cmdFactionsDescription.getTemplate()));
// Log
if (MConf.get().logFactionCreate)

3
src/com/massivecraft/factions/cmd/CmdFactionsHome.java
View File

@@ -4,7 +4,6 @@ import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.entity.Player;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.cmd.type.TypeFaction;
@@ -73,7 +72,7 @@ public class CmdFactionsHome extends FactionsCommandHome
if (MPerm.getPermSethome().has(msender, faction, false))
{
msender.msg("<i>You should:");
msender.message(Factions.get().getOuterCmdFactions().cmdFactionsSethome.getTemplate());
msender.message(CmdFactions.get().cmdFactionsSethome.getTemplate());
}
return;

3
src/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java
View File

@@ -4,7 +4,6 @@ import java.util.Collection;
import org.bukkit.ChatColor;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.cmd.type.TypeMPlayer;
import com.massivecraft.factions.entity.MPerm;
@@ -77,7 +76,7 @@ public class CmdFactionsInviteAdd extends FactionsCommand
else
{
// Mson
String command = Factions.get().getOuterCmdFactions().cmdFactionsInvite.cmdFactionsInviteRemove.getCommandLine(mplayer.getName());
String command = CmdFactions.get().cmdFactionsInvite.cmdFactionsInviteRemove.getCommandLine(mplayer.getName());
String tooltip = Txt.parse("<i>Click to <c>%s<i>.", command);
Mson remove = Mson.mson(

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

@@ -7,7 +7,6 @@ import java.util.Set;
import org.bukkit.ChatColor;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.cmd.type.TypeMPlayer;
import com.massivecraft.factions.entity.MPerm;
@@ -73,7 +72,7 @@ public class CmdFactionsInviteRemove extends FactionsCommand
if (mplayer.getFaction() == msenderFaction)
{
// Mson
String command = Factions.get().getOuterCmdFactions().cmdFactionsKick.getCommandLine(mplayer.getName());
String command = CmdFactions.get().cmdFactionsKick.getCommandLine(mplayer.getName());
String tooltip = Txt.parse("Click to <c>%s<i>.", command);
Mson kick = Mson.mson(
@@ -116,7 +115,7 @@ public class CmdFactionsInviteRemove extends FactionsCommand
else
{
// Mson
String command = Factions.get().getOuterCmdFactions().cmdFactionsInvite.cmdFactionsInviteAdd.getCommandLine(mplayer.getName());
String command = CmdFactions.get().cmdFactionsInvite.cmdFactionsInviteAdd.getCommandLine(mplayer.getName());
String tooltip = Txt.parse("Click to <c>%s<i>.", command);
Mson invite = Mson.mson(

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

@@ -60,7 +60,7 @@ public class CmdFactionsJoin extends FactionsCommand
if (faction == mplayerFaction)
{
String command = Factions.get().getOuterCmdFactions().cmdFactionsKick.getCommandLine(mplayer.getName());
String command = CmdFactions.get().cmdFactionsKick.getCommandLine(mplayer.getName());
// Mson creation
Mson alreadyMember = Mson.mson(
@@ -80,7 +80,7 @@ public class CmdFactionsJoin extends FactionsCommand
if (mplayerFaction.isNormal())
{
String command = Factions.get().getOuterCmdFactions().cmdFactionsLeave.getCommandLine(mplayer.getName());
String command = CmdFactions.get().cmdFactionsLeave.getCommandLine(mplayer.getName());
// Mson creation
Mson leaveFirst = Mson.mson(

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

@@ -49,7 +49,7 @@ public class CmdFactionsKick extends FactionsCommand
if (msender == mplayer)
{
msg("<b>You can't kick yourself.");
message(mson(mson("You might want to: ").color(ChatColor.YELLOW), Factions.get().getOuterCmdFactions().cmdFactionsLeave.getTemplate(false)));
message(mson(mson("You might want to: ").color(ChatColor.YELLOW), CmdFactions.get().cmdFactionsLeave.getTemplate(false)));
return;
}

3
src/com/massivecraft/factions/cmd/CmdFactionsRankOld.java
View File

@@ -1,6 +1,5 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.cmd.type.TypeFaction;
import com.massivecraft.factions.cmd.type.TypeMPlayer;
import com.massivecraft.massivecore.command.Visibility;
@@ -41,7 +40,7 @@ public class CmdFactionsRankOld extends FactionsCommand
@Override
public void perform()
{
Factions.get().getOuterCmdFactions().cmdFactionsRank.execute(sender, MUtil.list(this.argAt(0), this.rankName, this.argAt(1)));
CmdFactions.get().cmdFactionsRank.execute(sender, MUtil.list(this.argAt(0), this.rankName, this.argAt(1)));
}
}

9
src/com/massivecraft/factions/cmd/CmdFactionsRelationAbstract.java
View File

@@ -1,6 +1,5 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.cmd.req.ReqHasFaction;
@@ -88,10 +87,10 @@ public abstract class CmdFactionsRelationAbstract extends FactionsCommand
else
{
MassiveCommand relationshipCommand = null;
if (newRelation.equals(Rel.NEUTRAL)) relationshipCommand = Factions.get().getOuterCmdFactions().cmdFactionsRelationNeutral;
else if (newRelation.equals(Rel.TRUCE)) relationshipCommand = Factions.get().getOuterCmdFactions().cmdFactionsRelationTruce;
else if (newRelation.equals(Rel.ALLY)) relationshipCommand = Factions.get().getOuterCmdFactions().cmdFactionsRelationAlly;
else if (newRelation.equals(Rel.ENEMY)) relationshipCommand = Factions.get().getOuterCmdFactions().cmdFactionsRelationEnemy;
if (newRelation.equals(Rel.NEUTRAL)) relationshipCommand = CmdFactions.get().cmdFactionsRelationNeutral;
else if (newRelation.equals(Rel.TRUCE)) relationshipCommand = CmdFactions.get().cmdFactionsRelationTruce;
else if (newRelation.equals(Rel.ALLY)) relationshipCommand = CmdFactions.get().cmdFactionsRelationAlly;
else if (newRelation.equals(Rel.ENEMY)) relationshipCommand = CmdFactions.get().cmdFactionsRelationEnemy;
String command = relationshipCommand.getCommandLine(msenderFaction.getName());
String tooltip = Txt.parse("<g>Click to <c>%s<i>.", command);

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

@@ -1,6 +1,5 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.cmd.type.TypeFaction;
import com.massivecraft.factions.entity.Faction;
@@ -63,7 +62,7 @@ public class CmdFactionsSethome extends FactionsCommandHome
// Inform
faction.msg("%s<i> set the home for your faction. You can now use:", msender.describeTo(msenderFaction, true));
faction.sendMessage(Factions.get().getOuterCmdFactions().cmdFactionsHome.getTemplate());
faction.sendMessage(CmdFactions.get().cmdFactionsHome.getTemplate());
if (faction != msenderFaction)
{
msender.msg("<i>You have set the home for " + faction.getName(msender) + "<i>.");