Merge minimessage

.gitignore

@@ -1,22 +1,11 @@
 /.gradle/
-/.idea/
-/build/
-/api/build/
-/api/out/
-/api/run/
-/bom/build/
 /build-logic/.gradle/
-/build-logic/build/
-/extra-kotlin/build/
-/extra-kotlin/out/
-/key/build/
-/key/out/
-/nbt/build/
-/nbt/out/
-/run/
-/serializer-configurate*/build/
-/serializer-configurate*/out/
-/text-serializer-*/build/
-/text-serializer-*/out/
+/build/
+/*/build/
+/*/out/
+/*/run/
+/.idea/
 /*.iml
 /*/.factorypath
+/*/.settings/
+/*/.classpath

bom/build.gradle.kts

@@ -18,6 +18,7 @@ dependencies {
       "nbt",
       "serializer-configurate3",
       "serializer-configurate4",
+      "text-minimessage",
       "text-serializer-gson",
       "text-serializer-gson-legacy-impl",
       "text-serializer-legacy",

build-logic/src/main/kotlin/adventure.base-conventions.gradle.kts

@@ -36,6 +36,11 @@ indra {
         developer {
           id.set("Electroid")
         }
+
+        developer {
+          id.set("minidigger")
+          name.set("MiniDigger")
+        }
       }
     }
   }

build-logic/src/main/kotlin/adventure.common-conventions.gradle.kts

@@ -148,4 +148,14 @@ tasks {
   jacocoTestReport {
     dependsOn(test)
   }
+
+  // Non-incremental
+  named("eclipseFactorypath", com.diffplug.gradle.eclipse.apt.GenerateEclipseFactorypath::class) {
+    doFirst {
+      val inFile = inputFile
+      if (inFile != null && inFile.exists()) {
+        inFile.delete()
+      }
+    }
+  }
 }

settings.gradle.kts

@@ -14,6 +14,7 @@ sequenceOf(
   "nbt",
   "serializer-configurate3",
   "serializer-configurate4",
+  "text-minimessage",
   "text-serializer-gson",
   "text-serializer-gson-legacy-impl",
   "text-serializer-legacy",

text-minimessage/CHANGELOG.md

@@ -0,0 +1,41 @@
+# Changelog
+
+# 4.1.0 (xx.11.2020) - the bye bye regex release
+
+* Rewrote the whole parser to use less regex and more formal grammar!  
+This means, that the whole parser is much more robust now.
+* Added a transformation registry, to disable certain tags and add your own ones!
+* Added placeholder resolvers, to better integrate placeholder apis!
+* Added markdown flavors, to allow supporting multiple ones. DiscordFlavor for example supports ||sploilers||!
+* Added a bunch of convenience aliases, `<strikethrough>` becomes `<st>`. For the full list, see the docs.
+* Added ability to handle malformed input lenient or strict  
+* Slightly better escape handling (more work to come...)
+* More unit tests!
+* Updated adventure to 4.2
+
+This doesn't even look that much, now that I wrote this all down, but this release has over three thousand new lines and almost one thousand deleted lines!
+This small lib contains now almost five thousand lines of code and one hundred unit tests!
+
+# 4.0.0 (xx.07.2020) - the lost release
+
+* MiniMessage is now part of the Kyori organization!
+* Add support for hex colors, rainbows and gradients
+* Add templates, a new type of placeholder that works with components
+* Dropped bungee impl
+* Moved markdown ext into the main project
+* Refactored the project, MiniMessage is now the main api
+* Moved docs to the adventure docs page https://docs.adventure.kyori.net/minimessage.html
+* Moved the project to gradle to align with other kyori projects
+
+# 2.1.0 (12.06.2020) - the rgb release
+
+* Move packages around to avoid confusion between bungee and text impls
+* Allow the usage of single quotes to define inner components
+* Use localized toLower/Uppercase methods (@mikroskeem)
+* Use map lookup over valueOf when resolving stuff (@mikroskeem)
+* Add new color tag syntax (in preparation for 1.16 hex colors) (@mikroskeem)
+* Support reset tags
+* Support pre tags
+* Support placeholders in lang tags
+* Add [docs](/DOCS.md)
+* Add changelog (this, lol)

text-minimessage/build.gradle.kts

@@ -0,0 +1,17 @@
+plugins {
+  id("adventure.common-conventions")
+  id("me.champeau.jmh")
+}
+
+description = "A string-based, user-friendly format for representing Minecraft: Java Edition chat components."
+
+dependencies {
+  api(project(":adventure-api"))
+  testImplementation(project(":adventure-text-serializer-plain"))
+}
+
+tasks.checkstyleJmh {
+  exclude("**")
+}
+
+applyJarMetadata("net.kyori.adventure.text.minimessage")

text-minimessage/src/jmh/java/net/kyori/adventure/text/minimessage/benchmark/MiniMessageBenchmark.java

@@ -0,0 +1,64 @@
+/*
+ * This file is part of adventure, licensed under the MIT License.
+ *
+ * Copyright (c) 2017-2021 KyoriPowered
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package net.kyori.adventure.text.minimessage.benchmark;
+
+import java.util.concurrent.TimeUnit;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.text.minimessage.placeholder.PlaceholderResolver;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+
+@Fork(value = 1, warmups = 1)
+@BenchmarkMode(Mode.SampleTime)
+@OutputTimeUnit(TimeUnit.MICROSECONDS)
+public class MiniMessageBenchmark {
+
+  @Benchmark
+  public Component testNiceMix() {
+    final String input = "<yellow><test> random <gradient:red:blue:green><bold>stranger</gradient></bold><click:run_command:test command><underlined><red>click here</click><blue> to <rainbow><b>FEEL</rainbow></underlined> it";
+    return MiniMessage.miniMessage().parse(input);
+  }
+
+  @Benchmark
+  public Component testSimple() {
+    final String input = "<yellow><test><bold>stranger";
+    return MiniMessage.miniMessage().deserialize(input, PlaceholderResolver.resolving("test", "test2"));
+  }
+
+  @Benchmark
+  public Component testGradient() {
+    final String input = "<gradient:red:blue:green>COLORS ARE COOL";
+    return MiniMessage.miniMessage().parse(input);
+  }
+
+  @Benchmark
+  public Component testRainbow() {
+    final String input = "<rainbow>COLORS ARE COOL";
+    return MiniMessage.miniMessage().parse(input);
+  }
+}