zhdev/bukman
1
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Small fixes

Browse source
This commit is contained in:
Frank van der Heijden 2021-07-24 21:05:36 +02:00
parent 25fdec31b1
commit 483e91bad1
No known key found for this signature in database
GPG key ID: B808721C2DD5B5B8
2 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Common/src/main/java/net/frankheijden/serverutils/common/commands/CommandServerUtils.java
View file

@ -5,7 +5,6 @@ import cloud.commandframework.CommandManager;
import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.arguments.CommandArgument;
import cloud.commandframework.context.CommandContext; import cloud.commandframework.context.CommandContext;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
import net.frankheijden.serverutils.common.config.ServerUtilsConfig; import net.frankheijden.serverutils.common.config.ServerUtilsConfig;
@ -29,22 +28,17 @@ public abstract class CommandServerUtils<U extends ServerUtilsPlugin<P, ?, C, ?>
@Override @Override
public void register(CommandManager<C> manager, Command.Builder<C> builder) { public void register(CommandManager<C> manager, Command.Builder<C> builder) {
final List<String> pluginFileNames = plugin.getPluginManager().getPluginFileNames();
addArgument(CommandArgument.<C, String>ofType(String.class, "jarFile") addArgument(CommandArgument.<C, String>ofType(String.class, "jarFile")
.manager(manager) .manager(manager)
.withSuggestionsProvider((context, s) -> pluginFileNames) .withSuggestionsProvider((context, s) -> plugin.getPluginManager().getPluginFileNames())
.build()); .build());
final List<String> pluginNames = plugin.getPluginManager().getPluginNames();
addArgument(CommandArgument.<C, String>ofType(String.class, "plugin") addArgument(CommandArgument.<C, String>ofType(String.class, "plugin")
.manager(manager) .manager(manager)
.withSuggestionsProvider((context, s) -> pluginNames) .withSuggestionsProvider((context, s) -> plugin.getPluginManager().getPluginNames())
.build()); .build());
final List<String> commandNames = new ArrayList<>(plugin.getPluginManager().getCommands());
addArgument(CommandArgument.<C, String>ofType(String.class, "command") addArgument(CommandArgument.<C, String>ofType(String.class, "command")
.manager(manager) .manager(manager)
.withSuggestionsProvider((context, s) -> commandNames) .withSuggestionsProvider((context, s) -> new ArrayList<>(plugin.getPluginManager().getCommands()))
.build()); .build());
manager.command(builder manager.command(builder

17
Common/src/main/java/net/frankheijden/serverutils/common/tasks/PluginWatcherTask.java
View file

@ -28,15 +28,13 @@ public class PluginWatcherTask extends AbstractTask {
StandardWatchEventKinds.ENTRY_DELETE StandardWatchEventKinds.ENTRY_DELETE
}; };
private final ServerUtilsPlugin plugin = ServerUtilsApp.getPlugin(); private final ServerUtilsPlugin<?, ?, ?, ?> plugin = ServerUtilsApp.getPlugin();
private final AbstractPluginManager<?> pluginManager = plugin.getPluginManager();
@SuppressWarnings("rawtypes") private final ChatProvider<?, ?> chatProvider = plugin.getChatProvider();
private final AbstractPluginManager pluginManager = plugin.getPluginManager();
private final ChatProvider chatProvider = plugin.getChatProvider();
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
private final AbstractTaskManager taskManager = plugin.getTaskManager(); private final AbstractTaskManager taskManager = plugin.getTaskManager();
private final ServerCommandSender sender; private final ServerCommandSender<?> sender;
private final String pluginName; private final String pluginName;
private final AtomicBoolean run; private final AtomicBoolean run;
private File file; private File file;
@ -51,7 +49,7 @@ public class PluginWatcherTask extends AbstractTask {
* *
* @param pluginName The name of the plugin. * @param pluginName The name of the plugin.
*/ */
public PluginWatcherTask(ServerCommandSender sender, String pluginName) { public PluginWatcherTask(ServerCommandSender<?> sender, String pluginName) {
this.sender = sender; this.sender = sender;
this.pluginName = pluginName; this.pluginName = pluginName;
this.file = pluginManager.getPluginFile(pluginName); this.file = pluginManager.getPluginFile(pluginName);
@ -71,7 +69,6 @@ public class PluginWatcherTask extends AbstractTask {
for (WatchEvent<?> event : key.pollEvents()) { for (WatchEvent<?> event : key.pollEvents()) {
if (file.getName().equals(event.context().toString())) { if (file.getName().equals(event.context().toString())) {
if (task != null) { if (task != null) {
//noinspection unchecked
taskManager.cancelTask(task); taskManager.cancelTask(task);
} }
@ -96,8 +93,10 @@ public class PluginWatcherTask extends AbstractTask {
break; break;
} }
} }
} catch (IOException | InterruptedException ex) { } catch (IOException ex) {
ex.printStackTrace(); ex.printStackTrace();
} catch (InterruptedException ex) {
Thread.currentThread().interrupt();
} catch (ClosedWatchServiceException ignored) { } catch (ClosedWatchServiceException ignored) {
// //
} }