trueog/CraftingStore-OG
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Merge pull request #18 from RoccoDev/master

Browse Source 
Fix support for Velocity 3.0.0
This commit is contained in:
thijs_a authored and GitHub committed 2021-07-08 12:04:44 +02:00
2 parents 2a24f9a874 f0b9a05de2
commit a9850c2abe
5 files changed
+45 -42
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

velocity/pom.xml
+1 -1
View File
@@ -52,7 +52,7 @@
<dependency>
<groupId>com.velocitypowered</groupId>
<artifactId>velocity-api</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>3.0.0</version>
<scope>provided</scope>
</dependency>
velocity/src/main/java/net/craftingstore/velocity/CraftingStoreVelocity.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class CraftingStoreVelocity {
this.craftingStore = new CraftingStore(injector.getInstance(CraftingStoreVelocityImpl.class));
injector = injector.createChildInjector(new CraftingStoreModule(craftingStore));
commandManager.register(injector.getInstance(CraftingStoreCommand.class), "csv");
commandManager.register("csv", injector.getInstance(CraftingStoreCommand.class));
eventManager.register(this, injector.getInstance(PendingDonationJoinListener.class));
}
velocity/src/main/java/net/craftingstore/velocity/CraftingStoreVelocityImpl.java
+5 -3
View File
@@ -53,9 +53,11 @@ public class CraftingStoreVelocityImpl implements CraftingStorePlugin {
return false;
}
if (!proxyServer.getCommandManager().execute(proxyServer.getConsoleCommandSource(), donation.getCommand())) {
logger.error("Command " + donation.getCommand() + " failed");
}
proxyServer.getCommandManager().executeAsync(proxyServer.getConsoleCommandSource(), donation.getCommand())
.exceptionally(e -> {
logger.error("Command " + donation.getCommand() + " failed");
return null;
});
return true;
}
velocity/src/main/java/net/craftingstore/velocity/command/CraftingStoreCommand.java
+29 -28
View File
@@ -1,28 +1,27 @@
package net.craftingstore.velocity.command;
import com.google.inject.Inject;
import com.velocitypowered.api.command.Command;
import com.velocitypowered.api.command.CommandSource;
import com.velocitypowered.api.command.SimpleCommand;
import com.velocitypowered.api.proxy.ProxyServer;
import net.craftingstore.core.CraftingStore;
import net.craftingstore.velocity.CraftingStoreVelocity;
import net.craftingstore.velocity.annotation.Prefix;
import net.craftingstore.velocity.config.Config;
import net.kyori.text.TextComponent;
import net.kyori.text.format.TextColor;
import net.kyori.text.format.TextDecoration;
import org.checkerframework.checker.nullness.qual.NonNull;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.format.TextDecoration;
import java.util.concurrent.ExecutionException;
public class CraftingStoreCommand implements Command {
public class CraftingStoreCommand implements SimpleCommand {
@Inject
private CraftingStore craftingStore;
@Inject
@Prefix
private TextComponent prefix;
private Component prefix;
@Inject
private CraftingStoreVelocity velocityPlugin;
@@ -34,12 +33,14 @@ public class CraftingStoreCommand implements Command {
private ProxyServer proxyServer;
@Override
public void execute(CommandSource sender, @NonNull String[] args) {
public void execute(Invocation invocation) {
String[] args = invocation.arguments();
CommandSource sender = invocation.source();
if (args.length == 1 && args[0].equalsIgnoreCase("reload")) {
craftingStore.reload();
sender.sendMessage(TextComponent.builder("")
sender.sendMessage(Component.text()
.append(prefix)
.append(TextComponent.of("The plugin is reloading!"))
.append(Component.text("The plugin is reloading!"))
.build());
return;
}
@@ -49,14 +50,14 @@ public class CraftingStoreCommand implements Command {
proxyServer.getScheduler().buildTask(velocityPlugin, () -> {
try {
if (craftingStore.reload().get()) {
sender.sendMessage(TextComponent.builder("")
sender.sendMessage(Component.text()
.append(prefix)
.append(TextComponent.of("The new API key has been set in the config, and the plugin has been reloaded."))
.append(Component.text("The new API key has been set in the config, and the plugin has been reloaded."))
.build());
} else {
sender.sendMessage(TextComponent.builder("")
sender.sendMessage(Component.text()
.append(prefix)
.append(TextComponent.of("The API key is invalid. The plugin will not work until you set a valid API key."))
.append(Component.text("The API key is invalid. The plugin will not work until you set a valid API key."))
.build());
}
} catch (InterruptedException | ExecutionException e) {
@@ -67,29 +68,29 @@ public class CraftingStoreCommand implements Command {
}
sender.sendMessage(
TextComponent.of("-----------------------", TextColor.GRAY).decoration(TextDecoration.STRIKETHROUGH, true)
Component.text("-----------------------", NamedTextColor.GRAY).decoration(TextDecoration.STRIKETHROUGH, true)
);
sender.sendMessage(TextComponent.builder("")
.append(TextComponent.of("> ", TextColor.DARK_GRAY))
.append(TextComponent.of("/csv reload", TextColor.GRAY))
.append(TextComponent.of(" -> ", TextColor.DARK_GRAY))
.append(TextComponent.of("Reload the config.", TextColor.GRAY))
sender.sendMessage(Component.text()
.append(Component.text("> ", NamedTextColor.DARK_GRAY))
.append(Component.text("/csv reload", NamedTextColor.GRAY))
.append(Component.text(" -> ", NamedTextColor.DARK_GRAY))
.append(Component.text("Reload the config.", NamedTextColor.GRAY))
.build()
);
sender.sendMessage(TextComponent.builder("")
.append(TextComponent.of("> ", TextColor.DARK_GRAY))
.append(TextComponent.of("/csv key <your key>", TextColor.GRAY))
.append(TextComponent.of(" -> ", TextColor.DARK_GRAY))
.append(TextComponent.of("Update the key.", TextColor.GRAY))
sender.sendMessage(Component.text()
.append(Component.text("> ", NamedTextColor.DARK_GRAY))
.append(Component.text("/csv key <your key>", NamedTextColor.GRAY))
.append(Component.text(" -> ", NamedTextColor.DARK_GRAY))
.append(Component.text("Update the key.", NamedTextColor.GRAY))
.build()
);
sender.sendMessage(
TextComponent.of("-----------------------", TextColor.GRAY).decoration(TextDecoration.STRIKETHROUGH, true)
Component.text("-----------------------", NamedTextColor.GRAY).decoration(TextDecoration.STRIKETHROUGH, true)
);
}
@Override
public boolean hasPermission(CommandSource source, @NonNull String[] args) {
return source.hasPermission("craftingstore.admin");
public boolean hasPermission(Invocation invocation) {
return invocation.source().hasPermission("craftingstore.admin");
}
}
velocity/src/main/java/net/craftingstore/velocity/module/CraftingStoreModule.java
+9 -9
View File
@@ -2,19 +2,19 @@ package net.craftingstore.velocity.module;
import com.google.inject.AbstractModule;
import net.craftingstore.core.CraftingStore;
import net.craftingstore.velocity.CraftingStoreVelocity;
import net.craftingstore.velocity.annotation.Prefix;
import net.kyori.text.TextComponent;
import net.kyori.text.format.TextColor;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.format.NamedTextColor;
public class CraftingStoreModule extends AbstractModule {
private CraftingStore craftingStore;
private TextComponent prefix = TextComponent.builder("")
.append(TextComponent.of("[", TextColor.GRAY))
.append(TextComponent.of("CraftingStore", TextColor.RED))
.append(TextComponent.of("] ", TextColor.GRAY))
.append(TextComponent.of("", TextColor.WHITE))
private TextComponent prefix = Component.text()
.append(Component.text("[", NamedTextColor.GRAY))
.append(Component.text("CraftingStore", NamedTextColor.RED))
.append(Component.text("] ", NamedTextColor.GRAY))
.append(Component.text("", NamedTextColor.WHITE))
.build();
public CraftingStoreModule(CraftingStore craftingStore) {
@@ -23,6 +23,6 @@ public class CraftingStoreModule extends AbstractModule {
protected void configure() {
bind(CraftingStore.class).toInstance(craftingStore);
bind(TextComponent.class).annotatedWith(Prefix.class).toInstance(prefix);
bind(Component.class).annotatedWith(Prefix.class).toInstance(prefix);
}
}