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

14
src/com/massivecraft/factions/entity/Faction.java
View File

@@ -31,7 +31,7 @@ import com.massivecraft.massivecore.collections.MassiveList;
import com.massivecraft.massivecore.collections.MassiveMapDef;
import com.massivecraft.massivecore.collections.MassiveTreeSetDef;
import com.massivecraft.massivecore.comparator.ComparatorCaseInsensitive;
import com.massivecraft.massivecore.mixin.Mixin;
import com.massivecraft.massivecore.mixin.MixinMessage;
import com.massivecraft.massivecore.money.Money;
import com.massivecraft.massivecore.predicate.Predicate;
import com.massivecraft.massivecore.ps.PS;
@@ -1215,34 +1215,34 @@ public class Faction extends Entity<Faction> implements EconomyParticipator, Nam
public boolean sendMessage(Object message)
{
return Mixin.messagePredicate(new FactionEqualsPredicate(this), message);
return MixinMessage.get().messagePredicate(new FactionEqualsPredicate(this), message);
}
public boolean sendMessage(Object... messages)
{
return Mixin.messagePredicate(new FactionEqualsPredicate(this), messages);
return MixinMessage.get().messagePredicate(new FactionEqualsPredicate(this), messages);
}
public boolean sendMessage(Collection<Object> messages)
{
return Mixin.messagePredicate(new FactionEqualsPredicate(this), messages);
return MixinMessage.get().messagePredicate(new FactionEqualsPredicate(this), messages);
}
// CONVENIENCE MSG
public boolean msg(String msg)
{
return Mixin.msgPredicate(new FactionEqualsPredicate(this), msg);
return MixinMessage.get().msgPredicate(new FactionEqualsPredicate(this), msg);
}
public boolean msg(String msg, Object... args)
{
return Mixin.msgPredicate(new FactionEqualsPredicate(this), msg, args);
return MixinMessage.get().msgPredicate(new FactionEqualsPredicate(this), msg, args);
}
public boolean msg(Collection<String> msgs)
{
return Mixin.msgPredicate(new FactionEqualsPredicate(this), msgs);
return MixinMessage.get().msgPredicate(new FactionEqualsPredicate(this), msgs);
}
}

13
src/com/massivecraft/factions/entity/MPlayer.java
View File

@@ -23,7 +23,8 @@ import com.massivecraft.factions.event.EventFactionsMembershipChange;
import com.massivecraft.factions.event.EventFactionsRemovePlayerMillis;
import com.massivecraft.factions.event.EventFactionsMembershipChange.MembershipChangeReason;
import com.massivecraft.factions.util.RelationUtil;
import com.massivecraft.massivecore.mixin.Mixin;
import com.massivecraft.massivecore.mixin.MixinSenderPs;
import com.massivecraft.massivecore.mixin.MixinTitle;
import com.massivecraft.massivecore.ps.PS;
import com.massivecraft.massivecore.ps.PSFormatHumanSpace;
import com.massivecraft.massivecore.store.SenderEntity;
@@ -90,7 +91,7 @@ public class MPlayer extends SenderEntity<MPlayer> implements EconomyParticipato
Faction faction = this.getFaction();
faction.mplayers.add(this);
//Factions.get().log(Txt.parse("<g>postAttach added <h>%s <i>aka <h>%s <i>to <h>%s <i>aka <h>%s<i>.", id, Mixin.getDisplayName(id), faction.getId(), faction.getName()));
//Factions.get().log(Txt.parse("<g>postAttach added <h>%s <i>aka <h>%s <i>to <h>%s <i>aka <h>%s<i>.", id, MixinDisplayName.get().getDisplayName(id), faction.getId(), faction.getName()));
}
@Override
@@ -103,7 +104,7 @@ public class MPlayer extends SenderEntity<MPlayer> implements EconomyParticipato
Faction faction = this.getFaction();
faction.mplayers.remove(this);
//Factions.get().log(Txt.parse("<b>preDetach removed <h>%s <i>aka <h>%s <i>to <h>%s <i>aka <h>%s<i>.", id, Mixin.getDisplayName(id), faction.getId(), faction.getName()));
//Factions.get().log(Txt.parse("<b>preDetach removed <h>%s <i>aka <h>%s <i>to <h>%s <i>aka <h>%s<i>.", id, MixinDisplayName.get().getDisplayName(id), faction.getId(), faction.getName()));
}
// -------------------------------------------- //
@@ -575,7 +576,7 @@ public class MPlayer extends SenderEntity<MPlayer> implements EconomyParticipato
public boolean isTerritoryInfoTitles()
{
if ( ! Mixin.isTitlesAvailable()) return false;
if ( ! MixinTitle.get().isTitlesAvailable()) return false;
if (this.territoryInfoTitles == null) return MConf.get().territoryInfoTitlesDefault;
return this.territoryInfoTitles;
}
@@ -707,14 +708,14 @@ public class MPlayer extends SenderEntity<MPlayer> implements EconomyParticipato
public boolean isInOwnTerritory()
{
PS ps = Mixin.getSenderPs(this.getId());
PS ps = MixinSenderPs.get().getSenderPs(this.getId());
if (ps == null) return false;
return BoardColl.get().getFactionAt(ps) == this.getFaction();
}
public boolean isInEnemyTerritory()
{
PS ps = Mixin.getSenderPs(this.getId());
PS ps = MixinSenderPs.get().getSenderPs(this.getId());
if (ps == null) return false;
return BoardColl.get().getFactionAt(ps).getRelationTo(this) == Rel.ENEMY;
}