Fix formatting
This commit is contained in:
parent
2c8b15cb1e
commit
35c1b26a20
@ -7,13 +7,13 @@ import lombok.Setter;
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
public abstract class BaseComponent {
|
||||
public abstract class BaseComponent
|
||||
{
|
||||
|
||||
@Getter(AccessLevel.NONE)
|
||||
@Setter(AccessLevel.NONE)
|
||||
@ -40,7 +40,8 @@ public abstract class BaseComponent {
|
||||
private ClickEvent clickEvent;
|
||||
private HoverEvent hoverEvent;
|
||||
|
||||
public BaseComponent(BaseComponent old) {
|
||||
public BaseComponent(BaseComponent old)
|
||||
{
|
||||
setColor( old.getColorRaw() );
|
||||
setBold( old.isBoldRaw() );
|
||||
setItalic( old.isItalicRaw() );
|
||||
@ -49,17 +50,21 @@ public abstract class BaseComponent {
|
||||
setObfuscated( old.isObfuscatedRaw() );
|
||||
}
|
||||
|
||||
public static String toLegacyText(BaseComponent[] components) {
|
||||
public static String toLegacyText(BaseComponent[] components)
|
||||
{
|
||||
StringBuilder builder = new StringBuilder();
|
||||
for (BaseComponent msg : components) {
|
||||
for (BaseComponent msg : components)
|
||||
{
|
||||
builder.append( msg.toLegacyText() );
|
||||
}
|
||||
return builder.toString();
|
||||
}
|
||||
|
||||
public static String toPlainText(BaseComponent[] components) {
|
||||
public static String toPlainText(BaseComponent[] components)
|
||||
{
|
||||
StringBuilder builder = new StringBuilder();
|
||||
for (BaseComponent msg : components) {
|
||||
for (BaseComponent msg : components)
|
||||
{
|
||||
builder.append( msg.toPlainText() );
|
||||
}
|
||||
return builder.toString();
|
||||
@ -70,11 +75,15 @@ public abstract class BaseComponent {
|
||||
* Returns the color of this component. This uses the parent's color
|
||||
* if this component doesn't have one. {@link net.md_5.bungee.api.ChatColor#WHITE}
|
||||
* is returned if no color is found.
|
||||
*
|
||||
* @return the color of this component
|
||||
*/
|
||||
public ChatColor getColor() {
|
||||
if (color == null) {
|
||||
if (parent == null) {
|
||||
public ChatColor getColor()
|
||||
{
|
||||
if (color == null)
|
||||
{
|
||||
if (parent == null)
|
||||
{
|
||||
return ChatColor.WHITE;
|
||||
}
|
||||
return parent.getColor();
|
||||
@ -85,9 +94,11 @@ public abstract class BaseComponent {
|
||||
/**
|
||||
* Returns the color of this component without checking the parents
|
||||
* color. May return null
|
||||
*
|
||||
* @return the color of this component
|
||||
*/
|
||||
public ChatColor getColorRaw() {
|
||||
public ChatColor getColorRaw()
|
||||
{
|
||||
return color;
|
||||
}
|
||||
|
||||
@ -95,10 +106,13 @@ public abstract class BaseComponent {
|
||||
* Returns whether this component is bold. This uses the parent's
|
||||
* setting if this component hasn't been set. false is returned
|
||||
* if none of the parent chain has been set.
|
||||
*
|
||||
* @return whether the component is bold
|
||||
*/
|
||||
public boolean isBold() {
|
||||
if (bold == null) {
|
||||
public boolean isBold()
|
||||
{
|
||||
if (bold == null)
|
||||
{
|
||||
return parent != null && parent.isBold();
|
||||
}
|
||||
return bold;
|
||||
@ -107,9 +121,11 @@ public abstract class BaseComponent {
|
||||
/**
|
||||
* Returns whether this component is bold without checking
|
||||
* the parents setting. May return null
|
||||
*
|
||||
* @return whether the component is bold
|
||||
*/
|
||||
public Boolean isBoldRaw() {
|
||||
public Boolean isBoldRaw()
|
||||
{
|
||||
return bold;
|
||||
}
|
||||
|
||||
@ -117,10 +133,13 @@ public abstract class BaseComponent {
|
||||
* Returns whether this component is italic. This uses the parent's
|
||||
* setting if this component hasn't been set. false is returned
|
||||
* if none of the parent chain has been set.
|
||||
*
|
||||
* @return whether the component is italic
|
||||
*/
|
||||
public boolean isItalic() {
|
||||
if (italic == null) {
|
||||
public boolean isItalic()
|
||||
{
|
||||
if (italic == null)
|
||||
{
|
||||
return parent != null && parent.isItalic();
|
||||
}
|
||||
return italic;
|
||||
@ -129,9 +148,11 @@ public abstract class BaseComponent {
|
||||
/**
|
||||
* Returns whether this component is italic without checking
|
||||
* the parents setting. May return null
|
||||
*
|
||||
* @return whether the component is italic
|
||||
*/
|
||||
public Boolean isItalicRaw() {
|
||||
public Boolean isItalicRaw()
|
||||
{
|
||||
return italic;
|
||||
}
|
||||
|
||||
@ -139,10 +160,13 @@ public abstract class BaseComponent {
|
||||
* Returns whether this component is underlined. This uses the parent's
|
||||
* setting if this component hasn't been set. false is returned
|
||||
* if none of the parent chain has been set.
|
||||
*
|
||||
* @return whether the component is underlined
|
||||
*/
|
||||
public boolean isUnderlined() {
|
||||
if (underlined == null) {
|
||||
public boolean isUnderlined()
|
||||
{
|
||||
if (underlined == null)
|
||||
{
|
||||
return parent != null && parent.isUnderlined();
|
||||
}
|
||||
return underlined;
|
||||
@ -151,9 +175,11 @@ public abstract class BaseComponent {
|
||||
/**
|
||||
* Returns whether this component is underlined without checking
|
||||
* the parents setting. May return null
|
||||
*
|
||||
* @return whether the component is underlined
|
||||
*/
|
||||
public Boolean isUnderlinedRaw() {
|
||||
public Boolean isUnderlinedRaw()
|
||||
{
|
||||
return underlined;
|
||||
}
|
||||
|
||||
@ -161,10 +187,13 @@ public abstract class BaseComponent {
|
||||
* Returns whether this component is strikethrough. This uses the parent's
|
||||
* setting if this component hasn't been set. false is returned
|
||||
* if none of the parent chain has been set.
|
||||
*
|
||||
* @return whether the component is strikethrough
|
||||
*/
|
||||
public boolean isStrikethrough() {
|
||||
if (strikethrough == null) {
|
||||
public boolean isStrikethrough()
|
||||
{
|
||||
if (strikethrough == null)
|
||||
{
|
||||
return parent != null && parent.isStrikethrough();
|
||||
}
|
||||
return strikethrough;
|
||||
@ -173,9 +202,11 @@ public abstract class BaseComponent {
|
||||
/**
|
||||
* Returns whether this component is strikethrough without checking
|
||||
* the parents setting. May return null
|
||||
*
|
||||
* @return whether the component is strikethrough
|
||||
*/
|
||||
public Boolean isStrikethroughRaw() {
|
||||
public Boolean isStrikethroughRaw()
|
||||
{
|
||||
return strikethrough;
|
||||
}
|
||||
|
||||
@ -183,10 +214,13 @@ public abstract class BaseComponent {
|
||||
* Returns whether this component is obfuscated. This uses the parent's
|
||||
* setting if this component hasn't been set. false is returned
|
||||
* if none of the parent chain has been set.
|
||||
*
|
||||
* @return whether the component is obfuscated
|
||||
*/
|
||||
public boolean isObfuscated() {
|
||||
if (obfuscated == null) {
|
||||
public boolean isObfuscated()
|
||||
{
|
||||
if (obfuscated == null)
|
||||
{
|
||||
return parent != null && parent.isObfuscated();
|
||||
}
|
||||
return obfuscated;
|
||||
@ -195,14 +229,18 @@ public abstract class BaseComponent {
|
||||
/**
|
||||
* Returns whether this component is obfuscated without checking
|
||||
* the parents setting. May return null
|
||||
*
|
||||
* @return whether the component is obfuscated
|
||||
*/
|
||||
public Boolean isObfuscatedRaw() {
|
||||
public Boolean isObfuscatedRaw()
|
||||
{
|
||||
return obfuscated;
|
||||
}
|
||||
|
||||
public void setExtra(List<BaseComponent> components) {
|
||||
for (BaseComponent component : components) {
|
||||
public void setExtra(List<BaseComponent> components)
|
||||
{
|
||||
for (BaseComponent component : components)
|
||||
{
|
||||
component.parent = this;
|
||||
}
|
||||
extra = components;
|
||||
@ -211,54 +249,68 @@ public abstract class BaseComponent {
|
||||
/**
|
||||
* Appends a text element to the component. The text will
|
||||
* inherit this component's formatting
|
||||
*
|
||||
* @param text the text to append
|
||||
*/
|
||||
public void addExtra(String text) {
|
||||
public void addExtra(String text)
|
||||
{
|
||||
addExtra( new TextComponent( text ) );
|
||||
}
|
||||
|
||||
/**
|
||||
* Appends a component to the component. The text will
|
||||
* inherit this component's formatting
|
||||
*
|
||||
* @param component the component to append
|
||||
*/
|
||||
public void addExtra(BaseComponent component) {
|
||||
if (extra == null) {
|
||||
public void addExtra(BaseComponent component)
|
||||
{
|
||||
if (extra == null)
|
||||
{
|
||||
extra = new ArrayList<>();
|
||||
}
|
||||
component.parent = this;
|
||||
extra.add( component );
|
||||
}
|
||||
|
||||
public boolean hasFormatting() {
|
||||
public boolean hasFormatting()
|
||||
{
|
||||
return color != null || bold != null ||
|
||||
italic != null || underlined != null ||
|
||||
strikethrough != null || obfuscated != null;
|
||||
}
|
||||
|
||||
public String toPlainText() {
|
||||
public String toPlainText()
|
||||
{
|
||||
StringBuilder builder = new StringBuilder();
|
||||
toPlainText( builder );
|
||||
return builder.toString();
|
||||
}
|
||||
|
||||
protected void toPlainText(StringBuilder builder) {
|
||||
if (extra != null) {
|
||||
for (BaseComponent e : extra) {
|
||||
protected void toPlainText(StringBuilder builder)
|
||||
{
|
||||
if (extra != null)
|
||||
{
|
||||
for (BaseComponent e : extra)
|
||||
{
|
||||
e.toPlainText( builder );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public String toLegacyText() {
|
||||
public String toLegacyText()
|
||||
{
|
||||
StringBuilder builder = new StringBuilder();
|
||||
toLegacyText( builder );
|
||||
return builder.toString();
|
||||
}
|
||||
|
||||
protected void toLegacyText(StringBuilder builder) {
|
||||
if (extra != null) {
|
||||
for (BaseComponent e : extra) {
|
||||
protected void toLegacyText(StringBuilder builder)
|
||||
{
|
||||
if (extra != null)
|
||||
{
|
||||
for (BaseComponent e : extra)
|
||||
{
|
||||
e.toLegacyText( builder );
|
||||
}
|
||||
}
|
||||
@ -266,7 +318,8 @@ public abstract class BaseComponent {
|
||||
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
public String toString()
|
||||
{
|
||||
return String.format( "BaseComponent{color=%s, bold=%b, italic=%b, underlined=%b, strikethrough=%b, obfuscated=%b}", getColor().getName(), isBold(), isItalic(), isUnderlined(), isStrikethrough(), isObfuscated() );
|
||||
}
|
||||
}
|
||||
|
@ -10,11 +10,13 @@ import lombok.Setter;
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class ClickEvent {
|
||||
public class ClickEvent
|
||||
{
|
||||
private Action action;
|
||||
private String value;
|
||||
|
||||
public enum Action {
|
||||
public enum Action
|
||||
{
|
||||
OPEN_URL,
|
||||
OPEN_FILE,
|
||||
RUN_COMMAND,
|
||||
|
@ -5,7 +5,8 @@ import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@NoArgsConstructor
|
||||
public class HoverEvent {
|
||||
public class HoverEvent
|
||||
{
|
||||
@Getter
|
||||
@Setter
|
||||
private Action action;
|
||||
@ -13,25 +14,30 @@ public class HoverEvent {
|
||||
@Getter
|
||||
private Object value;
|
||||
|
||||
public HoverEvent(Action action, String value) {
|
||||
public HoverEvent(Action action, String value)
|
||||
{
|
||||
setAction( action );
|
||||
setValue( value );
|
||||
}
|
||||
|
||||
public HoverEvent(Action action, BaseComponent value) {
|
||||
public HoverEvent(Action action, BaseComponent value)
|
||||
{
|
||||
setAction( action );
|
||||
setValue( value );
|
||||
}
|
||||
|
||||
public void setValue(String value) {
|
||||
public void setValue(String value)
|
||||
{
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public void setValue(BaseComponent value) {
|
||||
public void setValue(BaseComponent value)
|
||||
{
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public enum Action {
|
||||
public enum Action
|
||||
{
|
||||
SHOW_TEXT,
|
||||
SHOW_ACHIEVEMENT,
|
||||
SHOW_ITEM
|
||||
|
@ -14,25 +14,31 @@ import java.util.regex.Pattern;
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class TextComponent extends BaseComponent {
|
||||
public class TextComponent extends BaseComponent
|
||||
{
|
||||
|
||||
private static final Pattern url = Pattern.compile( "^(?:(https?)://)?([-\\w_\\.]{2,}\\.[a-z]{2,4})(/\\S*)?$" );
|
||||
|
||||
public static BaseComponent[] fromLegacyText(String message) {
|
||||
public static BaseComponent[] fromLegacyText(String message)
|
||||
{
|
||||
ArrayList<BaseComponent> components = new ArrayList<>();
|
||||
StringBuilder builder = new StringBuilder();
|
||||
TextComponent component = new TextComponent();
|
||||
Matcher matcher = url.matcher( message );
|
||||
|
||||
for ( int i = 0; i < message.length(); i++ ) {
|
||||
for (int i = 0; i < message.length(); i++)
|
||||
{
|
||||
char c = message.charAt( i );
|
||||
if (c == ChatColor.COLOR_CHAR) {
|
||||
if (c == ChatColor.COLOR_CHAR)
|
||||
{
|
||||
i++;
|
||||
c = message.charAt( i );
|
||||
if (c >= 'A' && c <= 'Z') {
|
||||
if (c >= 'A' && c <= 'Z')
|
||||
{
|
||||
c += 32;
|
||||
}
|
||||
if (builder.length() > 0) {
|
||||
if (builder.length() > 0)
|
||||
{
|
||||
TextComponent old = component;
|
||||
component = new TextComponent( old );
|
||||
old.setText( builder.toString() );
|
||||
@ -40,7 +46,8 @@ public class TextComponent extends BaseComponent {
|
||||
components.add( old );
|
||||
}
|
||||
ChatColor format = ChatColor.getByChar( c );
|
||||
switch (format) {
|
||||
switch (format)
|
||||
{
|
||||
case BOLD:
|
||||
component.setBold( true );
|
||||
break;
|
||||
@ -67,9 +74,11 @@ public class TextComponent extends BaseComponent {
|
||||
}
|
||||
int pos = message.indexOf( ' ', i );
|
||||
if (pos == -1) pos = message.length();
|
||||
if (matcher.region(i, pos).find()) { //Web link handling
|
||||
if (matcher.region( i, pos ).find())
|
||||
{ //Web link handling
|
||||
|
||||
if (builder.length() > 0) {
|
||||
if (builder.length() > 0)
|
||||
{
|
||||
TextComponent old = component;
|
||||
component = new TextComponent( old );
|
||||
old.setText( builder.toString() );
|
||||
@ -82,10 +91,12 @@ public class TextComponent extends BaseComponent {
|
||||
ClickEvent clickEvent = new ClickEvent();
|
||||
clickEvent.setAction( ClickEvent.Action.OPEN_URL );
|
||||
String urlString = message.substring( i, pos );
|
||||
if (urlString.startsWith("http")) {
|
||||
if (urlString.startsWith( "http" ))
|
||||
{
|
||||
component.setText( urlString );
|
||||
clickEvent.setValue( urlString );
|
||||
} else {
|
||||
} else
|
||||
{
|
||||
component.setText( urlString );
|
||||
clickEvent.setValue( "http://" + urlString );
|
||||
}
|
||||
@ -97,7 +108,8 @@ public class TextComponent extends BaseComponent {
|
||||
}
|
||||
builder.append( c );
|
||||
}
|
||||
if (builder.length() > 0) {
|
||||
if (builder.length() > 0)
|
||||
{
|
||||
component.setText( builder.toString() );
|
||||
components.add( component );
|
||||
}
|
||||
@ -106,19 +118,22 @@ public class TextComponent extends BaseComponent {
|
||||
|
||||
private String text;
|
||||
|
||||
public TextComponent(TextComponent old) {
|
||||
public TextComponent(TextComponent old)
|
||||
{
|
||||
super( old );
|
||||
setText( old.getText() );
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void toPlainText(StringBuilder builder) {
|
||||
protected void toPlainText(StringBuilder builder)
|
||||
{
|
||||
builder.append( text );
|
||||
super.toPlainText( builder );
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void toLegacyText(StringBuilder builder) {
|
||||
protected void toLegacyText(StringBuilder builder)
|
||||
{
|
||||
builder.append( getColor() );
|
||||
if (isBold()) builder.append( ChatColor.BOLD );
|
||||
if (isItalic()) builder.append( ChatColor.ITALIC );
|
||||
@ -130,7 +145,8 @@ public class TextComponent extends BaseComponent {
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
public String toString()
|
||||
{
|
||||
return String.format( "TextComponent{text=%s, %s}", text, super.toString() );
|
||||
}
|
||||
}
|
||||
|
@ -10,44 +10,54 @@ import java.util.List;
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
public class TranslatableComponent extends BaseComponent {
|
||||
public class TranslatableComponent extends BaseComponent
|
||||
{
|
||||
|
||||
private String translate;
|
||||
private List<BaseComponent> with;
|
||||
|
||||
public TranslatableComponent(String translate, Object ...with) {
|
||||
public TranslatableComponent(String translate, Object... with)
|
||||
{
|
||||
setTranslate( translate );
|
||||
this.with = new ArrayList<>();
|
||||
for (Object w : with) {
|
||||
if (w instanceof String) {
|
||||
for (Object w : with)
|
||||
{
|
||||
if (w instanceof String)
|
||||
{
|
||||
this.with.add( new TextComponent( (String) w ) );
|
||||
} else {
|
||||
} else
|
||||
{
|
||||
this.with.add( (BaseComponent) w );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void setWith(List<BaseComponent> components) {
|
||||
for (BaseComponent component : components) {
|
||||
public void setWith(List<BaseComponent> components)
|
||||
{
|
||||
for (BaseComponent component : components)
|
||||
{
|
||||
component.parent = this;
|
||||
}
|
||||
with = components;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void toPlainText(StringBuilder builder) {
|
||||
protected void toPlainText(StringBuilder builder)
|
||||
{
|
||||
//TODO
|
||||
super.toPlainText( builder );
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void toLegacyText(StringBuilder builder) {
|
||||
protected void toLegacyText(StringBuilder builder)
|
||||
{
|
||||
//TODO
|
||||
super.toLegacyText( builder );
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
public String toString()
|
||||
{
|
||||
return String.format( "TranslatableComponent{translate=%s, with=%s, %s}", translate, with, super.toString() );
|
||||
}
|
||||
}
|
||||
|
@ -494,13 +494,15 @@ public class BungeeCord extends ProxyServer
|
||||
}
|
||||
|
||||
@Override
|
||||
public void broadcast(BaseComponent[] message) {
|
||||
public void broadcast(BaseComponent[] message)
|
||||
{
|
||||
getConsole().sendMessage( BaseComponent.toLegacyText( message ) );
|
||||
broadcast( new Chat( ComponentSerializer.toString( message ) ) );
|
||||
}
|
||||
|
||||
@Override
|
||||
public void broadcast(BaseComponent message) {
|
||||
public void broadcast(BaseComponent message)
|
||||
{
|
||||
getConsole().sendMessage( message.toLegacyText() );
|
||||
broadcast( new Chat( ComponentSerializer.toString( message ) ) );
|
||||
}
|
||||
|
@ -47,7 +47,8 @@ public class ServerConnection implements Server
|
||||
}
|
||||
|
||||
@Override
|
||||
public void disconnect(BaseComponent[] reason) {
|
||||
public void disconnect(BaseComponent[] reason)
|
||||
{
|
||||
if (!ch.isClosed())
|
||||
{
|
||||
// TODO: Can we just use a future here?
|
||||
@ -65,7 +66,8 @@ public class ServerConnection implements Server
|
||||
}
|
||||
|
||||
@Override
|
||||
public void disconnect(BaseComponent reason) {
|
||||
public void disconnect(BaseComponent reason)
|
||||
{
|
||||
disconnect( new BaseComponent[]{reason} );
|
||||
}
|
||||
|
||||
|
@ -263,12 +263,14 @@ public final class UserConnection implements ProxiedPlayer
|
||||
}
|
||||
|
||||
@Override
|
||||
public void disconnect(BaseComponent[] reason) {
|
||||
public void disconnect(BaseComponent[] reason)
|
||||
{
|
||||
disconnect0( reason );
|
||||
}
|
||||
|
||||
@Override
|
||||
public void disconnect(BaseComponent reason) {
|
||||
public void disconnect(BaseComponent reason)
|
||||
{
|
||||
disconnect0( new BaseComponent[]{reason} );
|
||||
}
|
||||
|
||||
@ -309,12 +311,14 @@ public final class UserConnection implements ProxiedPlayer
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendMessage(BaseComponent[] message) {
|
||||
public void sendMessage(BaseComponent[] message)
|
||||
{
|
||||
unsafe().sendPacket( new Chat( ComponentSerializer.toString( message ) ) );
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendMessage(BaseComponent message) {
|
||||
public void sendMessage(BaseComponent message)
|
||||
{
|
||||
unsafe().sendPacket( new Chat( ComponentSerializer.toString( message ) ) );
|
||||
}
|
||||
|
||||
|
@ -10,83 +10,106 @@ import net.md_5.bungee.api.chat.HoverEvent;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
public class BaseComponentSerializer {
|
||||
public class BaseComponentSerializer
|
||||
{
|
||||
|
||||
protected void deserialize(JsonObject object, BaseComponent component, JsonDeserializationContext context) {
|
||||
if (object.has("color")) {
|
||||
protected void deserialize(JsonObject object, BaseComponent component, JsonDeserializationContext context)
|
||||
{
|
||||
if (object.has( "color" ))
|
||||
{
|
||||
component.setColor( ChatColor.valueOf( object.get( "color" ).getAsString().toUpperCase() ) );
|
||||
}
|
||||
if (object.has("bold")) {
|
||||
if (object.has( "bold" ))
|
||||
{
|
||||
component.setBold( object.get( "bold" ).getAsBoolean() );
|
||||
}
|
||||
if (object.has("italic")) {
|
||||
if (object.has( "italic" ))
|
||||
{
|
||||
component.setItalic( object.get( "italic" ).getAsBoolean() );
|
||||
}
|
||||
if (object.has("underlined")) {
|
||||
if (object.has( "underlined" ))
|
||||
{
|
||||
component.setUnderlined( object.get( "underlined" ).getAsBoolean() );
|
||||
}
|
||||
if (object.has("strikethrough")) {
|
||||
if (object.has( "strikethrough" ))
|
||||
{
|
||||
component.setUnderlined( object.get( "strikethrough" ).getAsBoolean() );
|
||||
}
|
||||
if (object.has("obfuscated")) {
|
||||
if (object.has( "obfuscated" ))
|
||||
{
|
||||
component.setUnderlined( object.get( "obfuscated" ).getAsBoolean() );
|
||||
}
|
||||
if (object.has("extra")) {
|
||||
if (object.has( "extra" ))
|
||||
{
|
||||
component.setExtra( Arrays.asList( (BaseComponent[]) context.deserialize( object.get( "extra" ), BaseComponent[].class ) ) );
|
||||
}
|
||||
|
||||
//Events
|
||||
if (object.has("clickEvent")) {
|
||||
if (object.has( "clickEvent" ))
|
||||
{
|
||||
JsonObject event = object.getAsJsonObject( "clickEvent" );
|
||||
component.setClickEvent( new ClickEvent(
|
||||
ClickEvent.Action.valueOf( event.get( "action" ).getAsString().toUpperCase() ),
|
||||
event.get( "value" ).getAsString() ) );
|
||||
}
|
||||
if (object.has("hoverEvent")) {
|
||||
if (object.has( "hoverEvent" ))
|
||||
{
|
||||
JsonObject event = object.getAsJsonObject( "hoverEvent" );
|
||||
HoverEvent hoverEvent = new HoverEvent();
|
||||
hoverEvent.setAction( HoverEvent.Action.valueOf( event.get( "action" ).getAsString().toUpperCase() ) );
|
||||
Object res = context.deserialize( event.get( "value" ), BaseComponent.class );
|
||||
if (res instanceof String) {
|
||||
if (res instanceof String)
|
||||
{
|
||||
hoverEvent.setValue( (String) res );
|
||||
} else {
|
||||
} else
|
||||
{
|
||||
hoverEvent.setValue( (BaseComponent) res );
|
||||
}
|
||||
component.setHoverEvent( hoverEvent );
|
||||
}
|
||||
}
|
||||
|
||||
protected void serialize(JsonObject object, BaseComponent component, JsonSerializationContext context) {
|
||||
if (component.getColorRaw() != null) {
|
||||
protected void serialize(JsonObject object, BaseComponent component, JsonSerializationContext context)
|
||||
{
|
||||
if (component.getColorRaw() != null)
|
||||
{
|
||||
object.addProperty( "color", component.getColorRaw().getName() );
|
||||
}
|
||||
if (component.isBoldRaw() != null) {
|
||||
if (component.isBoldRaw() != null)
|
||||
{
|
||||
object.addProperty( "bold", component.isBoldRaw() );
|
||||
}
|
||||
if (component.isItalicRaw() != null) {
|
||||
if (component.isItalicRaw() != null)
|
||||
{
|
||||
object.addProperty( "italic", component.isItalicRaw() );
|
||||
}
|
||||
if (component.isUnderlinedRaw() != null) {
|
||||
if (component.isUnderlinedRaw() != null)
|
||||
{
|
||||
object.addProperty( "underlined", component.isUnderlinedRaw() );
|
||||
}
|
||||
if (component.isStrikethroughRaw() != null) {
|
||||
if (component.isStrikethroughRaw() != null)
|
||||
{
|
||||
object.addProperty( "strikethrough", component.isStrikethroughRaw() );
|
||||
}
|
||||
if (component.isObfuscatedRaw() != null) {
|
||||
if (component.isObfuscatedRaw() != null)
|
||||
{
|
||||
object.addProperty( "obfuscated", component.isObfuscatedRaw() );
|
||||
}
|
||||
|
||||
if (component.getExtra() != null) {
|
||||
if (component.getExtra() != null)
|
||||
{
|
||||
object.add( "extra", context.serialize( component.getExtra() ) );
|
||||
}
|
||||
|
||||
//Events
|
||||
if (component.getClickEvent() != null) {
|
||||
if (component.getClickEvent() != null)
|
||||
{
|
||||
JsonObject clickEvent = new JsonObject();
|
||||
clickEvent.addProperty( "action", component.getClickEvent().getAction().toString().toLowerCase() );
|
||||
clickEvent.addProperty( "value", component.getClickEvent().getValue() );
|
||||
}
|
||||
if (component.getHoverEvent() != null) {
|
||||
if (component.getHoverEvent() != null)
|
||||
{
|
||||
JsonObject clickEvent = new JsonObject();
|
||||
clickEvent.addProperty( "action", component.getHoverEvent().getAction().toString().toLowerCase() );
|
||||
clickEvent.add( "value", context.serialize( component.getHoverEvent().getValue() ) );
|
||||
|
@ -1,23 +1,22 @@
|
||||
package net.md_5.bungee.chat;
|
||||
|
||||
import com.google.gson.*;
|
||||
import com.google.gson.reflect.TypeToken;
|
||||
import com.google.gson.stream.JsonReader;
|
||||
import com.google.gson.stream.JsonWriter;
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
import com.google.gson.JsonDeserializationContext;
|
||||
import com.google.gson.JsonDeserializer;
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.google.gson.JsonParseException;
|
||||
import com.google.gson.JsonSerializationContext;
|
||||
import com.google.gson.JsonSerializer;
|
||||
import net.md_5.bungee.api.chat.BaseComponent;
|
||||
import net.md_5.bungee.api.chat.ClickEvent;
|
||||
import net.md_5.bungee.api.chat.TextComponent;
|
||||
import net.md_5.bungee.api.chat.TranslatableComponent;
|
||||
|
||||
import javax.xml.soap.Text;
|
||||
import java.io.IOException;
|
||||
import java.lang.reflect.Type;
|
||||
import java.util.ArrayList;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
public class ComponentSerializer implements JsonSerializer<BaseComponent>, JsonDeserializer<BaseComponent> {
|
||||
public class ComponentSerializer implements JsonSerializer<BaseComponent>, JsonDeserializer<BaseComponent>
|
||||
{
|
||||
|
||||
private final static Gson gson = new GsonBuilder().
|
||||
registerTypeAdapter( BaseComponent.class, new ComponentSerializer() ).
|
||||
@ -25,35 +24,43 @@ public class ComponentSerializer implements JsonSerializer<BaseComponent>, JsonD
|
||||
registerTypeAdapter( TranslatableComponent.class, new TranslatableComponentSerializer() ).
|
||||
create();
|
||||
|
||||
public static BaseComponent[] parse(String json) {
|
||||
if (json.startsWith("[")) { //Array
|
||||
public static BaseComponent[] parse(String json)
|
||||
{
|
||||
if (json.startsWith( "[" ))
|
||||
{ //Array
|
||||
return gson.fromJson( json, BaseComponent[].class );
|
||||
}
|
||||
return new BaseComponent[]{gson.fromJson( json, BaseComponent.class )};
|
||||
}
|
||||
|
||||
public static String toString(BaseComponent component) {
|
||||
public static String toString(BaseComponent component)
|
||||
{
|
||||
return gson.toJson( component );
|
||||
}
|
||||
|
||||
public static String toString(BaseComponent[] components) {
|
||||
public static String toString(BaseComponent[] components)
|
||||
{
|
||||
return gson.toJson( components );
|
||||
}
|
||||
|
||||
@Override
|
||||
public BaseComponent deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
|
||||
if (json.isJsonPrimitive()) {
|
||||
public BaseComponent deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException
|
||||
{
|
||||
if (json.isJsonPrimitive())
|
||||
{
|
||||
return new TextComponent( json.getAsString() );
|
||||
}
|
||||
JsonObject object = json.getAsJsonObject();
|
||||
if (object.has("translate")) {
|
||||
if (object.has( "translate" ))
|
||||
{
|
||||
return context.deserialize( json, TranslatableComponent.class );
|
||||
}
|
||||
return context.deserialize( json, TextComponent.class );
|
||||
}
|
||||
|
||||
@Override
|
||||
public JsonElement serialize(BaseComponent src, Type typeOfSrc, JsonSerializationContext context) {
|
||||
public JsonElement serialize(BaseComponent src, Type typeOfSrc, JsonSerializationContext context)
|
||||
{
|
||||
return context.serialize( src, src.getClass() );
|
||||
}
|
||||
}
|
||||
|
@ -1,13 +1,22 @@
|
||||
package net.md_5.bungee.chat;
|
||||
|
||||
import com.google.gson.*;
|
||||
import com.google.gson.JsonDeserializationContext;
|
||||
import com.google.gson.JsonDeserializer;
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.google.gson.JsonParseException;
|
||||
import com.google.gson.JsonPrimitive;
|
||||
import com.google.gson.JsonSerializationContext;
|
||||
import com.google.gson.JsonSerializer;
|
||||
import net.md_5.bungee.api.chat.TextComponent;
|
||||
|
||||
import java.lang.reflect.Type;
|
||||
|
||||
public class TextComponentSerializer extends BaseComponentSerializer implements JsonSerializer<TextComponent> , JsonDeserializer<TextComponent>{
|
||||
public class TextComponentSerializer extends BaseComponentSerializer implements JsonSerializer<TextComponent>, JsonDeserializer<TextComponent>
|
||||
{
|
||||
@Override
|
||||
public TextComponent deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
|
||||
public TextComponent deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException
|
||||
{
|
||||
TextComponent component = new TextComponent();
|
||||
JsonObject object = json.getAsJsonObject();
|
||||
deserialize( object, component, context );
|
||||
@ -16,8 +25,10 @@ public class TextComponentSerializer extends BaseComponentSerializer implements
|
||||
}
|
||||
|
||||
@Override
|
||||
public JsonElement serialize(TextComponent src, Type typeOfSrc, JsonSerializationContext context) {
|
||||
if (!src.hasFormatting()) {
|
||||
public JsonElement serialize(TextComponent src, Type typeOfSrc, JsonSerializationContext context)
|
||||
{
|
||||
if (!src.hasFormatting())
|
||||
{
|
||||
return new JsonPrimitive( src.getText() );
|
||||
}
|
||||
JsonObject object = new JsonObject();
|
||||
|
@ -1,33 +1,42 @@
|
||||
package net.md_5.bungee.chat;
|
||||
|
||||
import com.google.gson.*;
|
||||
import com.google.gson.JsonDeserializationContext;
|
||||
import com.google.gson.JsonDeserializer;
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.google.gson.JsonParseException;
|
||||
import com.google.gson.JsonSerializationContext;
|
||||
import com.google.gson.JsonSerializer;
|
||||
import net.md_5.bungee.api.chat.BaseComponent;
|
||||
import net.md_5.bungee.api.chat.TextComponent;
|
||||
import net.md_5.bungee.api.chat.TranslatableComponent;
|
||||
|
||||
import java.lang.reflect.Type;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
|
||||
public class TranslatableComponentSerializer extends BaseComponentSerializer implements JsonSerializer<TranslatableComponent> , JsonDeserializer<TranslatableComponent>{
|
||||
public class TranslatableComponentSerializer extends BaseComponentSerializer implements JsonSerializer<TranslatableComponent>, JsonDeserializer<TranslatableComponent>
|
||||
{
|
||||
@Override
|
||||
public TranslatableComponent deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
|
||||
public TranslatableComponent deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException
|
||||
{
|
||||
TranslatableComponent component = new TranslatableComponent();
|
||||
JsonObject object = json.getAsJsonObject();
|
||||
deserialize( object, component, context );
|
||||
component.setTranslate( object.get( "translate" ).getAsString() );
|
||||
if (object.has("with")) {
|
||||
if (object.has( "with" ))
|
||||
{
|
||||
component.setWith( Arrays.asList( (BaseComponent[]) context.deserialize( object.get( "with" ), BaseComponent[].class ) ) );
|
||||
}
|
||||
return component;
|
||||
}
|
||||
|
||||
@Override
|
||||
public JsonElement serialize(TranslatableComponent src, Type typeOfSrc, JsonSerializationContext context) {
|
||||
public JsonElement serialize(TranslatableComponent src, Type typeOfSrc, JsonSerializationContext context)
|
||||
{
|
||||
JsonObject object = new JsonObject();
|
||||
serialize( object, src, context );
|
||||
object.addProperty( "translate", src.getTranslate() );
|
||||
if (src.getWith() != null) {
|
||||
if (src.getWith() != null)
|
||||
{
|
||||
object.add( "with", context.serialize( src.getWith() ) );
|
||||
}
|
||||
return object;
|
||||
|
@ -36,12 +36,14 @@ public class ConsoleCommandSender implements CommandSender
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendMessage(BaseComponent[] message) {
|
||||
public void sendMessage(BaseComponent[] message)
|
||||
{
|
||||
sendMessage( BaseComponent.toLegacyText( message ) );
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendMessage(BaseComponent message) {
|
||||
public void sendMessage(BaseComponent message)
|
||||
{
|
||||
sendMessage( message.toLegacyText() );
|
||||
}
|
||||
|
||||
|
@ -406,7 +406,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||
}
|
||||
|
||||
@Override
|
||||
public void disconnect(BaseComponent[] reason) {
|
||||
public void disconnect(BaseComponent[] reason)
|
||||
{
|
||||
if (!ch.isClosed())
|
||||
{
|
||||
unsafe().sendPacket( new Kick( ComponentSerializer.toString( reason ) ) );
|
||||
@ -415,7 +416,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||
}
|
||||
|
||||
@Override
|
||||
public void disconnect(BaseComponent reason) {
|
||||
public void disconnect(BaseComponent reason)
|
||||
{
|
||||
disconnect( new BaseComponent[]{reason} );
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user