Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a Simple Plugin System #972

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Permission: add the children tags,Command: add the permissionMessage
magiclu550 committed Nov 26, 2019
commit 28cf55756e729393236daa9c4a59fd5d337fcf40
23 changes: 23 additions & 0 deletions src/main/java/cn/nukkit/permission/Permission.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package cn.nukkit.permission;

import cn.nukkit.Server;
import cn.nukkit.plugin.simple.Children;

import java.util.*;

@@ -130,6 +131,28 @@ public Permission addParent(String name, boolean value) {
return perm;
}

public static HashMap<String,Object> parsePermission(cn.nukkit.plugin.simple.Permission[] permissions){
HashMap<String,Object> pers = new HashMap<>();
for(cn.nukkit.plugin.simple.Permission p:permissions){
HashMap<String,Object> pers_child = new HashMap<>();
pers_child.put("description",p.description());
pers_child.put("default",p.theDefault());
Children[] children = p.childeren();
if(children.length!=0) {
HashMap<String,Object> map = new HashMap<>();
for (Children c : children) {
HashMap<String,Object> childValue = new HashMap<>();
childValue.put("description",c.description());
childValue.put("default",c.theDefault());
map.put(c.name(),childValue);
}
pers_child.put("children",map);
}
pers.put(p.permission(),pers_child);
}
return pers;
}

public static List<Permission> loadPermissions(Map<String, Object> data) {
return loadPermissions(data, DEFAULT_OP);
}
12 changes: 2 additions & 10 deletions src/main/java/cn/nukkit/plugin/JavaPluginLoader.java
Original file line number Diff line number Diff line change
@@ -19,6 +19,8 @@
import java.util.jar.JarFile;
import java.util.regex.Pattern;

import static cn.nukkit.permission.Permission.parsePermission;

/**
* Created by Nukkit Team.
*/
@@ -201,16 +203,6 @@ private PluginDescription getSimpleDescription(Class<?> plugin){
return descript;
}

public static HashMap<String,Object> parsePermission(Permission[] permissions){
HashMap<String,Object> pers = new HashMap<>();
for(Permission p:permissions){
HashMap<String,Object> pers_child = new HashMap<>();
pers_child.put("description",p.description());
pers_child.put("default",p.theDefault());
pers.put(p.permission(),pers_child);
}
return pers;
}

@Override
public Plugin loadPlugin(String filename) throws Exception {
3 changes: 2 additions & 1 deletion src/main/java/cn/nukkit/plugin/PluginManager.java
Original file line number Diff line number Diff line change
@@ -474,7 +474,7 @@ protected List<PluginCommand> parseSimplePluginCommands(Plugin plugin){
cn.nukkit.plugin.simple.Permission permission =
method.getAnnotation(cn.nukkit.plugin.simple.Permission.class);
if(cmd!=null&&permission!=null){
plugin.getDescription().getPermissions().addAll(Permission.loadPermissions(JavaPluginLoader.parsePermission(new cn.nukkit.plugin.simple.Permission[] {
plugin.getDescription().getPermissions().addAll(Permission.loadPermissions(Permission.parsePermission(new cn.nukkit.plugin.simple.Permission[] {
permission
})));
SimplePluginCommand command = new SimplePluginCommand(cmd.name(),plugin);
@@ -491,6 +491,7 @@ private void initCommand(PluginCommand newCmd,Command command){
newCmd.setUsage(command.usage());
newCmd.setAliases(command.aliases());
newCmd.setPermission(command.permission());
newCmd.setPermissionMessage(command.permissionMessage());
}

protected List<PluginCommand> parseYamlCommands(Plugin plugin) {
15 changes: 15 additions & 0 deletions src/main/java/cn/nukkit/plugin/simple/Children.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package cn.nukkit.plugin.simple;

import cn.nukkit.permission.Permission;

/**
* The children permission
*/
public @interface Children {

String name();

String description() default "";

String theDefault() default Permission.DEFAULT_PERMISSION;
}
2 changes: 2 additions & 0 deletions src/main/java/cn/nukkit/plugin/simple/Command.java
Original file line number Diff line number Diff line change
@@ -18,4 +18,6 @@
String permission();

String[] aliases() default {};

String permissionMessage() default "";
}
3 changes: 2 additions & 1 deletion src/main/java/cn/nukkit/plugin/simple/Permission.java
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@

String description() default "";

String theDefault();
String theDefault() default cn.nukkit.permission.Permission.DEFAULT_PERMISSION;

Children[] childeren() default {};
}