Move getAsBoolean() into ComponentStyleSerializer

SpigotMC · Dec 7, 2023 · 2fe9d2b · 2fe9d2b
1 parent c2cd541
commit 2fe9d2b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 30 deletions.
diff --git a/chat/src/main/java/net/md_5/bungee/chat/BaseComponentSerializer.java b/chat/src/main/java/net/md_5/bungee/chat/BaseComponentSerializer.java
@@ -5,7 +5,6 @@
 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 java.util.ArrayList;
 import java.util.Arrays;
@@ -21,30 +20,6 @@
 public class BaseComponentSerializer
 {
 
-    static boolean getAsBoolean(JsonElement el)
-    {
-        if ( el.isJsonPrimitive() )
-        {
-            JsonPrimitive primitive = (JsonPrimitive) el;
-
-            if ( primitive.isBoolean() )
-            {
-                return primitive.getAsBoolean();
-            }
-
-            if ( primitive.isNumber() )
-            {
-                Number number = primitive.getAsNumber();
-                if ( number instanceof Byte )
-                {
-                    return number.byteValue() != 0;
-                }
-            }
-        }
-
-        return false;
-    }
-
     protected void deserialize(JsonObject object, BaseComponent component, JsonDeserializationContext context)
     {
         component.applyStyle( context.deserialize( object, ComponentStyle.class ) );

diff --git a/chat/src/main/java/net/md_5/bungee/chat/ComponentStyleSerializer.java b/chat/src/main/java/net/md_5/bungee/chat/ComponentStyleSerializer.java
@@ -5,6 +5,7 @@
 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 java.lang.reflect.Type;
@@ -15,6 +16,30 @@
 public class ComponentStyleSerializer implements JsonSerializer<ComponentStyle>, JsonDeserializer<ComponentStyle>
 {
 
+    private static boolean getAsBoolean(JsonElement el)
+    {
+        if ( el.isJsonPrimitive() )
+        {
+            JsonPrimitive primitive = (JsonPrimitive) el;
+
+            if ( primitive.isBoolean() )
+            {
+                return primitive.getAsBoolean();
+            }
+
+            if ( primitive.isNumber() )
+            {
+                Number number = primitive.getAsNumber();
+                if ( number instanceof Byte )
+                {
+                    return number.byteValue() != 0;
+                }
+            }
+        }
+
+        return false;
+    }
+
     static void serializeTo(ComponentStyle style, JsonObject object)
     {
         if ( style.isBoldRaw() != null )
@@ -54,23 +79,23 @@ public ComponentStyle deserialize(JsonElement json, Type typeOfT, JsonDeserializ
         JsonObject object = json.getAsJsonObject();
         if ( object.has( "bold" ) )
         {
-            builder.bold( BaseComponentSerializer.getAsBoolean( object.get( "bold" ) ) );
+            builder.bold( getAsBoolean( object.get( "bold" ) ) );
         }
         if ( object.has( "italic" ) )
         {
-            builder.italic( BaseComponentSerializer.getAsBoolean( object.get( "italic" ) ) );
+            builder.italic( getAsBoolean( object.get( "italic" ) ) );
         }
         if ( object.has( "underlined" ) )
         {
-            builder.underlined( BaseComponentSerializer.getAsBoolean( object.get( "underlined" ) ) );
+            builder.underlined( getAsBoolean( object.get( "underlined" ) ) );
         }
         if ( object.has( "strikethrough" ) )
         {
-            builder.strikethrough( BaseComponentSerializer.getAsBoolean( object.get( "strikethrough" ) ) );
+            builder.strikethrough( getAsBoolean( object.get( "strikethrough" ) ) );
         }
         if ( object.has( "obfuscated" ) )
         {
-            builder.obfuscated( BaseComponentSerializer.getAsBoolean( object.get( "obfuscated" ) ) );
+            builder.obfuscated( getAsBoolean( object.get( "obfuscated" ) ) );
         }
         if ( object.has( "color" ) )
         {