502647092
/
TabooLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

+ tellraw fixed

master
坏黑 2019-05-28 22:35:26 +08:00
parent fd9817e5c5
commit 2791f90c9c
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/scala/me/skymc/taboolib/json/tellraw/TellrawJson.java
View File

@ -17,7 +17,6 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
/** /**
* @Author sky * @Author sky
@ -70,13 +69,7 @@ public class TellrawJson {
public void send(CommandSender sender, String... args) { public void send(CommandSender sender, String... args) {
if (sender instanceof Player) { if (sender instanceof Player) {
if (TellrawCreator.isViaVersionLoaded()) { TLocale.Tellraw.send(sender, Strings.replaceWithOrder(toRawMessage((Player) sender), args));
TLocale.Tellraw.send(sender, Strings.replaceWithOrder(toRawMessage(Via.getAPI().getPlayerVersion(sender) > 316 ? TellrawVersion.HIGH_VERSION : TellrawVersion.LOW_VERSION), args));
} else if (TellrawCreator.isProtocolSupportLoaded()) {
TLocale.Tellraw.send(sender, Strings.replaceWithOrder(toRawMessage(ProtocolSupportAPI.getProtocolVersion((Player) sender).getId() > 316 ? TellrawVersion.HIGH_VERSION : TellrawVersion.LOW_VERSION), args));
} else {
TLocale.Tellraw.send(sender, Strings.replaceWithOrder(toRawMessage(), args));
}
} else { } else {
TLocale.Tellraw.send(sender, Strings.replaceWithOrder(toRawMessage(), args)); TLocale.Tellraw.send(sender, Strings.replaceWithOrder(toRawMessage(), args));
} }
@ -97,6 +90,18 @@ public class TellrawJson {
return rawMessage; return rawMessage;
} }
public String toRawMessage(Player player) {
// ViaVersion support!
if (TellrawCreator.isViaVersionLoaded()) {
return toRawMessage(Via.getAPI().getPlayerVersion(player) > 316 ? TellrawVersion.HIGH_VERSION : TellrawVersion.LOW_VERSION);
}
// ProtocolSupport support!
else if (TellrawCreator.isProtocolSupportLoaded()) {
return toRawMessage(ProtocolSupportAPI.getProtocolVersion(player).getId() > 316 ? TellrawVersion.HIGH_VERSION : TellrawVersion.LOW_VERSION);
}
return toRawMessage();
}
public String toLegacyText() { public String toLegacyText() {
return TextComponent.toLegacyText(getComponentsAll()); return TextComponent.toLegacyText(getComponentsAll());
} }
@ -161,9 +166,8 @@ public class TellrawJson {
} }
public BaseComponent[] getComponentsAll() { public BaseComponent[] getComponentsAll() {
List<BaseComponent> components = this.components.stream().filter(component -> !(component instanceof TextComponent) || !((TextComponent) component).getText().isEmpty()).collect(Collectors.toList());
this.componentsLatest.stream().filter(component -> !(component instanceof TextComponent) || !((TextComponent) component).getText().isEmpty()).forEach(components::add); this.componentsLatest.stream().filter(component -> !(component instanceof TextComponent) || !((TextComponent) component).getText().isEmpty()).forEach(components::add);
return components.toArray(new BaseComponent[0]); return this.components.stream().filter(component -> !(component instanceof TextComponent) || !((TextComponent) component).getText().isEmpty()).toArray(BaseComponent[]::new);
} }
@Deprecated @Deprecated