TextComponent.fromLegacy cmopatibility

Author: CryptoMorin

core/src/main/java/com/cryptomorin/xseries/base/XRegistry.java

@@ -26,12 +26,10 @@
 import com.cryptomorin.xseries.base.annotations.XInfo;
 import com.cryptomorin.xseries.base.annotations.XMerge;
 import com.cryptomorin.xseries.particles.XParticle;
-import com.google.common.base.Preconditions;
 import org.bukkit.Keyed;
 import org.bukkit.NamespacedKey;
 import org.bukkit.Registry;
 import org.bukkit.enchantments.Enchantment;
-import org.bukkit.plugin.Plugin;
 import org.bukkit.potion.PotionEffectType;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;

core/src/main/java/com/cryptomorin/xseries/messages/ActionBar.java

@@ -180,7 +180,7 @@ public static void sendActionBar(@NotNull Plugin plugin, @NotNull Player player,
                 } catch (NumberFormatException ignored) {
                 }
                 if (time >= 0)
-                    sendActionBar(plugin, player, TextComponent.fromLegacy(message.substring(end + 1)), time);
+                    sendActionBar(plugin, player, MessageComponents.fromLegacy(message.substring(end + 1)), time);
             }
         }
 

core/src/main/java/com/cryptomorin/xseries/messages/MessageComponents.java

@@ -26,10 +26,12 @@
 import com.cryptomorin.xseries.reflection.minecraft.MinecraftClassHandle;
 import com.cryptomorin.xseries.reflection.minecraft.MinecraftPackage;
 import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.chat.ComponentSerializer;
 import org.jetbrains.annotations.ApiStatus;
 
 import java.lang.invoke.MethodHandle;
+import java.util.regex.Pattern;
 
 import static com.cryptomorin.xseries.reflection.XReflection.ofMinecraft;
 
@@ -53,7 +55,7 @@ public final class MessageComponents {
                     .method("public static IChatBaseComponent fromJSON(String jsonMessage)").returns(IChatBaseComponentClass)
                     .reflect();
         } catch (Throwable ex) {
-            throw new IllegalStateException(ex);
+            fromJson = null;
         }
 
         CraftChatMessage_fromJson = fromJson;
@@ -66,4 +68,11 @@ public static Object bungeeToVanilla(BaseComponent component) throws Throwable {
         String json = ComponentSerializer.toString(component);
         return CraftChatMessage_fromJson.invoke(json);
     }
+
+    private static final Pattern url = Pattern.compile("^(?:(https?)://)?([-\\w_.]{2,}\\.[a-z]{2,4})(/\\S*)?$");
+
+    @SuppressWarnings("deprecation")
+    public static BaseComponent fromLegacy(String message) {
+        return new TextComponent(TextComponent.fromLegacyText(message));
+    }
 }

core/src/main/java/com/cryptomorin/xseries/messages/Titles.java

@@ -26,7 +26,6 @@
 import com.cryptomorin.xseries.reflection.minecraft.MinecraftConnection;
 import com.cryptomorin.xseries.reflection.minecraft.MinecraftPackage;
 import net.md_5.bungee.api.chat.BaseComponent;
-import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -185,7 +184,7 @@ public Titles(BaseComponent title, BaseComponent subtitle, int fadeIn, int stay,
     }
 
     public Titles(String title, String subtitle, int fadeIn, int stay, int fadeOut) {
-        this(TextComponent.fromLegacy(title), TextComponent.fromLegacy(subtitle), fadeIn, stay, fadeOut);
+        this(MessageComponents.fromLegacy(title), MessageComponents.fromLegacy(subtitle), fadeIn, stay, fadeOut);
     }
 
     public Titles copy() {
@@ -211,7 +210,7 @@ public void send(Player player) {
     public static void sendTitle(@NotNull Player player,
                                  int fadeIn, int stay, int fadeOut,
                                  @Nullable String title, @Nullable String subtitle) {
-        sendTitle(player, fadeIn, stay, fadeOut, TextComponent.fromLegacy(title), TextComponent.fromLegacy(subtitle));
+        sendTitle(player, fadeIn, stay, fadeOut, MessageComponents.fromLegacy(title), MessageComponents.fromLegacy(subtitle));
     }
 
     public static void sendTitle(@NotNull Player player,
@@ -341,12 +340,12 @@ public BaseComponent getSubtitle() {
 
     @Deprecated
     public void setTitle(String title) {
-        this.title = TextComponent.fromLegacy(title);
+        this.title = MessageComponents.fromLegacy(title);
     }
 
     @Deprecated
     public void setSubtitle(String subtitle) {
-        this.subtitle = TextComponent.fromLegacy(subtitle);
+        this.subtitle = MessageComponents.fromLegacy(subtitle);
     }
 
     public void setTitle(BaseComponent title) {

core/src/main/java/com/cryptomorin/xseries/profiles/lock/KeyedLock.java

@@ -22,9 +22,12 @@
 
 package com.cryptomorin.xseries.profiles.lock;
 
+import org.jetbrains.annotations.ApiStatus;
+
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
+@ApiStatus.Internal
 public final class KeyedLock<K> implements AutoCloseable {
     private final KeyedLockMap<K> map;
     protected final K key;

core/src/main/java/com/cryptomorin/xseries/profiles/lock/KeyedLockMap.java

@@ -22,9 +22,12 @@
 
 package com.cryptomorin.xseries.profiles.lock;
 
+import org.jetbrains.annotations.ApiStatus;
+
 import java.util.HashMap;
 import java.util.Map;
 
+@ApiStatus.Internal
 public final class KeyedLockMap<K> {
     private final Map<K, KeyedLock<K>> locks = new HashMap<>();
 

core/src/main/java/com/cryptomorin/xseries/profiles/lock/MojangRequestQueue.java

@@ -22,8 +22,11 @@
 
 package com.cryptomorin.xseries.profiles.lock;
 
+import org.jetbrains.annotations.ApiStatus;
+
 import java.util.UUID;
 
+@ApiStatus.Internal
 public final class MojangRequestQueue {
     public static final KeyedLockMap<String> USERNAME_REQUESTS = new KeyedLockMap<>();
     public static final KeyedLockMap<UUID> UUID_REQUESTS = new KeyedLockMap<>();

core/src/test/com/cryptomorin/xseries/test/XSeriesTests.java

@@ -317,7 +317,6 @@ private static void testXMaterial() {
         assertSame(XMaterial.matchXMaterial("CLAY_BRICK"), XMaterial.BRICK);
         assertMaterial("MELON", "MELON");
 
-        assertNotNull(XMaterial.ACACIA_SIGN.parseItem(), "Acacia Sign is null");
         assertMaterial("COMMAND_BLOCK", XMaterial.COMMAND_BLOCK);
         assertMaterial("STEP:1", XMaterial.SANDSTONE_SLAB);
         assertMaterial("WOOD_BUTTON", XMaterial.OAK_BUTTON);
@@ -329,6 +328,7 @@ private static void testXMaterial() {
         assertMaterial("INK_SACK:4", XMaterial.LAPIS_LAZULI);
 
         if (XMaterial.supports(14)) {
+            assertNotNull(XMaterial.ACACIA_SIGN.parseItem(), "Acacia Sign is null");
             assertMaterial(XMaterial.RED_DYE, Material.RED_DYE);
             assertMaterial(XMaterial.GREEN_DYE, Material.GREEN_DYE);
             assertMaterial(XMaterial.BLACK_DYE, Material.BLACK_DYE);