Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2025-02-14 01:21:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check for brigadier better

Browse Source
This commit is contained in:
Vankka 2025-01-13 17:44:47 +02:00
parent 00e1cd3782
commit 3c2f90a024
No known key found for this signature in database
GPG Key ID: 62E48025ED4E7EBB
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bukkit/src/main/java/com/discordsrv/bukkit/BukkitDiscordSRVImpl.java
View File

@ -81,7 +81,7 @@ public class BukkitDiscordSRVImpl extends BukkitDiscordSRV {
@Override @Override
protected void enable() throws Throwable { protected void enable() throws Throwable {
// Commands // Commands
if (ReflectionUtil.classExists("com.mojang.brigadier.CommandDispatcher")) { if (ReflectionUtil.classExists("me.lucko.commodore.Commodore")) {
this.commandHandler = new CommodoreHandler(this); this.commandHandler = new CommodoreHandler(this);
} else { } else {
this.commandHandler = new BukkitBasicCommandHandler(this); this.commandHandler = new BukkitBasicCommandHandler(this);

7
bukkit/src/main/java/com/discordsrv/bukkit/DiscordSRVBukkitBootstrap.java
View File

@ -21,6 +21,7 @@ package com.discordsrv.bukkit;
import com.discordsrv.common.abstraction.bootstrap.LifecycleManager; import com.discordsrv.common.abstraction.bootstrap.LifecycleManager;
import com.discordsrv.common.core.logging.Logger; import com.discordsrv.common.core.logging.Logger;
import com.discordsrv.common.core.logging.backend.impl.JavaLoggerImpl; import com.discordsrv.common.core.logging.backend.impl.JavaLoggerImpl;
import com.discordsrv.common.util.ReflectionUtil;
import dev.vankka.dependencydownload.classpath.ClasspathAppender; import dev.vankka.dependencydownload.classpath.ClasspathAppender;
import dev.vankka.dependencydownload.jarinjar.classloader.JarInJarClassLoader; import dev.vankka.dependencydownload.jarinjar.classloader.JarInJarClassLoader;
import dev.vankka.mcdependencydownload.bukkit.bootstrap.BukkitBootstrap; import dev.vankka.mcdependencydownload.bukkit.bootstrap.BukkitBootstrap;
@ -53,12 +54,8 @@ public class DiscordSRVBukkitBootstrap extends BukkitBootstrap implements IBukki
private static List<String> getDependencyResources() { private static List<String> getDependencyResources() {
List<String> resources = new ArrayList<>(); List<String> resources = new ArrayList<>();
resources.add("dependencies/runtimeDownload-bukkit.txt"); resources.add("dependencies/runtimeDownload-bukkit.txt");
if (ReflectionUtil.classExists("com.mojang.brigadier.CommandDispatcher")) {
try {
Class.forName("com.mojang.brigadier.CommandDispatcher");
resources.add("dependencies/commodore.txt"); resources.add("dependencies/commodore.txt");
} catch (ClassNotFoundException ignored) {
// CommandDispatcher not present, don't need to bother downloading commodore
} }
return resources; return resources;