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

Add Velocity Updater support

Browse source
This commit is contained in:
Frank van der Heijden 2021-07-25 00:08:56 +02:00
parent 483e91bad1
commit cb78112cb3
No known key found for this signature in database
GPG key ID: B808721C2DD5B5B8
14 changed files with 151 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Velocity/src/main/java/net/frankheijden/serverutils/velocity/entities/VelocityPlugin.java
View file

@ -34,7 +34,11 @@ public class VelocityPlugin extends ServerUtilsPlugin<
*/
public VelocityPlugin(ServerUtils plugin) {
this.plugin = plugin;
this.pluginManager = new VelocityPluginManager();
this.pluginManager = new VelocityPluginManager(
plugin.getProxy(),
plugin.getLogger(),
plugin.getPluginCommandManager()
);
this.taskManager = new VelocityTaskManager(plugin);
this.resourceProvider = new VelocityResourceProvider(plugin);
this.chatProvider = new VelocityChatProvider(plugin);
@ -66,6 +70,11 @@ public class VelocityPlugin extends ServerUtilsPlugin<
return Platform.VELOCITY;
}
@Override
public PluginContainer getPlugin() {
return plugin.getPluginContainer();
}
@Override
public VelocityResourceProvider getResourceProvider() {
return this.resourceProvider;

4
Velocity/src/main/java/net/frankheijden/serverutils/velocity/listeners/VelocityPlayerListener.java
View file

@ -2,11 +2,13 @@ package net.frankheijden.serverutils.velocity.listeners;
import com.velocitypowered.api.event.Subscribe;
import com.velocitypowered.api.event.player.PlayerChooseInitialServerEvent;
import com.velocitypowered.api.plugin.PluginContainer;
import net.frankheijden.serverutils.common.listeners.PlayerListener;
import net.frankheijden.serverutils.velocity.entities.VelocityCommandSender;
import net.frankheijden.serverutils.velocity.entities.VelocityPlugin;
public class VelocityPlayerListener extends PlayerListener<VelocityPlugin, VelocityCommandSender> {
public class VelocityPlayerListener
extends PlayerListener<VelocityPlugin, PluginContainer, VelocityCommandSender> {
public VelocityPlayerListener(VelocityPlugin plugin) {
super(plugin);

27
Velocity/src/main/java/net/frankheijden/serverutils/velocity/managers/VelocityPluginManager.java
View file

@ -30,7 +30,6 @@ import net.frankheijden.serverutils.common.entities.CloseableResult;
import net.frankheijden.serverutils.common.entities.Result;
import net.frankheijden.serverutils.common.events.PluginEvent;
import net.frankheijden.serverutils.common.managers.AbstractPluginManager;
import net.frankheijden.serverutils.velocity.ServerUtils;
import net.frankheijden.serverutils.velocity.entities.VelocityLoadResult;
import net.frankheijden.serverutils.velocity.events.VelocityPluginDisableEvent;
import net.frankheijden.serverutils.velocity.events.VelocityPluginEnableEvent;
@ -43,15 +42,23 @@ import net.frankheijden.serverutils.velocity.reflection.RVelocityEventManager;
import net.frankheijden.serverutils.velocity.reflection.RVelocityPluginContainer;
import net.frankheijden.serverutils.velocity.reflection.RVelocityPluginManager;
import net.frankheijden.serverutils.velocity.reflection.RVelocityScheduler;
import org.slf4j.Logger;
public class VelocityPluginManager implements AbstractPluginManager<PluginContainer> {
private static VelocityPluginManager instance;
private final ProxyServer proxy;
private final Logger logger;
private final VelocityPluginCommandManager pluginCommandManager;
public VelocityPluginManager() {
/**
* Constructs a new VelocityPluginManager.
*/
public VelocityPluginManager(ProxyServer proxy, Logger logger, VelocityPluginCommandManager pluginCommandManager) {
instance = this;
this.proxy = ServerUtils.getInstance().getProxy();
this.proxy = proxy;
this.logger = logger;
this.pluginCommandManager = pluginCommandManager;
}
public static VelocityPluginManager get() {
@ -73,7 +80,7 @@ public class VelocityPluginManager implements AbstractPluginManager<PluginContai
for (PluginDependency dependency : candidate.getDependencies()) {
if (!dependency.isOptional() && !proxy.getPluginManager().isLoaded(dependency.getId())) {
ServerUtils.getInstance().getLogger().error(
logger.error(
"Can't load plugin {} due to missing dependency {}",
candidate.getId(),
dependency.getId()
@ -123,14 +130,14 @@ public class VelocityPluginManager implements AbstractPluginManager<PluginContai
try {
RJavaPluginLoader.createPlugin(javaPluginLoader, container, module, commonModule);
} catch (Exception ex) {
ServerUtils.getInstance().getLogger().error(
logger.error(
String.format("Can't create plugin %s", container.getDescription().getId()),
ex
);
return Result.ERROR;
}
ServerUtils.getInstance().getLogger().info(
logger.info(
"Loaded plugin {} {} by {}",
realPlugin.getId(),
realPlugin.getVersion().orElse("<UNKNOWN>"),
@ -158,7 +165,7 @@ public class VelocityPluginManager implements AbstractPluginManager<PluginContai
).join().createFunction(console);
if (permissionFunction == null) {
ServerUtils.getInstance().getLogger().error(
logger.error(
"A plugin permission provider {} provided an invalid permission function for the console."
+ " This is a bug in the plugin, not in Velocity."
+ " Falling back to the default permission function.",
@ -232,7 +239,6 @@ public class VelocityPluginManager implements AbstractPluginManager<PluginContai
}
String pluginId = container.getDescription().getId();
VelocityPluginCommandManager pluginCommandManager = ServerUtils.getInstance().getPluginCommandManager();
for (String alias : pluginCommandManager.getPluginCommands().removeAll(pluginId)) {
proxy.getCommandManager().unregister(alias);
}
@ -287,6 +293,11 @@ public class VelocityPluginManager implements AbstractPluginManager<PluginContai
return proxy.getPluginManager().getPlugin(pluginName).orElse(null);
}
@Override
public Object getInstance(PluginContainer plugin) {
return plugin.getInstance().orElse(null);
}
@Override
public Set<String> getCommands() {
return RVelocityCommandManager.getDispatcher(proxy.getCommandManager()).getRoot().getChildren().stream()