Merge remote-tracking branch 'upstream/2.0' into dev/nukkitx-standard-generator

Author: DaMatrix

pom.xml

@@ -150,6 +150,11 @@
             <artifactId>slf4j-api</artifactId>
             <version>2.0.0-alpha1</version>
         </dependency>
+        <dependency>
+            <groupId>com.lmax</groupId>
+            <artifactId>disruptor</artifactId>
+            <version>3.4.2</version>
+        </dependency>
 
         <!-- Jackson -->
         <dependency>

src/main/java/cn/nukkit/utils/TextFormat.java

@@ -35,9 +35,9 @@ public enum TextFormat {
      */
     DARK_PURPLE('5', 0x5),
     /**
-     * Represents gold.
+     * Represents orange.
      */
-    GOLD('6', 0x6),
+    ORANGE('6', 0x6),
     /**
      * Represents gray.
      */
@@ -74,6 +74,10 @@ public enum TextFormat {
      * Represents white.
      */
     WHITE('f', 0xF),
+    /**
+     * Represents gold.
+     */
+    GOLD('g', 0x16),
     /**
      * Makes the text obfuscated.
      */
@@ -105,7 +109,7 @@ public enum TextFormat {
      */
     public static final char ESCAPE = '\u00A7';
 
-    private static final Pattern CLEAN_PATTERN = Pattern.compile("(?i)" + ESCAPE + "[0-9A-FK-OR]");
+    private static final Pattern CLEAN_PATTERN = Pattern.compile("(?i)" + ESCAPE + "[0-9A-GK-OR]");
     private final static Map<Integer, TextFormat> BY_ID = Maps.newTreeMap();
     private final static Map<Character, TextFormat> BY_CHAR = new HashMap<>();
 
@@ -185,7 +189,7 @@ public static String clean(final String input, final boolean recursive) {
      * Translates a string using an alternate format code character into a
      * string that uses the internal TextFormat.ESCAPE format code
      * character. The alternate format code character will only be replaced if
-     * it is immediately followed by 0-9, A-F, a-f, K-O, k-o, R or r.
+     * it is immediately followed by 0-9, A-G, a-g, K-O, k-o, R or r.
      *
      * @param altFormatChar   The alternate format code character to replace. Ex: &amp;
      * @param textToTranslate Text containing the alternate format code character.
@@ -194,7 +198,7 @@ public static String clean(final String input, final boolean recursive) {
     public static String colorize(char altFormatChar, String textToTranslate) {
         char[] b = textToTranslate.toCharArray();
         for (int i = 0; i < b.length - 1; i++) {
-            if (b[i] == altFormatChar && "0123456789AaBbCcDdEeFfKkLlMmNnOoRr".indexOf(b[i + 1]) > -1) {
+            if (b[i] == altFormatChar && "0123456789AaBbCcDdEeFfGgKkLlMmNnOoRr".indexOf(b[i + 1]) > -1) {
                 b[i] = TextFormat.ESCAPE;
                 b[i + 1] = Character.toLowerCase(b[i + 1]);
             }
@@ -206,7 +210,7 @@ public static String colorize(char altFormatChar, String textToTranslate) {
      * Translates a string, using an ampersand (&amp;) as an alternate format code
      * character, into a string that uses the internal TextFormat.ESCAPE format
      * code character. The alternate format code character will only be replaced if
-     * it is immediately followed by 0-9, A-F, a-f, K-O, k-o, R or r.
+     * it is immediately followed by 0-9, A-G, a-g, K-O, k-o, R or r.
      *
      * @param textToTranslate Text containing the alternate format code character.
      * @return Text containing the TextFormat.ESCAPE format code character.

src/main/resources/log4j2.component.properties

@@ -1,4 +1,5 @@
 ## log4j2.messageFactory=cn.nukkit.locale.NukkitMessageFactory
+log4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector
 log4j2.enableThreadlocals=true
 log4j2.enableDirectEncoders=true
 log4j2.garbagefreeThreadContextMap=true