Release 3.0.0-BETA-pre17. Add compile time variables. Remove deprecat…

…ed LiteResult and LegacyContextProvider.

README.md

@@ -34,12 +34,12 @@ Framework Core
 <dependency>
     <groupId>dev.rollczi</groupId>
     <artifactId>litecommands-core</artifactId>
-    <version>3.0.0-BETA-pre16</version>
+    <version>3.0.0-BETA-pre17</version>
 </dependency>
 ```
 
 ```groovy
-implementation 'dev.rollczi:litecommands-core:3.0.0-BETA-pre16'
+implementation 'dev.rollczi:litecommands-core:3.0.0-BETA-pre17'
 ```
 
 ### First Simple Command
@@ -85,12 +85,12 @@ Add this to your dependencies if you want to use ready-made implementation for v
 <dependency>
     <groupId>dev.rollczi</groupId>
     <artifactId>litecommands-velocity</artifactId>
-    <version>3.0.0-BETA-pre16</version>
+    <version>3.0.0-BETA-pre17</version>
 </dependency>
 ```
 
 ```groovy
-implementation 'dev.rollczi:litecommands-velocity:3.0.0-BETA-pre16'
+implementation 'dev.rollczi:litecommands-velocity:3.0.0-BETA-pre17'
 ```
 
 #### Add -parameters to your compiler to use all features of LiteCommands

buildSrc/build.gradle.kts

@@ -8,6 +8,8 @@ repositories {
 
 dependencies {
     implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.1")
+    implementation("net.kyori:blossom:1.3.1")
+    implementation("net.kyori:indra-git:3.1.3")
 }
 
 sourceSets {

buildSrc/src/main/kotlin/litecommands-compile-variables.gradle.kts

@@ -0,0 +1,25 @@
+plugins {
+    id("java-library")
+    id("net.kyori.blossom")
+    id("net.kyori.indra.git")
+}
+
+blossom {
+    indraGit {
+        if (!isPresent) {
+            throw IllegalStateException("indra-git is not present")
+        }
+
+        val litecommandsVariables = "src/dev/rollczi/litecommands/LiteCommandsVariables.java"
+
+        val version = project.version.toString()
+        val branchName = branchName() ?: throw IllegalStateException("branch name is null")
+
+        val commit = commit() ?: throw IllegalStateException("commit is null")
+        val commitHash = commit.name
+
+        replaceToken("{litecommands-version}", version, litecommandsVariables)
+        replaceToken("{litecommands-branch}", branchName, litecommandsVariables)
+        replaceToken("{litecommands-commit}", commitHash, litecommandsVariables)
+    }
+}

buildSrc/src/main/kotlin/litecommands-java-benchmark.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("java-library")
+
     id("me.champeau.jmh")
 }
 

buildSrc/src/main/kotlin/litecommands-publish.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "dev.rollczi"
-version = "3.0.0-BETA-pre16"
+version = "3.0.0-BETA-pre17"
 
 java {
     withSourcesJar()

examples/bukkit-adventure-platform/build.gradle.kts

@@ -18,8 +18,8 @@ repositories {
 dependencies {
     compileOnly("org.spigotmc:spigot-api:1.20.2-R0.1-SNAPSHOT")
 
-    // implementation("dev.rollczi:litecommands-bukkit:3.0.0-BETA-pre16") // <-- uncomment in your project
-    // implementation("dev.rollczi:litecommands-adventure-platform:3.0.0-BETA-pre16") // <-- uncomment in your project
+    // implementation("dev.rollczi:litecommands-bukkit:3.0.0-BETA-pre17") // <-- uncomment in your project
+    // implementation("dev.rollczi:litecommands-adventure-platform:3.0.0-BETA-pre17") // <-- uncomment in your project
     implementation("net.kyori:adventure-platform-bukkit:4.3.0")
     implementation("net.kyori:adventure-text-minimessage:4.14.0")
 

examples/bukkit-chatgpt/build.gradle.kts

@@ -18,8 +18,8 @@ repositories {
 dependencies {
     compileOnly("org.spigotmc:spigot-api:1.20.2-R0.1-SNAPSHOT")
 
-    // implementation("dev.rollczi:litecommands-bukkit:3.0.0-BETA-pre16") // <-- uncomment in your project
-    // implementation("dev.rollczi:litecommands-chatgpt:3.0.0-BETA-pre16") // <-- uncomment in your project
+    // implementation("dev.rollczi:litecommands-bukkit:3.0.0-BETA-pre17") // <-- uncomment in your project
+    // implementation("dev.rollczi:litecommands-chatgpt:3.0.0-BETA-pre17") // <-- uncomment in your project
     implementation(project(":litecommands-bukkit")) // don't use this line in your build.gradle
     implementation(project(":litecommands-chatgpt")) // don't use this line in your build.gradle
 }

examples/bukkit/build.gradle.kts

@@ -18,7 +18,7 @@ repositories {
 dependencies {
     compileOnly("org.spigotmc:spigot-api:1.20.2-R0.1-SNAPSHOT")
 
-    // implementation("dev.rollczi:litecommands-bukkit:3.0.0-BETA-pre16") // <-- uncomment in your project
+    // implementation("dev.rollczi:litecommands-bukkit:3.0.0-BETA-pre17") // <-- uncomment in your project
     implementation(project(":litecommands-bukkit")) // don't use this line in your build.gradle
 }
 

examples/velocity/build.gradle.kts

@@ -19,7 +19,7 @@ dependencies {
     compileOnly("com.velocitypowered:velocity-api:3.2.0-SNAPSHOT")
     annotationProcessor("com.velocitypowered:velocity-api:3.2.0-SNAPSHOT")
 
-    // implementation("dev.rollczi:litecommands-velocity:3.0.0-BETA-pre16") // <-- uncomment in your project
+    // implementation("dev.rollczi:litecommands-velocity:3.0.0-BETA-pre17") // <-- uncomment in your project
     implementation(project(":litecommands-velocity")) // don't use this line in your build.gradle
 }
 

litecommands-adventure/src/dev/rollczi/litecommands/adventure/AdventureAudienceContextual.java

@@ -2,10 +2,8 @@
 
 import dev.rollczi.litecommands.context.ContextProvider;
 import dev.rollczi.litecommands.context.ContextResult;
-import dev.rollczi.litecommands.context.LegacyContextProvider;
 import dev.rollczi.litecommands.invocation.Invocation;
 import net.kyori.adventure.audience.Audience;
-import panda.std.Result;
 
 class AdventureAudienceContextual<SENDER> implements ContextProvider<SENDER, Audience> {
 

litecommands-annotations/src/dev/rollczi/litecommands/annotations/LiteCommandsAnnotations.java

@@ -37,7 +37,7 @@ public List<CommandBuilder<SENDER>> provide(LiteCommandsInternalBuilderApi<SENDE
         WrapperRegistry wrapperRegistry = builder.getWrapperRegistry();
 
         InstanceSourceProcessor<SENDER> processor = new InstanceSourceProcessor<>(annotationProcessorService, wrapperRegistry);
-        Injector<SENDER> injector = new Injector<>(builder.getBindRegistry());
+        Injector injector = new Injector(builder.getBindRegistry());
 
         List<Object> instances = new ArrayList<>(this.commandInstances);
 

litecommands-annotations/src/dev/rollczi/litecommands/annotations/MethodParameterUtil.java

@@ -3,11 +3,11 @@
 import dev.rollczi.litecommands.reflect.ReflectFormatUtil;
 import dev.rollczi.litecommands.wrapper.WrapFormat;
 import dev.rollczi.litecommands.wrapper.WrapperRegistry;
-import panda.std.Option;
 
 import java.lang.reflect.Parameter;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.util.Optional;
 
 final class MethodParameterUtil {
 
@@ -18,9 +18,9 @@ private MethodParameterUtil() {
         Class<?> outParameterType = parameter.getType();
 
         if (wrapperRegistry.isWrapper(outParameterType)) {
-            Option<Class<?>> optionGenericType = extractFirstType(parameter);
+            Optional<Class<?>> optionGenericType = extractFirstType(parameter);
 
-            if (optionGenericType.isEmpty()) {
+            if (!optionGenericType.isPresent()) {
                 throw new IllegalArgumentException("Cannot extract expected type from parameter " + ReflectFormatUtil.parameter(parameter));
             }
 
@@ -30,27 +30,27 @@ private MethodParameterUtil() {
         return WrapFormat.notWrapped(outParameterType);
     }
 
-    private static Option<Class<?>> extractFirstType(Parameter parameter) {
+    private static Optional<Class<?>> extractFirstType(Parameter parameter) {
         Type parameterizedType = parameter.getParameterizedType();
 
         if (parameterizedType instanceof ParameterizedType) {
             ParameterizedType parameterized = (ParameterizedType) parameterizedType;
             Type[] arguments = parameterized.getActualTypeArguments();
 
             if (arguments.length == 0) {
-                return Option.none();
+                return Optional.empty();
             }
 
             Type type = arguments[0];
 
             if (!(type instanceof Class)) {
-                return Option.none();
+                return Optional.empty();
             }
 
-            return Option.of((Class<?>) type);
+            return Optional.of((Class<?>) type);
         }
 
-        return Option.none();
+        return Optional.empty();
     }
 
 }

litecommands-annotations/src/dev/rollczi/litecommands/annotations/inject/Injector.java

@@ -3,6 +3,7 @@
 import dev.rollczi.litecommands.bind.BindRegistry;
 import dev.rollczi.litecommands.LiteCommandsException;
 import dev.rollczi.litecommands.reflect.LiteCommandsReflectInvocationException;
+import panda.std.Result;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Parameter;
@@ -11,7 +12,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class Injector<SENDER> {
+public class Injector {
 
     private final BindRegistry registry;
 
@@ -38,14 +39,14 @@ public <T> T createInstance(Class<T> type) {
             for (int i = 0; i < constructor.getParameterCount(); i++) {
                 Parameter parameter = constructor.getParameters()[i];
                 Class<?> parameterType = parameter.getType();
-                Object valueToInject = this.registry.getInstance(parameterType);
+                Result<?, String> result = this.registry.getInstance(parameterType);
 
-                if (valueToInject == null) {
-                    exceptions.add(new LiteCommandsReflectInvocationException(constructor, parameter, "Cannot inject parameter " + parameterType.getName()));
+                if (result.isErr()) {
+                    exceptions.add(new LiteCommandsReflectInvocationException(constructor, parameter, "Cannot inject parameter " + parameterType.getName() + " error: " + result.getError()));
                     continue;
                 }
 
-                parameters[i] = valueToInject;
+                parameters[i] = result.get();
             }
 
             try {

litecommands-annotations/test/dev/rollczi/litecommands/annotations/ExampleUnitTest.java

@@ -10,7 +10,6 @@
 import org.junit.jupiter.api.Test;
 import panda.std.Option;
 
-import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 

litecommands-bukkit/src/dev/rollczi/litecommands/bukkit/BukkitSchedulerImpl.java

@@ -2,10 +2,10 @@
 
 import dev.rollczi.litecommands.scheduler.Scheduler;
 import dev.rollczi.litecommands.scheduler.SchedulerPoll;
+import dev.rollczi.litecommands.shared.ThrowingSupplier;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitScheduler;
-import panda.std.function.ThrowingSupplier;
 
 import java.time.Duration;
 import java.util.concurrent.CompletableFuture;

litecommands-bungee/src/dev/rollczi/litecommands/bungee/tools/BungeeOnlyPlayerContextual.java

@@ -1,15 +1,14 @@
 package dev.rollczi.litecommands.bungee.tools;
 
-import dev.rollczi.litecommands.context.LegacyContextProvider;
+import dev.rollczi.litecommands.context.ContextProvider;
+import dev.rollczi.litecommands.context.ContextResult;
 import dev.rollczi.litecommands.invocation.Invocation;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
-import panda.std.Option;
-import panda.std.Result;
 
 import java.util.function.Supplier;
 
-public class BungeeOnlyPlayerContextual<MESSAGE> implements LegacyContextProvider<CommandSender, ProxiedPlayer> {
+public class BungeeOnlyPlayerContextual<MESSAGE> implements ContextProvider<CommandSender, ProxiedPlayer> {
 
     private final Supplier<MESSAGE> onlyPlayerMessage;
 
@@ -22,10 +21,12 @@ public BungeeOnlyPlayerContextual(MESSAGE onlyPlayerMessage) {
     }
 
     @Override
-    public Result<ProxiedPlayer, Object> provideLegacy(Invocation<CommandSender> invocation) {
-        return Option.of(invocation.sender())
-            .is(ProxiedPlayer.class)
-            .toResult(onlyPlayerMessage.get());
+    public ContextResult<ProxiedPlayer> provide(Invocation<CommandSender> invocation) {
+        if (invocation.sender() instanceof ProxiedPlayer) {
+            return ContextResult.ok(() -> (ProxiedPlayer) invocation.sender());
+        }
+
+        return ContextResult.error(onlyPlayerMessage.get());
     }
 
 }

litecommands-core/build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
     `litecommands-java-unit-test`
     `litecommands-repositories`
     `litecommands-publish`
+    `litecommands-compile-variables`
 }
 
 dependencies {

litecommands-core/src/dev/rollczi/litecommands/LiteCommands.java

@@ -4,7 +4,8 @@
 
 public interface LiteCommands<SENDER> {
 
-    String VERSION = "3.0.0-BETA-pre16";
+    @Deprecated
+    String VERSION = LiteCommandsVariables.VERSION;
 
     CommandManager<SENDER> getCommandManager();
 

litecommands-core/src/dev/rollczi/litecommands/LiteCommandsVariables.java

@@ -0,0 +1,17 @@
+package dev.rollczi.litecommands;
+
+/**
+ * Holds the version of LiteCommands.
+ * Replaced by Gradle during build, see buildSrc/src/main/kotlin/litecommands-compile-variables.gradle.kts
+ * see also <a href="https://github.com/KyoriPowered/blossom">Blossom</a>
+ */
+public final class LiteCommandsVariables {
+
+    public static final String VERSION = "{litecommands-version}";
+    public static final String BRANCH = "{litecommands-branch}";
+    public static final String COMMIT = "{litecommands-commit}";
+
+    private LiteCommandsVariables() {
+    }
+
+}

litecommands-core/src/dev/rollczi/litecommands/bind/BindRegistry.java

@@ -1,11 +1,11 @@
 package dev.rollczi.litecommands.bind;
 
 import dev.rollczi.litecommands.util.MapUtil;
-import panda.std.Option;
 import panda.std.Result;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.function.Supplier;
 
 public class BindRegistry {
@@ -21,8 +21,8 @@ public void bindInstanceUnsafe(Class<?> on, Supplier<?> bind) {
     }
 
     @SuppressWarnings("unchecked")
-    public <T> Result<T, Object> getInstance(Class<T> clazz) {
-        Option<Supplier<?>> option = MapUtil.findByInstanceOf(clazz, this.instanceBindings);
+    public <T> Result<T, String> getInstance(Class<T> clazz) {
+        Optional<Supplier<?>> option = MapUtil.findByInstanceOf(clazz, this.instanceBindings);
 
         if (option.isPresent()) {
             Supplier<T> supplier = (Supplier<T>) option.get();

litecommands-core/src/dev/rollczi/litecommands/command/builder/CommandBuilderBase.java

@@ -7,7 +7,6 @@
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import panda.std.Option;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -129,11 +128,16 @@ public boolean hasSimilarNames(CommandBuilder<SENDER> context) {
 
     @Override
     public @NotNull CommandBuilder<SENDER> appendChild(CommandBuilder<SENDER> context) {
-        CommandBuilder<SENDER> newContext = Option.ofOptional(this.getChild(context.name()))
-            .peek(current -> current.meagre(context))
-            .orElseGet(context);
+        Optional<CommandBuilder<SENDER>> childOption = this.getChild(context.name());
 
-        this.children.put(newContext.name(), newContext);
+        if (childOption.isPresent()) {
+            CommandBuilder<SENDER> child = childOption.get();
+            child.meagre(context);
+
+            context = child;
+        }
+
+        this.children.put(context.name(), context);
         return this;
     }
 

litecommands-core/src/dev/rollczi/litecommands/command/executor/CommandExecuteService.java

@@ -317,7 +317,7 @@ private <PARSED> RequirementResult<PARSED> matchContext(ContextRequirement<PARSE
 
     private <PARSED> RequirementResult<?> matchBind(BindRequirement<PARSED> bindRequirement, Invocation<SENDER> invocation) {
         WrapFormat<PARSED, ?> wrapFormat = bindRequirement.getWrapperFormat();
-        Result<PARSED, Object> instance = bindRegistry.getInstance(wrapFormat.getParsedType());
+        Result<PARSED, String> instance = bindRegistry.getInstance(wrapFormat.getParsedType());
         Wrapper wrapper = wrapperRegistry.getWrappedExpectedFactory(wrapFormat);
 
         if (instance.isOk()) {