Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.github/workflows/maven.yml
#	pom.xml

Author: onebeastchris

api/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.21-R0.3-SNAPSHOT</version>
+        <version>1.21-R0.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-api</artifactId>
-    <version>1.21-R0.3-SNAPSHOT</version>
+    <version>1.21-R0.4-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-API</name>

api/src/main/java/net/md_5/bungee/api/event/CustomClickEvent.java

@@ -1,6 +1,6 @@
 package net.md_5.bungee.api.event;
 
-import java.util.Map;
+import com.google.gson.JsonElement;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -20,11 +20,6 @@
 public class CustomClickEvent extends Event implements Cancellable
 {
 
-    /**
-     * Map key containing the form action, if available.
-     */
-    public static final String ACTION_KEY = "action";
-    //
     /**
      * Player who clicked.
      */
@@ -34,19 +29,9 @@ public class CustomClickEvent extends Event implements Cancellable
      */
     private final String id;
     /**
-     * The raw data as submitted.
-     */
-    private final String rawData;
-    /**
-     * The parsed form data.
-     * <br>
-     * If a form submission, usually contains a
-     * {@code CustomClickEvent.ACTION_KEY} key with the ID of the relevant
-     * submission action.
-     * <br>
-     * If not a form submission, then may be null.
+     * The data as submitted.
      */
-    private final Map<String, String> parsedData;
+    private final JsonElement data;
     /**
      * Cancelled state.
      */

api/src/main/java/net/md_5/bungee/api/plugin/LibraryLoader.java

@@ -35,6 +35,7 @@
 class LibraryLoader
 {
 
+    private static final String REPOSITORY_PROPERTY = "net.md_5.bungee.api.plugin.centralURL";
     private final Logger logger;
     private final RepositorySystem repository;
     private final DefaultRepositorySystemSession session;
@@ -68,7 +69,7 @@ public void transferStarted(TransferEvent event) throws TransferCancelledExcepti
         session.setSystemProperties( System.getProperties() );
         session.setReadOnly();
 
-        this.repositories = repository.newResolutionRepositories( session, Arrays.asList( new RemoteRepository.Builder( "central", "default", "https://repo.maven.apache.org/maven2" ).build() ) );
+        this.repositories = repository.newResolutionRepositories( session, Arrays.asList( new RemoteRepository.Builder( "central", "default", System.getProperty( REPOSITORY_PROPERTY, "https://repo.maven.apache.org/maven2" ) ).build() ) );
     }
 
     public ClassLoader createLoader(PluginDescription desc)

api/src/main/java/net/md_5/bungee/util/CaseInsensitiveHashingStrategy.java

@@ -1,22 +1,37 @@
 package net.md_5.bungee.util;
 
-import gnu.trove.strategy.HashingStrategy;
+import it.unimi.dsi.fastutil.Hash;
 import java.util.Locale;
 
-class CaseInsensitiveHashingStrategy implements HashingStrategy
+class CaseInsensitiveHashingStrategy implements Hash.Strategy<String>
 {
 
     static final CaseInsensitiveHashingStrategy INSTANCE = new CaseInsensitiveHashingStrategy();
 
     @Override
-    public int computeHashCode(Object object)
+    public int hashCode(String object)
     {
-        return ( (String) object ).toLowerCase( Locale.ROOT ).hashCode();
+        if ( object == null )
+        {
+            return 0;
+        }
+
+        return object.toLowerCase( Locale.ROOT ).hashCode();
     }
 
     @Override
-    public boolean equals(Object o1, Object o2)
+    public boolean equals(String o1, String o2)
     {
-        return o1.equals( o2 ) || ( o1 instanceof String && o2 instanceof String && ( (String) o1 ).toLowerCase( Locale.ROOT ).equals( ( (String) o2 ).toLowerCase( Locale.ROOT ) ) );
+        if ( o1 == o2 )
+        {
+            return true;
+        }
+
+        if ( o1 == null || o2 == null )
+        {
+            return false;
+        }
+
+        return o1.equals( o2 ) || o1.toLowerCase( Locale.ROOT ).equals( o2.toLowerCase( Locale.ROOT ) );
     }
 }

api/src/main/java/net/md_5/bungee/util/CaseInsensitiveMap.java

@@ -1,9 +1,9 @@
 package net.md_5.bungee.util;
 
-import gnu.trove.map.hash.TCustomHashMap;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenCustomHashMap;
 import java.util.Map;
 
-public class CaseInsensitiveMap<V> extends TCustomHashMap<String, V>
+public class CaseInsensitiveMap<V> extends Object2ObjectOpenCustomHashMap<String, V>
 {
 
     public CaseInsensitiveMap()
@@ -13,6 +13,6 @@ public CaseInsensitiveMap()
 
     public CaseInsensitiveMap(Map<? extends String, ? extends V> map)
     {
-        super( CaseInsensitiveHashingStrategy.INSTANCE, map );
+        super( map, CaseInsensitiveHashingStrategy.INSTANCE );
     }
 }

api/src/main/java/net/md_5/bungee/util/CaseInsensitiveSet.java

@@ -1,9 +1,9 @@
 package net.md_5.bungee.util;
 
-import gnu.trove.set.hash.TCustomHashSet;
+import it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet;
 import java.util.Collection;
 
-public class CaseInsensitiveSet extends TCustomHashSet<String>
+public class CaseInsensitiveSet extends ObjectOpenCustomHashSet<String>
 {
 
     public CaseInsensitiveSet()
@@ -13,6 +13,6 @@ public CaseInsensitiveSet()
 
     public CaseInsensitiveSet(Collection<? extends String> collection)
     {
-        super( CaseInsensitiveHashingStrategy.INSTANCE, collection );
+        super( collection, CaseInsensitiveHashingStrategy.INSTANCE );
     }
 }

api/src/test/java/net/md_5/bungee/util/CaseInsensitiveTest.java

@@ -13,12 +13,12 @@ public void testMaps()
         CaseInsensitiveMap<Object> map = new CaseInsensitiveMap<>();
 
         map.put( "FOO", obj );
-        assertTrue( map.contains( "foo" ) ); // Assert that contains is case insensitive
+        assertTrue( map.containsKey( "foo" ) ); // Assert that contains is case insensitive
         assertTrue( map.entrySet().iterator().next().getKey().equals( "FOO" ) ); // Assert that case is preserved
 
         // Assert that remove is case insensitive
         map.remove( "FoO" );
-        assertFalse( map.contains( "foo" ) );
+        assertFalse( map.containsKey( "foo" ) );
     }
 
     @Test

bootstrap/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.21-R0.3-SNAPSHOT</version>
+        <version>1.21-R0.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-bootstrap</artifactId>
-    <version>1.21-R0.3-SNAPSHOT</version>
+    <version>1.21-R0.4-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Bootstrap</name>
@@ -48,6 +48,7 @@
                             <Main-Class>net.md_5.bungee.Bootstrap</Main-Class> 
                             <Implementation-Version>${describe}</Implementation-Version>
                             <Specification-Version>${maven.build.timestamp}</Specification-Version>
+                            <Enable-Native-Access>ALL-UNNAMED</Enable-Native-Access>
                         </manifestEntries>
                     </archive>
                 </configuration>

chat/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.21-R0.3-SNAPSHOT</version>
+        <version>1.21-R0.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-chat</artifactId>
-    <version>1.21-R0.3-SNAPSHOT</version>
+    <version>1.21-R0.4-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BungeeCord-Chat</name>

chat/src/main/java/net/md_5/bungee/api/chat/BaseComponent.java

@@ -4,6 +4,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import lombok.AccessLevel;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
@@ -677,11 +678,11 @@ public boolean hasFormatting()
     public String toPlainText()
     {
         StringBuilder builder = new StringBuilder();
-        toPlainText( builder );
+        toPlainText( new LimitedStringVisitor( builder, Short.MAX_VALUE ) );
         return builder.toString();
     }
 
-    void toPlainText(StringBuilder builder)
+    void toPlainText(StringVisitor builder)
     {
         if ( extra != null )
         {
@@ -701,11 +702,11 @@ void toPlainText(StringBuilder builder)
     public String toLegacyText()
     {
         StringBuilder builder = new StringBuilder();
-        toLegacyText( builder );
+        toLegacyText( new LimitedStringVisitor( builder, Short.MAX_VALUE ) );
         return builder.toString();
     }
 
-    void toLegacyText(StringBuilder builder)
+    void toLegacyText(StringVisitor builder)
     {
         if ( extra != null )
         {
@@ -716,7 +717,7 @@ void toLegacyText(StringBuilder builder)
         }
     }
 
-    void addFormat(StringBuilder builder)
+    void addFormat(StringVisitor builder)
     {
         builder.append( getColor() );
         if ( isBold() )
@@ -740,4 +741,35 @@ void addFormat(StringBuilder builder)
             builder.append( ChatColor.MAGIC );
         }
     }
+
+    @FunctionalInterface
+    protected static interface StringVisitor
+    {
+
+        void append(String s);
+
+        default void append(Object obj)
+        {
+            append( String.valueOf( obj ) );
+        }
+    }
+
+    @Data
+    protected static class LimitedStringVisitor implements StringVisitor
+    {
+
+        private final StringBuilder builder;
+        private final int maxLength;
+
+        @Override
+        public void append(String s)
+        {
+            if ( builder.length() >= maxLength )
+            {
+                throw new IllegalArgumentException( "String exceeded maximum length " + maxLength );
+            }
+
+            builder.append( s );
+        }
+    }
 }