2424import io .papermc .lib .PaperLib ;
2525import lombok .EqualsAndHashCode ;
2626import me .lucko .helper .serialize .BlockPosition ;
27+ import net .md_5 .bungee .api .chat .BaseComponent ;
2728import net .md_5 .bungee .api .chat .ComponentBuilder ;
2829import net .md_5 .bungee .api .chat .TextComponent ;
2930import net .md_5 .bungee .api .chat .TranslatableComponent ;
31+ import net .md_5 .bungee .chat .ComponentSerializer ;
3032import org .bukkit .DyeColor ;
3133import org .bukkit .Location ;
3234import org .bukkit .Material ;
@@ -740,31 +742,33 @@ public List<ComponentPackage> getSignText(@NotNull String locale) {
740742 }
741743
742744 // TODO No-longer use SHOP_SIGN_PREFIX since we use modern storage method. Pending for deletion.
743- lines .add (new ComponentPackage (TextComponent . fromLegacyText ( SHOP_SIGN_PREFIX + line2 + " " )));
745+ lines .add (new ComponentPackage (new ComponentBuilder (). color ( net . md_5 . bungee . api . ChatColor . BLACK ). appendLegacy ( line2 ). create ( )));
744746
745747 //line 3
746748 if (plugin .getConfiguration ().getBoolean ("shop.force-use-item-original-name" ) || !this .getItem ().hasItemMeta () || !this .getItem ().getItemMeta ().hasDisplayName ()) {
747- TextComponent left = new TextComponent (plugin .text ().of ("signs.item-left" ).forLocale ());
748- TextComponent right = new TextComponent (plugin .text ().of ("signs.item-right" ).forLocale ());
749+ BaseComponent [] left = TextComponent . fromLegacyText (plugin .text ().of ("signs.item-left" ).forLocale ());
750+ BaseComponent [] right = TextComponent . fromLegacyText (plugin .text ().of ("signs.item-right" ).forLocale ());
749751 if (plugin .getNbtapi () == null ) {
750752 // NBTAPI not installed
751753 lines .add (new ComponentPackage (new ComponentBuilder ()
754+ .color (net .md_5 .bungee .api .ChatColor .BLACK )
752755 .append (left )
753- .append ( TextComponent . fromLegacyText ( Util .getItemStackName (getItem () )))
756+ .appendLegacy ( Util .getItemStackName (getItem ()))
754757 .append (right )
755758 .create ()));
756759 } else {
757760 // NBTAPI installed
758761 lines .add (new ComponentPackage (new ComponentBuilder ()
762+ .color (net .md_5 .bungee .api .ChatColor .BLACK )
759763 .append (left )
760764 .append (new TranslatableComponent (ReflectFactory .getMaterialMinecraftNamespacedKey (getItem ().getType ())))
761765 .append (right )
762766 .create ()));
763767 }
764768 } else {
765- lines .add (new ComponentPackage (new ComponentBuilder ().append ( TextComponent . fromLegacyText (plugin .text ().of ("signs.item-left" ).forLocale () ))
766- .append (new TextComponent ( Util .getItemStackName (getItem ())). toLegacyText ( ))
767- .append ( TextComponent . fromLegacyText ( plugin .text ().of ("signs.item-right" ).forLocale () )).create ()));
769+ lines .add (new ComponentPackage (new ComponentBuilder ().color ( net . md_5 . bungee . api . ChatColor . BLACK ). appendLegacy (plugin .text ().of ("signs.item-left" ).forLocale ())
770+ .append (Util .getItemStackName (getItem ()))
771+ .appendLegacy ( plugin .text ().of ("signs.item-right" ).forLocale ()).create ()));
768772 }
769773
770774 //line 4
@@ -776,7 +780,10 @@ public List<ComponentPackage> getSignText(@NotNull String locale) {
776780 } else {
777781 line4 = plugin .text ().of ("signs.price" , plugin .getShopManager ().format (this .getPrice (), this )).forLocale ();
778782 }
779- lines .add (new ComponentPackage (TextComponent .fromLegacyText (line4 )));
783+ lines .add (new ComponentPackage (new ComponentBuilder ().color (net .md_5 .bungee .api .ChatColor .BLACK ).appendLegacy (line4 ).create ()));
784+
785+ lines .forEach (pack -> Util .debugLog (ComponentSerializer .toString (pack .getComponents ())));
786+
780787 return lines ;
781788 }
782789
0 commit comments