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

MassiveCore - Remove Static Mixin

Browse Source
This commit is contained in:
Olof Larsson
2016-05-13 12:32:05 +02:00
parent 41bfc0bd8f
commit 9c9681957c
12 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,7 @@ import com.massivecraft.factions.event.EventFactionsDescriptionChange;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
import com.massivecraft.massivecore.command.type.primitive.TypeString;
import com.massivecraft.massivecore.mixin.Mixin;
import com.massivecraft.massivecore.mixin.MixinDisplayName;
public class CmdFactionsDescription extends FactionsCommand
{
@@ -54,7 +54,7 @@ public class CmdFactionsDescription extends FactionsCommand
// Inform
for (MPlayer follower : msenderFaction.getMPlayers())
{
follower.msg("<i>%s <i>set your faction description to:\n%s", Mixin.getDisplayName(sender, follower), msenderFaction.getDescription());
follower.msg("<i>%s <i>set your faction description to:\n%s", MixinDisplayName.get().getDisplayName(sender, follower), msenderFaction.getDescription());
}
}

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

@@ -13,7 +13,7 @@ import com.massivecraft.factions.Perm;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.PriorityLines;
import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
import com.massivecraft.massivecore.mixin.Mixin;
import com.massivecraft.massivecore.mixin.MixinMessage;
import com.massivecraft.massivecore.util.Txt;
public class CmdFactionsFaction extends FactionsCommand
@@ -56,13 +56,13 @@ public class CmdFactionsFaction extends FactionsCommand
if (event.isCancelled()) return;
// Title
Mixin.messageOne(sender, Txt.titleize("Faction " + faction.getName(msender)));
MixinMessage.get().messageOne(sender, Txt.titleize("Faction " + faction.getName(msender)));
// Lines
TreeSet<PriorityLines> priorityLiness = new TreeSet<PriorityLines>(event.getIdPriorityLiness().values());
for (PriorityLines priorityLines : priorityLiness)
{
Mixin.messageOne(sender, priorityLines.getLines());
MixinMessage.get().messageOne(sender, priorityLines.getLines());
}
}
});

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

@@ -17,7 +17,7 @@ import com.massivecraft.factions.event.EventFactionsHomeTeleport;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer;
import com.massivecraft.massivecore.mixin.Mixin;
import com.massivecraft.massivecore.mixin.MixinTeleport;
import com.massivecraft.massivecore.mixin.TeleporterException;
import com.massivecraft.massivecore.ps.PS;
import com.massivecraft.massivecore.teleport.Destination;
@@ -152,7 +152,7 @@ public class CmdFactionsHome extends FactionsCommandHome
try
{
Destination destination = new DestinationSimple(home, homeDesc);
Mixin.teleport(me, destination, sender);
MixinTeleport.get().teleport(me, destination, sender);
}
catch (TeleporterException e)
{

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

@@ -8,7 +8,7 @@ import com.massivecraft.massivecore.MassiveCore;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
import com.massivecraft.massivecore.command.type.primitive.TypeString;
import com.massivecraft.massivecore.mixin.Mixin;
import com.massivecraft.massivecore.mixin.MixinDisplayName;
import com.massivecraft.massivecore.util.MUtil;
import com.massivecraft.massivecore.util.Txt;
@@ -88,7 +88,7 @@ public class CmdFactionsMotd extends FactionsCommand
// Inform
for (MPlayer follower : msenderFaction.getMPlayers())
{
follower.msg("<i>%s <i>set your faction motd to:\n%s", Mixin.getDisplayName(sender, follower), msenderFaction.getMotd());
follower.msg("<i>%s <i>set your faction motd to:\n%s", MixinDisplayName.get().getDisplayName(sender, follower), msenderFaction.getMotd());
}
}

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

@@ -10,7 +10,7 @@ import com.massivecraft.factions.entity.BoardColl;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
import com.massivecraft.massivecore.mixin.Mixin;
import com.massivecraft.massivecore.mixin.MixinWorld;
import com.massivecraft.massivecore.ps.PS;
import com.massivecraft.massivecore.util.MUtil;
@@ -85,7 +85,7 @@ public class CmdFactionsSetAll extends CmdFactionsSetXAll
}
Board board = BoardColl.get().get(worldId);
chunks = board.getChunks(oldFaction);
String worldDisplayName = Mixin.getWorldDisplayName(worldId);
String worldDisplayName = MixinWorld.get().getWorldDisplayName(worldId);
this.setFormatOne("<h>%s<i> %s <h>%d <i>chunk using " + word + " <h>" + worldDisplayName + "<i>.");
this.setFormatMany("<h>%s<i> %s <h>%d <i>chunks using " + word + " <h>" + worldDisplayName + "<i>.");
}

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

@@ -6,7 +6,7 @@ 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.mixin.Mixin;
import com.massivecraft.massivecore.mixin.MixinTitle;
import com.massivecraft.massivecore.util.Txt;
public class CmdFactionsTerritorytitles extends FactionsCommand
@@ -36,7 +36,7 @@ public class CmdFactionsTerritorytitles extends FactionsCommand
public Visibility getVisibility()
{
// We hide the command if titles aren't available.
if ( ! Mixin.isTitlesAvailable()) return Visibility.INVISIBLE;
if ( ! MixinTitle.get().isTitlesAvailable()) return Visibility.INVISIBLE;
return super.getVisibility();
}

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

@@ -16,7 +16,7 @@ import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer;
import com.massivecraft.massivecore.mixin.Mixin;
import com.massivecraft.massivecore.mixin.MixinTeleport;
import com.massivecraft.massivecore.mixin.TeleporterException;
import com.massivecraft.massivecore.ps.PS;
import com.massivecraft.massivecore.teleport.Destination;
@@ -67,7 +67,7 @@ public class CmdFactionsUnstuck extends FactionsCommand
Destination destination = new DestinationSimple(PS.valueOf(location));
try
{
Mixin.teleport(me, destination, MConf.get().unstuckSeconds);
MixinTeleport.get().teleport(me, destination, MConf.get().unstuckSeconds);
}
catch (TeleporterException e)
{