spigot-mirror/plugin-annotations
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/plugin-annotations.git synced 2025-04-13 09:29:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

PLUG-305: Fix @Commands not able to be used on Command Executors

Browse source
This commit is contained in:
Senmori 2018-10-13 11:56:40 +11:00 • committed by md_5
parent 394166672c
commit a827d5fe07
2 changed files with 48 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -10,7 +10,7 @@
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>plugin-annotations</artifactId> <artifactId>plugin-annotations</artifactId>
<version>1.2.1-SNAPSHOT</version> <version>1.2.2-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Plugin Annotations</name> <name>Plugin Annotations</name>

58
src/main/java/org/bukkit/plugin/java/annotation/PluginAnnotationProcessor.java
View file

@ -172,8 +172,8 @@ public class PluginAnnotationProcessor extends AbstractProcessor {
// commands // commands
// Begin processing external command annotations // Begin processing external command annotations
Map<String, Map<String, Object>> commandMap = Maps.newLinkedHashMap(); Map<String, Map<String, Object>> commandMap = Maps.newLinkedHashMap();
boolean result = processExternalCommands( rEnv.getElementsAnnotatedWith( Command.class ), mainPluginType, commandMap ); boolean validCommandExecutors = processExternalCommands( rEnv.getElementsAnnotatedWith( Commands.class ), mainPluginType, commandMap );
if ( !result ) { if ( !validCommandExecutors ) {
// #processExternalCommand already raised the errors // #processExternalCommand already raised the errors
return false; return false;
} }
@ -213,6 +213,12 @@ public class PluginAnnotationProcessor extends AbstractProcessor {
joined.putAll( this.processPermissions( permissions ) ); joined.putAll( this.processPermissions( permissions ) );
permissionMetadata = joined; permissionMetadata = joined;
} }
// Process Permissions on command executors
boolean validPermissions = processExternalPermissions( rEnv.getElementsAnnotatedWith( Permissions.class ), mainPluginType, permissionMetadata );
if ( !validPermissions ) {
return false;
}
yml.put( "permissions", permissionMetadata ); yml.put( "permissions", permissionMetadata );
// api-version // api-version
@ -245,15 +251,43 @@ public class PluginAnnotationProcessor extends AbstractProcessor {
return true; return true;
} }
private boolean processExternalPermissions(Set<? extends Element> commandExecutors, TypeElement mainPluginType, Map<String, Map<String, Object>> yml) {
for ( Element element : commandExecutors ) {
// Check to see if someone annotated a non-class with this
if ( !( element instanceof TypeElement ) ) {
this.raiseError( "Specified Command Executor class is not a class." );
return false;
}
TypeElement typeElement = ( TypeElement ) element;
if ( typeElement.equals( mainPluginType ) ) {
continue;
}
// Check to see if annotated class is actuall a command executor
TypeMirror mirror = this.processingEnv.getElementUtils().getTypeElement( CommandExecutor.class.getName() ).asType();
if ( !( this.processingEnv.getTypeUtils().isAssignable( typeElement.asType(), mirror ) ) ) {
this.raiseError( "Specified Command Executor class is not assignable from CommandExecutor " );
return false;
}
Map<String, Map<String, Object>> newMap = Maps.newLinkedHashMap();
Permissions annotation = typeElement.getAnnotation( Permissions.class );
if ( annotation != null && annotation.value().length > 0 ) {
newMap.putAll( processPermissions( annotation ) );
}
yml.putAll( newMap );
}
return true;
}
private void checkForNoArgsConstructor(TypeElement mainPluginType) { private void checkForNoArgsConstructor(TypeElement mainPluginType) {
ExecutableElement construct = null;
for ( ExecutableElement constructor : ElementFilter.constructorsIn( mainPluginType.getEnclosedElements() ) ) { for ( ExecutableElement constructor : ElementFilter.constructorsIn( mainPluginType.getEnclosedElements() ) ) {
if ( constructor.getParameters().isEmpty() ) { if ( constructor.getParameters().isEmpty() ) {
return; return;
} }
construct = constructor;
} }
raiseError( "Main plugin class must have a no argument constructor.", construct ); raiseError( "Main plugin class must have a no argument constructor.", mainPluginType );
} }
private void raiseError(String message) { private void raiseError(String message) {
@ -317,8 +351,10 @@ public class PluginAnnotationProcessor extends AbstractProcessor {
return false; return false;
} }
Command annotation = typeElement.getAnnotation( Command.class ); Commands annotation = typeElement.getAnnotation( Commands.class );
commandMetadata.put( annotation.name(), this.processCommand( annotation ) ); if ( annotation != null && annotation.value().length > 0 ) {
commandMetadata.putAll( this.processCommands( annotation ) );
}
} }
return true; return true;
} }
@ -354,16 +390,16 @@ public class PluginAnnotationProcessor extends AbstractProcessor {
command.put( "aliases", commandAnnotation.aliases() ); command.put( "aliases", commandAnnotation.aliases() );
} }
if ( !"".equals( commandAnnotation.desc() ) ) { if ( !commandAnnotation.desc().isEmpty() ) {
command.put( "description", commandAnnotation.desc() ); command.put( "description", commandAnnotation.desc() );
} }
if ( !"".equals( commandAnnotation.permission() ) ) { if ( !commandAnnotation.permission().isEmpty() ) {
command.put( "permission", commandAnnotation.permission() ); command.put( "permission", commandAnnotation.permission() );
} }
if ( !"".equals( commandAnnotation.permissionMessage() ) ) { if ( !commandAnnotation.permissionMessage().isEmpty() ) {
command.put( "permission-message", commandAnnotation.permissionMessage() ); command.put( "permission-message", commandAnnotation.permissionMessage() );
} }
if ( !"".equals( commandAnnotation.usage() ) ) { if ( !commandAnnotation.usage().isEmpty() ) {
command.put( "usage", commandAnnotation.usage() ); command.put( "usage", commandAnnotation.usage() );
} }