1
mirror of https://github.com/CarmJos/UserPrefix.git synced 2026-06-05 00:35:02 +08:00

Compare commits

...

10 Commits

Author SHA1 Message Date
carm 2fc2474f89 feat(cmd): 使用命令为玩家更换称号 (#37)
* feat(cmd): 使用命令为玩家更换称号 #35
2022-10-02 15:44:24 +08:00
carm 01a83d5c9e feat(conf): 支持切换前缀时执行自定义操作 (#32) 2022-09-13 01:33:11 +08:00
carm f648e29ee2 fix(code): 移除重复代码 2022-09-10 02:01:13 +08:00
carm cc0122f9ba chore: 适配依赖更新,移除冗余代码 (#33)
* feat(actions): 为单个前缀的选择添加可配置的操作

* feat(actions): 实现在前缀选择时执行操作

* chore: 适配新接口,删除冗杂代码

* chore: 适配新接口,删除冗杂代码

* chore: 修改repo
2022-09-10 01:57:45 +08:00
carm e3c911d375 feat(actions): 支持切换前缀时执行自定义操作 (#32)
* feat(actions): 为单个前缀的选择添加可配置的操作
* feat(actions): 实现在前缀选择时执行操作
2022-09-09 21:28:15 +08:00
carm dc14b0cd2e chore(cmd): 移除空行 2022-08-11 18:22:57 +08:00
carm a8908b6dd4 chore(conf): 移除无用字段。 2022-08-06 18:36:46 +08:00
carm fa9f3bc1ed chore(cmd): 重构指令的实现方式。 2022-08-06 18:04:54 +08:00
carm 7c2391a3b0 chore(conf): 修改配置文件包名。 2022-08-06 17:43:36 +08:00
carm cb384ca201 build(javadoc): 添加 EasyPlugin 与 MineConfiguration 的Javadoc链接。 2022-07-01 21:11:26 +08:00
26 changed files with 375 additions and 186 deletions
+31
View File
@@ -0,0 +1,31 @@
# UserPrefix Actions 操作
## 使用方式
`actions` 配置节点下,可以配置多个操作,格式为 `[操作类型] {操作参数}`,例如:
- `[CHAT] HELLO %player_name%!`
- `[SOUND] ENTITY_PLAYER_LEVELUP`
## 操作类型
目前支持以下操作类型:
- `CHAT` 以玩家聊天的形式发送,若需要发送指令则添加“/”前缀
- `CONSOLE` 以后台的形式发送指令
- `MESSAGE` 向玩家发送一条消息
- `SOUND` 向玩家发送声音
- `CLOSE` 关闭当前打开的GUI
所有需要键入文本的类型均支持 [PlaceholderAPI](https://www.spigotmc.org/resources/6245/) 变量 。
## 限定点击类型
若您需要限定玩家点击的类型,如左键、右键等,则可以添加在操作类型后,以“`:`”分割,如:
- `[CLOSE:LEFT]` 代表左键点击关闭
- `[MESSAGE:MIDDLE] HELLO WORLD` 代表鼠标中间点击发送消息
详细点击类型见 [`org.bukkit.event.inventory.ClickType`](https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/inventory/ClickType.html) 。
+1
View File
@@ -13,6 +13,7 @@
- 使用示例
- [前缀配置文件预设示例](../src/main/resources/prefixes/example-prefix.yml)
- [操作(Actions)配置](ACTIONS.md)
## [开发文档](JAVADOC-README.md)
+2 -2
View File
@@ -92,11 +92,11 @@ README LANGUAGES [ [**中文**](README.md) | [English](README-en.md) ]
## 配置文件示例
### 基础配置文件 ([`config.yml`](src/main/java/cc/carm/plugin/userprefix/configuration/PluginConfig.java))
### 基础配置文件 ([`config.yml`](src/main/java/cc/carm/plugin/userprefix/conf/PluginConfig.java))
将会在服务器首次启动时生成,如果您想要修改配置,请在服务器启动后打开配置文件。
### 消息配置文件 ([`messages.yml`](src/main/java/cc/carm/plugin/userprefix/configuration/PluginMessages.java))
### 消息配置文件 ([`messages.yml`](src/main/java/cc/carm/plugin/userprefix/conf/PluginMessages.java))
将会在服务器首次启动时生成,如果您想要修改配置,请在服务器启动后打开配置文件 。
+50 -39
View File
@@ -13,13 +13,13 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<easyplugin.version>1.4.10</easyplugin.version>
<mineconfig.version>2.0.1</mineconfig.version>
<easyplugin.version>1.4.15</easyplugin.version>
<mineconfig.version>2.1.0</mineconfig.version>
</properties>
<groupId>cc.carm.plugin</groupId>
<artifactId>userprefix</artifactId>
<version>3.0.1</version>
<version>3.0.3</version>
<name>UserPrefix</name>
<description>轻便、高效、实时的用户前缀系统。</description>
@@ -61,6 +61,16 @@
<repositories>
<repository>
<id>maven-central</id>
<url>https://repo1.maven.org/maven2/</url>
</repository>
<repository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/repositories/public/</url>
</repository>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
@@ -71,16 +81,6 @@
<url>https://repo.lucko.me/</url>
</repository>
<repository>
<id>maven-central</id>
<url>https://repo1.maven.org/maven2/</url>
</repository>
<repository>
<id>sonatype-repo</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</repository>
<repository>
<id>EasyPlugin</id>
<url>https://raw.githubusercontent.com/CarmJos/EasyPlugin/repo/</url>
@@ -113,6 +113,14 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>cc.carm.lib</groupId>
<artifactId>easyplugin-command</artifactId>
<version>${easyplugin.version}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>cc.carm.lib</groupId>
<artifactId>easyplugin-gui</artifactId>
@@ -154,7 +162,7 @@
<dependency>
<groupId>net.luckperms</groupId>
<artifactId>api</artifactId>
<version>5.3</version>
<version>5.4</version>
<scope>provided</scope>
</dependency>
@@ -205,31 +213,6 @@
</filesets>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<classifier>javadoc</classifier>
<links>
<!-- <link>https://javadoc.io/doc/org.jetbrains/annotations/</link>-->
<link>https://hub.spigotmc.org/javadocs/bukkit/</link>
</links>
<detectJavaApiLink>true</detectJavaApiLink>
<encoding>UTF-8</encoding>
<charset>UTF-8</charset>
<docencoding>UTF-8</docencoding>
<locale>zh_CN</locale>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -275,6 +258,7 @@
<finalName>${project.name}-${project.version}</finalName>
<outputDirectory>${project.basedir}/asset/</outputDirectory>
<createDependencyReducedPom>false</createDependencyReducedPom>
<minimizeJar>true</minimizeJar>
<relocations>
<relocation>
<pattern>org.bstats</pattern>
@@ -300,6 +284,33 @@
</filters>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<classifier>javadoc</classifier>
<links>
<link>https://javadoc.io/doc/org.jetbrains/annotations/</link>
<link>https://hub.spigotmc.org/javadocs/bukkit/</link>
<link>https://carmjos.github.io/EasyPlugin/</link>
<link>https://carmjos.github.io/MineConfiguration/</link>
</links>
<detectJavaApiLink>true</detectJavaApiLink>
<encoding>UTF-8</encoding>
<charset>UTF-8</charset>
<docencoding>UTF-8</docencoding>
<locale>zh_CN</locale>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -2,19 +2,21 @@ package cc.carm.plugin.userprefix;
import cc.carm.lib.easyplugin.EasyPlugin;
import cc.carm.lib.easyplugin.gui.GUI;
import cc.carm.lib.easyplugin.gui.paged.AutoPagedGUI;
import cc.carm.lib.easyplugin.updatechecker.GHUpdateChecker;
import cc.carm.lib.easyplugin.utils.MessageUtils;
import cc.carm.plugin.userprefix.command.AdminCommand;
import cc.carm.plugin.userprefix.command.UserCommand;
import cc.carm.plugin.userprefix.configuration.PluginConfig;
import cc.carm.plugin.userprefix.conf.PluginConfig;
import cc.carm.plugin.userprefix.hooker.UserPrefixExpansion;
import cc.carm.plugin.userprefix.listener.ChatListener;
import cc.carm.plugin.userprefix.listener.UserListener;
import cc.carm.plugin.userprefix.listener.processor.UserNodeUpdateProcessor;
import cc.carm.plugin.userprefix.listener.UserPermListener;
import cc.carm.plugin.userprefix.manager.ConfigManager;
import cc.carm.plugin.userprefix.manager.PrefixManager;
import cc.carm.plugin.userprefix.manager.ServiceManager;
import cc.carm.plugin.userprefix.manager.UserManager;
import cc.carm.plugin.userprefix.ui.PrefixSelectGUI;
import net.luckperms.api.event.user.UserDataRecalculateEvent;
import org.bstats.bukkit.Metrics;
import org.bstats.charts.SimplePie;
@@ -47,17 +49,21 @@ public class Main extends EasyPlugin {
log("注册指令...");
registerCommand("UserPrefix", new UserCommand());
registerCommand("UserPrefixAdmin", new AdminCommand());
registerCommand("UserPrefixAdmin", new AdminCommand(this));
log("注册监听器...");
GUI.initialize(this);
registerListener(new UserListener());
registerListener(new ChatListener());
ServiceManager.getService().getEventBus().subscribe(
this, UserDataRecalculateEvent.class,
UserNodeUpdateProcessor::process
UserPermListener::process
);
log("初始化GUI管理器...");
GUI.initialize(this);
AutoPagedGUI.defaultNextPage = (PluginConfig.GUI.ITEMS.NEXT_PAGE::getItem);
AutoPagedGUI.defaultPreviousPage = (PluginConfig.GUI.ITEMS.PREV_PAGE::getItem);
if (MessageUtils.hasPlaceholderAPI()) {
log("注册变量...");
new UserPrefixExpansion(getInstance()).register();
@@ -93,6 +99,20 @@ public class Main extends EasyPlugin {
return true;
}
@Override
protected void shutdown() {
log("关闭已被打开的GUI...");
Bukkit.getOnlinePlayers().stream().filter(GUI::hasOpenedGUI).forEach(player -> {
player.closeInventory();
GUI.removeOpenedGUI(player);
PrefixSelectGUI.removeOpening(player);
});
log("&7感谢您使用 &3&lUserPrefix " + getDescription().getVersion() + "&7!");
log("&7本插件由 &b&lYourCraft &7提供长期支持与维护。");
}
@Override
public boolean isDebugging() {
return PluginConfig.DEBUG.getNotNull();
@@ -106,7 +126,7 @@ public class Main extends EasyPlugin {
getInstance().debug(message);
}
public static void serve(String... message) {
public static void severe(String... message) {
getInstance().error(message);
}
@@ -1,6 +1,6 @@
package cc.carm.plugin.userprefix;
import cc.carm.plugin.userprefix.configuration.prefix.PrefixConfig;
import cc.carm.plugin.userprefix.conf.prefix.PrefixConfig;
import cc.carm.plugin.userprefix.manager.ConfigManager;
import cc.carm.plugin.userprefix.manager.PrefixManager;
import cc.carm.plugin.userprefix.manager.UserManager;
@@ -1,63 +1,38 @@
package cc.carm.plugin.userprefix.command;
import cc.carm.plugin.userprefix.UserPrefixAPI;
import cc.carm.plugin.userprefix.configuration.PluginMessages;
import cc.carm.plugin.userprefix.configuration.prefix.PrefixConfig;
import cc.carm.plugin.userprefix.ui.PrefixSelectGUI;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import cc.carm.lib.easyplugin.command.CommandHandler;
import cc.carm.plugin.userprefix.command.admin.ListCommand;
import cc.carm.plugin.userprefix.command.admin.ReloadCommand;
import cc.carm.plugin.userprefix.command.admin.SetCommand;
import cc.carm.plugin.userprefix.conf.PluginMessages;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin;
import org.jetbrains.annotations.NotNull;
public class AdminCommand implements CommandExecutor {
public class AdminCommand extends CommandHandler {
public AdminCommand(@NotNull JavaPlugin plugin) {
super(plugin);
registerSubCommand(new ListCommand(this, "list", "l"));
registerSubCommand(new SetCommand(this, "set"));
registerSubCommand(new ReloadCommand(this, "reload"));
}
@Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String s, @NotNull String[] args) {
if (args.length == 1) {
String aim = args[0];
if (aim.equalsIgnoreCase("list")) {
PluginMessages.LIST.HEADER.send(sender);
for (PrefixConfig value : UserPrefixAPI.getPrefixManager().getPrefixes().values()) {
PluginMessages.LIST.VALUE.send(sender,
value.getWeight(), value.getIdentifier(),
value.getName(), value.getPermission(),
value.getContent(), sender.getName()
);
}
return true;
} else if (aim.equalsIgnoreCase("reload")) {
long s1 = System.currentTimeMillis();
PrefixSelectGUI.closeAll(); // 关掉所有正在显示的前缀列表
try {
UserPrefixAPI.getConfigManager().reload(); // 重载配置文件
int num = UserPrefixAPI.getPrefixManager().loadPrefixes(); //加载重载后了的前缀配置
for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
UserPrefixAPI.getUserManager().checkPrefix(onlinePlayer, false);
/*
* 这里关掉loadOthers(为其他玩家更新)了。
* 因为每个玩家更新的时候会为其他人更新自己,
* 全部走完一遍后,所有玩家都会加载最新的前缀内容。
*/
UserPrefixAPI.getUserManager().updatePrefixView(onlinePlayer, false);
}
PluginMessages.RELOAD.SUCCESS.send(sender, System.currentTimeMillis() - s1, num);
} catch (Exception e) {
PluginMessages.RELOAD.FAILED.send(sender, e.getMessage());
e.printStackTrace();
}
return true;
}
return help(sender);
}
public Void noArgs(CommandSender sender) {
return help(sender);
}
public static boolean help(CommandSender sender) {
PluginMessages.COMMAND_USAGE.ADMIN.send(sender);
return true;
@Override
public Void noPermission(CommandSender sender) {
PluginMessages.COMMAND_USAGE.NO_PERM.send(sender);
return null;
}
public static Void help(CommandSender sender) {
PluginMessages.COMMAND_USAGE.ADMIN.send(sender);
return null;
}
}
@@ -1,6 +1,6 @@
package cc.carm.plugin.userprefix.command;
import cc.carm.plugin.userprefix.configuration.PluginMessages;
import cc.carm.plugin.userprefix.conf.PluginMessages;
import cc.carm.plugin.userprefix.ui.PrefixSelectGUI;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
@@ -0,0 +1,32 @@
package cc.carm.plugin.userprefix.command.admin;
import cc.carm.lib.easyplugin.command.SubCommand;
import cc.carm.plugin.userprefix.UserPrefixAPI;
import cc.carm.plugin.userprefix.command.AdminCommand;
import cc.carm.plugin.userprefix.conf.PluginMessages;
import cc.carm.plugin.userprefix.conf.prefix.PrefixConfig;
import org.bukkit.command.CommandSender;
import org.bukkit.plugin.java.JavaPlugin;
import org.jetbrains.annotations.NotNull;
public class ListCommand extends SubCommand<AdminCommand> {
public ListCommand(@NotNull AdminCommand parent, String name, String... aliases) {
super(parent, name, aliases);
}
@Override
public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) {
PluginMessages.LIST.HEADER.send(sender);
for (PrefixConfig value : UserPrefixAPI.getPrefixManager().getPrefixes().values()) {
PluginMessages.LIST.VALUE.send(sender,
value.getWeight(), value.getIdentifier(),
value.getName(), value.getPermission(),
value.getContent(), sender.getName()
);
}
return null;
}
}
@@ -0,0 +1,43 @@
package cc.carm.plugin.userprefix.command.admin;
import cc.carm.lib.easyplugin.command.SubCommand;
import cc.carm.plugin.userprefix.UserPrefixAPI;
import cc.carm.plugin.userprefix.command.AdminCommand;
import cc.carm.plugin.userprefix.conf.PluginMessages;
import cc.carm.plugin.userprefix.ui.PrefixSelectGUI;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin;
import org.jetbrains.annotations.NotNull;
public class ReloadCommand extends SubCommand<AdminCommand> {
public ReloadCommand(@NotNull AdminCommand parent, String name, String... aliases) {
super(parent, name, aliases);
}
@Override
public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) {
long s1 = System.currentTimeMillis();
PrefixSelectGUI.closeAll(); // 关掉所有正在显示的前缀列表
try {
UserPrefixAPI.getConfigManager().reload(); // 重载配置文件
int num = UserPrefixAPI.getPrefixManager().loadPrefixes(); //加载重载后了的前缀配置
for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
UserPrefixAPI.getUserManager().checkPrefix(onlinePlayer, false);
/*
* 这里关掉loadOthers(为其他玩家更新)了。
* 因为每个玩家更新的时候会为其他人更新自己,
* 全部走完一遍后,所有玩家都会加载最新的前缀内容。
*/
UserPrefixAPI.getUserManager().updatePrefixView(onlinePlayer, false);
}
PluginMessages.RELOAD.SUCCESS.send(sender, System.currentTimeMillis() - s1, num);
} catch (Exception e) {
PluginMessages.RELOAD.FAILED.send(sender, e.getMessage());
e.printStackTrace();
}
return null;
}
}
@@ -0,0 +1,54 @@
package cc.carm.plugin.userprefix.command.admin;
import cc.carm.lib.easyplugin.command.SubCommand;
import cc.carm.plugin.userprefix.UserPrefixAPI;
import cc.carm.plugin.userprefix.command.AdminCommand;
import cc.carm.plugin.userprefix.conf.PluginMessages;
import cc.carm.plugin.userprefix.conf.prefix.PrefixConfig;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin;
import org.jetbrains.annotations.NotNull;
public class SetCommand extends SubCommand<AdminCommand> {
public SetCommand(@NotNull AdminCommand parent, String name, String... aliases) {
super(parent, name, aliases);
}
@Override
public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) {
if (args.length < 2) return getParent().noArgs(sender);
Player target = Bukkit.getPlayer(args[0]);
if (target == null) {
PluginMessages.NOT_ONLINE.send(sender, args[0]);
return null;
}
PrefixConfig prefixConfig;
String prefixInput = args[1];
if (prefixInput.equalsIgnoreCase("default")) {
prefixConfig = UserPrefixAPI.getDefaultPrefix();
} else {
prefixConfig = UserPrefixAPI.getPrefixManager().getPrefix(prefixInput);
}
if (prefixConfig == null) {
PluginMessages.SET.PREFIX_NOT_FOUND.send(sender, prefixInput);
return null;
}
if (!prefixConfig.checkPermission(target)) {
PluginMessages.SET.NO_PERM.send(sender, target.getName(), prefixConfig.getName());
return null;
}
UserPrefixAPI.getUserManager().setPrefix(target, prefixConfig, true);
PluginMessages.SET.SUCCESS.send(sender, target.getName(), prefixConfig.getName());
return null;
}
}
@@ -1,16 +1,17 @@
package cc.carm.plugin.userprefix.configuration;
package cc.carm.plugin.userprefix.conf;
import cc.carm.lib.configuration.core.ConfigurationRoot;
import cc.carm.lib.configuration.core.annotation.ConfigPath;
import cc.carm.lib.configuration.core.annotation.HeaderComment;
import cc.carm.lib.configuration.core.value.ConfigValue;
import cc.carm.lib.configuration.core.value.type.ConfiguredList;
import cc.carm.lib.configuration.core.value.type.ConfiguredValue;
import cc.carm.lib.easyplugin.gui.configuration.GUIActionConfiguration;
import cc.carm.lib.easyplugin.gui.configuration.GUIActionType;
import cc.carm.lib.easyplugin.gui.configuration.GUIItemConfiguration;
import cc.carm.lib.mineconfiguration.bukkit.source.CraftSectionWrapper;
import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredItem;
import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredSound;
import cc.carm.plugin.userprefix.configuration.reader.GUIItemReader;
import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemFlag;
@@ -120,7 +121,10 @@ public class PluginConfig extends ConfigurationRoot {
public static final ConfigValue<GUIItemConfiguration> BACK = ConfiguredValue.builder(GUIItemConfiguration.class)
.fromSection()
.serializeValue(GUIItemConfiguration::serialize)
.parseValue((v, d) -> GUIItemReader.readFrom(v))
.parseValue((v, d) -> {
if (!(v instanceof CraftSectionWrapper)) return null;
return GUIItemConfiguration.readFrom(((CraftSectionWrapper) v).getSource());
})
.defaults(new GUIItemConfiguration(
Material.BARRIER, 1, 0, "&c&l返回",
Collections.singletonList("&f点击即可返回上一菜单"),
@@ -154,6 +158,11 @@ public class PluginConfig extends ConfigurationRoot {
@HeaderComment({"默认前缀的内容,即用于显示的实际前缀"})
public static final ConfigValue<String> CONTENT = ConfiguredValue.of(String.class, "&r");
@HeaderComment({"选择默认前缀时执行的操作"})
public static final ConfiguredList<String> ACTIONS = ConfiguredList.builder(String.class).fromString()
.defaults("[CONSOLE] " + "say %player_name% 选择了默认前缀")
.build();
@HeaderComment({"默认前缀的显示物品"})
public static final class ITEM {
@@ -1,4 +1,4 @@
package cc.carm.plugin.userprefix.configuration;
package cc.carm.plugin.userprefix.conf;
import cc.carm.lib.configuration.core.ConfigurationRoot;
import cc.carm.lib.configuration.core.annotation.HeaderComment;
@@ -16,12 +16,22 @@ public class PluginMessages extends ConfigurationRoot {
"&3&l用户前缀系统 &f帮助",
"&8# &f/upa list",
"&8- &7查看当前前缀列表。",
"&8# &f/upa set &b<玩家ID> &b<前缀ID>",
"&8- &7为玩家设定指定前缀。",
"&8- &7&o注意:玩家必须拥有指定前缀的权限。",
"&8# &f/upa reload",
"&8- &7重载前缀配置。"
).build();
public static ConfiguredMessageList<String> NO_PERM = ConfiguredMessageList.asStrings()
.defaults("&c&l抱歉!&f但您没有权限使用该指令。")
.build();
}
public static ConfiguredMessageList<String> NOT_ONLINE = ConfiguredMessageList.asStrings()
.defaults("&7玩家 &b%(player) &7并不在线。")
.params("player").build();
public static ConfiguredMessageList<String> SELECTED = ConfiguredMessageList.asStrings()
.defaults("&7您选择了 &f%(name) &7作为当前显示的前缀。")
@@ -48,6 +58,23 @@ public class PluginMessages extends ConfigurationRoot {
.params("error").build();
}
public static final class SET {
public static ConfiguredMessageList<String> SUCCESS = ConfiguredMessageList.asStrings()
.defaults("&a&l设置成功!&7成功设定玩家 &b%(player) &f的前缀为 &r%(prefix) &f。")
.params("player", "prefix").build();
public static ConfiguredMessageList<String> PREFIX_NOT_FOUND = ConfiguredMessageList.asStrings()
.defaults("&c&l无法设置!&7不存在ID为 &b%(prefix) &7的前缀。")
.params("prefix").build();
public static ConfiguredMessageList<String> NO_PERM = ConfiguredMessageList.asStrings()
.defaults("&c&l无法设置!&7玩家 &b%(player) &7并没有前缀 &r%(prefix) &7的前缀。")
.params("player", "prefix")
.build();
}
@HeaderComment("管理员使用的 “/upa list” 指令的格式")
public static final class LIST {
@@ -1,22 +1,18 @@
package cc.carm.plugin.userprefix.configuration.prefix;
package cc.carm.plugin.userprefix.conf.prefix;
import cc.carm.lib.easyplugin.gui.configuration.GUIActionConfiguration;
import cc.carm.lib.easyplugin.utils.ColorParser;
import cc.carm.lib.mineconfiguration.bukkit.data.ItemConfig;
import cc.carm.plugin.userprefix.manager.ServiceManager;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.util.List;
public class PrefixConfig {
private @Nullable File dataFile;
private @Nullable FileConfiguration configuration;
protected final @NotNull String identifier;
protected final @NotNull String name;
@@ -26,12 +22,15 @@ public class PrefixConfig {
protected final @Nullable String permission;
protected final @NotNull List<GUIActionConfiguration> actions;
protected final @NotNull ItemConfig itemHasPermission;
protected final @Nullable ItemConfig itemNoPermission;
protected final @Nullable ItemConfig itemWhenUsing;
public PrefixConfig(@NotNull String identifier, @NotNull String name,
@NotNull String content, int weight, @Nullable String permission,
@NotNull List<GUIActionConfiguration> actions,
@NotNull ItemConfig itemHasPermission,
@Nullable ItemConfig itemWhenUsing,
@Nullable ItemConfig itemNoPermission) {
@@ -40,6 +39,7 @@ public class PrefixConfig {
this.content = content;
this.weight = weight;
this.permission = permission;
this.actions = actions;
this.itemHasPermission = itemHasPermission;
this.itemNoPermission = itemNoPermission;
this.itemWhenUsing = itemWhenUsing;
@@ -90,6 +90,10 @@ public class PrefixConfig {
return getPermission() == null;
}
public void executeActions(@NotNull Player player) {
this.actions.forEach(action -> action.executeAction(player));
}
public boolean isVisible(Player player) {
return this.itemWhenUsing != null || checkPermission(player);
}
@@ -1,42 +0,0 @@
package cc.carm.plugin.userprefix.configuration.reader;
import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
import cc.carm.lib.easyplugin.gui.configuration.GUIActionConfiguration;
import cc.carm.lib.easyplugin.gui.configuration.GUIItemConfiguration;
import org.bukkit.Material;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
public class GUIItemReader {
public static @Nullable GUIItemConfiguration readFrom(@Nullable ConfigurationWrapper section) {
if (section == null) return null;
String material = Optional.ofNullable(section.getString("type")).orElse("STONE");
Material type = Optional.ofNullable(Material.matchMaterial(material)).orElse(Material.STONE);
int data = section.getInt("data", 0);
int amount = section.getInt("amount", 1);
String name = section.getString("name");
List<String> lore = section.getStringList("lore");
List<Integer> slots = section.getIntegerList("slots");
int slot = section.getInt("slot", 0);
List<String> actionsString = section.getStringList("actions");
List<GUIActionConfiguration> actions = new ArrayList<>();
for (String actionString : actionsString) {
GUIActionConfiguration action = GUIActionConfiguration.deserialize(actionString);
if (action == null) continue;
actions.add(action);
}
return new GUIItemConfiguration(
type, amount, data, name, lore, actions,
slots.size() > 0 ? slots : Collections.singletonList(slot)
);
}
}
@@ -1,7 +1,7 @@
package cc.carm.plugin.userprefix.event;
import cc.carm.plugin.userprefix.Main;
import cc.carm.plugin.userprefix.configuration.prefix.PrefixConfig;
import cc.carm.plugin.userprefix.conf.prefix.PrefixConfig;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList;
@@ -1,7 +1,7 @@
package cc.carm.plugin.userprefix.event;
import cc.carm.plugin.userprefix.Main;
import cc.carm.plugin.userprefix.configuration.prefix.PrefixConfig;
import cc.carm.plugin.userprefix.conf.prefix.PrefixConfig;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
@@ -2,7 +2,7 @@ package cc.carm.plugin.userprefix.hooker;
import cc.carm.plugin.userprefix.Main;
import cc.carm.plugin.userprefix.UserPrefixAPI;
import cc.carm.plugin.userprefix.configuration.prefix.PrefixConfig;
import cc.carm.plugin.userprefix.conf.prefix.PrefixConfig;
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
@@ -2,8 +2,7 @@ package cc.carm.plugin.userprefix.listener;
import cc.carm.lib.easyplugin.utils.MessageUtils;
import cc.carm.plugin.userprefix.Main;
import cc.carm.plugin.userprefix.configuration.PluginConfig;
import me.clip.placeholderapi.PlaceholderAPI;
import cc.carm.plugin.userprefix.conf.PluginConfig;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.AsyncPlayerChatEvent;
@@ -20,8 +19,8 @@ public class ChatListener implements Listener {
try {
event.setFormat(MessageUtils.setPlaceholders(event.getPlayer(), format));
} catch (Exception exception) {
Main.serve("请检查配置文件中聊天相关是否配置正确。");
Main.serve("Please check the chat configuration.");
Main.severe("请检查配置文件中聊天相关是否配置正确。");
Main.severe("Please check the chat configuration.");
exception.printStackTrace();
}
@@ -1,4 +1,4 @@
package cc.carm.plugin.userprefix.listener.processor;
package cc.carm.plugin.userprefix.listener;
import cc.carm.plugin.userprefix.Main;
import cc.carm.plugin.userprefix.UserPrefixAPI;
@@ -7,7 +7,7 @@ import net.luckperms.api.event.user.UserDataRecalculateEvent;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
public class UserNodeUpdateProcessor {
public class UserPermListener {
public static void process(UserDataRecalculateEvent event) {
Player player = Bukkit.getPlayer(event.getUser().getUniqueId());
@@ -3,8 +3,8 @@ package cc.carm.plugin.userprefix.manager;
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
import cc.carm.lib.easyplugin.utils.JarResourceUtils;
import cc.carm.lib.mineconfiguration.bukkit.MineConfiguration;
import cc.carm.plugin.userprefix.configuration.PluginConfig;
import cc.carm.plugin.userprefix.configuration.PluginMessages;
import cc.carm.plugin.userprefix.conf.PluginConfig;
import cc.carm.plugin.userprefix.conf.PluginMessages;
import java.io.File;
import java.io.IOException;
@@ -1,10 +1,10 @@
package cc.carm.plugin.userprefix.manager;
import cc.carm.lib.easyplugin.gui.configuration.GUIActionConfiguration;
import cc.carm.lib.mineconfiguration.bukkit.data.ItemConfig;
import cc.carm.lib.mineconfiguration.bukkit.source.CraftSectionWrapper;
import cc.carm.plugin.userprefix.Main;
import cc.carm.plugin.userprefix.configuration.PluginConfig;
import cc.carm.plugin.userprefix.configuration.prefix.PrefixConfig;
import cc.carm.plugin.userprefix.conf.PluginConfig;
import cc.carm.plugin.userprefix.conf.prefix.PrefixConfig;
import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration;
@@ -41,9 +41,9 @@ public class PrefixManager {
String[] filesList = prefixDataFolder.list();
if (filesList == null || filesList.length < 1) {
Main.serve("配置文件夹中暂无任何前缀配置问,请检查。");
Main.serve("There's no configured prefix.");
Main.serve("Path: " + prefixDataFolder.getAbsolutePath());
Main.severe("配置文件夹中暂无任何前缀配置问,请检查。");
Main.severe("There's no configured prefix.");
Main.severe("Path: " + prefixDataFolder.getAbsolutePath());
return;
}
@@ -57,12 +57,12 @@ public class PrefixManager {
if (files.size() > 0) {
for (File file : files) {
try {
PrefixConfig prefix = adPrefix(file);
PrefixConfig prefix = addPrefix(file);
Main.debugging("完成前缀加载 " + prefix.getIdentifier() + " : " + prefix.getName());
loaded.put(prefix.getIdentifier(), prefix);
} catch (Exception ex) {
Main.serve("在加载前缀 " + file.getAbsolutePath() + " 时出错,请检查配置!");
Main.serve("Error occurred when loading prefix #" + file.getAbsolutePath() + " !");
Main.severe("在加载前缀 " + file.getAbsolutePath() + " 时出错,请检查配置!");
Main.severe("Error occurred when loading prefix #" + file.getAbsolutePath() + " !");
ex.printStackTrace();
}
}
@@ -78,6 +78,7 @@ public class PrefixManager {
PluginConfig.DEFAULT_PREFIX.CONTENT.getNotNull(),
PluginConfig.DEFAULT_PREFIX.WEIGHT.getNotNull(),
null,
readActions(PluginConfig.DEFAULT_PREFIX.ACTIONS.get()),
PluginConfig.DEFAULT_PREFIX.ITEM.NOT_USING.getNotNull(),
PluginConfig.DEFAULT_PREFIX.ITEM.USING.get(),
null
@@ -122,10 +123,11 @@ public class PrefixManager {
}
}
public static @NotNull PrefixConfig adPrefix(@NotNull File file) throws Exception {
public static @NotNull PrefixConfig addPrefix(@NotNull File file) throws Exception {
FileConfiguration configuration = YamlConfiguration.loadConfiguration(file);
String identifier = configuration.getString("identifier");
if (identifier == null) throw new Exception("配置文件 " + file.getAbsolutePath() + " 中没有配置前缀的唯一标识。");
if (identifier == null)
throw new Exception("配置文件 " + file.getAbsolutePath() + " 中没有配置前缀的唯一标识。");
String name = configuration.getString("name");
if (name == null) throw new Exception("配置文件 " + file.getAbsolutePath() + " 中没有配置前缀的显示名称。");
@@ -135,6 +137,7 @@ public class PrefixManager {
configuration.getString("content", "&r"),
configuration.getInt("weight", 1),
configuration.getString("permission"),
readActions(configuration.getStringList("actions")),
readItem(
configuration.getConfigurationSection("item.has-perm"),
new ItemConfig(Material.STONE, name, Arrays.asList(" ", "§a➥ 点击切换到该前缀"))
@@ -148,8 +151,11 @@ public class PrefixManager {
@Contract("_,!null->!null")
protected static ItemConfig readItem(@Nullable ConfigurationSection section, @Nullable ItemConfig defaultValue) throws Exception {
if (section == null) return defaultValue;
else return ItemConfig.deserialize(CraftSectionWrapper.of(section));
else return ItemConfig.deserialize(section);
}
protected static List<GUIActionConfiguration> readActions(@NotNull List<String> strings) {
return strings.stream().map(GUIActionConfiguration::deserialize).filter(Objects::nonNull).collect(Collectors.toList());
}
}
@@ -3,9 +3,9 @@ package cc.carm.plugin.userprefix.manager;
import cc.carm.lib.easyplugin.gui.GUI;
import cc.carm.plugin.userprefix.Main;
import cc.carm.plugin.userprefix.UserPrefixAPI;
import cc.carm.plugin.userprefix.configuration.PluginConfig;
import cc.carm.plugin.userprefix.configuration.PluginMessages;
import cc.carm.plugin.userprefix.configuration.prefix.PrefixConfig;
import cc.carm.plugin.userprefix.conf.PluginConfig;
import cc.carm.plugin.userprefix.conf.PluginMessages;
import cc.carm.plugin.userprefix.conf.prefix.PrefixConfig;
import cc.carm.plugin.userprefix.event.UserPrefixChangeEvent;
import cc.carm.plugin.userprefix.event.UserPrefixExpireEvent;
import cc.carm.plugin.userprefix.hooker.UserNameTag;
@@ -141,9 +141,7 @@ public class UserManager {
}
UserPrefixChangeEvent.call(player, currentPrefix, newPrefix, (after) -> {
if (after != null) {
setPrefix(player, after, updateView);
}
if (after != null) setPrefix(player, after, updateView);
checkingPlayers.remove(player.getUniqueId());
});
@@ -183,6 +181,7 @@ public class UserManager {
*/
public void setPrefix(Player player, PrefixConfig prefix, boolean updateView) {
setPrefixData(player, prefix.getIdentifier());
prefix.executeActions(player);
if (updateView) updatePrefixView(player, false);
}
@@ -4,9 +4,10 @@ import cc.carm.lib.easyplugin.gui.GUIItem;
import cc.carm.lib.easyplugin.gui.GUIType;
import cc.carm.lib.easyplugin.gui.paged.AutoPagedGUI;
import cc.carm.plugin.userprefix.UserPrefixAPI;
import cc.carm.plugin.userprefix.configuration.PluginConfig;
import cc.carm.plugin.userprefix.configuration.PluginMessages;
import cc.carm.plugin.userprefix.configuration.prefix.PrefixConfig;
import cc.carm.plugin.userprefix.conf.PluginConfig;
import cc.carm.plugin.userprefix.conf.PluginMessages;
import cc.carm.plugin.userprefix.conf.prefix.PrefixConfig;
import cc.carm.plugin.userprefix.event.UserPrefixChangeEvent;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
@@ -51,15 +52,22 @@ public class PrefixSelectGUI extends AutoPagedGUI {
addItem(new GUIItem(prefix.getItemWhenUsing(player) != null ? prefix.getItemWhenUsing(player) : prefix.getItemHasPermission(player)));
} else if (prefix.checkPermission(player)) {
addItem(new GUIItem(prefix.getItemHasPermission(player)) {
@Override
public void onClick(ClickType type) {
public void onClick(Player clicker, ClickType type) {
player.closeInventory();
//再次检查,防止打开GUI后、选择前的时间段内权限消失
if (prefix.checkPermission(player)) {
UserPrefixAPI.getUserManager().setPrefix(player, prefix, true);
// 发送消息与提示
PluginConfig.SOUNDS.PREFIX_CHANGE.playTo(player);
PluginMessages.SELECTED.send(player, prefix.getName());
UserPrefixChangeEvent.call(player, usingPrefix, prefix, config -> {
if (config == null) return;
UserPrefixAPI.getUserManager().setPrefix(player, config, true);
});
} else {
PluginConfig.SOUNDS.GUI_CLICK.playTo(player);
}
@@ -68,7 +76,7 @@ public class PrefixSelectGUI extends AutoPagedGUI {
} else {
addItem(new GUIItem(prefix.getItemNoPermission(player)) {
@Override
public void onClick(ClickType type) {
public void onClick(Player clicker, ClickType type) {
PluginConfig.SOUNDS.GUI_CLICK.playTo(player);
}
});
@@ -22,6 +22,11 @@ weight: 1
# (because it is impossible to display items without permission at all)
permission: "yc.vip"
# Actions when select [Unnecessary]
# Please check https://github.com/CarmJos/UserPrefix/tree/master/.documentation/ACTIONS.md
actions:
- "[CONSOLE] say %player_name% selected PRO "
item:
# itemHasPermission [Necessary]
# This Item will be displayed when player has permission
@@ -22,6 +22,13 @@ weight: 1
# 如果没有就是人人都能用,也代表不用配置“itemNoPermission”了(因为压根不可能显示没权限时候的物品)
permission: "yc.pro"
# 选择这个前缀时执行的操作 [非必须]
# 用于在玩家选择/取消选择前缀时执行相应动作,以便于实现一些特殊的功能。
# 具体操作类型详见介绍,前缀操作不支持限定点击类型。
# https://github.com/CarmJos/UserPrefix/tree/master/.documentation/ACTIONS.md
actions:
- "[CONSOLE] say %player_name% 选择了 Pro会员前缀 "
# 该前缀的GUI物品配置
item: