FormattedText - remove unneeded old color arg

DenizenScript · Oct 9, 2022 · 021f194 · 021f194
1 parent 3efdfee
commit 021f194
Show file tree

Hide file tree

Showing 27 changed files with 52 additions and 52 deletions.
diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/PaperModule.java b/paper/src/main/java/com/denizenscript/denizen/paper/PaperModule.java
@@ -90,11 +90,11 @@ public static Component parseFormattedText(String text, ChatColor baseColor) {
         return jsonToComponent(ComponentSerializer.toString(FormattedTextHelper.parse(text, baseColor)));
     }
 
-    public static String stringifyComponent(Component component, ChatColor baseColor) {
+    public static String stringifyComponent(Component component) {
         if (component == null) {
             return null;
         }
-        return FormattedTextHelper.stringify(ComponentSerializer.parse(componentToJson(component)), baseColor);
+        return FormattedTextHelper.stringify(ComponentSerializer.parse(componentToJson(component)));
     }
 
     public static Component jsonToComponent(String json) {

diff --git a/...om/denizenscript/denizen/paper/events/PlayerCompletesAdvancementScriptEventPaperImpl.java b/...om/denizenscript/denizen/paper/events/PlayerCompletesAdvancementScriptEventPaperImpl.java
@@ -12,7 +12,7 @@ public class PlayerCompletesAdvancementScriptEventPaperImpl extends PlayerComple
     @Override
     public ObjectTag getContext(String name) {
         switch (name) {
-            case "message": return new ElementTag(PaperModule.stringifyComponent(event.message(), ChatColor.WHITE));
+            case "message": return new ElementTag(PaperModule.stringifyComponent(event.message()));
         }
         return super.getContext(name);
     }

diff --git a/.../main/java/com/denizenscript/denizen/paper/events/ServerListPingScriptEventPaperImpl.java b/.../main/java/com/denizenscript/denizen/paper/events/ServerListPingScriptEventPaperImpl.java
@@ -107,7 +107,7 @@ public void setMotd(String text) {
     public ObjectTag getContext(String name) {
         switch (name) {
             case "motd":
-                return new ElementTag(PaperModule.stringifyComponent(event.motd(), ChatColor.WHITE));
+                return new ElementTag(PaperModule.stringifyComponent(event.motd()));
             case "protocol_version":
                 return new ElementTag(((PaperServerListPingEvent) event).getProtocolVersion());
             case "version_name":

diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/utilities/PaperAPIToolsImpl.java b/paper/src/main/java/com/denizenscript/denizen/paper/utilities/PaperAPIToolsImpl.java
@@ -41,14 +41,14 @@ public Inventory createInventory(InventoryHolder holder, InventoryType type, Str
     }
 
     @Override
-    public String parseComponent(Object input, ChatColor baseColor) {
+    public String parseComponent(Object input) {
         if (input == null) {
             return null;
         }
         if (input instanceof Component) {
-            return PaperModule.stringifyComponent((Component) input, baseColor);
+            return PaperModule.stringifyComponent((Component) input);
         }
-        return super.parseComponent(input, baseColor);
+        return super.parseComponent(input);
     }
 
     @Override
@@ -64,7 +64,7 @@ public void setCustomName(Entity entity, String name) {
 
     @Override
     public String getCustomName(Entity entity) {
-        return PaperModule.stringifyComponent(entity.customName(), ChatColor.WHITE);
+        return PaperModule.stringifyComponent(entity.customName());
     }
 
     @Override
@@ -74,15 +74,15 @@ public void setPlayerListName(Player player, String name) {
 
     @Override
     public String getPlayerListName(Player player) {
-        return PaperModule.stringifyComponent(player.playerListName(), ChatColor.WHITE);
+        return PaperModule.stringifyComponent(player.playerListName());
     }
 
     @Override
     public String[] getSignLines(Sign sign) {
         String[] output = new String[4];
         int i = 0;
         for (Component component : sign.lines()) {
-            output[i++] = PaperModule.stringifyComponent(component, ChatColor.BLACK);
+            output[i++] = PaperModule.stringifyComponent(component);
         }
         return output;
     }
@@ -113,7 +113,7 @@ public void sendSignUpdate(Player player, Location loc, String[] text) {
 
     @Override
     public String getCustomName(Nameable object) {
-        return PaperModule.stringifyComponent(object.customName(), ChatColor.BLACK);
+        return PaperModule.stringifyComponent(object.customName());
     }
 
     @Override
@@ -191,7 +191,7 @@ public boolean isDenizenMix(ItemStack currInput, ItemStack ingredient) {
 
     @Override
     public String getDeathMessage(PlayerDeathEvent event) {
-        return PaperModule.stringifyComponent(event.deathMessage(), ChatColor.WHITE);
+        return PaperModule.stringifyComponent(event.deathMessage());
     }
 
     @Override

diff --git a/...c/main/java/com/denizenscript/denizen/events/player/PlayerReceivesMessageScriptEvent.java b/...c/main/java/com/denizenscript/denizen/events/player/PlayerReceivesMessageScriptEvent.java
@@ -97,7 +97,7 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) {
             if (lower.startsWith("raw_json:")) {
                 rawJson = new ElementTag(determination.substring("raw_json:".length()));
                 altMessageDetermination = null;
-                message = new ElementTag(FormattedTextHelper.stringify(ComponentSerializer.parse(rawJson.asString()), ChatColor.WHITE), true);
+                message = new ElementTag(FormattedTextHelper.stringify(ComponentSerializer.parse(rawJson.asString())), true);
                 modified = true;
                 return true;
             }

diff --git a/...ain/java/com/denizenscript/denizen/objects/properties/bukkit/BukkitElementExtensions.java b/...ain/java/com/denizenscript/denizen/objects/properties/bukkit/BukkitElementExtensions.java
@@ -438,7 +438,7 @@ public static void register() {
         // Inverts <@link tag ElementTag.to_raw_json>.
         // -->
         ElementTag.tagProcessor.registerStaticTag(ElementTag.class, "from_raw_json", (attribute, object) -> {
-            return new ElementTag(FormattedTextHelper.stringify(ComponentSerializer.parse(object.asString()), ChatColor.WHITE));
+            return new ElementTag(FormattedTextHelper.stringify(ComponentSerializer.parse(object.asString())));
         });
 
         // <--[tag]

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemBook.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemBook.java
@@ -93,7 +93,7 @@ public static void registerTags() {
             List<BaseComponent[]> pages = object.getBookMeta().spigot().getPages();
             ListTag pageList = new ListTag(pages.size());
             for (BaseComponent[] page : pages) {
-                pageList.addObject(new ElementTag(FormattedTextHelper.stringify(page, ChatColor.BLACK), true));
+                pageList.addObject(new ElementTag(FormattedTextHelper.stringify(page), true));
             }
             return pageList;
         });
@@ -130,7 +130,7 @@ public static void registerTags() {
             }
             if ((attribute.startsWith("page", 2) || attribute.startsWith("get_page", 2)) && attribute.hasContext(2)) {
                 attribute.fulfill(1);
-                return new ElementTag(FormattedTextHelper.stringify(bookMeta.spigot().getPage(attribute.getIntParam()), ChatColor.BLACK));
+                return new ElementTag(FormattedTextHelper.stringify(bookMeta.spigot().getPage(attribute.getIntParam())));
             }
             if ((attribute.startsWith("raw_page", 2) || attribute.startsWith("get_raw_page", 2)) && attribute.hasContext(2)) {
                 BukkitImplDeprecations.bookItemRawTags.warn(attribute.context);
@@ -141,7 +141,7 @@ public static void registerTags() {
                 attribute.fulfill(1);
                 ListTag output = new ListTag();
                 for (BaseComponent[] page : bookMeta.spigot().getPages()) {
-                    output.add(FormattedTextHelper.stringify(page, ChatColor.BLACK));
+                    output.add(FormattedTextHelper.stringify(page));
                 }
                 return output;
             }
@@ -333,7 +333,7 @@ public MapTag getBookMap() {
             List<BaseComponent[]> pages = bookMeta.spigot().getPages();
             ListTag pageList = new ListTag(pages.size());
             for (BaseComponent[] page : pages) {
-                pageList.addObject(new ElementTag(FormattedTextHelper.stringify(page, ChatColor.BLACK), true));
+                pageList.addObject(new ElementTag(FormattedTextHelper.stringify(page), true));
             }
             bookMap.putObject("pages", pageList);
         }
@@ -359,7 +359,7 @@ public String getOutputString() {
         output.append("pages|");
         if (bookMeta.hasPages()) {
             for (BaseComponent[] page : bookMeta.spigot().getPages()) {
-                output.append(EscapeTagBase.escape(FormattedTextHelper.stringify(page, ChatColor.BLACK))).append("|");
+                output.append(EscapeTagBase.escape(FormattedTextHelper.stringify(page))).append("|");
             }
         }
         return output.substring(0, output.length() - 1);

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/FormattedTextHelper.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/FormattedTextHelper.java
@@ -71,7 +71,7 @@ public static boolean hasRootFormat(BaseComponent component) {
         return hasRootFormat(extra.get(0));
     }
 
-    public static String stringify(BaseComponent[] components, ChatColor baseColor) {
+    public static String stringify(BaseComponent[] components) {
         if (components == null) {
             return null;
         }

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/PaperAPITools.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/PaperAPITools.java
@@ -32,15 +32,15 @@ public Inventory createInventory(InventoryHolder holder, InventoryType type, Str
         return Bukkit.getServer().createInventory(holder, type, title);
     }
 
-    public String parseComponent(Object input, ChatColor baseColor) {
+    public String parseComponent(Object input) {
         if (input == null) {
             return null;
         }
         if (input instanceof String) {
             return (String) input;
         }
         else if (input instanceof BaseComponent[]) {
-            return FormattedTextHelper.stringify((BaseComponent[]) input, baseColor);
+            return FormattedTextHelper.stringify((BaseComponent[]) input);
         }
         else if (input instanceof BaseComponent) {
             return FormattedTextHelper.stringify((BaseComponent) input);

diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/Handler.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/Handler.java
@@ -238,7 +238,7 @@ public String stringForHover(HoverEvent hover) {
         if (contentObject instanceof Text) {
             Object value = ((Text) contentObject).getValue();
             if (value instanceof BaseComponent[]) {
-                return FormattedTextHelper.stringify((BaseComponent[]) value, ChatColor.WHITE);
+                return FormattedTextHelper.stringify((BaseComponent[]) value);
             }
             else {
                 return value.toString();

diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/ItemHelperImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/ItemHelperImpl.java
@@ -259,7 +259,7 @@ public String getDisplayName(ItemTag item) {
         net.minecraft.server.v1_16_R3.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(item.getItemStack());
         String jsonText = ((NBTTagCompound) nmsItemStack.getTag().get("display")).getString("Name");
         BaseComponent[] nameComponent = ComponentSerializer.parse(jsonText);
-        return FormattedTextHelper.stringify(nameComponent, ChatColor.WHITE);
+        return FormattedTextHelper.stringify(nameComponent);
     }
 
     @Override
@@ -272,7 +272,7 @@ public List<String> getLore(ItemTag item) {
         List<String> outList = new ArrayList<>();
         for (int i = 0; i < list.size(); i++) {
             BaseComponent[] lineComponent = ComponentSerializer.parse(list.getString(i));
-            outList.add(FormattedTextHelper.stringify(lineComponent, ChatColor.WHITE));
+            outList.add(FormattedTextHelper.stringify(lineComponent));
         }
         return outList;
     }

diff --git a/...main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutChatImpl.java b/...main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutChatImpl.java
@@ -27,12 +27,12 @@ public PacketOutChatImpl(PacketPlayOutChat internal) {
         try {
             IChatBaseComponent baseComponent = (IChatBaseComponent) MESSAGE.get(internal);
             if (baseComponent != null) {
-                message = FormattedTextHelper.stringify(Handler.componentToSpigot(baseComponent), ChatColor.WHITE);
+                message = FormattedTextHelper.stringify(Handler.componentToSpigot(baseComponent));
                 rawJson = IChatBaseComponent.ChatSerializer.a(baseComponent);
             }
             else {
                 if (internal.components != null) {
-                    message = FormattedTextHelper.stringify(internal.components, ChatColor.WHITE);
+                    message = FormattedTextHelper.stringify(internal.components);
                     rawJson = ComponentSerializer.toString(internal.components);
                 }
                 bungee = true;

diff --git a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/Handler.java b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/Handler.java
@@ -274,7 +274,7 @@ public String stringForHover(HoverEvent hover) {
         if (contentObject instanceof Text) {
             Object value = ((Text) contentObject).getValue();
             if (value instanceof BaseComponent[]) {
-                return FormattedTextHelper.stringify((BaseComponent[]) value, ChatColor.WHITE);
+                return FormattedTextHelper.stringify((BaseComponent[]) value);
             }
             else {
                 return value.toString();

diff --git a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/helpers/EnchantmentHelperImpl.java b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/helpers/EnchantmentHelperImpl.java
@@ -175,7 +175,7 @@ public int getMaxCost(Enchantment enchantment, int level) {
 
     @Override
     public String getFullName(Enchantment enchantment, int level) {
-        return FormattedTextHelper.stringify(Handler.componentToSpigot(((CraftEnchantment) enchantment).getHandle().getFullname(level)), ChatColor.GRAY);
+        return FormattedTextHelper.stringify(Handler.componentToSpigot(((CraftEnchantment) enchantment).getHandle().getFullname(level)));
     }
 
     @Override

diff --git a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/helpers/ItemHelperImpl.java b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/helpers/ItemHelperImpl.java
@@ -280,7 +280,7 @@ public String getDisplayName(ItemTag item) {
         net.minecraft.world.item.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(item.getItemStack());
         String jsonText = ((net.minecraft.nbt.CompoundTag) nmsItemStack.getTag().get("display")).getString("Name");
         BaseComponent[] nameComponent = ComponentSerializer.parse(jsonText);
-        return FormattedTextHelper.stringify(nameComponent, ChatColor.WHITE);
+        return FormattedTextHelper.stringify(nameComponent);
     }
 
     @Override
@@ -293,7 +293,7 @@ public List<String> getLore(ItemTag item) {
         List<String> outList = new ArrayList<>();
         for (int i = 0; i < list.size(); i++) {
             BaseComponent[] lineComponent = ComponentSerializer.parse(list.getString(i));
-            outList.add(FormattedTextHelper.stringify(lineComponent, ChatColor.WHITE));
+            outList.add(FormattedTextHelper.stringify(lineComponent));
         }
         return outList;
     }

diff --git a/.../com/denizenscript/denizen/nms/v1_17/impl/network/handlers/DenizenNetworkManagerImpl.java b/.../com/denizenscript/denizen/nms/v1_17/impl/network/handlers/DenizenNetworkManagerImpl.java
@@ -273,7 +273,7 @@ public boolean processActionbarPacket(Packet<?> packet, GenericFutureListener<?
             PlayerReceivesActionbarScriptEvent event = PlayerReceivesActionbarScriptEvent.instance;
             Component baseComponent = actionbarPacket.getText();
             event.reset();
-            event.message = new ElementTag(FormattedTextHelper.stringify(Handler.componentToSpigot(baseComponent), ChatColor.WHITE));
+            event.message = new ElementTag(FormattedTextHelper.stringify(Handler.componentToSpigot(baseComponent)));
             event.rawJson = new ElementTag(Component.Serializer.toJson(baseComponent));
             event.system = new ElementTag(false);
             event.player = PlayerTag.mirrorBukkitPlayer(player.getBukkitEntity());

diff --git a/...main/java/com/denizenscript/denizen/nms/v1_17/impl/network/packets/PacketOutChatImpl.java b/...main/java/com/denizenscript/denizen/nms/v1_17/impl/network/packets/PacketOutChatImpl.java
@@ -26,12 +26,12 @@ public PacketOutChatImpl(ClientboundChatPacket internal) {
         try {
             Component baseComponent = (Component) MESSAGE.get(internal);
             if (baseComponent != null) {
-                message = FormattedTextHelper.stringify(Handler.componentToSpigot(baseComponent), ChatColor.WHITE);
+                message = FormattedTextHelper.stringify(Handler.componentToSpigot(baseComponent));
                 rawJson = Component.Serializer.toJson(baseComponent);
             }
             else {
                 if (internal.components != null) {
-                    message = FormattedTextHelper.stringify(internal.components, ChatColor.WHITE);
+                    message = FormattedTextHelper.stringify(internal.components);
                     rawJson = ComponentSerializer.toString(internal.components);
                 }
                 bungee = true;

diff --git a/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/Handler.java b/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/Handler.java
@@ -184,7 +184,7 @@ public String getTitle(Inventory inventory) {
                 if (PAPER_INVENTORY_TITLE_GETTER == null) {
                     PAPER_INVENTORY_TITLE_GETTER = ReflectionHelper.getMethodHandle(nms.getClass(), "title");
                 }
-                return PaperAPITools.instance.parseComponent(PAPER_INVENTORY_TITLE_GETTER.invoke(nms), ChatColor.BLACK);
+                return PaperAPITools.instance.parseComponent(PAPER_INVENTORY_TITLE_GETTER.invoke(nms));
             }
             catch (Throwable ex) {
                 Debug.echoError(ex);
@@ -293,7 +293,7 @@ public String stringForHover(HoverEvent hover) {
         if (contentObject instanceof Text) {
             Object value = ((Text) contentObject).getValue();
             if (value instanceof BaseComponent[]) {
-                return FormattedTextHelper.stringify((BaseComponent[]) value, ChatColor.WHITE);
+                return FormattedTextHelper.stringify((BaseComponent[]) value);
             }
             else {
                 return value.toString();

diff --git a/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/EnchantmentHelperImpl.java b/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/EnchantmentHelperImpl.java
@@ -184,7 +184,7 @@ public int getMaxCost(Enchantment enchantment, int level) {
 
     @Override
     public String getFullName(Enchantment enchantment, int level) {
-        return FormattedTextHelper.stringify(Handler.componentToSpigot(((CraftEnchantment) enchantment).getHandle().getFullname(level)), ChatColor.GRAY);
+        return FormattedTextHelper.stringify(Handler.componentToSpigot(((CraftEnchantment) enchantment).getHandle().getFullname(level)));
     }
 
     @Override

diff --git a/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/ItemHelperImpl.java b/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/ItemHelperImpl.java
@@ -302,7 +302,7 @@ public String getDisplayName(ItemTag item) {
         net.minecraft.world.item.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(item.getItemStack());
         String jsonText = ((net.minecraft.nbt.CompoundTag) nmsItemStack.getTag().get("display")).getString("Name");
         BaseComponent[] nameComponent = ComponentSerializer.parse(jsonText);
-        return FormattedTextHelper.stringify(nameComponent, ChatColor.WHITE);
+        return FormattedTextHelper.stringify(nameComponent);
     }
 
     @Override
@@ -315,7 +315,7 @@ public List<String> getLore(ItemTag item) {
         List<String> outList = new ArrayList<>();
         for (int i = 0; i < list.size(); i++) {
             BaseComponent[] lineComponent = ComponentSerializer.parse(list.getString(i));
-            outList.add(FormattedTextHelper.stringify(lineComponent, ChatColor.WHITE));
+            outList.add(FormattedTextHelper.stringify(lineComponent));
         }
         return outList;
     }

diff --git a/.../com/denizenscript/denizen/nms/v1_18/impl/network/handlers/DenizenNetworkManagerImpl.java b/.../com/denizenscript/denizen/nms/v1_18/impl/network/handlers/DenizenNetworkManagerImpl.java
@@ -353,7 +353,7 @@ public boolean processTablistPacket(Packet<?> packet, GenericFutureListener<? ex
                 }
                 String modeText = update.getGameMode() == null ? null : update.getGameMode().name();
                 PlayerReceivesTablistUpdateScriptEvent.TabPacketData data = new PlayerReceivesTablistUpdateScriptEvent.TabPacketData(mode, profile.getId(), profile.getName(),
-                        update.getDisplayName() == null ? null : FormattedTextHelper.stringify(Handler.componentToSpigot(update.getDisplayName()), ChatColor.WHITE), modeText, texture, signature, update.getLatency());
+                        update.getDisplayName() == null ? null : FormattedTextHelper.stringify(Handler.componentToSpigot(update.getDisplayName())), modeText, texture, signature, update.getLatency());
                 PlayerReceivesTablistUpdateScriptEvent.fire(player.getBukkitEntity(), data);
                 if (data.modified) {
                     if (!isOverriding) {
@@ -400,7 +400,7 @@ public boolean processActionbarPacket(Packet<?> packet, GenericFutureListener<?
             PlayerReceivesActionbarScriptEvent event = PlayerReceivesActionbarScriptEvent.instance;
             Component baseComponent = actionbarPacket.getText();
             event.reset();
-            event.message = new ElementTag(FormattedTextHelper.stringify(Handler.componentToSpigot(baseComponent), ChatColor.WHITE));
+            event.message = new ElementTag(FormattedTextHelper.stringify(Handler.componentToSpigot(baseComponent)));
             event.rawJson = new ElementTag(Component.Serializer.toJson(baseComponent));
             event.system = new ElementTag(false);
             event.player = PlayerTag.mirrorBukkitPlayer(player.getBukkitEntity());