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

Territory info using 1.8 Titles.

Browse Source
This commit is contained in:
Olof Larsson 2015-02-02 23:33:19 +01:00
parent 15dab6e5f7
commit df90260030
2 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/com/massivecraft/factions/engine/EngineMain.java
View File

@ -691,12 +691,17 @@ public class EngineMain extends EngineAbstract
} }
else if (factionFrom != factionTo) else if (factionFrom != factionTo)
{ {
String msg = Txt.parse("<i>") + " ~ " + factionTo.getName(mplayer); if (this.isTerritoryInfoUsingScreen())
if (factionTo.hasDescription())
{ {
msg += " - " + factionTo.getDescription(); String maintitle = parseTerritoryInfo(MConf.get().territoryInfoScreenMaintitle, mplayer, factionTo);
String subtitle = parseTerritoryInfo(MConf.get().territoryInfoScreenSubtitle, mplayer, factionTo);
Mixin.sendTitleMessage(player, MConf.get().territoryInfoScreenTicksIn, MConf.get().territoryInfoScreenTicksStay, MConf.get().territoryInfoScreenTicksOut, maintitle, subtitle);
}
else
{
String message = parseTerritoryInfo(MConf.get().territoryInfoChat, mplayer, factionTo);
player.sendMessage(message);
} }
player.sendMessage(msg);
} }
// Show access level message if it changed. // Show access level message if it changed.
@ -706,7 +711,7 @@ public class EngineMain extends EngineAbstract
TerritoryAccess accessTo = BoardColl.get().getTerritoryAccessAt(chunkTo); TerritoryAccess accessTo = BoardColl.get().getTerritoryAccessAt(chunkTo);
Boolean hasTerritoryAccessTo = accessTo.hasTerritoryAccess(mplayer); Boolean hasTerritoryAccessTo = accessTo.hasTerritoryAccess(mplayer);
if (!MUtil.equals(hasTerritoryAccessFrom, hasTerritoryAccessTo)) if ( ! MUtil.equals(hasTerritoryAccessFrom, hasTerritoryAccessTo))
{ {
if (hasTerritoryAccessTo == null) if (hasTerritoryAccessTo == null)
{ {
@ -723,6 +728,24 @@ public class EngineMain extends EngineAbstract
} }
} }
public String parseTerritoryInfo(String string, MPlayer mplayer, Faction faction)
{
string = Txt.parse(string);
string = string.replace("{name}", faction.getName());
string = string.replace("{relcolor}", faction.getColorTo(mplayer).toString());
string = string.replace("{desc}", faction.getDescription());
return string;
}
public boolean isTerritoryInfoUsingScreen()
{
if ( ! MConf.get().territoryInfoUseScreen) return false;
if ( ! Mixin.isTitlesAvailable()) return false;
return true;
}
// -------------------------------------------- // // -------------------------------------------- //
// CHUNK CHANGE: AUTO CLAIM // CHUNK CHANGE: AUTO CLAIM
// -------------------------------------------- // // -------------------------------------------- //

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

@ -266,6 +266,20 @@ public class MConf extends Entity<MConf>
// Choose between: LOWEST, LOW, NORMAL, HIGH, HIGHEST and MONITOR. // Choose between: LOWEST, LOW, NORMAL, HIGH, HIGHEST and MONITOR.
public EventPriority homesTeleportToOnDeathPriority = EventPriority.NORMAL; public EventPriority homesTeleportToOnDeathPriority = EventPriority.NORMAL;
// -------------------------------------------- //
// TERRITORY INFO
// -------------------------------------------- //
public boolean territoryInfoUseScreen = true;
public String territoryInfoScreenMaintitle = "{relcolor}{name}";
public String territoryInfoScreenSubtitle = "<i>{desc}";
public int territoryInfoScreenTicksIn = 5;
public int territoryInfoScreenTicksStay = 60;
public int territoryInfoScreenTicksOut = 5;
public String territoryInfoChat = "<i> ~ {relcolor}{name} <i>{desc}";
// -------------------------------------------- // // -------------------------------------------- //
// ASSORTED // ASSORTED
// -------------------------------------------- // // -------------------------------------------- //