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

Moving prefixes and chat from ConfServer to MConf

Browse Source
This commit is contained in:
Olof Larsson
2013-04-22 09:51:19 +02:00
parent ec8be2d2c0
commit b0871b0ee6
9 changed files with 100 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/com/massivecraft/factions/integration/herochat/AlliesChannel.java
View File

@ -5,38 +5,38 @@ import java.util.Set;
import org.bukkit.ChatColor;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.entity.MConf;
public class AlliesChannel extends FactionsChannelAbstract
{
public static final Set<Rel> targetRelations = EnumSet.of(Rel.MEMBER, Rel.ALLY);
@Override public Set<Rel> getTargetRelations() { return targetRelations; }
@Override public String getName() { return ConfServer.herochatAlliesName; }
@Override public String getName() { return MConf.get().herochatAlliesName; }
@Override public String getNick() { return ConfServer.herochatAlliesNick; }
@Override public void setNick(String nick) { ConfServer.herochatAlliesNick = nick; }
@Override public String getNick() { return MConf.get().herochatAlliesNick; }
@Override public void setNick(String nick) { MConf.get().herochatAlliesNick = nick; }
@Override public String getFormat() { return ConfServer.herochatAlliesFormat; }
@Override public void setFormat(String format) { ConfServer.herochatAlliesFormat = format; }
@Override public String getFormat() { return MConf.get().herochatAlliesFormat; }
@Override public void setFormat(String format) { MConf.get().herochatAlliesFormat = format; }
@Override public ChatColor getColor() { return ConfServer.herochatAlliesColor; }
@Override public void setColor(ChatColor color) { ConfServer.herochatAlliesColor = color; }
@Override public ChatColor getColor() { return MConf.get().herochatAlliesColor; }
@Override public void setColor(ChatColor color) { MConf.get().herochatAlliesColor = color; }
@Override public int getDistance() { return ConfServer.herochatAlliesDistance; }
@Override public void setDistance(int distance) { ConfServer.herochatAlliesDistance = distance; }
@Override public int getDistance() { return MConf.get().herochatAlliesDistance; }
@Override public void setDistance(int distance) { MConf.get().herochatAlliesDistance = distance; }
@Override public void addWorld(String world) { ConfServer.herochatAlliesWorlds.add(world); }
@Override public Set<String> getWorlds() { return ConfServer.herochatAlliesWorlds; }
@Override public void setWorlds(Set<String> worlds) { ConfServer.herochatAlliesWorlds = worlds; }
@Override public void addWorld(String world) { MConf.get().herochatAlliesWorlds.add(world); }
@Override public Set<String> getWorlds() { return MConf.get().herochatAlliesWorlds; }
@Override public void setWorlds(Set<String> worlds) { MConf.get().herochatAlliesWorlds = worlds; }
@Override public boolean isShortcutAllowed() { return ConfServer.herochatAlliesIsShortcutAllowed; }
@Override public void setShortcutAllowed(boolean shortcutAllowed) { ConfServer.herochatAlliesIsShortcutAllowed = shortcutAllowed; }
@Override public boolean isShortcutAllowed() { return MConf.get().herochatAlliesIsShortcutAllowed; }
@Override public void setShortcutAllowed(boolean shortcutAllowed) { MConf.get().herochatAlliesIsShortcutAllowed = shortcutAllowed; }
@Override public boolean isCrossWorld() { return ConfServer.herochatAlliesCrossWorld; }
@Override public void setCrossWorld(boolean crossWorld) { ConfServer.herochatAlliesCrossWorld = crossWorld; }
@Override public boolean isCrossWorld() { return MConf.get().herochatAlliesCrossWorld; }
@Override public void setCrossWorld(boolean crossWorld) { MConf.get().herochatAlliesCrossWorld = crossWorld; }
@Override public boolean isMuted() { return ConfServer.herochatAlliesMuted; }
@Override public void setMuted(boolean value) { ConfServer.herochatAlliesMuted = value; }
@Override public boolean isMuted() { return MConf.get().herochatAlliesMuted; }
@Override public void setMuted(boolean value) { MConf.get().herochatAlliesMuted = value; }
}

38
src/com/massivecraft/factions/integration/herochat/FactionChannel.java
View File

@ -6,38 +6,38 @@ import java.util.Set;
import org.bukkit.ChatColor;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.entity.MConf;
public class FactionChannel extends FactionsChannelAbstract
{
public static final Set<Rel> targetRelations = EnumSet.of(Rel.MEMBER);
@Override public Set<Rel> getTargetRelations() { return targetRelations; }
@Override public String getName() { return ConfServer.herochatFactionName; }
@Override public String getName() { return MConf.get().herochatFactionName; }
@Override public String getNick() { return ConfServer.herochatFactionNick; }
@Override public void setNick(String nick) { ConfServer.herochatFactionNick = nick; }
@Override public String getNick() { return MConf.get().herochatFactionNick; }
@Override public void setNick(String nick) { MConf.get().herochatFactionNick = nick; }
@Override public String getFormat() { return ConfServer.herochatFactionFormat; }
@Override public void setFormat(String format) { ConfServer.herochatFactionFormat = format; }
@Override public String getFormat() { return MConf.get().herochatFactionFormat; }
@Override public void setFormat(String format) { MConf.get().herochatFactionFormat = format; }
@Override public ChatColor getColor() { return ConfServer.herochatFactionColor; }
@Override public void setColor(ChatColor color) { ConfServer.herochatFactionColor = color; }
@Override public ChatColor getColor() { return MConf.get().herochatFactionColor; }
@Override public void setColor(ChatColor color) { MConf.get().herochatFactionColor = color; }
@Override public int getDistance() { return ConfServer.herochatFactionDistance; }
@Override public void setDistance(int distance) { ConfServer.herochatFactionDistance = distance; }
@Override public int getDistance() { return MConf.get().herochatFactionDistance; }
@Override public void setDistance(int distance) { MConf.get().herochatFactionDistance = distance; }
@Override public void addWorld(String world) { ConfServer.herochatFactionWorlds.add(world); }
@Override public Set<String> getWorlds() { return new HashSet<String>(ConfServer.herochatFactionWorlds); }
@Override public void setWorlds(Set<String> worlds) { ConfServer.herochatFactionWorlds = worlds; }
@Override public void addWorld(String world) { MConf.get().herochatFactionWorlds.add(world); }
@Override public Set<String> getWorlds() { return new HashSet<String>(MConf.get().herochatFactionWorlds); }
@Override public void setWorlds(Set<String> worlds) { MConf.get().herochatFactionWorlds = worlds; }
@Override public boolean isShortcutAllowed() { return ConfServer.herochatFactionIsShortcutAllowed; }
@Override public void setShortcutAllowed(boolean shortcutAllowed) { ConfServer.herochatFactionIsShortcutAllowed = shortcutAllowed; }
@Override public boolean isShortcutAllowed() { return MConf.get().herochatFactionIsShortcutAllowed; }
@Override public void setShortcutAllowed(boolean shortcutAllowed) { MConf.get().herochatFactionIsShortcutAllowed = shortcutAllowed; }
@Override public boolean isCrossWorld() { return ConfServer.herochatFactionCrossWorld; }
@Override public void setCrossWorld(boolean crossWorld) { ConfServer.herochatFactionCrossWorld = crossWorld; }
@Override public boolean isCrossWorld() { return MConf.get().herochatFactionCrossWorld; }
@Override public void setCrossWorld(boolean crossWorld) { MConf.get().herochatFactionCrossWorld = crossWorld; }
@Override public boolean isMuted() { return ConfServer.herochatFactionMuted; }
@Override public void setMuted(boolean value) { ConfServer.herochatFactionMuted = value; }
@Override public boolean isMuted() { return MConf.get().herochatFactionMuted; }
@Override public void setMuted(boolean value) { MConf.get().herochatFactionMuted = value; }
}

4
src/com/massivecraft/factions/integration/herochat/HerochatEngine.java
View File

@ -8,9 +8,9 @@ import org.bukkit.event.Listener;
import com.dthielke.herochat.ChannelChatEvent;
import com.dthielke.herochat.Herochat;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.chat.ChatFormatter;
import com.massivecraft.factions.entity.MConf;
public class HerochatEngine implements Listener
@ -48,7 +48,7 @@ public class HerochatEngine implements Listener
public void onChannelChatEvent(ChannelChatEvent event)
{
// Should we even parse?
if ( ! ConfServer.chatParseTags) return;
if ( ! MConf.get().chatParseTags) return;
String format = event.getFormat();
format = format.replaceAll("&r", "§r");