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

Just started adding in the universe toggle.

Browse Source
This commit is contained in:
Olof Larsson
2013-04-25 12:18:39 +02:00
parent 8fd088e291
commit ac2c7c705c
7 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/massivecraft/factions/chat/tag/ChatTagName.java
View File

@@ -2,6 +2,7 @@ package com.massivecraft.factions.chat.tag;
import com.massivecraft.factions.chat.ChatTagAbstract;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.UConf;
import com.massivecraft.factions.entity.UPlayer;
public class ChatTagName extends ChatTagAbstract
@@ -21,6 +22,7 @@ public class ChatTagName extends ChatTagAbstract
@Override
public String getReplacement(UPlayer fsender, UPlayer frecipient)
{
if (!UConf.get(fsender).enabled) return "";
Faction faction = fsender.getFaction();
if (faction.isNone()) return "";
return faction.getName();

6
src/com/massivecraft/factions/chat/tag/ChatTagNameforce.java
View File

@@ -1,6 +1,8 @@
package com.massivecraft.factions.chat.tag;
import com.massivecraft.factions.chat.ChatTagAbstract;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.UConf;
import com.massivecraft.factions.entity.UPlayer;
public class ChatTagNameforce extends ChatTagAbstract
@@ -20,7 +22,9 @@ public class ChatTagNameforce extends ChatTagAbstract
@Override
public String getReplacement(UPlayer fsender, UPlayer frecipient)
{
return fsender.getFaction().getName();
if (!UConf.get(fsender).enabled) return "";
Faction faction = fsender.getFaction();
return faction.getName();
}
}

4
src/com/massivecraft/factions/chat/tag/ChatTagRelcolor.java
View File

@@ -1,6 +1,7 @@
package com.massivecraft.factions.chat.tag;
import com.massivecraft.factions.chat.ChatTagAbstract;
import com.massivecraft.factions.entity.UConf;
import com.massivecraft.factions.entity.UPlayer;
public class ChatTagRelcolor extends ChatTagAbstract
@@ -20,7 +21,8 @@ public class ChatTagRelcolor extends ChatTagAbstract
@Override
public String getReplacement(UPlayer fsender, UPlayer frecipient)
{
if (fsender == null) return "";
if (!UConf.get(fsender).enabled) return "";
if (frecipient == null) return "";
return frecipient.getRelationTo(fsender).getColor().toString();

5
src/com/massivecraft/factions/chat/tag/ChatTagRole.java
View File

@@ -1,6 +1,7 @@
package com.massivecraft.factions.chat.tag;
import com.massivecraft.factions.chat.ChatTagAbstract;
import com.massivecraft.factions.entity.UConf;
import com.massivecraft.factions.entity.UPlayer;
import com.massivecraft.mcore.util.Txt;
@@ -20,7 +21,9 @@ public class ChatTagRole extends ChatTagAbstract
@Override
public String getReplacement(UPlayer fsender, UPlayer frecipient)
{
{
if (!UConf.get(fsender).enabled) return "";
return Txt.upperCaseFirst(fsender.getRole().toString().toLowerCase());
}

5
src/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java
View File

@@ -1,6 +1,7 @@
package com.massivecraft.factions.chat.tag;
import com.massivecraft.factions.chat.ChatTagAbstract;
import com.massivecraft.factions.entity.UConf;
import com.massivecraft.factions.entity.UPlayer;
public class ChatTagRoleprefix extends ChatTagAbstract
@@ -19,7 +20,9 @@ public class ChatTagRoleprefix extends ChatTagAbstract
@Override
public String getReplacement(UPlayer fsender, UPlayer frecipient)
{
{
if (!UConf.get(fsender).enabled) return "";
return fsender.getRole().getPrefix();
}

3
src/com/massivecraft/factions/chat/tag/ChatTagTitle.java
View File

@@ -1,6 +1,7 @@
package com.massivecraft.factions.chat.tag;
import com.massivecraft.factions.chat.ChatTagAbstract;
import com.massivecraft.factions.entity.UConf;
import com.massivecraft.factions.entity.UPlayer;
public class ChatTagTitle extends ChatTagAbstract
@@ -20,6 +21,8 @@ public class ChatTagTitle extends ChatTagAbstract
@Override
public String getReplacement(UPlayer fsender, UPlayer frecipient)
{
if (!UConf.get(fsender).enabled) return "";
if (!fsender.hasTitle()) return "";
return fsender.getTitle();
}

6
src/com/massivecraft/factions/entity/UConf.java
View File

@@ -24,6 +24,12 @@ public class UConf extends Entity<UConf>
return UConfColls.get().get2(oid);
}
// -------------------------------------------- //
// UNIVERSE ENABLE SWITCH
// -------------------------------------------- //
public boolean enabled = true;
// -------------------------------------------- //
// SPECIAL FACTION IDS
// -------------------------------------------- //