SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove Fanciful, fix compilation (part 1/2)

Browse Source
This commit is contained in:
Paul Sauve 2015-05-24 18:05:27 -05:00
parent 535aa5c90e
commit fc1d08e507
11 changed files with 170 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pom.xml
View File

@ -44,15 +44,10 @@
<createDependencyReducedPom>false</createDependencyReducedPom> <createDependencyReducedPom>false</createDependencyReducedPom>
<artifactSet> <artifactSet>
<includes> <includes>
<include>mkremins:fanciful</include>
<include>com.google.code.gson:gson</include> <include>com.google.code.gson:gson</include>
</includes> </includes>
</artifactSet> </artifactSet>
<relocations> <relocations>
<relocation>
<pattern>mkremins.fanciful</pattern>
<shadedPattern>com.massivecraft.factions.shade.mkremins.fanciful</shadedPattern>
</relocation>
<relocation> <relocation>
<pattern>com.google.gson</pattern> <pattern>com.google.gson</pattern>
<shadedPattern>com.massivecraft.factions.shade.com.google.gson</shadedPattern> <shadedPattern>com.massivecraft.factions.shade.com.google.gson</shadedPattern>
@ -103,11 +98,6 @@
<artifactId>EssentialsXChat</artifactId> <artifactId>EssentialsXChat</artifactId>
<version>2.0.1-SNAPSHOT</version> <version>2.0.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>mkremins</groupId>
<artifactId>fanciful</artifactId>
<version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency> <dependency>
<groupId>org.dynmap</groupId> <groupId>org.dynmap</groupId>
<artifactId>dynmap</artifactId> <artifactId>dynmap</artifactId>
@ -148,9 +138,5 @@
<id>repo.mikeprimm.com</id> <id>repo.mikeprimm.com</id>
<url>http://repo.mikeprimm.com/</url> <url>http://repo.mikeprimm.com/</url>
</repository> </repository>
<repository>
<id>franga2000-repo</id>
<url>http://repo.franga2000.com/artifactory/public</url>
</repository>
</repositories> </repositories>
</project> </project>

17
src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java
View File

@ -5,8 +5,10 @@ import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers; import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import mkremins.fanciful.FancyMessage; import net.md_5.bungee.api.chat.BaseComponent;
import org.bukkit.ChatColor; import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.HoverEvent;
import net.md_5.bungee.api.chat.TextComponent;
public class CmdDeinvite extends FCommand { public class CmdDeinvite extends FCommand {
@ -31,13 +33,18 @@ public class CmdDeinvite extends FCommand {
public void perform() { public void perform() {
FPlayer you = this.argAsBestFPlayerMatch(0); FPlayer you = this.argAsBestFPlayerMatch(0);
if (you == null) { if (you == null) {
FancyMessage msg = new FancyMessage(TL.COMMAND_DEINVITE_CANDEINVITE.toString()).color(ChatColor.GOLD); TextComponent component = new TextComponent(TL.COMMAND_DEINVITE_CANDEINVITE.toString());
component.setColor(net.md_5.bungee.api.ChatColor.GOLD);
for (String id : myFaction.getInvites()) { for (String id : myFaction.getInvites()) {
FPlayer fp = FPlayers.getInstance().getById(id); FPlayer fp = FPlayers.getInstance().getById(id);
String name = fp != null ? fp.getName() : id; String name = fp != null ? fp.getName() : id;
msg.then(name + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_DEINVITE_CLICKTODEINVITE.format(name)).command(Conf.baseCommandAliases.get(0) + " deinvite " + name); TextComponent then = new TextComponent(name + " ");
then.setColor(net.md_5.bungee.api.ChatColor.WHITE);
then.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new BaseComponent[]{new TextComponent(TL.COMMAND_DEINVITE_CLICKTODEINVITE.format(name))}));
then.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, Conf.baseCommandAliases.get(0) + " deinvite " + name));
component.addExtra(then);
} }
sendFancyMessage(msg); fme.getPlayer().spigot().sendMessage(component);
return; return;
} }

18
src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java
View File

@ -5,9 +5,12 @@ import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.P; import com.massivecraft.factions.P;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.util.LazyLocation; import com.massivecraft.factions.util.LazyLocation;
import com.massivecraft.factions.util.WarmUpUtil;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import mkremins.fanciful.FancyMessage; import net.md_5.bungee.api.chat.BaseComponent;
import org.bukkit.ChatColor; import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.HoverEvent;
import net.md_5.bungee.api.chat.TextComponent;
import java.util.Map; import java.util.Map;
@ -28,12 +31,17 @@ public class CmdFWarp extends FCommand {
public void perform() { public void perform() {
//TODO: check if in combat. //TODO: check if in combat.
if (args.size() == 0) { if (args.size() == 0) {
FancyMessage msg = new FancyMessage(TL.COMMAND_FWARP_WARPS.toString()).color(ChatColor.GOLD); TextComponent component = new TextComponent(TL.COMMAND_FWARP_WARPS.toString());
component.setColor(net.md_5.bungee.api.ChatColor.GOLD);
Map<String, LazyLocation> warps = myFaction.getWarps(); Map<String, LazyLocation> warps = myFaction.getWarps();
for (String s : warps.keySet()) { for (String s : warps.keySet()) {
msg.then(s + " ").tooltip(TL.COMMAND_FWARP_CLICKTOWARP.toString()).command(Conf.baseCommandAliases.get(0) + " warp " + s).color(ChatColor.WHITE); TextComponent then = new TextComponent(s + " ");
then.setColor(net.md_5.bungee.api.ChatColor.WHITE);
then.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new BaseComponent[]{new TextComponent(TL.COMMAND_FWARP_CLICKTOWARP.toString())}));
then.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, Conf.baseCommandAliases.get(0) + " warp " + s));
component.addExtra(then);
} }
sendFancyMessage(msg); fme.getPlayer().spigot().sendMessage(component);
} else if (args.size() > 1) { } else if (args.size() > 1) {
fme.msg(TL.COMMAND_FWARP_COMMANDFORMAT); fme.msg(TL.COMMAND_FWARP_COMMANDFORMAT);
} else { } else {

11
src/main/java/com/massivecraft/factions/cmd/CmdInvite.java
View File

@ -4,8 +4,7 @@ import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import mkremins.fanciful.FancyMessage; import net.md_5.bungee.api.chat.*;
import org.bukkit.ChatColor;
public class CmdInvite extends FCommand { public class CmdInvite extends FCommand {
@ -50,9 +49,13 @@ public class CmdInvite extends FCommand {
} }
// Tooltips, colors, and commands only apply to the string immediately before it. // Tooltips, colors, and commands only apply to the string immediately before it.
FancyMessage message = new FancyMessage(fme.describeTo(you, true)).tooltip(TL.COMMAND_INVITE_CLICKTOJOIN.toString()).command(Conf.baseCommandAliases.get(0) + " join " + myFaction.getTag()).then(TL.COMMAND_INVITE_INVITEDYOU.toString()).color(ChatColor.YELLOW).tooltip(TL.COMMAND_INVITE_CLICKTOJOIN.toString()).command(Conf.baseCommandAliases.get(0) + " join " + myFaction.getTag()).then(myFaction.describeTo(you)).tooltip(TL.COMMAND_INVITE_CLICKTOJOIN.toString()).command(Conf.baseCommandAliases.get(0) + " join " + myFaction.getTag()); TextComponent component = new TextComponent(fme.describeTo(you, true));
component.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new BaseComponent[]{new TextComponent(TL.COMMAND_INVITE_CLICKTOJOIN.toString())}));
component.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, Conf.baseCommandAliases.get(0) + " join " + myFaction.getTag()));
component.addExtra(new ComponentBuilder(TL.COMMAND_INVITE_INVITEDYOU.toString()).color(net.md_5.bungee.api.ChatColor.YELLOW).create()[0]);
component.addExtra(new ComponentBuilder(myFaction.describeTo(you)).color(net.md_5.bungee.api.ChatColor.YELLOW).create()[0]);
message.send(you.getPlayer()); you.getPlayer().spigot().sendMessage(component);
//you.msg("%s<i> invited you to %s", fme.describeTo(you, true), myFaction.describeTo(you)); //you.msg("%s<i> invited you to %s", fme.describeTo(you, true), myFaction.describeTo(you));
myFaction.msg(TL.COMMAND_INVITE_INVITED, fme.describeTo(myFaction, true), you.describeTo(myFaction)); myFaction.msg(TL.COMMAND_INVITE_INVITED, fme.describeTo(myFaction, true), you.describeTo(myFaction));

23
src/main/java/com/massivecraft/factions/cmd/CmdKick.java
View File

@ -8,9 +8,11 @@ import com.massivecraft.factions.event.FPlayerLeaveEvent;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import mkremins.fanciful.FancyMessage; import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.HoverEvent;
import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
public class CmdKick extends FCommand { public class CmdKick extends FCommand {
@ -34,19 +36,28 @@ public class CmdKick extends FCommand {
public void perform() { public void perform() {
FPlayer toKick = this.argIsSet(0) ? this.argAsBestFPlayerMatch(0) : null; FPlayer toKick = this.argIsSet(0) ? this.argAsBestFPlayerMatch(0) : null;
if (toKick == null) { if (toKick == null) {
FancyMessage msg = new FancyMessage(TL.COMMAND_KICK_CANDIDATES.toString()).color(ChatColor.GOLD); TextComponent component = new TextComponent(TL.COMMAND_KICK_CANDIDATES.toString());
component.setColor(net.md_5.bungee.api.ChatColor.GOLD);
for (FPlayer player : myFaction.getFPlayersWhereRole(Role.NORMAL)) { for (FPlayer player : myFaction.getFPlayersWhereRole(Role.NORMAL)) {
String s = player.getName(); String s = player.getName();
msg.then(s + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_KICK_CLICKTOKICK.toString() + s).command(Conf.baseCommandAliases.get(0) + " kick " + s); TextComponent then = new TextComponent(s + " ");
then.setColor(net.md_5.bungee.api.ChatColor.WHITE);
then.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new BaseComponent[]{new TextComponent(TL.COMMAND_KICK_CLICKTOKICK.toString() + s)}));
then.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, Conf.baseCommandAliases.get(0) + " kick " + s));
component.addExtra(then);
} }
if (fme.getRole() == Role.ADMIN) { if (fme.getRole() == Role.ADMIN) {
for (FPlayer player : myFaction.getFPlayersWhereRole(Role.MODERATOR)) { for (FPlayer player : myFaction.getFPlayersWhereRole(Role.MODERATOR)) {
String s = player.getName(); String s = player.getName();
msg.then(s + " ").color(ChatColor.GRAY).tooltip(TL.COMMAND_KICK_CLICKTOKICK.toString() + s).command(Conf.baseCommandAliases.get(0) + " kick " + s); TextComponent then = new TextComponent(s + " ");
then.setColor(net.md_5.bungee.api.ChatColor.GRAY);
then.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new BaseComponent[]{new TextComponent(TL.COMMAND_KICK_CLICKTOKICK.toString() + s)}));
then.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, Conf.baseCommandAliases.get(0) + " kick " + s));
component.addExtra(then);
} }
} }
sendFancyMessage(msg); fme.getPlayer().spigot().sendMessage(component);
return; return;
} }

17
src/main/java/com/massivecraft/factions/cmd/CmdMod.java
View File

@ -6,8 +6,10 @@ import com.massivecraft.factions.Faction;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import mkremins.fanciful.FancyMessage; import net.md_5.bungee.api.chat.BaseComponent;
import org.bukkit.ChatColor; import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.HoverEvent;
import net.md_5.bungee.api.chat.TextComponent;
public class CmdMod extends FCommand { public class CmdMod extends FCommand {
@ -31,13 +33,18 @@ public class CmdMod extends FCommand {
public void perform() { public void perform() {
FPlayer you = this.argAsBestFPlayerMatch(0); FPlayer you = this.argAsBestFPlayerMatch(0);
if (you == null) { if (you == null) {
FancyMessage msg = new FancyMessage(TL.COMMAND_MOD_CANDIDATES.toString()).color(ChatColor.GOLD); TextComponent component = new TextComponent(TL.COMMAND_MOD_CANDIDATES.toString());
component.setColor(net.md_5.bungee.api.ChatColor.GOLD);
for (FPlayer player : myFaction.getFPlayersWhereRole(Role.NORMAL)) { for (FPlayer player : myFaction.getFPlayersWhereRole(Role.NORMAL)) {
String s = player.getName(); String s = player.getName();
msg.then(s + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_MOD_CLICKTOPROMOTE.toString() + s).command(Conf.baseCommandAliases.get(0) + " mod " + s); TextComponent then = new TextComponent(s + " ");
then.setColor(net.md_5.bungee.api.ChatColor.WHITE);
then.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new BaseComponent[]{new TextComponent(TL.COMMAND_MOD_CLICKTOPROMOTE.toString() + s)}));
then.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, Conf.baseCommandAliases.get(0) + " mod " + s));
component.addExtra(then);
} }
sendFancyMessage(msg); fme.getPlayer().spigot().sendMessage(component);
return; return;
} }

10
src/main/java/com/massivecraft/factions/cmd/CmdShow.java
View File

@ -7,7 +7,7 @@ import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import com.massivecraft.factions.zcore.util.TagReplacer; import com.massivecraft.factions.zcore.util.TagReplacer;
import com.massivecraft.factions.zcore.util.TagUtil; import com.massivecraft.factions.zcore.util.TagUtil;
import mkremins.fanciful.FancyMessage; import net.md_5.bungee.api.chat.BaseComponent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -79,10 +79,10 @@ public class CmdShow extends FCommand {
for (String raw : show) { for (String raw : show) {
String parsed = TagUtil.parsePlain(faction, fme, raw); // use relations String parsed = TagUtil.parsePlain(faction, fme, raw); // use relations
if (TagUtil.hasFancy(parsed)) { if (TagUtil.hasComponent(parsed)) {
List<FancyMessage> fancy = TagUtil.parseFancy(faction, fme, parsed); List<BaseComponent> components = TagUtil.parseComponent(faction, fme, parsed);
if (fancy != null) { if (components != null) {
sendFancyMessage(fancy); fme.getPlayer().spigot().sendMessage(components.toArray(new BaseComponent[components.size()]));
} }
continue; continue;
} }

17
src/main/java/com/massivecraft/factions/cmd/CmdShowInvites.java
View File

@ -5,8 +5,10 @@ import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers; import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import mkremins.fanciful.FancyMessage; import net.md_5.bungee.api.chat.BaseComponent;
import org.bukkit.ChatColor; import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.HoverEvent;
import net.md_5.bungee.api.chat.TextComponent;
public class CmdShowInvites extends FCommand { public class CmdShowInvites extends FCommand {
@ -21,14 +23,19 @@ public class CmdShowInvites extends FCommand {
@Override @Override
public void perform() { public void perform() {
FancyMessage msg = new FancyMessage(TL.COMMAND_SHOWINVITES_PENDING.toString()).color(ChatColor.GOLD); TextComponent component = new TextComponent(TL.COMMAND_SHOWINVITES_PENDING.toString());
component.setColor(net.md_5.bungee.api.ChatColor.GOLD);
for (String id : myFaction.getInvites()) { for (String id : myFaction.getInvites()) {
FPlayer fp = FPlayers.getInstance().getById(id); FPlayer fp = FPlayers.getInstance().getById(id);
String name = fp != null ? fp.getName() : id; String name = fp != null ? fp.getName() : id;
msg.then(name + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_SHOWINVITES_CLICKTOREVOKE.format(name)).command(Conf.baseCommandAliases.get(0) + " deinvite " + name); TextComponent then = new TextComponent(name + " ");
then.setColor(net.md_5.bungee.api.ChatColor.WHITE);
then.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new BaseComponent[]{new TextComponent(TL.COMMAND_SHOWINVITES_CLICKTOREVOKE.format(name))}));
then.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, Conf.baseCommandAliases.get(0) + " deinvite " + name));
component.addExtra(then);
} }
sendFancyMessage(msg); fme.getPlayer().spigot().sendMessage(component);
} }
@Override @Override

11
src/main/java/com/massivecraft/factions/zcore/MCommand.java
View File

@ -6,7 +6,6 @@ import com.massivecraft.factions.P;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import com.massivecraft.factions.zcore.util.TextUtil; import com.massivecraft.factions.zcore.util.TextUtil;
import mkremins.fanciful.FancyMessage;
import org.apache.commons.lang.time.DurationFormatUtils; import org.apache.commons.lang.time.DurationFormatUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -269,16 +268,6 @@ public abstract class MCommand<T extends MPlugin> {
} }
} }
public void sendFancyMessage(FancyMessage message) {
message.send(sender);
}
public void sendFancyMessage(List<FancyMessage> messages) {
for (FancyMessage m : messages) {
sendFancyMessage(m);
}
}
public List<String> getToolTips(FPlayer player) { public List<String> getToolTips(FPlayer player) {
List<String> lines = new ArrayList<String>(); List<String> lines = new ArrayList<String>();
for (String s : p.getConfig().getStringList("tooltips.show")) { for (String s : p.getConfig().getStringList("tooltips.show")) {

120
src/main/java/com/massivecraft/factions/zcore/util/TagUtil.java
View File

@ -6,7 +6,9 @@ import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions; import com.massivecraft.factions.Factions;
import com.massivecraft.factions.P; import com.massivecraft.factions.P;
import com.massivecraft.factions.util.MiscUtil; import com.massivecraft.factions.util.MiscUtil;
import mkremins.fanciful.FancyMessage; import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.HoverEvent;
import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import java.util.ArrayList; import java.util.ArrayList;
@ -74,33 +76,34 @@ public class TagUtil {
return line; return line;
} }
/** /**
* Scan a line and parse the fancy variable into a fancy list * Scan a line and parse the component variable into a component list
* *
* @param faction for faction (viewers faction) * @param faction for faction (viewers faction)
* @param fme for player (viewer) * @param fme for player (viewer)
* @param line fancy message prefix * @param line component prefix
* *
* @return * @return
*/ */
public static List<FancyMessage> parseFancy(Faction faction, FPlayer fme, String line) { public static List<BaseComponent> parseComponent(Faction faction, FPlayer fme, String line) {
for (TagReplacer tagReplacer : TagReplacer.getByType(TagType.FANCY)) { for (TagReplacer tagReplacer : TagReplacer.getByType(TagType.FANCY)) {
if (tagReplacer.contains(line)) { if (tagReplacer.contains(line)) {
String clean = line.replace(tagReplacer.getTag(), ""); // remove tag String clean = line.replace(tagReplacer.getTag(), ""); // remove tag
return getFancy(faction, fme, tagReplacer, clean); return getComponent(faction, fme, tagReplacer, clean);
} }
} }
return null; return null;
} }
/** /**
* Checks if a line has fancy variables * Checks if a line has component variables
* *
* @param line raw line from config with variables * @param line raw line from config with variables
* *
* @return if the line has fancy variables * @return if the line has fancy variables
*/ */
public static boolean hasFancy(String line) { public static boolean hasComponent(String line) {
for (TagReplacer tagReplacer : TagReplacer.getByType(TagType.FANCY)) { for (TagReplacer tagReplacer : TagReplacer.getByType(TagType.FANCY)) {
if (tagReplacer.contains(line)) { if (tagReplacer.contains(line)) {
return true; return true;
@ -109,8 +112,9 @@ public class TagUtil {
return false; return false;
} }
/** /**
* Lets get fancy. * Lets get components?
* *
* @param target Faction to get relate from * @param target Faction to get relate from
* @param fme Player to relate to * @param fme Player to relate to
@ -118,11 +122,11 @@ public class TagUtil {
* *
* @return list of fancy messages to send * @return list of fancy messages to send
*/ */
protected static List<FancyMessage> getFancy(Faction target, FPlayer fme, TagReplacer type, String prefix) { protected static List<BaseComponent> getComponent(Faction target, FPlayer fme, TagReplacer type, String prefix) {
List<FancyMessage> fancyMessages = new ArrayList<FancyMessage>(); List<BaseComponent> components = new ArrayList<BaseComponent>();
switch (type) { switch (type) {
case ALLIES_LIST: case ALLIES_LIST:
FancyMessage currentAllies = P.p.txt.parseFancy(prefix); BaseComponent currentAllies = P.p.txt.parseComponent(prefix);
boolean firstAlly = true; boolean firstAlly = true;
for (Faction otherFaction : Factions.getInstance().getAllFactions()) { for (Faction otherFaction : Factions.getInstance().getAllFactions()) {
if (otherFaction == target) { if (otherFaction == target) {
@ -130,19 +134,27 @@ public class TagUtil {
} }
String s = otherFaction.getTag(fme); String s = otherFaction.getTag(fme);
if (otherFaction.getRelationTo(target).isAlly()) { if (otherFaction.getRelationTo(target).isAlly()) {
currentAllies.then(firstAlly ? s : ", " + s); TextComponent then = new TextComponent(firstAlly ? s : ", " + s);
currentAllies.tooltip(tipFaction(otherFaction)).color(fme.getColorTo(otherFaction)); List<String> list = tipFaction(otherFaction);
TextComponent[] hover = new TextComponent[list.size()];
for (int i = 0; i < list.size(); i++) {
TextComponent component = new TextComponent(list.get(i));
component.setColor(net.md_5.bungee.api.ChatColor.valueOf(fme.getColorTo(otherFaction).name()));
hover[i] = component;
}
then.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, hover));
currentAllies.addExtra(then);
firstAlly = false; firstAlly = false;
if (currentAllies.toJSONString().length() > ARBITRARY_LIMIT) { if (currentAllies.toPlainText().length() > ARBITRARY_LIMIT) {
fancyMessages.add(currentAllies); components.add(currentAllies);
currentAllies = new FancyMessage(""); currentAllies = new TextComponent("");
} }
} }
} }
fancyMessages.add(currentAllies); components.add(currentAllies);
return fancyMessages; // we must return here and not outside the switch return components; // we must return here and not outside the switch
case ENEMIES_LIST: case ENEMIES_LIST:
FancyMessage currentEnemies = P.p.txt.parseFancy(prefix); BaseComponent currentEnemies = P.p.txt.parseComponent(prefix);
boolean firstEnemy = true; boolean firstEnemy = true;
for (Faction otherFaction : Factions.getInstance().getAllFactions()) { for (Faction otherFaction : Factions.getInstance().getAllFactions()) {
if (otherFaction == target) { if (otherFaction == target) {
@ -150,49 +162,73 @@ public class TagUtil {
} }
String s = otherFaction.getTag(fme); String s = otherFaction.getTag(fme);
if (otherFaction.getRelationTo(target).isEnemy()) { if (otherFaction.getRelationTo(target).isEnemy()) {
currentEnemies.then(firstEnemy ? s : ", " + s); TextComponent then = new TextComponent(firstEnemy ? s : ", " + s);
currentEnemies.tooltip(tipFaction(otherFaction)).color(fme.getColorTo(otherFaction)); List<String> list = tipFaction(otherFaction);
TextComponent[] hover = new TextComponent[list.size()];
for (int i = 0; i < list.size(); i++) {
TextComponent component = new TextComponent(list.get(i));
component.setColor(net.md_5.bungee.api.ChatColor.valueOf(fme.getColorTo(otherFaction).name()));
hover[i] = component;
}
then.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, hover));
currentEnemies.addExtra(then);
firstEnemy = false; firstEnemy = false;
if (currentEnemies.toJSONString().length() > ARBITRARY_LIMIT) { if (currentEnemies.toPlainText().length() > ARBITRARY_LIMIT) {
fancyMessages.add(currentEnemies); components.add(currentEnemies);
currentEnemies = new FancyMessage(""); currentEnemies = new TextComponent("");
} }
} }
} }
fancyMessages.add(currentEnemies); components.add(currentEnemies);
return fancyMessages; // we must return here and not outside the switch return components; // we must return here and not outside the switch
case ONLINE_LIST: case ONLINE_LIST:
FancyMessage currentOnline = P.p.txt.parseFancy(prefix); BaseComponent currentOnline = P.p.txt.parseComponent(prefix);
boolean firstOnline = true; boolean firstOnline = true;
for (FPlayer p : MiscUtil.rankOrder(target.getFPlayersWhereOnline(true))) { for (FPlayer p : MiscUtil.rankOrder(target.getFPlayersWhereOnline(true))) {
String name = p.getNameAndTitle(); String name = p.getNameAndTitle();
currentOnline.then(firstOnline ? name : ", " + name); TextComponent then = new TextComponent(firstOnline ? name : ", " + name);
currentOnline.tooltip(tipPlayer(p)).color(fme.getColorTo(p)); List<String> list = tipPlayer(p);
TextComponent[] hover = new TextComponent[list.size()];
for (int i = 0; i < list.size(); i++) {
TextComponent component = new TextComponent(list.get(i));
component.setColor(net.md_5.bungee.api.ChatColor.valueOf(fme.getColorTo(p).name()));
hover[i] = component;
}
then.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, hover));
currentOnline.addExtra(then);
firstOnline = false; firstOnline = false;
if (currentOnline.toJSONString().length() > ARBITRARY_LIMIT) { if (currentOnline.toPlainText().length() > ARBITRARY_LIMIT) {
fancyMessages.add(currentOnline); components.add(currentOnline);
currentOnline = new FancyMessage(""); currentOnline = new TextComponent("");
} }
} }
fancyMessages.add(currentOnline); components.add(currentOnline);
return fancyMessages; // we must return here and not outside the switch return components; // we must return here and not outside the switch
case OFFLINE_LIST: case OFFLINE_LIST:
FancyMessage currentOffline = P.p.txt.parseFancy(prefix); BaseComponent currentOffline = P.p.txt.parseComponent(prefix);
boolean firstOffline = true; boolean firstOffline = true;
for (FPlayer p : MiscUtil.rankOrder(target.getFPlayers())) { for (FPlayer p : MiscUtil.rankOrder(target.getFPlayers())) {
String name = p.getNameAndTitle(); String name = p.getNameAndTitle();
if (!p.isOnline()) { if (!p.isOnline()) {
currentOffline.then(firstOffline ? name : ", " + name); TextComponent then = new TextComponent(firstOffline ? name : ", " + name);
currentOffline.tooltip(tipPlayer(p)).color(fme.getColorTo(p)); List<String> list = tipPlayer(p);
TextComponent[] hover = new TextComponent[list.size()];
for (int i = 0; i < list.size(); i++) {
TextComponent component = new TextComponent(list.get(i));
component.setColor(net.md_5.bungee.api.ChatColor.valueOf(fme.getColorTo(p).name()));
hover[i] = component;
}
then.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, hover));
currentOffline.addExtra(then);
firstOffline = false; firstOffline = false;
if (currentOffline.toJSONString().length() > ARBITRARY_LIMIT) { if (currentOffline.toPlainText().length() > ARBITRARY_LIMIT) {
fancyMessages.add(currentOffline); components.add(currentOffline);
currentOffline = new FancyMessage(""); currentOffline = new TextComponent("");
} }
} }
} }
fancyMessages.add(currentOffline); components.add(currentOffline);
return fancyMessages; // we must return here and not outside the switch return components; // we must return here and not outside the switch
} }
return null; return null;
} }

44
src/main/java/com/massivecraft/factions/zcore/util/TextUtil.java
View File

@ -1,6 +1,7 @@
package com.massivecraft.factions.zcore.util; package com.massivecraft.factions.zcore.util;
import mkremins.fanciful.FancyMessage; import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Material; import org.bukkit.Material;
@ -55,41 +56,24 @@ public class TextUtil {
} }
// -------------------------------------------- // // -------------------------------------------- //
// Fancy parsing // Component parsing
// -------------------------------------------- // // -------------------------------------------- //
public FancyMessage parseFancy(String prefix) { public BaseComponent parseComponent(String prefix) {
return toFancy(parse(prefix)); return toComponent(parse(prefix));
} }
public static FancyMessage toFancy(String first) { public static BaseComponent toComponent(String first) {
String text = ""; BaseComponent[] components = TextComponent.fromLegacyText(first);
FancyMessage message = new FancyMessage(text); if (components.length == 0) {
ChatColor color = null; return null;
char[] chars = first.toCharArray();
for (int i = 0; i < chars.length; i++) {
if (chars[i] == '§') {
if (color != null) {
message.then(text).color(color);
text = "";
color = ChatColor.getByChar(chars[i + 1]);
} else {
color = ChatColor.getByChar(chars[i + 1]);
} }
i++; // skip color char // convert it to a single component, for ease
} else { BaseComponent component = components[0];
text += chars[i]; for (int i = 1; i < components.length; i++) {
component.addExtra(components[i]);
} }
} return component;
if (text.length() > 0) {
if (color != null) {
message.then(text).color(color);
} else {
message.text(text);
}
}
return message;
} }
// -------------------------------------------- // // -------------------------------------------- //