Move to Adventure

EngineHub · Aug 11, 2020 · 22b2564 · 22b2564
1 parent cccb64a
commit 22b2564
Show file tree

Hide file tree

Showing 50 changed files with 110 additions and 108 deletions.
diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt
@@ -4,9 +4,9 @@ object Libs {
     const val junitEngine = "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
     const val junitVintageEngine = "org.junit.vintage:junit-vintage-engine:$junitVersion"
     const val guava = "com.google.guava:guava"
-    private const val kyoriTextVersion = "3.0.4"
-    const val kyoriText = "net.kyori:text-api:$kyoriTextVersion"
-    const val kyoriTextPlain = "net.kyori:text-serializer-plain:$kyoriTextVersion"
+    private const val kyoriAdventureVersion = "4.0.0-SNAPSHOT"
+    const val kyoriAdventure = "net.kyori:adventure-api:$kyoriAdventureVersion"
+    const val kyoriAdventureTextPlain = "net.kyori:adventure-text-serializer-plain:$kyoriAdventureVersion"
     const val autoCommon = "com.google.auto:auto-common:0.10"
     private const val autoValueVersion = "1.7.3"
     const val autoValueAnnotations = "com.google.auto.value:auto-value-annotations:$autoValueVersion"

diff --git a/buildSrc/src/main/kotlin/common.kt b/buildSrc/src/main/kotlin/common.kt
@@ -49,6 +49,13 @@ fun Project.applyCommonConfig(
 
     repositories {
         jcenter()
+        maven {
+            name = "Sonatype Snapshots"
+            url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
+            mavenContent {
+                snapshotsOnly()
+            }
+        }
     }
 
     dependencies {

diff --git a/core-ap/processor/src/main/java/org/enginehub/piston/gen/util/CodeBlockUtil.java b/core-ap/processor/src/main/java/org/enginehub/piston/gen/util/CodeBlockUtil.java
@@ -22,8 +22,8 @@
 import com.google.common.collect.ImmutableList;
 import com.squareup.javapoet.CodeBlock;
 import com.squareup.javapoet.TypeName;
-import net.kyori.text.TextComponent;
-import net.kyori.text.TranslatableComponent;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.TranslatableComponent;
 import org.enginehub.piston.internal.RegistrationUtil;
 
 import javax.annotation.Nullable;

diff --git a/core-ap/processor/src/test/kotlin/org/enginehub/piston/RegressionTest.kt b/core-ap/processor/src/test/kotlin/org/enginehub/piston/RegressionTest.kt
@@ -19,7 +19,7 @@
 
 package org.enginehub.piston
 
-import net.kyori.text.TextComponent
+import net.kyori.adventure.text.TextComponent
 import org.enginehub.piston.commands.RegressionCommands
 import org.enginehub.piston.commands.RegressionCommandsRegistration
 import org.enginehub.piston.converter.SimpleArgumentConverter

diff --git a/core-ap/processor/src/test/kotlin/org/enginehub/piston/TestSupport.kt b/core-ap/processor/src/test/kotlin/org/enginehub/piston/TestSupport.kt
@@ -21,8 +21,8 @@ package org.enginehub.piston
 
 import com.google.common.collect.ImmutableList
 import com.google.common.collect.ImmutableSet
-import net.kyori.text.TextComponent
-import net.kyori.text.TranslatableComponent
+import net.kyori.adventure.text.TextComponent
+import net.kyori.adventure.text.TranslatableComponent
 import org.enginehub.piston.gen.CommandRegistration
 import org.enginehub.piston.part.ArgAcceptingCommandFlag
 import org.enginehub.piston.part.CommandArgument

diff --git a/core-ap/processor/src/test/kotlin/org/enginehub/piston/suggestion/ManagerSuggestionTest.kt b/core-ap/processor/src/test/kotlin/org/enginehub/piston/suggestion/ManagerSuggestionTest.kt
@@ -19,7 +19,7 @@
 
 package org.enginehub.piston.suggestion
 
-import net.kyori.text.TextComponent
+import net.kyori.adventure.text.TextComponent
 import org.enginehub.piston.Command
 import org.enginehub.piston.CommandManager
 import org.enginehub.piston.assertEqualUnordered

diff --git a/...ap/processor/src/test/kotlin/org/enginehub/piston/suggestion/SimpleSuggestingConverter.kt b/...ap/processor/src/test/kotlin/org/enginehub/piston/suggestion/SimpleSuggestingConverter.kt
@@ -19,8 +19,8 @@
 
 package org.enginehub.piston.suggestion
 
-import net.kyori.text.Component
-import net.kyori.text.TextComponent
+import net.kyori.adventure.text.Component
+import net.kyori.adventure.text.TextComponent
 import org.enginehub.piston.converter.ArgumentConverter
 import org.enginehub.piston.converter.ConversionResult
 import org.enginehub.piston.converter.FailedConversion

diff --git a/core-ap/processor/src/test/kotlin/org/enginehub/piston/util/HelpGeneratorTest.kt b/core-ap/processor/src/test/kotlin/org/enginehub/piston/util/HelpGeneratorTest.kt
@@ -20,7 +20,7 @@
 package org.enginehub.piston.util
 
 import com.google.common.collect.ImmutableList
-import net.kyori.text.TextComponent
+import net.kyori.adventure.text.TextComponent
 import org.enginehub.piston.TestCommandMetadata
 import org.enginehub.piston.TestCommandParameters
 import org.enginehub.piston.TestParseResult
@@ -180,4 +180,4 @@ class HelpGeneratorTest {
         ).fullName))
     }
 
-}
+}
diff --git a/core-ap/processor/src/test/resources/gen/CollectionArgRegistration.java b/core-ap/processor/src/test/resources/gen/CollectionArgRegistration.java
@@ -34,8 +34,8 @@
 import java.lang.Throwable;
 import java.lang.reflect.Method;
 import java.util.Collection;
-import net.kyori.text.TextComponent;
-import net.kyori.text.TranslatableComponent;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.TranslatableComponent;
 import org.enginehub.piston.CommandManager;
 import org.enginehub.piston.CommandParameters;
 import org.enginehub.piston.gen.CommandCallListener;

diff --git a/core-ap/processor/src/test/resources/gen/CommandValueArgRegistration.java b/core-ap/processor/src/test/resources/gen/CommandValueArgRegistration.java
@@ -32,8 +32,8 @@
 import java.lang.Throwable;
 import java.lang.reflect.Method;
 import java.util.Collection;
-import net.kyori.text.TextComponent;
-import net.kyori.text.TranslatableComponent;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.TranslatableComponent;
 import org.enginehub.piston.CommandManager;
 import org.enginehub.piston.CommandParameters;
 import org.enginehub.piston.CommandValue;

diff --git a/core-ap/processor/src/test/resources/gen/FlagsRegistration.java b/core-ap/processor/src/test/resources/gen/FlagsRegistration.java
@@ -32,8 +32,8 @@
 import java.lang.Throwable;
 import java.lang.reflect.Method;
 import java.util.Collection;
-import net.kyori.text.TextComponent;
-import net.kyori.text.TranslatableComponent;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.TranslatableComponent;
 import org.enginehub.piston.CommandManager;
 import org.enginehub.piston.CommandParameters;
 import org.enginehub.piston.gen.CommandCallListener;
@@ -166,4 +166,4 @@ public void build() {
     private String extract$flag3(CommandParameters parameters) {
         return flagPart3.value(parameters).asSingle(string_Key);
     }
-}
+}
diff --git a/core-ap/processor/src/test/resources/gen/IntArgRegistration.java b/core-ap/processor/src/test/resources/gen/IntArgRegistration.java
@@ -37,8 +37,8 @@
 import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.List;
-import net.kyori.text.TextComponent;
-import net.kyori.text.TranslatableComponent;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.TranslatableComponent;
 import org.enginehub.piston.CommandManager;
 import org.enginehub.piston.CommandParameters;
 import org.enginehub.piston.gen.CommandCallListener;

diff --git a/core-ap/processor/src/test/resources/gen/NoArgRegistration.java b/core-ap/processor/src/test/resources/gen/NoArgRegistration.java
@@ -32,7 +32,7 @@
 import java.lang.Throwable;
 import java.lang.reflect.Method;
 import java.util.Collection;
-import net.kyori.text.TextComponent;
+import net.kyori.adventure.text.TextComponent;
 import org.enginehub.piston.Command;
 import org.enginehub.piston.CommandManager;
 import org.enginehub.piston.CommandParameters;

diff --git a/core-ap/processor/src/test/resources/gen/NonArgParametersRegistration.java b/core-ap/processor/src/test/resources/gen/NonArgParametersRegistration.java
@@ -34,7 +34,7 @@
 import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.concurrent.Callable;
-import net.kyori.text.TextComponent;
+import net.kyori.adventure.text.TextComponent;
 import org.enginehub.piston.CommandManager;
 import org.enginehub.piston.CommandParameters;
 import org.enginehub.piston.gen.CommandCallListener;
@@ -126,4 +126,4 @@ public void build() {
     private Callable<Object> extract$injected(CommandParameters parameters) {
         return requireOptional(callable$Object_Key, "injected", parameters.injectedValue(callable$Object_Key));
     }
-}
+}
diff --git a/core-ap/processor/src/test/resources/gen/Outer_BasicNestedRegistration.java b/core-ap/processor/src/test/resources/gen/Outer_BasicNestedRegistration.java
@@ -32,7 +32,7 @@
 import java.lang.Throwable;
 import java.lang.reflect.Method;
 import java.util.Collection;
-import net.kyori.text.TextComponent;
+import net.kyori.adventure.text.TextComponent;
 import org.enginehub.piston.CommandManager;
 import org.enginehub.piston.CommandParameters;
 import org.enginehub.piston.gen.CommandCallListener;

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -2,9 +2,9 @@ applyCommonConfig()
 
 dependencies {
     "api"(Libs.guava)
-    "api"(Libs.kyoriText)
+    "api"(Libs.kyoriAdventure)
     "api"(Libs.javaxAnnotations)
-    "implementation"(Libs.kyoriTextPlain)
+    "implementation"(Libs.kyoriAdventureTextPlain)
     "compileOnly"(Libs.autoValueAnnotations)
     "annotationProcessor"(Libs.autoValueProcessor)
     "testImplementation"(Libs.mockito)

diff --git a/core/src/main/java/org/enginehub/piston/Command.java b/core/src/main/java/org/enginehub/piston/Command.java
@@ -20,7 +20,7 @@
 package org.enginehub.piston;
 
 import com.google.common.collect.ImmutableList;
-import net.kyori.text.Component;
+import net.kyori.adventure.text.Component;
 import org.enginehub.piston.inject.InjectedValueAccess;
 import org.enginehub.piston.part.CommandPart;
 import org.enginehub.piston.suggestion.SuggestionProvider;

diff --git a/core/src/main/java/org/enginehub/piston/config/ColorConfig.java b/core/src/main/java/org/enginehub/piston/config/ColorConfig.java
@@ -20,11 +20,12 @@
 package org.enginehub.piston.config;
 
 import com.google.common.collect.ImmutableList;
-import net.kyori.text.Component;
-import net.kyori.text.TextComponent;
-import net.kyori.text.TranslatableComponent;
-import net.kyori.text.format.Style;
-import net.kyori.text.format.TextColor;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.TranslatableComponent;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.Style;
+import net.kyori.adventure.text.format.TextColor;
 
 import javax.annotation.Nullable;
 import java.util.Arrays;
@@ -37,13 +38,13 @@
 public class ColorConfig extends Config<TextColor> {
 
     private static final ColorConfig TEXT_MODIFIER =
-        new ColorConfig("piston.style.text.modifier", TextColor.YELLOW);
+        new ColorConfig("piston.style.text.modifier", NamedTextColor.YELLOW);
     private static final ColorConfig MAIN_TEXT =
-        new ColorConfig("piston.style.main.text", TextColor.GOLD);
+        new ColorConfig("piston.style.main.text", NamedTextColor.GOLD);
     private static final ColorConfig HELP_TEXT =
-        new ColorConfig("piston.style.help.text", TextColor.GRAY);
+        new ColorConfig("piston.style.help.text", NamedTextColor.GRAY);
     private static final ColorConfig PART_WRAPPING =
-        new ColorConfig("piston.style.part.wrapping", TextColor.YELLOW);
+        new ColorConfig("piston.style.part.wrapping", NamedTextColor.YELLOW);
 
     private static final Set<Style.Merge> MERGE_NO_COLOR = Style.Merge.of(
         Style.Merge.DECORATIONS, Style.Merge.INSERTION, Style.Merge.EVENTS

diff --git a/core/src/main/java/org/enginehub/piston/config/Config.java b/core/src/main/java/org/enginehub/piston/config/Config.java
@@ -20,8 +20,8 @@
 package org.enginehub.piston.config;
 
 import com.google.common.collect.ImmutableList;
-import net.kyori.text.Component;
-import net.kyori.text.TranslatableComponent;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TranslatableComponent;
 
 import javax.annotation.Nullable;
 import java.util.List;

diff --git a/core/src/main/java/org/enginehub/piston/config/ConfigHolder.java b/core/src/main/java/org/enginehub/piston/config/ConfigHolder.java
@@ -19,7 +19,7 @@
 
 package org.enginehub.piston.config;
 
-import net.kyori.text.Component;
+import net.kyori.adventure.text.Component;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/core/src/main/java/org/enginehub/piston/config/ConfigRenderer.java b/core/src/main/java/org/enginehub/piston/config/ConfigRenderer.java
@@ -20,9 +20,9 @@
 package org.enginehub.piston.config;
 
 import com.google.common.collect.ImmutableList;
-import net.kyori.text.Component;
-import net.kyori.text.TranslatableComponent;
-import net.kyori.text.renderer.ComponentRenderer;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TranslatableComponent;
+import net.kyori.adventure.text.renderer.ComponentRenderer;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.List;

diff --git a/core/src/main/java/org/enginehub/piston/config/TextConfig.java b/core/src/main/java/org/enginehub/piston/config/TextConfig.java
@@ -19,9 +19,9 @@
 
 package org.enginehub.piston.config;
 
-import net.kyori.text.Component;
-import net.kyori.text.TextComponent;
-import net.kyori.text.TranslatableComponent;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.TranslatableComponent;
 
 import javax.annotation.Nullable;
 

diff --git a/core/src/main/java/org/enginehub/piston/converter/ArgumentConverter.java b/core/src/main/java/org/enginehub/piston/converter/ArgumentConverter.java
@@ -19,7 +19,7 @@
 
 package org.enginehub.piston.converter;
 
-import net.kyori.text.Component;
+import net.kyori.adventure.text.Component;
 import org.enginehub.piston.inject.InjectedValueAccess;
 
 import java.util.Collections;

diff --git a/core/src/main/java/org/enginehub/piston/converter/ForwardingArgumentConverter.java b/core/src/main/java/org/enginehub/piston/converter/ForwardingArgumentConverter.java
@@ -19,7 +19,7 @@
 
 package org.enginehub.piston.converter;
 
-import net.kyori.text.Component;
+import net.kyori.adventure.text.Component;
 import org.enginehub.piston.inject.InjectedValueAccess;
 
 import java.util.List;

diff --git a/core/src/main/java/org/enginehub/piston/converter/MapArgumentConverter.java b/core/src/main/java/org/enginehub/piston/converter/MapArgumentConverter.java
@@ -20,7 +20,7 @@
 package org.enginehub.piston.converter;
 
 import com.google.common.collect.ImmutableMap;
-import net.kyori.text.Component;
+import net.kyori.adventure.text.Component;
 import org.enginehub.piston.config.ColorConfig;
 import org.enginehub.piston.inject.InjectedValueAccess;
 

diff --git a/core/src/main/java/org/enginehub/piston/converter/MultiKeyConverter.java b/core/src/main/java/org/enginehub/piston/converter/MultiKeyConverter.java
@@ -26,7 +26,7 @@
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Maps;
 import com.google.common.collect.SetMultimap;
-import net.kyori.text.Component;
+import net.kyori.adventure.text.Component;
 import org.enginehub.piston.config.ColorConfig;
 import org.enginehub.piston.inject.InjectedValueAccess;
 

diff --git a/core/src/main/java/org/enginehub/piston/converter/SimpleArgumentConverter.java b/core/src/main/java/org/enginehub/piston/converter/SimpleArgumentConverter.java
@@ -19,8 +19,8 @@
 
 package org.enginehub.piston.converter;
 
-import net.kyori.text.Component;
-import net.kyori.text.TextComponent;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TextComponent;
 import org.enginehub.piston.inject.InjectedValueAccess;
 
 import java.util.List;

diff --git a/core/src/main/java/org/enginehub/piston/exception/CommandException.java b/core/src/main/java/org/enginehub/piston/exception/CommandException.java
@@ -20,8 +20,8 @@
 package org.enginehub.piston.exception;
 
 import com.google.common.collect.ImmutableList;
-import net.kyori.text.Component;
-import net.kyori.text.TextComponent;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TextComponent;
 import org.enginehub.piston.Command;
 import org.enginehub.piston.util.TextHelper;
 

diff --git a/core/src/main/java/org/enginehub/piston/exception/ConditionFailedException.java b/core/src/main/java/org/enginehub/piston/exception/ConditionFailedException.java
@@ -21,7 +21,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
-import net.kyori.text.TextComponent;
+import net.kyori.adventure.text.TextComponent;
 import org.enginehub.piston.Command;
 
 public class ConditionFailedException extends CommandException {

diff --git a/core/src/main/java/org/enginehub/piston/exception/ConversionFailedException.java b/core/src/main/java/org/enginehub/piston/exception/ConversionFailedException.java
@@ -19,8 +19,8 @@
 
 package org.enginehub.piston.exception;
 
-import net.kyori.text.Component;
-import net.kyori.text.TextComponent;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TextComponent;
 import org.enginehub.piston.CommandParseResult;
 import org.enginehub.piston.CommandValue;
 import org.enginehub.piston.converter.ArgumentConverter;

diff --git a/core/src/main/java/org/enginehub/piston/exception/NoSuchCommandException.java b/core/src/main/java/org/enginehub/piston/exception/NoSuchCommandException.java
@@ -20,7 +20,7 @@
 package org.enginehub.piston.exception;
 
 import com.google.common.collect.ImmutableList;
-import net.kyori.text.TextComponent;
+import net.kyori.adventure.text.TextComponent;
 
 public class NoSuchCommandException extends CommandException {
 

diff --git a/core/src/main/java/org/enginehub/piston/exception/NoSuchFlagException.java b/core/src/main/java/org/enginehub/piston/exception/NoSuchFlagException.java
@@ -21,8 +21,8 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
-import net.kyori.text.Component;
-import net.kyori.text.TextComponent;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TextComponent;
 import org.enginehub.piston.Command;
 import org.enginehub.piston.CommandParseResult;
 import org.enginehub.piston.config.ColorConfig;

diff --git a/core/src/main/java/org/enginehub/piston/exception/StopExecutionException.java b/core/src/main/java/org/enginehub/piston/exception/StopExecutionException.java
@@ -20,7 +20,7 @@
 package org.enginehub.piston.exception;
 
 import com.google.common.collect.ImmutableList;
-import net.kyori.text.Component;
+import net.kyori.adventure.text.Component;
 import org.enginehub.piston.Command;
 
 /**

diff --git a/core/src/main/java/org/enginehub/piston/exception/UsageException.java b/core/src/main/java/org/enginehub/piston/exception/UsageException.java
@@ -19,7 +19,7 @@
 
 package org.enginehub.piston.exception;
 
-import net.kyori.text.Component;
+import net.kyori.adventure.text.Component;
 import org.enginehub.piston.CommandParseResult;
 
 /**