Milky-Way/PluginUtils
1
0
Fork 0
mirror of https://github.com/AXOLOTsh/PluginUtils.git synced 2026-09-29 15:48:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: strict parent command class in ICommand interface

Browse Source
This commit is contained in:
AXOLOTsh
2026-08-18 03:34:46 +03:00
parent 6c59468628
commit 6e49b2a0e5
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugin-utils/src/main/java/org/axolotsh/pluginutils/dependency_injection/BaseJavaPlugin.java
View File

@@ -107,16 +107,17 @@ public abstract class BaseJavaPlugin extends JavaPlugin {
for (var command : commands) { for (var command : commands) {
var clazzName = command.getClass().getName(); var clazzName = command.getClass().getName();
command.parentCommand().ifPresent(parentClazz -> { var parentCommand = command.parentCommand();
var parent = commandsByClazz.get(parentClazz); if (parentCommand != null) {
var parent = commandsByClazz.get(parentCommand);
if (parent == null) { if (parent == null) {
logger.error("Parent command '{}' for command '{}' cannot be found.", logger.error("Parent command '{}' for command '{}' cannot be found.",
parentClazz.getName(), parentCommand.getName(),
clazzName); clazzName);
} else } else
result.get(parent).add(command); result.get(parent).add(command);
}); }
} }
return result; return result;

5
plugin-utils/src/main/java/org/axolotsh/pluginutils/dependency_injection/entities/ICommand.java
View File

@@ -1,9 +1,9 @@
package org.axolotsh.pluginutils.dependency_injection.entities; package org.axolotsh.pluginutils.dependency_injection.entities;
import java.util.Collection; import java.util.Collection;
import java.util.Optional;
import org.bukkit.permissions.Permission; import org.bukkit.permissions.Permission;
import org.jetbrains.annotations.Nullable;
import dev.jorel.commandapi.CommandAPICommand; import dev.jorel.commandapi.CommandAPICommand;
@@ -12,5 +12,6 @@ public interface ICommand {
public CommandAPICommand command(); public CommandAPICommand command();
public Optional<Class<ICommand>> parentCommand(); @Nullable
public Class<? extends ICommand> parentCommand();
} }