Update Depend Versions:
Guava 17.0 -> 18.0 Lombok 1.12.6 -> 1.14.8 Gson 2.2.4 -> 2.3 SnakeYaml 1.13 -> 1.14
This commit is contained in:
parent
6fcfb5aecb
commit
57a07dc2e2
@ -1,141 +0,0 @@
|
|||||||
package net.md_5.bungee.chat;
|
|
||||||
|
|
||||||
import com.google.common.base.Preconditions;
|
|
||||||
import com.google.gson.JsonDeserializationContext;
|
|
||||||
import com.google.gson.JsonObject;
|
|
||||||
import com.google.gson.JsonSerializationContext;
|
|
||||||
import net.md_5.bungee.api.ChatColor;
|
|
||||||
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 java.util.Arrays;
|
|
||||||
import java.util.HashSet;
|
|
||||||
|
|
||||||
public class BaseComponentSerializer
|
|
||||||
{
|
|
||||||
|
|
||||||
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" ) )
|
|
||||||
{
|
|
||||||
component.setBold( object.get( "bold" ).getAsBoolean() );
|
|
||||||
}
|
|
||||||
if ( object.has( "italic" ) )
|
|
||||||
{
|
|
||||||
component.setItalic( object.get( "italic" ).getAsBoolean() );
|
|
||||||
}
|
|
||||||
if ( object.has( "underlined" ) )
|
|
||||||
{
|
|
||||||
component.setUnderlined( object.get( "underlined" ).getAsBoolean() );
|
|
||||||
}
|
|
||||||
if ( object.has( "strikethrough" ) )
|
|
||||||
{
|
|
||||||
component.setUnderlined( object.get( "strikethrough" ).getAsBoolean() );
|
|
||||||
}
|
|
||||||
if ( object.has( "obfuscated" ) )
|
|
||||||
{
|
|
||||||
component.setUnderlined( object.get( "obfuscated" ).getAsBoolean() );
|
|
||||||
}
|
|
||||||
if ( object.has( "extra" ) )
|
|
||||||
{
|
|
||||||
component.setExtra( Arrays.<BaseComponent>asList( context.<BaseComponent[]>deserialize( object.get( "extra" ), BaseComponent[].class ) ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
//Events
|
|
||||||
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" ) )
|
|
||||||
{
|
|
||||||
JsonObject event = object.getAsJsonObject( "hoverEvent" );
|
|
||||||
BaseComponent[] res;
|
|
||||||
if ( event.get( "value" ).isJsonArray() )
|
|
||||||
{
|
|
||||||
res = context.deserialize( event.get( "value" ), BaseComponent[].class );
|
|
||||||
} else
|
|
||||||
{
|
|
||||||
res = new BaseComponent[]
|
|
||||||
{
|
|
||||||
context.<BaseComponent>deserialize( event.get( "value" ), BaseComponent.class )
|
|
||||||
};
|
|
||||||
}
|
|
||||||
component.setHoverEvent( new HoverEvent( HoverEvent.Action.valueOf( event.get( "action" ).getAsString().toUpperCase() ), res ) );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void serialize(JsonObject object, BaseComponent component, JsonSerializationContext context)
|
|
||||||
{
|
|
||||||
boolean first = false;
|
|
||||||
if ( ComponentSerializer.serializedComponents.get() == null )
|
|
||||||
{
|
|
||||||
first = true;
|
|
||||||
ComponentSerializer.serializedComponents.set( new HashSet<BaseComponent>() );
|
|
||||||
}
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Preconditions.checkArgument( !ComponentSerializer.serializedComponents.get().contains( component ), "Component loop" );
|
|
||||||
ComponentSerializer.serializedComponents.get().add( component );
|
|
||||||
if ( component.getColorRaw() != null )
|
|
||||||
{
|
|
||||||
object.addProperty( "color", component.getColorRaw().getName() );
|
|
||||||
}
|
|
||||||
if ( component.isBoldRaw() != null )
|
|
||||||
{
|
|
||||||
object.addProperty( "bold", component.isBoldRaw() );
|
|
||||||
}
|
|
||||||
if ( component.isItalicRaw() != null )
|
|
||||||
{
|
|
||||||
object.addProperty( "italic", component.isItalicRaw() );
|
|
||||||
}
|
|
||||||
if ( component.isUnderlinedRaw() != null )
|
|
||||||
{
|
|
||||||
object.addProperty( "underlined", component.isUnderlinedRaw() );
|
|
||||||
}
|
|
||||||
if ( component.isStrikethroughRaw() != null )
|
|
||||||
{
|
|
||||||
object.addProperty( "strikethrough", component.isStrikethroughRaw() );
|
|
||||||
}
|
|
||||||
if ( component.isObfuscatedRaw() != null )
|
|
||||||
{
|
|
||||||
object.addProperty( "obfuscated", component.isObfuscatedRaw() );
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( component.getExtra() != null )
|
|
||||||
{
|
|
||||||
object.add( "extra", context.serialize( component.getExtra() ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
//Events
|
|
||||||
if ( component.getClickEvent() != null )
|
|
||||||
{
|
|
||||||
JsonObject clickEvent = new JsonObject();
|
|
||||||
clickEvent.addProperty( "action", component.getClickEvent().getAction().toString().toLowerCase() );
|
|
||||||
clickEvent.addProperty( "value", component.getClickEvent().getValue() );
|
|
||||||
object.add( "clickEvent", clickEvent );
|
|
||||||
}
|
|
||||||
if ( component.getHoverEvent() != null )
|
|
||||||
{
|
|
||||||
JsonObject hoverEvent = new JsonObject();
|
|
||||||
hoverEvent.addProperty( "action", component.getHoverEvent().getAction().toString().toLowerCase() );
|
|
||||||
hoverEvent.add( "value", context.serialize( component.getHoverEvent().getValue() ) );
|
|
||||||
object.add( "hoverEvent", hoverEvent );
|
|
||||||
}
|
|
||||||
} finally
|
|
||||||
{
|
|
||||||
ComponentSerializer.serializedComponents.get().remove( component );
|
|
||||||
if ( first )
|
|
||||||
{
|
|
||||||
ComponentSerializer.serializedComponents.set( null );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,64 +0,0 @@
|
|||||||
package net.md_5.bungee.chat;
|
|
||||||
|
|
||||||
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 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.HashSet;
|
|
||||||
|
|
||||||
public class ComponentSerializer implements JsonDeserializer<BaseComponent>
|
|
||||||
{
|
|
||||||
|
|
||||||
private final static Gson gson = new GsonBuilder().
|
|
||||||
registerTypeAdapter( BaseComponent.class, new ComponentSerializer() ).
|
|
||||||
registerTypeAdapter( TextComponent.class, new TextComponentSerializer() ).
|
|
||||||
registerTypeAdapter( TranslatableComponent.class, new TranslatableComponentSerializer() ).
|
|
||||||
create();
|
|
||||||
|
|
||||||
public final static ThreadLocal<HashSet<BaseComponent>> serializedComponents = new ThreadLocal<>();
|
|
||||||
|
|
||||||
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)
|
|
||||||
{
|
|
||||||
return gson.toJson( component );
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String toString(BaseComponent... components)
|
|
||||||
{
|
|
||||||
return gson.toJson( new TextComponent( components ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
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" ) )
|
|
||||||
{
|
|
||||||
return context.deserialize( json, TranslatableComponent.class );
|
|
||||||
}
|
|
||||||
return context.deserialize( json, TextComponent.class );
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,43 +0,0 @@
|
|||||||
package net.md_5.bungee.chat;
|
|
||||||
|
|
||||||
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.BaseComponent;
|
|
||||||
import net.md_5.bungee.api.chat.TextComponent;
|
|
||||||
|
|
||||||
import java.lang.reflect.Type;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class TextComponentSerializer extends BaseComponentSerializer implements JsonSerializer<TextComponent>, JsonDeserializer<TextComponent>
|
|
||||||
{
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public TextComponent deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException
|
|
||||||
{
|
|
||||||
TextComponent component = new TextComponent();
|
|
||||||
JsonObject object = json.getAsJsonObject();
|
|
||||||
deserialize( object, component, context );
|
|
||||||
component.setText( object.get( "text" ).getAsString() );
|
|
||||||
return component;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public JsonElement serialize(TextComponent src, Type typeOfSrc, JsonSerializationContext context)
|
|
||||||
{
|
|
||||||
List<BaseComponent> extra = src.getExtra();
|
|
||||||
if ( !src.hasFormatting() && ( extra == null || extra.isEmpty() ) )
|
|
||||||
{
|
|
||||||
return new JsonPrimitive( src.getText() );
|
|
||||||
}
|
|
||||||
JsonObject object = new JsonObject();
|
|
||||||
serialize( object, src, context );
|
|
||||||
object.addProperty( "text", src.getText() );
|
|
||||||
return object;
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,45 +0,0 @@
|
|||||||
package net.md_5.bungee.chat;
|
|
||||||
|
|
||||||
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.TranslatableComponent;
|
|
||||||
|
|
||||||
import java.lang.reflect.Type;
|
|
||||||
import java.util.Arrays;
|
|
||||||
|
|
||||||
public class TranslatableComponentSerializer extends BaseComponentSerializer implements JsonSerializer<TranslatableComponent>, JsonDeserializer<TranslatableComponent>
|
|
||||||
{
|
|
||||||
|
|
||||||
@Override
|
|
||||||
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" ) )
|
|
||||||
{
|
|
||||||
component.setWith( Arrays.asList( (BaseComponent[]) context.deserialize( object.get( "with" ), BaseComponent[].class ) ) );
|
|
||||||
}
|
|
||||||
return component;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
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 )
|
|
||||||
{
|
|
||||||
object.add( "with", context.serialize( src.getWith() ) );
|
|
||||||
}
|
|
||||||
return object;
|
|
||||||
}
|
|
||||||
}
|
|
@ -22,7 +22,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.code.gson</groupId>
|
<groupId>com.google.code.gson</groupId>
|
||||||
<artifactId>gson</artifactId>
|
<artifactId>gson</artifactId>
|
||||||
<version>2.2.4</version>
|
<version>2.3</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.yaml</groupId>
|
<groupId>org.yaml</groupId>
|
||||||
<artifactId>snakeyaml</artifactId>
|
<artifactId>snakeyaml</artifactId>
|
||||||
<version>1.13</version>
|
<version>1.14</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
4
pom.xml
4
pom.xml
@ -79,7 +79,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.guava</groupId>
|
<groupId>com.google.guava</groupId>
|
||||||
<artifactId>guava</artifactId>
|
<artifactId>guava</artifactId>
|
||||||
<version>17.0</version>
|
<version>18.0</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -91,7 +91,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.projectlombok</groupId>
|
<groupId>org.projectlombok</groupId>
|
||||||
<artifactId>lombok</artifactId>
|
<artifactId>lombok</artifactId>
|
||||||
<version>1.12.6</version>
|
<version>1.14.8</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
@ -29,12 +29,6 @@
|
|||||||
<version>${netty.version}</version>
|
<version>${netty.version}</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>io.netty</groupId>
|
|
||||||
<artifactId>netty-transport-native-epoll</artifactId>
|
|
||||||
<version>${netty.version}</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.netty</groupId>
|
<groupId>io.netty</groupId>
|
||||||
<artifactId>netty-transport-native-epoll</artifactId>
|
<artifactId>netty-transport-native-epoll</artifactId>
|
||||||
@ -75,19 +69,19 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>mysql</groupId>
|
<groupId>mysql</groupId>
|
||||||
<artifactId>mysql-connector-java</artifactId>
|
<artifactId>mysql-connector-java</artifactId>
|
||||||
<version>5.1.30</version>
|
<version>5.1.32</version>
|
||||||
<scope>runtime</scope>
|
<scope>runtime</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.javassist</groupId>
|
<groupId>org.javassist</groupId>
|
||||||
<artifactId>javassist</artifactId>
|
<artifactId>javassist</artifactId>
|
||||||
<version>3.18.1-GA</version>
|
<version>3.18.2-GA</version>
|
||||||
<scope>runtime</scope>
|
<scope>runtime</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.fusesource.jansi</groupId>
|
<groupId>org.fusesource.jansi</groupId>
|
||||||
<artifactId>jansi</artifactId>
|
<artifactId>jansi</artifactId>
|
||||||
<version>1.8</version>
|
<version>1.11</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
@ -24,7 +24,7 @@ public class JenkinsModuleSource implements ModuleSource
|
|||||||
con.setConnectTimeout( 15000 );
|
con.setConnectTimeout( 15000 );
|
||||||
con.setReadTimeout( 15000 );
|
con.setReadTimeout( 15000 );
|
||||||
|
|
||||||
Files.copy( ByteStreams.newInputStreamSupplier( ByteStreams.toByteArray( con.getInputStream() ) ), module.getFile() );
|
Files.write( ByteStreams.toByteArray( con.getInputStream() ), module.getFile() );
|
||||||
System.out.println( "Download complete" );
|
System.out.println( "Download complete" );
|
||||||
} catch ( IOException ex )
|
} catch ( IOException ex )
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user