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

Quickfixed everything easy.

Browse Source
This commit is contained in:
Olof Larsson
2013-04-22 13:03:21 +02:00
parent 9fc75b1fcf
commit 61e8730495
52 changed files with 134 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/massivecraft/factions/chat/ChatFormatter.java
View File

@@ -8,6 +8,8 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.massivecraft.factions.entity.FPlayer;
/**
* The ChatFormater is a system offered by factions for tag parsing.
*
@@ -100,7 +102,7 @@ public class ChatFormatter
// FORMAT
// -------------------------------------------- //
public static String format(String msg, String senderId, String sendeeId, String recipientId)
public static String format(String msg, FPlayer fsender, FPlayer frecipient)
{
// We build the return value in this string buffer
StringBuffer ret = new StringBuffer();
@@ -135,7 +137,7 @@ public class ChatFormatter
}
else
{
replacement = compute(tag, modifierIds, senderId, sendeeId, recipientId);
replacement = compute(tag, modifierIds, fsender, frecipient);
if (replacement == null)
{
// If a tag or modifier returns null it's the same as opting out.
@@ -157,9 +159,9 @@ public class ChatFormatter
// TAG COMPUTE
// -------------------------------------------- //
public static String compute(ChatTag tag, List<String> modifierIds, String senderId, String sendeeId, String recipientId)
public static String compute(ChatTag tag, List<String> modifierIds, FPlayer fsender, FPlayer frecipient)
{
String ret = tag.getReplacement(senderId, sendeeId, recipientId);
String ret = tag.getReplacement(fsender, frecipient);
if (ret == null) return null;
for (String modifierId : modifierIds)
@@ -170,7 +172,7 @@ public class ChatFormatter
// Modify and ignore change if null.
// Modifier can't get or return null.
String modified = modifier.getModified(ret, senderId, sendeeId, recipientId);
String modified = modifier.getModified(ret, fsender, frecipient);
if (modified == null) continue;
ret = modified;

4
src/com/massivecraft/factions/chat/ChatModifier.java
View File

@@ -1,10 +1,12 @@
package com.massivecraft.factions.chat;
import com.massivecraft.factions.entity.FPlayer;
public interface ChatModifier
{
public String getId();
public String getModified(String subject, String senderId, String sendeeId, String recipientId);
public String getModified(String subject, FPlayer fsender, FPlayer frecipient);
public boolean register();
public boolean unregister();
}

4
src/com/massivecraft/factions/chat/ChatTag.java
View File

@@ -1,9 +1,11 @@
package com.massivecraft.factions.chat;
import com.massivecraft.factions.entity.FPlayer;
public interface ChatTag
{
public String getId();
public String getReplacement(String senderId, String sendeeId, String recipientId);
public String getReplacement(FPlayer fsender, FPlayer frecipient);
public boolean register();
public boolean unregister();
}

3
src/com/massivecraft/factions/chat/modifier/ChatModifierLc.java
View File

@@ -1,6 +1,7 @@
package com.massivecraft.factions.chat.modifier;
import com.massivecraft.factions.chat.ChatModifierAbstract;
import com.massivecraft.factions.entity.FPlayer;
public class ChatModifierLc extends ChatModifierAbstract
{
@@ -17,7 +18,7 @@ public class ChatModifierLc extends ChatModifierAbstract
// -------------------------------------------- //
@Override
public String getModified(String subject, String senderId, String sendeeId, String recipientId)
public String getModified(String subject, FPlayer fsender, FPlayer frecipient)
{
return subject.toLowerCase();
}

3
src/com/massivecraft/factions/chat/modifier/ChatModifierLp.java
View File

@@ -1,6 +1,7 @@
package com.massivecraft.factions.chat.modifier;
import com.massivecraft.factions.chat.ChatModifierAbstract;
import com.massivecraft.factions.entity.FPlayer;
public class ChatModifierLp extends ChatModifierAbstract
@@ -18,7 +19,7 @@ public class ChatModifierLp extends ChatModifierAbstract
// -------------------------------------------- //
@Override
public String getModified(String subject, String senderId, String sendeeId, String recipientId)
public String getModified(String subject, FPlayer fsender, FPlayer frecipient)
{
if (subject.equals("")) return subject;
return " "+subject;

3
src/com/massivecraft/factions/chat/modifier/ChatModifierParse.java
View File

@@ -1,6 +1,7 @@
package com.massivecraft.factions.chat.modifier;
import com.massivecraft.factions.chat.ChatModifierAbstract;
import com.massivecraft.factions.entity.FPlayer;
import com.massivecraft.mcore.util.Txt;
public class ChatModifierParse extends ChatModifierAbstract
@@ -18,7 +19,7 @@ public class ChatModifierParse extends ChatModifierAbstract
// -------------------------------------------- //
@Override
public String getModified(String subject, String senderId, String sendeeId, String recipientId)
public String getModified(String subject, FPlayer fsender, FPlayer frecipient)
{
return Txt.parse(subject);
}

3
src/com/massivecraft/factions/chat/modifier/ChatModifierRp.java
View File

@@ -1,6 +1,7 @@
package com.massivecraft.factions.chat.modifier;
import com.massivecraft.factions.chat.ChatModifierAbstract;
import com.massivecraft.factions.entity.FPlayer;
public class ChatModifierRp extends ChatModifierAbstract
{
@@ -17,7 +18,7 @@ public class ChatModifierRp extends ChatModifierAbstract
// -------------------------------------------- //
@Override
public String getModified(String subject, String senderId, String sendeeId, String recipientId)
public String getModified(String subject, FPlayer fsender, FPlayer frecipient)
{
if (subject.equals("")) return subject;
return subject+" ";

3
src/com/massivecraft/factions/chat/modifier/ChatModifierUc.java
View File

@@ -1,6 +1,7 @@
package com.massivecraft.factions.chat.modifier;
import com.massivecraft.factions.chat.ChatModifierAbstract;
import com.massivecraft.factions.entity.FPlayer;
public class ChatModifierUc extends ChatModifierAbstract
{
@@ -17,7 +18,7 @@ public class ChatModifierUc extends ChatModifierAbstract
// -------------------------------------------- //
@Override
public String getModified(String subject, String senderId, String sendeeId, String recipientId)
public String getModified(String subject, FPlayer fsender, FPlayer frecipient)
{
return subject.toUpperCase();
}

3
src/com/massivecraft/factions/chat/modifier/ChatModifierUcf.java
View File

@@ -1,6 +1,7 @@
package com.massivecraft.factions.chat.modifier;
import com.massivecraft.factions.chat.ChatModifierAbstract;
import com.massivecraft.factions.entity.FPlayer;
import com.massivecraft.mcore.util.Txt;
public class ChatModifierUcf extends ChatModifierAbstract
@@ -18,7 +19,7 @@ public class ChatModifierUcf extends ChatModifierAbstract
// -------------------------------------------- //
@Override
public String getModified(String subject, String senderId, String sendeeId, String recipientId)
public String getModified(String subject, FPlayer fsender, FPlayer frecipient)
{
return Txt.upperCaseFirst(subject);
}

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

@@ -2,7 +2,6 @@ package com.massivecraft.factions.chat.tag;
import com.massivecraft.factions.chat.ChatTagAbstract;
import com.massivecraft.factions.entity.FPlayer;
import com.massivecraft.factions.entity.FPlayerColl;
public class ChatTagRelcolor extends ChatTagAbstract
{
@@ -19,14 +18,8 @@ public class ChatTagRelcolor extends ChatTagAbstract
// -------------------------------------------- //
@Override
public String getReplacement(String senderId, String sendeeId, String recipientId)
public String getReplacement(FPlayer fsender, FPlayer frecipient)
{
if (senderId == null) return "";
if (recipientId == null) return "";
FPlayer fsender = FPlayerColl.get().get(senderId);
FPlayer frecipient = FPlayerColl.get().get(recipientId);
if (fsender == null) return "";
if (frecipient == null) return "";

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

@@ -2,7 +2,6 @@ package com.massivecraft.factions.chat.tag;
import com.massivecraft.factions.chat.ChatTagAbstract;
import com.massivecraft.factions.entity.FPlayer;
import com.massivecraft.factions.entity.FPlayerColl;
import com.massivecraft.mcore.util.Txt;
public class ChatTagRole extends ChatTagAbstract
@@ -20,9 +19,8 @@ public class ChatTagRole extends ChatTagAbstract
// -------------------------------------------- //
@Override
public String getReplacement(String senderId, String sendeeId, String recipientId)
public String getReplacement(FPlayer fsender, FPlayer frecipient)
{
FPlayer fsender = FPlayerColl.get().get(senderId);
return Txt.upperCaseFirst(fsender.getRole().toString().toLowerCase());
}

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

@@ -2,7 +2,6 @@ package com.massivecraft.factions.chat.tag;
import com.massivecraft.factions.chat.ChatTagAbstract;
import com.massivecraft.factions.entity.FPlayer;
import com.massivecraft.factions.entity.FPlayerColl;
public class ChatTagRoleprefix extends ChatTagAbstract
{
@@ -19,9 +18,8 @@ public class ChatTagRoleprefix extends ChatTagAbstract
// -------------------------------------------- //
@Override
public String getReplacement(String senderId, String sendeeId, String recipientId)
public String getReplacement(FPlayer fsender, FPlayer frecipient)
{
FPlayer fsender = FPlayerColl.get().get(senderId);
return fsender.getRole().getPrefix();
}

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

@@ -2,7 +2,6 @@ package com.massivecraft.factions.chat.tag;
import com.massivecraft.factions.chat.ChatTagAbstract;
import com.massivecraft.factions.entity.FPlayer;
import com.massivecraft.factions.entity.FPlayerColl;
public class ChatTagTag extends ChatTagAbstract
{
@@ -19,9 +18,8 @@ public class ChatTagTag extends ChatTagAbstract
// -------------------------------------------- //
@Override
public String getReplacement(String senderId, String sendeeId, String recipientId)
public String getReplacement(FPlayer fsender, FPlayer frecipient)
{
FPlayer fsender = FPlayerColl.get().get(senderId);
if (!fsender.hasFaction()) return "";
return fsender.getFaction().getTag();
}

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

@@ -2,7 +2,6 @@ package com.massivecraft.factions.chat.tag;
import com.massivecraft.factions.chat.ChatTagAbstract;
import com.massivecraft.factions.entity.FPlayer;
import com.massivecraft.factions.entity.FPlayerColl;
public class ChatTagTagforce extends ChatTagAbstract
{
@@ -19,9 +18,8 @@ public class ChatTagTagforce extends ChatTagAbstract
// -------------------------------------------- //
@Override
public String getReplacement(String senderId, String sendeeId, String recipientId)
{
FPlayer fsender = FPlayerColl.get().get(senderId);
public String getReplacement(FPlayer fsender, FPlayer frecipient)
{
return fsender.getFaction().getTag();
}

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

@@ -2,7 +2,6 @@ package com.massivecraft.factions.chat.tag;
import com.massivecraft.factions.chat.ChatTagAbstract;
import com.massivecraft.factions.entity.FPlayer;
import com.massivecraft.factions.entity.FPlayerColl;
public class ChatTagTitle extends ChatTagAbstract
{
@@ -19,9 +18,8 @@ public class ChatTagTitle extends ChatTagAbstract
// -------------------------------------------- //
@Override
public String getReplacement(String senderId, String sendeeId, String recipientId)
{
FPlayer fsender = FPlayerColl.get().get(sendeeId);
public String getReplacement(FPlayer fsender, FPlayer frecipient)
{
return fsender.getTitle();
}