more work on api migration 7 => 8

Author: edewit

api-jvm-impl/src/main/java/ch/vorburger/minecraft/storeys/japi/impl/EventsImpl.java

@@ -18,7 +18,6 @@
  */
 package ch.vorburger.minecraft.storeys.japi.impl;
 
-import ch.vorburger.minecraft.osgi.api.PluginInstance;
 import ch.vorburger.minecraft.storeys.japi.Callback;
 import ch.vorburger.minecraft.storeys.japi.Events;
 import ch.vorburger.minecraft.storeys.japi.ReadingSpeed;
@@ -30,13 +29,15 @@
 import java.util.Collection;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import net.kyori.adventure.audience.Audience;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.spongepowered.api.Sponge;
-import org.spongepowered.api.command.CommandMapping;
+import org.spongepowered.api.command.Command;
+import org.spongepowered.api.command.CommandCause;
 import org.spongepowered.api.command.CommandResult;
-import org.spongepowered.api.command.CommandSource;
-import org.spongepowered.api.command.spec.CommandSpec;
+import org.spongepowered.api.command.registrar.CommandRegistrar;
+import org.spongepowered.plugin.PluginContainer;
 
 /**
  * {@link Events} implementation.
@@ -49,7 +50,7 @@ class EventsImpl implements Events, Unregisterable {
 
     private static final Logger LOG = LoggerFactory.getLogger(EventsImpl.class);
 
-    private final PluginInstance plugin;
+    private final PluginContainer plugin;
     private final EventService eventService;
 
     // when made modifiable, then this should be per Player
@@ -58,22 +59,25 @@ class EventsImpl implements Events, Unregisterable {
     private final Collection<Unregisterable> unregistrables = new ConcurrentLinkedQueue<>();
     private final ActionPlayer player = new ActionPlayer();
 
-    EventsImpl(PluginInstance plugin, EventService eventService) {
+    EventsImpl(PluginContainer plugin, EventService eventService) {
         this.plugin = plugin;
         this.eventService = eventService;
     }
 
     @Override public void whenCommand(String name, Callback callback) {
-        CommandSpec spec = CommandSpec.builder().executor((src, args) -> {
-            CommandExceptions.doOrThrow("/" + name, () -> invokeCallback(src, callback));
+        final Command.Parameterized spec = Command.builder().executor((src) -> {
+            CommandExceptions.doOrThrow("/" + name, () -> invokeCallback(src.cause().audience(), callback));
             return CommandResult.success();
         }).build();
-        Optional<CommandMapping> opt = Sponge.getCommandManager().register(plugin, spec, name);
-        if (!opt.isPresent()) {
+        final Optional<CommandRegistrar<Command.Parameterized>> registrar = Sponge.server().commandManager().registrar(Command.Parameterized.class);
+        if (!registrar.isPresent()) {
             LOG.error("Could not register new command, because it's already present: /" + name);
             return;
         }
-        unregistrables.add(() -> Sponge.getCommandManager().removeMapping(opt.get()));
+        registrar.get().register(plugin, spec, name);
+        unregistrables.add(() -> {
+
+        });
     }
 
     @Override public void whenPlayerJoins(Callback callback) {
@@ -109,9 +113,9 @@ class EventsImpl implements Events, Unregisterable {
         }
     }
 
-    private void invokeCallback(CommandSource source, Callback callback) throws Exception {
+    private void invokeCallback(Audience source, Callback callback) throws Exception {
         MinecraftJvmImpl m = new MinecraftJvmImpl(plugin, source);
         callback.invoke(m);
-        player.play(new ActionContextImpl(m.player(), readingSpeed), m.getActionList());
+        player.play(new ActionContextImpl(source, readingSpeed), m.getActionList());
     }
 }

api-jvm-impl/src/main/java/ch/vorburger/minecraft/storeys/japi/impl/MinecraftJvmImpl.java

@@ -18,7 +18,6 @@
  */
 package ch.vorburger.minecraft.storeys.japi.impl;
 
-import ch.vorburger.minecraft.osgi.api.PluginInstance;
 import ch.vorburger.minecraft.storeys.japi.Action;
 import ch.vorburger.minecraft.storeys.japi.Events;
 import ch.vorburger.minecraft.storeys.japi.Minecraft;
@@ -29,35 +28,37 @@
 import ch.vorburger.minecraft.storeys.japi.impl.actions.TitleAction;
 import java.util.ArrayList;
 import java.util.List;
+import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.text.Component;
 import org.spongepowered.api.Sponge;
-import org.spongepowered.api.command.CommandSource;
+import org.spongepowered.api.command.CommandCause;
 import org.spongepowered.api.entity.living.player.Player;
-import org.spongepowered.api.text.Text;
+import org.spongepowered.plugin.PluginContainer;
 
 /**
  * {@link Minecraft} implementation.
  * Created indirectly (by EventsImpl) via {@link Scripts}.
  *
  * <p>The "lifecycle" of this is NOT a Singleton,
  * but one for each instance (not just kind of) of an event registered on {@link Events},
- * such as custom command, when right clicked, when player joined, when inside, etc.
+ * such as custom command, when right-clicked, when player joined, when inside, etc.
  */
 class MinecraftJvmImpl implements Minecraft {
 
-    private final PluginInstance plugin;
-    private final CommandSource source;
+    private final PluginContainer plugin;
+    private final Audience source;
     private final ActionWaitHelper actionWaitHelper;
 
     private final List<Action<?>> actionList = new ArrayList<>();
 
-    MinecraftJvmImpl(PluginInstance plugin, CommandSource source) {
+    MinecraftJvmImpl(PluginContainer plugin, Audience source) {
         this.source = source;
         this.plugin = plugin;
         this.actionWaitHelper = new ActionWaitHelper(plugin);
     }
 
     @Override public void cmd(String command) {
-        CommandAction action = new CommandAction(plugin, Sponge.getScheduler());
+        CommandAction action = new CommandAction(plugin, Sponge.asyncScheduler());
         action.setCommand(command);
         actionList.add(action);
     }
@@ -72,7 +73,7 @@ class MinecraftJvmImpl implements Minecraft {
         Narrator narrator = new Narrator(plugin);
         NarrateAction action = new NarrateAction(narrator);
         action.setEntity(entity);
-        action.setText(Text.of(text));
+        action.setText(Component.text(text));
         actionList.add(action);
     }
 

api-jvm-impl/src/main/java/ch/vorburger/minecraft/storeys/japi/impl/Scripts.java

@@ -25,15 +25,16 @@
 import java.util.concurrent.ConcurrentHashMap;
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import org.spongepowered.plugin.PluginContainer;
 
 @Singleton
 public class Scripts {
 
     private final Map<Object, Unregisterable> unregisterables = new ConcurrentHashMap<>();
-    private final PluginInstance plugin;
+    private final PluginContainer plugin;
     private final EventService eventService;
 
-    @Inject public Scripts(PluginInstance plugin, EventService eventService) {
+    @Inject public Scripts(PluginContainer plugin, EventService eventService) {
         this.plugin = plugin;
         this.eventService = eventService;
     }

api-jvm-impl/src/main/java/ch/vorburger/minecraft/storeys/japi/impl/actions/ActionContextImpl.java

@@ -20,21 +20,22 @@
 
 import ch.vorburger.minecraft.storeys.japi.ActionContext;
 import ch.vorburger.minecraft.storeys.japi.ReadingSpeed;
+import net.kyori.adventure.audience.Audience;
 import org.spongepowered.api.command.CommandCause;
 
 public final class ActionContextImpl implements ActionContext {
 
-    private final CommandCause commandSource;
+    private final Audience commandCause;
     private final ReadingSpeed readingSpeed;
 
-    public ActionContextImpl(CommandCause commandSource, ReadingSpeed readingSpeed) {
+    public ActionContextImpl(Audience commandCause, ReadingSpeed readingSpeed) {
         super();
-        this.commandSource = commandSource;
+        this.commandCause = commandCause;
         this.readingSpeed = readingSpeed;
     }
 
-    public CommandCause getCommandCause() {
-        return commandSource;
+    public Audience getCommandCause() {
+        return commandCause;
     }
 
     public ReadingSpeed getReadingSpeed() {
@@ -44,7 +45,7 @@ public ReadingSpeed getReadingSpeed() {
     @Override public int hashCode() {
         final int prime = 31;
         int result = 1;
-        result = (prime * result) + (commandSource == null ? 0 : commandSource.hashCode());
+        result = (prime * result) + (commandCause == null ? 0 : commandCause.hashCode());
         result = (prime * result) + (readingSpeed == null ? 0 : readingSpeed.hashCode());
         return result;
     }
@@ -60,11 +61,11 @@ public ReadingSpeed getReadingSpeed() {
             return false;
         }
         ActionContextImpl other = (ActionContextImpl) obj;
-        if (commandSource == null) {
-            if (other.commandSource != null) {
+        if (commandCause == null) {
+            if (other.commandCause != null) {
                 return false;
             }
-        } else if (!commandSource.equals(other.commandSource)) {
+        } else if (!commandCause.equals(other.commandCause)) {
             return false;
         }
         if (readingSpeed == null) {
@@ -74,7 +75,7 @@ public ReadingSpeed getReadingSpeed() {
     }
 
     @Override public String toString() {
-        return "ActionContext[commandSource=" + commandSource + ", readingSpeed=" + readingSpeed + "]";
+        return "ActionContext[commandSource=" + commandCause + ", readingSpeed=" + readingSpeed + "]";
     }
 
 }

api-jvm-impl/src/main/java/ch/vorburger/minecraft/storeys/japi/impl/actions/ActionException.java

@@ -18,28 +18,39 @@
  */
 package ch.vorburger.minecraft.storeys.japi.impl.actions;
 
-import ch.vorburger.minecraft.storeys.japi.util.Texts;
-import org.spongepowered.api.text.Text;
-import org.spongepowered.api.util.TextMessageException;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.format.NamedTextColor;
 
-public class ActionException extends TextMessageException {
+public class ActionException extends Exception {
 
     private static final long serialVersionUID = 6261204063265579413L;
+    private final TextComponent message;
 
-    public ActionException(Text message) {
-        super(message);
+    public ActionException(TextComponent message) {
+        this.message = (message);
     }
 
-    public ActionException(Text message, Throwable throwable) {
-        super(message, throwable);
+    public ActionException(TextComponent message, Throwable throwable) {
+        super(throwable);
+        this.message = message;
     }
 
     public ActionException(String message) {
-        this(Texts.inRed(message));
+        this(Component.text(message).color(NamedTextColor.RED));
     }
 
     public ActionException(String message, Throwable throwable) {
-        this(Texts.inRed(message), throwable);
+        this(Component.text(message).color(NamedTextColor.RED), throwable);
+    }
+
+    public String getMessage() {
+        TextComponent message = getText();
+        return message == null ? null : message.content();
+    }
+
+    public TextComponent getText() {
+        return this.message;
     }
 
 }

api-jvm-impl/src/main/java/ch/vorburger/minecraft/storeys/japi/impl/actions/ActionWaitHelper.java

@@ -20,26 +20,26 @@
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
-import ch.vorburger.minecraft.osgi.api.PluginInstance;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import javax.inject.Inject;
 import org.spongepowered.api.scheduler.Task;
+import org.spongepowered.plugin.PluginContainer;
 
 public class ActionWaitHelper {
 
-    private final PluginInstance plugin;
+    private final PluginContainer plugin;
 
-    @Inject public ActionWaitHelper(PluginInstance plugin) {
+    @Inject public ActionWaitHelper(PluginContainer plugin) {
         this.plugin = plugin;
     }
 
     public <T> CompletionStage<T> executeAndWait(int msToWaitAfterRunning, Callable<T> callable) {
         CompletableFuture<T> future = new CompletableFuture<>();
         try {
             T returnValue = callable.call();
-            Task.builder().async().execute(() -> future.complete(returnValue)).delay(msToWaitAfterRunning, MILLISECONDS).submit(plugin);
+            Task.builder().execute(() -> future.complete(returnValue)).delay(msToWaitAfterRunning, MILLISECONDS).plugin(plugin);
 
         } catch (Throwable throwable) {
             future.completeExceptionally(throwable);

api-jvm-impl/src/main/java/ch/vorburger/minecraft/storeys/japi/impl/actions/CommandAction.java

@@ -20,15 +20,17 @@
 
 import static java.util.Objects.requireNonNull;
 
-import ch.vorburger.minecraft.osgi.api.PluginInstance;
 import ch.vorburger.minecraft.storeys.japi.ActionContext;
-import java.util.StringJoiner;
 import javax.inject.Inject;
+import net.kyori.adventure.audience.Audience;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.command.CommandResult;
+import org.spongepowered.api.command.exception.CommandException;
 import org.spongepowered.api.scheduler.Scheduler;
+import org.spongepowered.api.service.permission.Subject;
+import org.spongepowered.plugin.PluginContainer;
 
 public class CommandAction extends MainThreadAction<CommandResult> {
 
@@ -39,7 +41,7 @@ public class CommandAction extends MainThreadAction<CommandResult> {
 
     private String commandLineWithoutSlash;
 
-    @Inject public CommandAction(PluginInstance plugin, Scheduler scheduler) {
+    @Inject public CommandAction(PluginContainer plugin, Scheduler scheduler) {
         super(plugin, scheduler);
     }
 
@@ -55,23 +57,27 @@ public CommandAction setCommand(String commandLine) {
         setCommand(param);
     }
 
-    @Override protected CommandResult executeInMainThread(ActionContext context) throws ActionException {
-        CommandResult result = Sponge.getCommandManager().process(context.getCommandCause(),
-                requireNonNull(commandLineWithoutSlash, "commandLineWithoutSlash"));
-        LOG.info("processed command \"/{}\" from source {} with result {}", commandLineWithoutSlash, context.getCommandCause(),
-                toString(result));
+    @Override protected CommandResult executeInMainThread(ActionContext context) {
+        final CommandResult result;
+        try {
+            result = Sponge.server().commandManager().process((Subject & Audience) context.getCommandCause(),
+                    requireNonNull(commandLineWithoutSlash, "commandLineWithoutSlash"));
+        } catch (CommandException e) {
+            throw new RuntimeException(e);
+        }
+        LOG.info("processed command \"/{}\" from source {} with result {}", commandLineWithoutSlash, context.getCommandCause(), result);
         return result;
     }
 
-    private String toString(CommandResult result) {
-        StringJoiner sj = new StringJoiner(", ", "{", "}");
-        result.getAffectedBlocks().ifPresent(affectedBlocked -> sj.add("affectedBlocked: " + affectedBlocked));
-        result.getAffectedEntities().ifPresent(affectedEntities -> sj.add("affectedEntities: " + affectedEntities));
-        result.getAffectedItems().ifPresent(affectedItems -> sj.add("affectedItems: " + affectedItems));
-        result.getQueryResult().ifPresent(queryResult -> sj.add("queryResult: " + queryResult));
-        result.getSuccessCount().ifPresent(successCount -> sj.add("successCount: " + successCount));
-        return sj.toString();
-    }
+    //    private String toString(CommandResult result) {
+    //        StringJoiner sj = new StringJoiner(", ", "{", "}");
+    //        result.getAffectedBlocks().ifPresent(affectedBlocked -> sj.add("affectedBlocked: " + affectedBlocked));
+    //        result.getAffectedEntities().ifPresent(affectedEntities -> sj.add("affectedEntities: " + affectedEntities));
+    //        result.getAffectedItems().ifPresent(affectedItems -> sj.add("affectedItems: " + affectedItems));
+    //        result.getQueryResult().ifPresent(queryResult -> sj.add("queryResult: " + queryResult));
+    //        result.getSuccessCount().ifPresent(successCount -> sj.add("successCount: " + successCount));
+    //        return sj.toString();
+    //    }
 
     @Override public String toString() {
         return getClass().getSimpleName() + ": " + (commandLineWithoutSlash != null ? ("/" + commandLineWithoutSlash) : "null");