mirror of
https://github.com/CarmJos/EasyPlugin.git
synced 2026-06-05 00:58:17 +08:00
Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ce1538003b | |||
| fa4a97d60d | |||
| 85b7179867 | |||
| 391f9b6389 | |||
| 0e74d6864c | |||
| f5d2022d8b | |||
| d7303719dd | |||
| 76b15f0cda | |||
| f97fd97a3c |
@@ -26,7 +26,7 @@ jobs:
|
||||
server-password: MAVEN_TOKEN
|
||||
|
||||
- name: "Maven Deploy"
|
||||
run: mvn -B -Pgithub deploy --file pom.xml -DskipTests
|
||||
run: mvn -B -Pgithub deploy --file pom.xml -DskipTests -Dgpg.skip
|
||||
env:
|
||||
MAVEN_USERNAME: ${{ github.repository_owner }}
|
||||
MAVEN_TOKEN: ${{secrets.GITHUB_TOKEN}}
|
||||
@@ -42,9 +42,8 @@ jobs:
|
||||
java-version: '8'
|
||||
distribution: 'adopt'
|
||||
cache: maven
|
||||
|
||||
- name: "Maven Deploy"
|
||||
run: mvn -B -Plocal deploy --file pom.xml -DskipTests
|
||||
run: mvn -B -Plocal deploy --file pom.xml -DskipTests -Dgpg.skip
|
||||
|
||||
- name: "Copy artifacts"
|
||||
run: |
|
||||
|
||||
@@ -25,7 +25,7 @@ jobs:
|
||||
server-username: MAVEN_USERNAME
|
||||
server-password: MAVEN_TOKEN
|
||||
- name: "Package"
|
||||
run: mvn -B package --file pom.xml -Dmaven.javadoc.skip=true
|
||||
run: mvn -B package --file pom.xml -Dmaven.javadoc.skip=true -Dgpg.skip
|
||||
env:
|
||||
MAVEN_USERNAME: ${{ github.repository_owner }}
|
||||
MAVEN_TOKEN: ${{secrets.GITHUB_TOKEN}}
|
||||
@@ -36,6 +36,9 @@
|
||||
|
||||
### 主要部分 (`/base`)
|
||||
|
||||
- Color [`easyplugin-color`](base/color)
|
||||
- 颜色工具类模块,提供功能全面的MC颜色解析转换工具。
|
||||
- 支持 `&+颜色代码`(原版颜色)、`§(#XXXXXX)`(RGB颜色) 与 `&<#XXXXXX>`(前后标注RGB颜色渐变)。
|
||||
- Utils [`easyplugin-utils`](base/utils)
|
||||
- 通用工具类模块,该模块中的内容支持在Bungee、Bukkit使用。
|
||||
- 本模块提供
|
||||
@@ -69,6 +72,7 @@
|
||||
### 附属部分 (`/extension`)
|
||||
|
||||
- [PlaceholderAPI](https://www.spigotmc.org/resources/6245/) [`easyplugin-placeholderapi`](extension/papi)
|
||||
- PlaceholderAPI 扩展模块,提供了方便的 PlaceholderAPI 变量注册方法。
|
||||
- [Vault](https://github.com/MilkBowl/VaultAPI)* [`easyplugin-vault`](extension/vault)
|
||||
|
||||
## 开发
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
<parent>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<version>1.5.1</version>
|
||||
<version>1.5.5</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<properties>
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<version>1.5.5</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<properties>
|
||||
<maven.compiler.source>${project.jdk.version}</maven.compiler.source>
|
||||
<maven.compiler.target>${project.jdk.version}</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
|
||||
</properties>
|
||||
<artifactId>easyplugin-command-alias</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>EasyPlugin-Command-Alias</name>
|
||||
<description>轻松插件指令别名映射模块,支持将插件内复杂的子指令简化为一个单独的指令,方便玩家使用。</description>
|
||||
<url>https://github.com/CarmJos/EasyPlugin</url>
|
||||
|
||||
<developers>
|
||||
<developer>
|
||||
<id>CarmJos</id>
|
||||
<name>Carm Jos</name>
|
||||
<email>carm@carm.cc</email>
|
||||
<url>https://www.carm.cc</url>
|
||||
</developer>
|
||||
</developers>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>The MIT License</name>
|
||||
<url>https://opensource.org/licenses/MIT</url>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<issueManagement>
|
||||
<system>GitHub Issues</system>
|
||||
<url>https://github.com/CarmJos/EasyPlugin/issues</url>
|
||||
</issueManagement>
|
||||
|
||||
<ciManagement>
|
||||
<system>GitHub Actions</system>
|
||||
<url>https://github.com/CarmJos/EasyPlugin/actions/workflows/maven.yml</url>
|
||||
</ciManagement>
|
||||
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
+51
@@ -0,0 +1,51 @@
|
||||
package cc.carm.lib.easyplugin.command.alias;
|
||||
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.command.SimpleCommandMap;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
public class AliasCommand extends Command {
|
||||
|
||||
protected final AliasCommandManager aliasCommandManager;
|
||||
protected final String targetCommand;
|
||||
|
||||
public AliasCommand(String name, AliasCommandManager aliasCommandManager, String targetCommand) {
|
||||
super(name);
|
||||
this.aliasCommandManager = aliasCommandManager;
|
||||
this.targetCommand = targetCommand;
|
||||
}
|
||||
|
||||
protected SimpleCommandMap getCommandMap() {
|
||||
return this.aliasCommandManager.getCommandMap();
|
||||
}
|
||||
|
||||
protected String buildCommand(String[] args) {
|
||||
return this.targetCommand + " " + String.join(" ", args);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, @NotNull String[] args) {
|
||||
return getCommandMap().dispatch(sender, buildCommand(args));
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias,
|
||||
@NotNull String[] args, @Nullable Location location) throws IllegalArgumentException {
|
||||
return Optional.ofNullable(getCommandMap().tabComplete(sender, buildCommand(args))).orElse(Collections.emptyList());
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException {
|
||||
return tabComplete(sender, alias, args, null);
|
||||
}
|
||||
|
||||
}
|
||||
+88
@@ -0,0 +1,88 @@
|
||||
package cc.carm.lib.easyplugin.command.alias;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.SimpleCommandMap;
|
||||
import org.bukkit.plugin.SimplePluginManager;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 指令简化别名(简化映射)管理器
|
||||
* <br>支持将插件内复杂的子指令简化为一个单独的指令,方便玩家使用。
|
||||
*/
|
||||
public class AliasCommandManager {
|
||||
|
||||
protected final @NotNull JavaPlugin plugin;
|
||||
protected final @NotNull String prefix;
|
||||
|
||||
protected final @NotNull SimpleCommandMap commandMap;
|
||||
protected final @NotNull Field knownCommandsFiled;
|
||||
|
||||
protected final @NotNull Map<String, AliasCommand> registeredCommands = new HashMap<>();
|
||||
|
||||
public AliasCommandManager(@NotNull JavaPlugin plugin) throws Exception {
|
||||
this(plugin, plugin.getName());
|
||||
}
|
||||
|
||||
public AliasCommandManager(@NotNull JavaPlugin plugin, @NotNull String prefix) throws Exception {
|
||||
this.plugin = plugin;
|
||||
this.prefix = prefix.trim();
|
||||
|
||||
SimplePluginManager manager = (SimplePluginManager) Bukkit.getPluginManager();
|
||||
Field commandMapField = SimplePluginManager.class.getDeclaredField("commandMap");
|
||||
commandMapField.setAccessible(true);
|
||||
this.commandMap = (SimpleCommandMap) commandMapField.get(manager);
|
||||
|
||||
this.knownCommandsFiled = SimpleCommandMap.class.getDeclaredField("knownCommands");
|
||||
this.knownCommandsFiled.setAccessible(true);
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
protected Map<String, Command> getKnownCommands() {
|
||||
try {
|
||||
return (Map<String, Command>) knownCommandsFiled.get(commandMap);
|
||||
} catch (IllegalAccessException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return new HashMap<>();
|
||||
}
|
||||
|
||||
protected @NotNull SimpleCommandMap getCommandMap() {
|
||||
return commandMap;
|
||||
}
|
||||
|
||||
public String getCommandPrefix() {
|
||||
return this.prefix;
|
||||
}
|
||||
|
||||
public void register(@NotNull String alias, @NotNull String subCommand) {
|
||||
AliasCommand current = this.registeredCommands.get(alias);
|
||||
if (current != null) current.unregister(getCommandMap());
|
||||
|
||||
AliasCommand cmd = new AliasCommand(alias, this, getCommandPrefix() + " " + subCommand);
|
||||
this.registeredCommands.put(alias, cmd);
|
||||
getCommandMap().register(plugin.getName(), cmd);
|
||||
}
|
||||
|
||||
public void unregister(@NotNull String alias) {
|
||||
AliasCommand current = this.registeredCommands.remove(alias);
|
||||
if (current != null) {
|
||||
getKnownCommands().remove(alias);
|
||||
current.unregister(getCommandMap());
|
||||
}
|
||||
}
|
||||
|
||||
public void unregisterAll() {
|
||||
registeredCommands.forEach((k, v) -> {
|
||||
getKnownCommands().remove(k);
|
||||
v.unregister(getCommandMap());
|
||||
});
|
||||
registeredCommands.clear();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>1.5.1</version>
|
||||
<version>1.5.5</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>1.5.1</version>
|
||||
<version>1.5.5</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@@ -117,7 +117,7 @@ public class CommonPagedGUI extends PagedGUI {
|
||||
* @return 最后一页的页码
|
||||
*/
|
||||
public int getLastPageNumber() {
|
||||
return (this.container.size() / range.length) + 1;
|
||||
return (this.container.size() / range.length) + ((this.container.size() % range.length) == 0 ? 0 : 1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>1.5.1</version>
|
||||
<version>1.5.5</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<parent>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<version>1.5.1</version>
|
||||
<version>1.5.5</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<properties>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>1.5.1</version>
|
||||
<version>1.5.5</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<version>1.5.5</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<properties>
|
||||
<maven.compiler.source>${project.jdk.version}</maven.compiler.source>
|
||||
<maven.compiler.target>${project.jdk.version}</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
|
||||
</properties>
|
||||
<artifactId>easyplugin-user</artifactId>
|
||||
|
||||
<developers>
|
||||
<developer>
|
||||
<id>CarmJos</id>
|
||||
<name>Carm Jos</name>
|
||||
<email>carm@carm.cc</email>
|
||||
<url>https://www.carm.cc</url>
|
||||
</developer>
|
||||
</developers>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>The MIT License</name>
|
||||
<url>https://opensource.org/licenses/MIT</url>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<issueManagement>
|
||||
<system>GitHub Issues</system>
|
||||
<url>https://github.com/CarmJos/EasyPlugin/issues</url>
|
||||
</issueManagement>
|
||||
|
||||
<ciManagement>
|
||||
<system>GitHub Actions</system>
|
||||
<url>https://github.com/CarmJos/EasyPlugin/actions/workflows/maven.yml</url>
|
||||
</ciManagement>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>${project.parent.groupId}</groupId>
|
||||
<artifactId>easyplugin-main</artifactId>
|
||||
<version>${project.parent.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
@@ -0,0 +1,32 @@
|
||||
package cc.carm.lib.easyplugin.user;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
public abstract class UserData<K> {
|
||||
|
||||
protected final @NotNull K key;
|
||||
|
||||
protected UserData(@NotNull K key) {
|
||||
this.key = key;
|
||||
}
|
||||
|
||||
public @NotNull K getKey() {
|
||||
return key;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) return true;
|
||||
if (o == null || getClass() != o.getClass()) return false;
|
||||
UserData<?> userData = (UserData<?>) o;
|
||||
return key.equals(userData.key);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(key);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,245 @@
|
||||
package cc.carm.lib.easyplugin.user;
|
||||
|
||||
import cc.carm.lib.easyplugin.EasyPlugin;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.OfflinePlayer;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.jetbrains.annotations.Unmodifiable;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.function.Consumer;
|
||||
import java.util.function.Function;
|
||||
import java.util.function.Predicate;
|
||||
import java.util.function.Supplier;
|
||||
import java.util.logging.Logger;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public abstract class UserDataManager<K, U extends UserData<K>> {
|
||||
|
||||
protected final @NotNull EasyPlugin plugin;
|
||||
|
||||
protected final @NotNull ExecutorService executor;
|
||||
protected final @NotNull Map<K, U> dataCache;
|
||||
|
||||
public UserDataManager(@NotNull EasyPlugin plugin) {
|
||||
this(plugin, Executors.newCachedThreadPool((r) -> {
|
||||
Thread t = new Thread(r);
|
||||
t.setDaemon(true);
|
||||
t.setName(plugin.getName() + "-UserManager");
|
||||
return t;
|
||||
}), new ConcurrentHashMap<>());
|
||||
}
|
||||
|
||||
public UserDataManager(@NotNull EasyPlugin plugin, @NotNull ExecutorService executor) {
|
||||
this(plugin, executor, new ConcurrentHashMap<>());
|
||||
}
|
||||
|
||||
public UserDataManager(@NotNull EasyPlugin plugin, @NotNull ExecutorService executor, @NotNull Map<K, U> cacheMap) {
|
||||
this.plugin = plugin;
|
||||
this.executor = executor;
|
||||
this.dataCache = cacheMap;
|
||||
}
|
||||
|
||||
public void shutdown() {
|
||||
this.executor.shutdown();
|
||||
}
|
||||
|
||||
protected @NotNull EasyPlugin getPlugin() {
|
||||
return plugin;
|
||||
}
|
||||
|
||||
protected @NotNull Logger getLogger() {
|
||||
return getPlugin().getLogger();
|
||||
}
|
||||
|
||||
public String serializeKey(@NotNull K key) {
|
||||
return key.toString();
|
||||
}
|
||||
|
||||
public abstract @NotNull U empty(@NotNull K key);
|
||||
|
||||
protected abstract @Nullable U loadData(@NotNull K key) throws Exception;
|
||||
|
||||
protected abstract void saveData(@NotNull U data) throws Exception;
|
||||
|
||||
public @NotNull CompletableFuture<U> load(@NotNull K key) {
|
||||
return load(key, false);
|
||||
}
|
||||
|
||||
public @NotNull CompletableFuture<U> load(@NotNull K key, boolean cache) {
|
||||
return load(key, () -> cache);
|
||||
}
|
||||
|
||||
public @NotNull Map<K, U> getDataCache() {
|
||||
return dataCache;
|
||||
}
|
||||
|
||||
@Unmodifiable
|
||||
public @NotNull Set<U> list() {
|
||||
return ImmutableSet.copyOf(getDataCache().values());
|
||||
}
|
||||
|
||||
public @NotNull U get(@NotNull K key) {
|
||||
return Optional.ofNullable(getNullable(key)).orElseThrow(() -> new NullPointerException("User " + key + " not found."));
|
||||
}
|
||||
|
||||
public @Nullable U getNullable(@NotNull K key) {
|
||||
return getDataCache().get(key);
|
||||
}
|
||||
|
||||
public @NotNull Optional<@Nullable U> getOptional(@NotNull K key) {
|
||||
return Optional.ofNullable(getNullable(key));
|
||||
}
|
||||
|
||||
public @NotNull CompletableFuture<U> load(@NotNull K key, @NotNull Supplier<Boolean> cacheCondition) {
|
||||
return CompletableFuture.supplyAsync(() -> {
|
||||
String identifier = serializeKey(key);
|
||||
|
||||
try {
|
||||
long s1 = System.currentTimeMillis();
|
||||
getPlugin().debug("开始加载用户 " + identifier + " 的数据...");
|
||||
U data = loadData(key);
|
||||
if (data == null) {
|
||||
getPlugin().debug("数据库内不存在用户 " + identifier + " 的数据,视作新档案。");
|
||||
return empty(key);
|
||||
} else {
|
||||
getPlugin().debug("加载用户 " + identifier + " 的数据完成,耗时 " + (System.currentTimeMillis() - s1) + " ms.");
|
||||
return data;
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
getPlugin().error("加载用户 " + serializeKey(key) + " 数据失败,请检查相关配置!");
|
||||
ex.printStackTrace();
|
||||
return empty(key);
|
||||
}
|
||||
|
||||
}, executor).thenApply((data) -> {
|
||||
if (cacheCondition.get()) dataCache.put(key, data);
|
||||
return data;
|
||||
});
|
||||
}
|
||||
|
||||
public @NotNull CompletableFuture<Boolean> save(@NotNull U user) {
|
||||
return CompletableFuture.supplyAsync(() -> {
|
||||
String identifier = serializeKey(user.getKey());
|
||||
|
||||
try {
|
||||
long s1 = System.currentTimeMillis();
|
||||
getPlugin().debug("开始保存用户 " + identifier + " 的数据...");
|
||||
saveData(user);
|
||||
getPlugin().debug("保存用户 " + identifier + " 的数据完成,耗时 " + (System.currentTimeMillis() - s1) + " ms.");
|
||||
return true;
|
||||
} catch (Exception ex) {
|
||||
getPlugin().error("保存用户 " + identifier + " 数据失败,请检查相关配置!");
|
||||
ex.printStackTrace();
|
||||
return false;
|
||||
}
|
||||
|
||||
}, executor);
|
||||
}
|
||||
|
||||
public @NotNull CompletableFuture<Boolean> unload(@NotNull K key) {
|
||||
return unload(key, true);
|
||||
}
|
||||
|
||||
public @NotNull CompletableFuture<Boolean> unload(@NotNull K key, boolean save) {
|
||||
U data = getNullable(key);
|
||||
if (data == null) return CompletableFuture.completedFuture(false);
|
||||
|
||||
if (save) {
|
||||
return save(data).thenApply(result -> {
|
||||
this.dataCache.remove(key);
|
||||
return result;
|
||||
});
|
||||
} else {
|
||||
this.dataCache.remove(key);
|
||||
return CompletableFuture.completedFuture(true);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public @NotNull CompletableFuture<Boolean> modify(@NotNull K key, @NotNull Consumer<U> consumer) {
|
||||
U cached = getNullable(key);
|
||||
if (cached != null) {
|
||||
return CompletableFuture.supplyAsync(() -> {
|
||||
consumer.accept(cached);
|
||||
return true;
|
||||
}, executor);
|
||||
} else {
|
||||
return load(key, false).thenApply((data) -> {
|
||||
consumer.accept(data);
|
||||
return data;
|
||||
}).thenCompose(this::save);
|
||||
}
|
||||
}
|
||||
|
||||
public <V> @NotNull CompletableFuture<V> peek(@NotNull K key, @NotNull Function<U, V> function) {
|
||||
U cached = getNullable(key);
|
||||
if (cached != null) {
|
||||
return CompletableFuture.supplyAsync(() -> function.apply(cached), executor);
|
||||
} else {
|
||||
return load(key, false).thenApply(function);
|
||||
}
|
||||
}
|
||||
|
||||
public @NotNull CompletableFuture<Map<K, U>> loadOnline(@NotNull Function<Player, ? extends K> function) {
|
||||
return loadGroup(Bukkit.getOnlinePlayers(), function, OfflinePlayer::isOnline);
|
||||
}
|
||||
|
||||
public <T> @NotNull CompletableFuture<Map<K, U>> loadGroup(@NotNull Collection<? extends T> users,
|
||||
@NotNull Function<? super T, ? extends K> function,
|
||||
@NotNull Predicate<T> cacheCondition) {
|
||||
CompletableFuture<Map<K, U>> task = CompletableFuture.completedFuture(new ConcurrentHashMap<>());
|
||||
if (users.isEmpty()) return task;
|
||||
|
||||
Map<K, T> usersMap = users.stream().collect(Collectors.toMap(function, Function.identity()));
|
||||
for (Map.Entry<K, T> entry : usersMap.entrySet()) {
|
||||
K key = entry.getKey();
|
||||
T user = entry.getValue();
|
||||
task = task.thenCombine(
|
||||
load(key, () -> cacheCondition.test(user)),
|
||||
(map, result) -> {
|
||||
map.put(key, result);
|
||||
return map;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
return task.thenApply(Collections::unmodifiableMap);
|
||||
}
|
||||
|
||||
public @NotNull CompletableFuture<Map<K, U>> loadGroup(@NotNull Collection<K> allKeys,
|
||||
@NotNull Predicate<K> cacheCondition) {
|
||||
return loadGroup(allKeys, Function.identity(), cacheCondition);
|
||||
}
|
||||
|
||||
public @NotNull CompletableFuture<Map<K, U>> loadGroup(@NotNull Collection<K> allKeys) {
|
||||
return loadGroup(allKeys, (v) -> false);
|
||||
}
|
||||
|
||||
public @NotNull CompletableFuture<Integer> saveAll() {
|
||||
CompletableFuture<Integer> future = CompletableFuture.completedFuture(0);
|
||||
if (getDataCache().isEmpty()) return future;
|
||||
|
||||
for (U value : getDataCache().values()) {
|
||||
future = future.thenCombine(save(value), (before, result) -> before + (result ? 1 : 0));
|
||||
}
|
||||
|
||||
return future;
|
||||
}
|
||||
|
||||
public @NotNull CompletableFuture<Integer> unloadAll() {
|
||||
return saveAll().thenApply(result -> {
|
||||
getDataCache().clear();
|
||||
return result;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>1.5.1</version>
|
||||
<version>1.5.5</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>1.5.1</version>
|
||||
<version>1.5.5</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>1.5.1</version>
|
||||
<version>1.5.5</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>1.5.1</version>
|
||||
<version>1.5.5</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>1.5.1</version>
|
||||
<version>1.5.5</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
+6
@@ -1,7 +1,9 @@
|
||||
package cc.carm.lib.easyplugin.updatechecker;
|
||||
|
||||
import cc.carm.lib.githubreleases4j.GithubReleases4J;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.util.List;
|
||||
@@ -31,6 +33,10 @@ public class GHUpdateChecker {
|
||||
return of(plugin).createRunner(plugin.getDescription().getVersion());
|
||||
}
|
||||
|
||||
public static @NotNull BukkitTask run(@NotNull Plugin plugin) {
|
||||
return Bukkit.getScheduler().runTaskAsynchronously(plugin, runner(plugin));
|
||||
}
|
||||
|
||||
protected final @NotNull Logger logger;
|
||||
protected final @NotNull String owner;
|
||||
protected final @NotNull String repo;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>1.5.1</version>
|
||||
<version>1.5.5</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
@@ -21,6 +21,7 @@
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>EasyPlugin-PlaceholderAPI</name>
|
||||
<description>EasyPlugin的 PlaceholderAPI 扩展模块,提供了方便的 PlaceholderAPI 变量注册方法。</description>
|
||||
|
||||
<dependencies>
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>1.5.1</version>
|
||||
<version>1.5.5</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>1.5.1</version>
|
||||
<version>1.5.5</version>
|
||||
<modules>
|
||||
<module>base/color</module>
|
||||
<module>base/utils</module>
|
||||
@@ -24,7 +24,9 @@
|
||||
<module>base/messages</module>
|
||||
<module>base/gui</module>
|
||||
<module>base/command</module>
|
||||
<module>base/command-alias</module>
|
||||
<module>base/storage</module>
|
||||
<module>base/user</module>
|
||||
|
||||
<module>extension/papi</module>
|
||||
<module>extension/vault</module>
|
||||
@@ -205,6 +207,37 @@
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-gpg-plugin</artifactId>
|
||||
<version>3.0.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>sign-artifacts</id>
|
||||
<phase>verify</phase>
|
||||
<goals>
|
||||
<goal>sign</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<gpgArguments>
|
||||
<arg>--pinentry-mode</arg>
|
||||
<arg>loopback</arg>
|
||||
</gpgArguments>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-release-plugin</artifactId>
|
||||
<version>2.5.3</version>
|
||||
<configuration>
|
||||
<autoVersionSubmodules>true</autoVersionSubmodules>
|
||||
<useReleaseProfile>false</useReleaseProfile>
|
||||
<releaseProfiles>release</releaseProfiles>
|
||||
<goals>deploy</goals>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
|
||||
Reference in New Issue
Block a user