1
mirror of https://github.com/CarmJos/MoeTeleport.git synced 2026-06-05 00:28:16 +08:00

42 Commits

Author SHA1 Message Date
carm e1c913dc00 Create FUNDING.yml 2022-02-25 06:45:18 +08:00
carm 4afcf85d65 Update README.md 2022-02-25 06:09:50 +08:00
carm c31bf8df65 Update README.md 2022-02-25 06:09:06 +08:00
carm fa958f8507 [no ci] 移除对于“mysql”存储方式的推荐标签 2022-02-25 06:05:27 +08:00
carm df7acc369f 修改空格行数 2022-02-25 05:57:43 +08:00
carm 120e8491d2 修改jdbc的URL 2022-02-25 05:49:56 +08:00
carm 90a1da8629 delHome添加limit限定 2022-02-25 05:46:56 +08:00
carm e81055e3f2 修复数据库保存传参错误的问题 2022-02-25 05:46:25 +08:00
carm f3c5ff6eb6 修改数据库配置读取方式,使其更简单明了 2022-02-25 05:43:47 +08:00
carm e186e5ea0a 修复报错空lastLocation的问题 2022-02-25 05:37:41 +08:00
carm 623fc36c20 修复报错空lastLocation的问题 2022-02-25 05:33:53 +08:00
carm 0f112280be 启动与卸载时输出插件信息 2022-02-25 05:25:09 +08:00
carm a2ae3f83f4 启动与卸载时输出插件信息 2022-02-25 05:22:28 +08:00
carm c350bb2037 启动与卸载时输出插件信息 2022-02-25 05:22:20 +08:00
carm 67a8b60670 指定API-VERSION 2022-02-25 05:17:16 +08:00
carm 848d3aaa33 支持 #6 中提到的 Essential 存储 2022-02-25 05:10:16 +08:00
carm 061b41b1a3 Merge remote-tracking branch 'origin/master' 2022-02-25 04:40:55 +08:00
carm 7bfef559d4 [3.0.0] 版本更新
- [F] 修复玩家给自己发送传送请求的问题。
- [A] 添加 插件更新 提示,允许自定义开关。
- [A] 添加 插件统计,允许自定义开关。
- [A] 实现 #6 提到的多数据源支持,目前支持 YAML、JSON与MySQL,并提供CUSTOM数据源允许开发者重写。
- [A] 对于家的名字长度做出限制,为 30 个字符。
- [U] 对于判断用户最多设置家数量的权限,不再添加“MoeTeleport”开头。
2022-02-25 04:40:45 +08:00
carm 947799e8b2 [2.1.0] 版本更新
- [F] 修复玩家给自己发送传送请求的问题。
- [A] 添加 插件更新 提示,允许自定义开关。
- [A] 添加 插件统计,允许自定义开关。
- [A] 实现 #6 提到的多数据源支持,目前支持 YAML、JSON与MySQL,并提供CUSTOM数据源允许开发者重写。
- [A] 对于家的名字长度做出限制,为 30 个字符。
- [U] 对于判断用户最多设置家数量的权限,不再添加“MoeTeleport”开头。
2022-02-25 04:38:58 +08:00
carm 5424c389ce [2.1.0] 版本更新
- [F] 修复玩家给自己发送传送请求的问题。
- [A] 添加 插件更新 提示,允许自定义开关。
- [A] 添加 插件统计,允许自定义开关。
- [A] 实现 #6 提到的多数据源支持,目前支持 YAML、JSON与MySQL,并提供CUSTOM数据源允许开发者重写。
- [A] 对于家的名字长度做出限制,为 30 个字符。
- [U] 对于判断用户最多设置家数量的权限,不再添加“MoeTeleport”开头。
2022-02-25 04:38:46 +08:00
carm 740670e19a 添加clean配置 2022-02-24 16:07:47 +08:00
carm a66a30abc4 [2.0.2] 版本修复
- [F] 修复玩家可以给自己发送传送请求的问题
2022-02-24 16:00:42 +08:00
carm 948b4f1915 [F] 修复玩家可以给自己发送传送请求的问题 2022-02-24 16:00:24 +08:00
carm b5f6794a85 Update feature_issues.md 2022-02-24 15:54:35 +08:00
carm ee31e501c8 Update bugs_report.md 2022-02-24 15:54:04 +08:00
carm e6ada9ed47 Update README.md 2022-02-24 06:36:36 +08:00
carm 9dea97bc79 Merge pull request #4 from Msyial/master
Add a clickable text for back command
2022-02-20 07:37:09 +08:00
Z1SHU 7ac6f4ebb7 Update messages.yml 2022-02-20 07:35:38 +08:00
carm 0bd002d606 移除 asset 的上传 2022-02-19 16:06:41 +08:00
carm 8bc2f0dba5 [2.0.1] 版本更新
- [F] 修复MoeTeleport指令错误的问题。
2022-02-18 20:59:02 +08:00
carm 9ee18d0f3c [2.0.0] 版本更新
- [A] 添加消息点击执行功能(基于MineDown实现)。
2022-02-18 20:44:26 +08:00
carm b311820483 [1.2.1] 版本更新
- [A] 添加重载指令。
- [U] 令方块安全检测更加宽松。
- [F] 修复非玩家离开游戏情况下数据不保存的问题。
2022-02-18 20:21:01 +08:00
carm b8d2d060dc [1.2.1] 版本更新
- [A] 添加重载指令。
- [U] 令方块安全检测更加宽松。
- [F] 修复非玩家离开游戏情况下数据不保存的问题。
2022-02-18 20:17:05 +08:00
carm 3b3e678fc7 测试构建同时上传产物 2022-02-18 19:52:47 +08:00
carm 47dfad862b [1.2.0] 版本更新
- [R] 使用空格代替制表符进行格式化。
- [F] 修复通过 PlugMan 等第三方插件进行重载时插件功能失效的问题。(来源 #2)
2022-02-18 19:50:44 +08:00
carm aa723087d4 [1.2.0] 版本更新
- [R] 使用空格代替制表符进行格式化。
- [F] 修复通过 PlugMan 等第三方插件进行重载时插件功能失效的问题。
2022-02-18 19:49:56 +08:00
carm 55a692243d 完善介绍内容。 2022-02-18 19:22:30 +08:00
carm 7862a698bd [v1.1.1] 取消cache 2022-01-22 18:52:11 +08:00
carm 351f9a8590 [v1.1.1] 修改构件名 2022-01-22 18:46:57 +08:00
carm ce3226ee18 [v1.1.0] 修复权限判断异常的问题 2022-01-22 18:45:19 +08:00
carm 5461063263 [F] 修复无法读取权限的错误 2021-12-18 01:08:41 +08:00
carm c7b0bf8261 [F] 修复名称错误 2021-12-17 21:01:43 +08:00
56 changed files with 2645 additions and 1110 deletions
+2
View File
@@ -0,0 +1,2 @@
custom: ['https://donate.carm.cc']
+7 -5
View File
@@ -8,23 +8,25 @@ assignees: ''
---
**问题简述**
用简短的话语描述一下大概问题。
<!--用简短的话语描述一下大概问题。-->
**问题来源**
<!--
描述一下通过哪些操作才发现的问题,如:
1. 打开 '...'
2. 点击了 '....'
3. 出现了报错 '....'
-->
**预期结果**(可选)
如果问题不发生,应该是什么情况
<!--如果问题不发生,应该是什么情况-->
**问题截图/问题报错**
如果有报错或输出,请提供截图。
<!--如果有报错或输出,请提供截图。-->
**操作环境**
请在后台输入 `version` 并复制相关输出。
<!--请在后台输入 `version` 并复制相关输出。-->
**其他补充**
如有其他补充,可以在这里描述。
<!--如有其他补充,可以在这里描述。-->
+4 -4
View File
@@ -8,13 +8,13 @@ assignees: ''
---
**功能简述**
简单的描述一下你想要的功能
<!--简单的描述一下你想要的功能-->
**需求来源**
简单的描述一下为什么需要这个功能。
<!--简单的描述一下为什么需要这个功能。-->
**功能参考**(可选)
如果有相关功能的参考,如文本、截图,请提供给我们。
<!--如果有相关功能的参考,如文本、截图,请提供给我们。-->
**附加内容**
如果有什么小细节需要重点注意,请在这里告诉我们。
<!--如果有什么小细节需要重点注意,请在这里告诉我们。-->
+9 -4
View File
@@ -1,7 +1,7 @@
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
name: Build
name: Build & Tests
on:
# 支持手动触发构建
@@ -29,10 +29,15 @@ jobs:
env:
MAVEN_USERNAME: ${{ github.repository_owner }}
MAVEN_TOKEN: ${{secrets.GITHUB_TOKEN}}
- name: "Target Stage"
run: mkdir staging && cp target/*.jar staging
- name: "Target Staging"
run: |
mkdir artifacts
cp -vrf target/ artifacts/target/
cp -vrf asset/*.jar artifacts
- name: "Upload artifact"
uses: actions/upload-artifact@v2
with:
name: Artifact
path: staging
path: artifacts
+38
View File
@@ -0,0 +1,38 @@
name: Release Version
on:
release:
types:
- published # 创建release的时候触发
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: "Set up JDK"
uses: actions/setup-java@v2
with:
java-version: '11'
distribution: 'adopt'
# cache: maven
server-id: github
server-username: MAVEN_USERNAME
server-password: MAVEN_TOKEN
- name: "Package"
run: mvn -B package --file pom.xml -Dmaven.javadoc.skip=true -DskipTests
env:
MAVEN_USERNAME: ${{ github.repository_owner }}
MAVEN_TOKEN: ${{secrets.GITHUB_TOKEN}}
- name: "Upload Release Asset"
id: upload-release-asset
uses: shogo82148/actions-upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ github.event.release.upload_url }}
asset_path: asset/*.jar
asset_content_type: application/java-archive
+1
View File
@@ -2,3 +2,4 @@
/target/
./*.iml
*.iml
asset/
+37 -3
View File
@@ -11,13 +11,39 @@
# MoeTeleport 喵喵传送
简单的传送请求插件,支持设置家与返回上一个地点
开源的传送插件,包含数个功能,并根据用户需求持续更新添加新功能
项目代码符合开发规范,适合新手开发者学习Bukkit,制作属于自己的插件。
本插件由 [璎珞服务器](https://www.yingluo.world/) 请求本人开发,经过授权后开源。
## 功能与优势
### 当前功能
- 多种存储格式,按需选择。
- 支持 YAML、JSON 与 MySQL/MariaDB 存储方式
- 支持直接调用 [EssentialsX](https://github.com/EssentialsX/Essentials) 数据,无缝切换
- 可点击的消息(如“点击同意”)
- 基于MineDown语法,可自定义配置
- 玩家间的传送请求
- 支持指定处理某位玩家的请求
- 设置家与回家 (可以理解为私人地标)
- 支持依照权限设定不同数量的家作为VIP附加内容
- 回到死亡地点、上一传送地点
### 优势
- **轻量插件。** 适合小型服务器使用,配置简单方便。
- **规范开发。** 插件符合开发规范,适合新手开发者学习。
- **持续维护。** 新功能需求均可提交,大概率在后续开发中支持。
- 功能需求请 [提交Issues](https://github.com/CarmJos/MoeTeleport/issues/new?assignees=&labels=enhancement&template=feature_issues.md&title=) ,不要在帖子中提交!
- 提交与 “传送” 相关联的请求才大概率会被更新支持。
## [依赖](https://github.com/CarmJos/MoeTeleport/network/dependencies)
- **[必须]** 插件本体基于 [Spigot-API](https://hub.spigotmc.org/stash/projects/SPIGOT) 、[BukkitAPI](http://bukkit.org/) 实现。
- **[自带]** 消息格式基于 [MineDown](https://github.com/Phoenix616/MineDown) 实现。
- 所有 messages.yml 均支持 MineDown 语法。
- **[推荐]** 变量部分基于 [PlaceholderAPI](https://www.spigotmc.org/resources/6245/) 实现。
详细依赖列表可见 [Dependencies](https://github.com/CarmJos/MoeTeleport/network/dependencies) 。
@@ -28,6 +54,10 @@
- 可选参数 `[参数]`
```text
# /MoeTeleport reload
@ 管理指令 (MoeTeleport.admin)
- 重载插件配置文件。
# /back
- 返回上一个传送地点
@@ -41,7 +71,9 @@
- 拒绝一个请求,可以限定某个玩家。
# /home [name]
- 返回家 (不填name会返回第一个家,若存在home则优先返回home)
- 返回设定的
- 不填name会返回第一个设置的家
- 若存在名为“home”的家则优先返回“home”。
# /listHome
- 列出所有家的位置
# /setHome [name]
@@ -58,7 +90,9 @@
### 消息配置文件 ([messages.yml](src/main/resources/messages.yml))
详见源文件。
支持 [MineDown 语法](https://wiki.phoenix616.dev/library:minedown:syntax)详见源文件。
### 玩家数据配置文件 (data/\<UUID\>.yml)
+97 -5
View File
@@ -3,7 +3,7 @@
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>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
@@ -13,7 +13,7 @@
<groupId>cc.carm.plugin</groupId>
<artifactId>moeteleport</artifactId>
<version>1.0.4</version>
<version>3.0.0</version>
<name>MoeTeleport</name>
<description>喵喵传送,简单的传送、设置家的插件。</description>
@@ -71,6 +71,16 @@
<url>https://repo1.maven.org/maven2/</url>
</repository>
<repository>
<id>minebench-repo</id>
<url>https://repo.minebench.de/</url>
</repository>
<repository>
<id>essentials-repo</id>
<url>https://repo.essentialsx.net/releases/</url>
</repository>
<repository>
<id>github</id>
<name>GitHub Packages</name>
@@ -103,6 +113,43 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.essentialsx</groupId>
<artifactId>EssentialsX</artifactId>
<version>2.19.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>cc.carm.lib</groupId>
<artifactId>easysql-beecp</artifactId>
<version>0.3.8</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>cc.carm.lib</groupId>
<artifactId>githubreleases4j</artifactId>
<version>1.3.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>de.themoep</groupId>
<artifactId>minedown</artifactId>
<version>1.7.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId>
<version>3.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -122,6 +169,29 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>2.5</version>
<configuration>
<filesets>
<fileset>
<directory>${project.basedir}/asset/</directory>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
<include>**/*</include>
</includes>
</fileset>
<fileset>
<directory>${project.basedir}/api-docs/</directory>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
<include>**/*</include>
</includes>
</fileset>
</filesets>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -161,12 +231,12 @@
<goals>
<goal>shade</goal>
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
</configuration>
</execution>
</executions>
<configuration>
<finalName>${project.name}-${project.version}</finalName>
<outputDirectory>${project.basedir}/asset/</outputDirectory>
<createDependencyReducedPom>false</createDependencyReducedPom>
<filters>
<filter>
<artifact>*:*</artifact>
@@ -176,6 +246,28 @@
</excludes>
</filter>
</filters>
<relocations>
<relocation>
<pattern>de.themoep.minedown</pattern>
<shadedPattern>cc.carm.plugin.moeteleport.lib.minedown</shadedPattern>
</relocation>
<relocation>
<pattern>org.bstats</pattern>
<shadedPattern>cc.carm.plugin.moeteleport.lib.bstats</shadedPattern>
</relocation>
<relocation>
<pattern>org.json</pattern>
<shadedPattern>cc.carm.plugin.moeteleport.lib.json</shadedPattern>
</relocation>
<relocation>
<pattern>cc.carm.lib.easysql</pattern>
<shadedPattern>cc.carm.plugin.moeteleport.lib.easysql</shadedPattern>
</relocation>
<relocation>
<pattern>cc.carm.lib.githubreleases4j</pattern>
<shadedPattern>cc.carm.plugin.moeteleport.lib.github</shadedPattern>
</relocation>
</relocations>
</configuration>
</plugin>
<plugin>
@@ -1,6 +1,7 @@
package cc.carm.plugin.moeteleport;
import cc.carm.plugin.moeteleport.command.BackCommand;
import cc.carm.plugin.moeteleport.command.MoeTeleportCommand;
import cc.carm.plugin.moeteleport.command.completer.HomeNameCompleter;
import cc.carm.plugin.moeteleport.command.completer.PlayerNameCompleter;
import cc.carm.plugin.moeteleport.command.completer.TpRequestCompleter;
@@ -10,12 +11,18 @@ import cc.carm.plugin.moeteleport.command.home.ListHomeCommand;
import cc.carm.plugin.moeteleport.command.home.SetHomeCommand;
import cc.carm.plugin.moeteleport.command.tpa.TpHandleCommand;
import cc.carm.plugin.moeteleport.command.tpa.TpaCommand;
import cc.carm.plugin.moeteleport.configuration.PluginConfig;
import cc.carm.plugin.moeteleport.listener.UserListener;
import cc.carm.plugin.moeteleport.manager.ConfigManager;
import cc.carm.plugin.moeteleport.manager.RequestManager;
import cc.carm.plugin.moeteleport.manager.TeleportManager;
import cc.carm.plugin.moeteleport.manager.UserManager;
import cc.carm.plugin.moeteleport.storage.DataStorage;
import cc.carm.plugin.moeteleport.storage.StorageMethod;
import cc.carm.plugin.moeteleport.util.ColorParser;
import cc.carm.plugin.moeteleport.util.JarResourceUtils;
import cc.carm.plugin.moeteleport.util.SchedulerUtils;
import org.bstats.bukkit.Metrics;
import org.bstats.charts.SimplePie;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.PluginCommand;
@@ -25,110 +32,160 @@ import org.bukkit.plugin.java.JavaPlugin;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Arrays;
public class Main extends JavaPlugin {
private static Main instance;
private static SchedulerUtils scheduler;
private static Main instance;
public static boolean debugMode = true;
private static DataStorage storage;
private UserManager userManager;
private TeleportManager teleportManager;
private RequestManager requestManager;
private UserManager userManager;
private RequestManager requestManager;
@Override
public void onEnable() {
instance = this;
log(getName() + " " + getDescription().getVersion() + " &7开始加载...");
long startTime = System.currentTimeMillis();
@Override
public void onEnable() {
instance = this;
scheduler = new SchedulerUtils(this);
outputInfo();
log("加载配置文件...");
ConfigManager.initConfig();
log(getName() + " " + getDescription().getVersion() + " &7开始加载...");
long startTime = System.currentTimeMillis();
log("加载用户管理器...");
this.userManager = new UserManager(this);
log("加载配置文件...");
ConfigManager.initConfig();
log("加载请求管理器...");
this.requestManager = new RequestManager(this);
log("初始化存储方式...");
StorageMethod storageMethod = StorageMethod.read(PluginConfig.STORAGE_METHOD.get());
log(" 正在使用 " + storageMethod.name() + " 进行数据存储");
log("注册监听器...");
regListener(new UserListener());
storage = storageMethod.createStorage();
if (!storage.initialize()) {
error("初始化存储失败,请检查配置文件。");
storage.shutdown();
setEnabled(false);
return; // 初始化失败,不再继续加载
}
log("注册指令...");
registerCommand("back", new BackCommand());
registerCommand("home", new GoHomeCommand(), new HomeNameCompleter());
registerCommand("delHome", new DelHomeCommand(), new HomeNameCompleter());
registerCommand("setHome", new SetHomeCommand());
registerCommand("listHome", new ListHomeCommand());
log("加载用户管理器...");
this.userManager = new UserManager();
if (Bukkit.getOnlinePlayers().size() > 0) {
log(" 加载现有用户数据...");
getUserManager().loadAll();
}
registerCommand("tpa", new TpaCommand(), new PlayerNameCompleter());
registerCommand("tpaHere", new TpaCommand(), new PlayerNameCompleter());
registerCommand("tpAccept", new TpHandleCommand(), new TpRequestCompleter());
registerCommand("tpDeny", new TpHandleCommand(), new TpRequestCompleter());
log("加载请求管理器...");
this.requestManager = new RequestManager(this);
log("加载完成 ,共耗时 " + (System.currentTimeMillis() - startTime) + " ms 。");
log("注册监听器...");
regListener(new UserListener());
}
log("注册指令...");
registerCommand("MoeTeleport", new MoeTeleportCommand());
@Override
public void onDisable() {
log(getName() + " " + getDescription().getVersion() + " 开始卸载...");
long startTime = System.currentTimeMillis();
registerCommand("back", new BackCommand());
getRequestManager().shutdown();
registerCommand("home", new GoHomeCommand(), new HomeNameCompleter());
registerCommand("delHome", new DelHomeCommand(), new HomeNameCompleter());
registerCommand("setHome", new SetHomeCommand());
registerCommand("listHome", new ListHomeCommand());
log("卸载监听器...");
Bukkit.getServicesManager().unregisterAll(this);
registerCommand("tpa", new TpaCommand(), new PlayerNameCompleter());
registerCommand("tpaHere", new TpaCommand(), new PlayerNameCompleter());
registerCommand("tpAccept", new TpHandleCommand(), new TpRequestCompleter());
registerCommand("tpDeny", new TpHandleCommand(), new TpRequestCompleter());
log("卸载完成 ,共耗时 " + (System.currentTimeMillis() - startTime) + " ms 。");
}
if (PluginConfig.METRICS.get()) {
log("启用统计数据...");
Metrics metrics = new Metrics(this, 14459);
metrics.addCustomChart(new SimplePie("storage_method", storageMethod::name));
}
/**
* 注册监听器
*
* @param listener 监听器
*/
public static void regListener(Listener listener) {
Bukkit.getPluginManager().registerEvents(listener, getInstance());
}
log("加载完成 ,共耗时 " + (System.currentTimeMillis() - startTime) + " ms 。");
}
public static void log(String message) {
Bukkit.getConsoleSender().sendMessage(ColorParser.parse("[" + getInstance().getName() + "] " + message));
}
@Override
public void onDisable() {
outputInfo();
log(getName() + " " + getDescription().getVersion() + " 开始卸载...");
long startTime = System.currentTimeMillis();
public static void error(String message) {
log("&4[ERROR] &r" + message);
}
log("关闭所有请求...");
getRequestManager().shutdown();
public static void debug(String message) {
if (debugMode) {
log("&b[DEBUG] &r" + message);
}
}
log("保存用户数据...");
getUserManager().unloadAll(true);
public static Main getInstance() {
return instance;
}
log("卸载监听器...");
Bukkit.getServicesManager().unregisterAll(this);
public static void registerCommand(String commandName,
@NotNull CommandExecutor executor) {
registerCommand(commandName, executor, null);
}
log("卸载完成 ,共耗时 " + (System.currentTimeMillis() - startTime) + " ms 。");
}
public static void registerCommand(String commandName,
@NotNull CommandExecutor executor,
@Nullable TabCompleter tabCompleter) {
PluginCommand command = Bukkit.getPluginCommand(commandName);
if (command == null) return;
command.setExecutor(executor);
if (tabCompleter != null) command.setTabCompleter(tabCompleter);
}
/**
* 注册监听器
*
* @param listener 监听器
*/
public static void regListener(Listener listener) {
Bukkit.getPluginManager().registerEvents(listener, getInstance());
}
public static UserManager getUserManager() {
return Main.getInstance().userManager;
}
public void outputInfo() {
String[] pluginInfo = JarResourceUtils.readResource(this.getResource("PLUGIN_INFO"));
if (pluginInfo != null) {
Arrays.stream(pluginInfo).forEach(Main::log);
}
}
public static void log(String message) {
Bukkit.getConsoleSender().sendMessage(ColorParser.parse("[" + getInstance().getName() + "] " + message));
}
public static void error(String message) {
log("&4[ERROR] &r" + message);
}
public static void debug(String message) {
if (PluginConfig.DEBUG.get()) {
log("&e[DEBUG] &r" + message);
}
}
public static Main getInstance() {
return instance;
}
public static SchedulerUtils getScheduler() {
return scheduler;
}
public static void registerCommand(String commandName,
@NotNull CommandExecutor executor) {
registerCommand(commandName, executor, null);
}
public static void registerCommand(String commandName,
@NotNull CommandExecutor executor,
@Nullable TabCompleter tabCompleter) {
PluginCommand command = Bukkit.getPluginCommand(commandName);
if (command == null) return;
command.setExecutor(executor);
if (tabCompleter != null) command.setTabCompleter(tabCompleter);
}
public static DataStorage getStorage() {
return storage;
}
public static UserManager getUserManager() {
return Main.getInstance().userManager;
}
public static RequestManager getRequestManager() {
return Main.getInstance().requestManager;
}
public static RequestManager getRequestManager() {
return Main.getInstance().requestManager;
}
}
@@ -12,17 +12,17 @@ import org.jetbrains.annotations.NotNull;
public class BackCommand implements CommandExecutor {
@Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
if (!(sender instanceof Player)) return false;
Player player = (Player) sender;
UserData data = Main.getUserManager().getData(player);
if (data.getLastLocation() == null) {
PluginMessages.NO_LAST_LOCATION.send(player);
return true;
}
TeleportManager.teleport(player, data.getLastLocation(), false);
return true;
}
@Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
if (!(sender instanceof Player)) return false;
Player player = (Player) sender;
UserData data = Main.getUserManager().getData(player);
if (data.getLastLocation() == null) {
PluginMessages.NO_LAST_LOCATION.send(player);
return true;
}
TeleportManager.teleport(player, data.getLastLocation(), false);
return true;
}
}
@@ -0,0 +1,23 @@
package cc.carm.plugin.moeteleport.command;
import cc.carm.plugin.moeteleport.manager.ConfigManager;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;
public class MoeTeleportCommand implements CommandExecutor {
@Override
public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command,
@NotNull String s, @NotNull String[] args) {
if (args.length == 1 && args[0].equalsIgnoreCase("reload")) {
commandSender.sendMessage("Reloading config...");
ConfigManager.reload();
commandSender.sendMessage("Config reloaded.");
return true;
}
return false;
}
}
@@ -14,17 +14,17 @@ import java.util.stream.Collectors;
public class HomeNameCompleter implements TabCompleter {
@Nullable
@Override
public java.util.List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
if (!(sender instanceof Player)) return ImmutableList.of();
if (args.length == 1) {
return Main.getUserManager().getData((Player) sender).getHomeLocations().keySet().stream()
.filter(s -> StringUtil.startsWithIgnoreCase(s, args[0]))
.limit(10).collect(Collectors.toList());
} else {
return ImmutableList.of();
}
}
@Nullable
@Override
public java.util.List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
if (!(sender instanceof Player)) return ImmutableList.of();
if (args.length == 1) {
return Main.getUserManager().getData((Player) sender).getHomeLocations().keySet().stream()
.filter(s -> StringUtil.startsWithIgnoreCase(s, args[0]))
.limit(10).collect(Collectors.toList());
} else {
return ImmutableList.of();
}
}
}
@@ -16,32 +16,32 @@ import java.util.stream.Collectors;
public class PlayerNameCompleter implements TabCompleter {
List<Integer> indexes;
List<Integer> indexes;
public PlayerNameCompleter() {
this(1);
}
public PlayerNameCompleter() {
this(1);
}
public PlayerNameCompleter(Integer index) {
this(new Integer[]{index});
}
public PlayerNameCompleter(Integer index) {
this(new Integer[]{index});
}
public PlayerNameCompleter(Integer[] indexes) {
this.indexes = Arrays.asList(indexes);
}
public PlayerNameCompleter(Integer[] indexes) {
this.indexes = Arrays.asList(indexes);
}
@Nullable
@Override
public java.util.List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
if (args.length >= 1 && indexes.contains(args.length)) {
return Bukkit.getOnlinePlayers().stream()
.map(HumanEntity::getName)
.filter(s -> StringUtil.startsWithIgnoreCase(s, args[args.length - 1]))
.limit(10).collect(Collectors.toList());
} else {
return ImmutableList.of();
}
}
@Nullable
@Override
public java.util.List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
if (args.length >= 1 && indexes.contains(args.length)) {
return Bukkit.getOnlinePlayers().stream()
.map(HumanEntity::getName)
.filter(s -> StringUtil.startsWithIgnoreCase(s, args[args.length - 1]))
.limit(10).collect(Collectors.toList());
} else {
return ImmutableList.of();
}
}
}
@@ -20,34 +20,34 @@ import java.util.stream.Collectors;
public class TpRequestCompleter implements TabCompleter {
List<Integer> indexes;
List<Integer> indexes;
public TpRequestCompleter() {
this(1);
}
public TpRequestCompleter() {
this(1);
}
public TpRequestCompleter(Integer index) {
this(new Integer[]{index});
}
public TpRequestCompleter(Integer index) {
this(new Integer[]{index});
}
public TpRequestCompleter(Integer[] indexes) {
this.indexes = Arrays.asList(indexes);
}
public TpRequestCompleter(Integer[] indexes) {
this.indexes = Arrays.asList(indexes);
}
@Nullable
@Override
public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
if (!(sender instanceof Player)) return ImmutableList.of();
if (args.length >= 1 && indexes.contains(args.length)) {
UserData data = Main.getUserManager().getData((Player) sender);
return data.getReceivedRequests().keySet().stream()
.map(Bukkit::getPlayer).filter(Objects::nonNull).map(HumanEntity::getName)
.filter(s -> StringUtil.startsWithIgnoreCase(s, args[args.length - 1]))
.limit(10).collect(Collectors.toList());
} else {
return ImmutableList.of();
}
}
@Nullable
@Override
public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
if (!(sender instanceof Player)) return ImmutableList.of();
if (args.length >= 1 && indexes.contains(args.length)) {
UserData data = Main.getUserManager().getData((Player) sender);
return data.getReceivedRequests().keySet().stream()
.map(Bukkit::getPlayer).filter(Objects::nonNull).map(HumanEntity::getName)
.filter(s -> StringUtil.startsWithIgnoreCase(s, args[args.length - 1]))
.limit(10).collect(Collectors.toList());
} else {
return ImmutableList.of();
}
}
}
@@ -14,26 +14,26 @@ import java.util.Map;
public class DelHomeCommand implements CommandExecutor {
@Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
@NotNull String label, @NotNull String[] args) {
if (!(sender instanceof Player)) return false;
if (args.length < 1) return false;
@Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
@NotNull String label, @NotNull String[] args) {
if (!(sender instanceof Player)) return false;
if (args.length < 1) return false;
Player player = (Player) sender;
UserData data = Main.getUserManager().getData(player);
String homeName = args[0];
Map.Entry<String, DataLocation> locationInfo = data.getHomeLocation(homeName);
if (locationInfo == null) {
PluginMessages.Home.NOT_FOUND.sendWithPlaceholders(player);
} else {
PluginMessages.Home.REMOVED.sendWithPlaceholders(player,
new String[]{"%(name)", "%(location)"},
new Object[]{locationInfo.getKey(), locationInfo.getValue().toFlatString()});
data.delHomeLocation(homeName);
}
return true;
}
Player player = (Player) sender;
UserData data = Main.getUserManager().getData(player);
String homeName = args[0];
Map.Entry<String, DataLocation> locationInfo = data.getHomeLocation(homeName);
if (locationInfo == null) {
PluginMessages.Home.NOT_FOUND.sendWithPlaceholders(player);
} else {
PluginMessages.Home.REMOVED.sendWithPlaceholders(player,
new String[]{"%(name)", "%(location)"},
new Object[]{locationInfo.getKey(), locationInfo.getValue().toFlatString()});
data.delHomeLocation(homeName);
}
return true;
}
}
@@ -15,21 +15,21 @@ import java.util.Map;
public class GoHomeCommand implements CommandExecutor {
@Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
@NotNull String label, @NotNull String[] args) {
if (!(sender instanceof Player)) return false;
Player player = (Player) sender;
UserData data = Main.getUserManager().getData(player);
String homeName = args.length >= 1 ? args[0] : null;
Map.Entry<String, DataLocation> locationInfo = data.getHomeLocation(homeName);
if (locationInfo == null) {
PluginMessages.Home.NOT_FOUND.sendWithPlaceholders(player);
} else {
TeleportManager.teleport(player, locationInfo.getValue(), false);
}
return true;
}
@Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
@NotNull String label, @NotNull String[] args) {
if (!(sender instanceof Player)) return false;
Player player = (Player) sender;
UserData data = Main.getUserManager().getData(player);
String homeName = args.length >= 1 ? args[0] : null;
Map.Entry<String, DataLocation> locationInfo = data.getHomeLocation(homeName);
if (locationInfo == null) {
PluginMessages.Home.NOT_FOUND.sendWithPlaceholders(player);
} else {
TeleportManager.teleport(player, locationInfo.getValue(), false);
}
return true;
}
}
@@ -11,19 +11,19 @@ import org.jetbrains.annotations.NotNull;
public class ListHomeCommand implements CommandExecutor {
@Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
@NotNull String label, @NotNull String[] args) {
if (!(sender instanceof Player)) return false;
Player player = (Player) sender;
UserData data = Main.getUserManager().getData(player);
PluginMessages.Home.HEADER.sendWithPlaceholders(player);
data.getHomeLocations().forEach((name, loc) -> PluginMessages.Home.LIST_OBJECT
.sendWithPlaceholders(player,
new String[]{"%(id)", "%(location)"},
new Object[]{name, loc.toFlatString()}
));
return true;
}
@Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
@NotNull String label, @NotNull String[] args) {
if (!(sender instanceof Player)) return false;
Player player = (Player) sender;
UserData data = Main.getUserManager().getData(player);
PluginMessages.Home.HEADER.sendWithPlaceholders(player);
data.getHomeLocations().forEach((name, loc) -> PluginMessages.Home.LIST_OBJECT
.sendWithPlaceholders(player,
new String[]{"%(id)", "%(location)"},
new Object[]{name, loc.toFlatString()}
));
return true;
}
}
@@ -11,28 +11,34 @@ import org.jetbrains.annotations.NotNull;
public class SetHomeCommand implements CommandExecutor {
@Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
@NotNull String label, @NotNull String[] args) {
if (!(sender instanceof Player)) return false;
Player player = (Player) sender;
UserData data = Main.getUserManager().getData(player);
String homeName = args.length >= 1 ? args[0] : "home";
@Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
@NotNull String label, @NotNull String[] args) {
if (!(sender instanceof Player)) return false;
Player player = (Player) sender;
UserData data = Main.getUserManager().getData(player);
String homeName = args.length >= 1 ? args[0] : "home";
int maxHome = Main.getUserManager().getMaxHome(player);
if (data.getHomeLocations().size() >= maxHome && data.getHomeLocation(homeName) == null) {
PluginMessages.Home.OVER_LIMIT.sendWithPlaceholders(sender,
new String[]{"%(max)"}, new Object[]{maxHome}
);
return true;
}
if (homeName.length() > 30) {
// 限定家的名字长度
PluginMessages.Home.NAME_TOO_LONG.sendWithPlaceholders(sender);
return true;
}
data.setHomeLocation(homeName, player.getLocation());
PluginMessages.Home.SET.sendWithPlaceholders(player,
new String[]{"%(name)"}, new Object[]{homeName}
);
return true;
}
int maxHome = Main.getUserManager().getMaxHome(player);
if (data.getHomeLocations().size() >= maxHome && data.getHomeLocation(homeName) == null) {
PluginMessages.Home.OVER_LIMIT.sendWithPlaceholders(sender,
new String[]{"%(max)"}, new Object[]{maxHome}
);
return true;
}
data.setHomeLocation(homeName, player.getLocation());
PluginMessages.Home.SET.sendWithPlaceholders(player,
new String[]{"%(name)"}, new Object[]{homeName}
);
return true;
}
}
@@ -15,51 +15,51 @@ import java.util.Comparator;
public class TpHandleCommand implements CommandExecutor {
@Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
@NotNull String label, @NotNull String[] args) {
if (!(sender instanceof Player)) return false;
Player player = (Player) sender;
UserData data = Main.getUserManager().getData(player);
if (data.getReceivedRequests().isEmpty()) {
PluginMessages.Request.NOT_FOUND.sendWithPlaceholders(player);
return true;
}
String targetName = args.length > 0 ? args[0] : null;
boolean accept = command.getName().equalsIgnoreCase("tpAccept");
data.setEnableAutoSelect(false);
if (targetName != null) {
Player target = Bukkit.getPlayer(targetName);
if (target == null || !data.getReceivedRequests().containsKey(target.getUniqueId())) {
PluginMessages.Request.NOT_FOUND_PLAYER.sendWithPlaceholders(player,
new String[]{"%(player)"},
new Object[]{target == null ? targetName : target.getName()}
);
} else {
handle(data.getReceivedRequests().get(target.getUniqueId()), accept); // 交给Manager处理
}
} else {
if (data.getReceivedRequests().size() == 1 || data.isEnableAutoSelect()) {
data.getReceivedRequests().values().stream()
.min(Comparator.comparingLong(TeleportRequest::getActiveTime))
.ifPresent(request -> handle(request, accept));
} else {
PluginMessages.Request.MULTI.sendWithPlaceholders(player,
new String[]{"%(num)", "%(command)"},
new Object[]{data.getReceivedRequests().size(), command.getName()}
);
data.setEnableAutoSelect(true);
}
}
return true;
}
@Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
@NotNull String label, @NotNull String[] args) {
if (!(sender instanceof Player)) return false;
Player player = (Player) sender;
UserData data = Main.getUserManager().getData(player);
if (data.getReceivedRequests().isEmpty()) {
PluginMessages.Request.NOT_FOUND.sendWithPlaceholders(player);
return true;
}
String targetName = args.length > 0 ? args[0] : null;
boolean accept = command.getName().equalsIgnoreCase("tpAccept");
data.setEnableAutoSelect(false);
if (targetName != null) {
Player target = Bukkit.getPlayer(targetName);
if (target == null || !data.getReceivedRequests().containsKey(target.getUniqueId())) {
PluginMessages.Request.NOT_FOUND_PLAYER.sendWithPlaceholders(player,
new String[]{"%(player)"},
new Object[]{target == null ? targetName : target.getName()}
);
} else {
handle(data.getReceivedRequests().get(target.getUniqueId()), accept); // 交给Manager处理
}
} else {
if (data.getReceivedRequests().size() == 1 || data.isEnableAutoSelect()) {
data.getReceivedRequests().values().stream()
.min(Comparator.comparingLong(TeleportRequest::getActiveTime))
.ifPresent(request -> handle(request, accept));
} else {
PluginMessages.Request.MULTI.sendWithPlaceholders(player,
new String[]{"%(num)", "%(command)"},
new Object[]{data.getReceivedRequests().size(), command.getName()}
);
data.setEnableAutoSelect(true);
}
}
return true;
}
private void handle(TeleportRequest request, boolean accept) {
if (accept) {
Main.getRequestManager().acceptRequest(request);
} else {
Main.getRequestManager().denyRequest(request);
}
}
private void handle(TeleportRequest request, boolean accept) {
if (accept) {
Main.getRequestManager().acceptRequest(request);
} else {
Main.getRequestManager().denyRequest(request);
}
}
}
@@ -12,32 +12,38 @@ import org.jetbrains.annotations.NotNull;
public class TpaCommand implements CommandExecutor {
@Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
@NotNull String label, @NotNull String[] args) {
if (!(sender instanceof Player) || args.length < 1) return false;
Player player = (Player) sender;
Player target = Bukkit.getPlayer(args[0]);
if (target == null) {
PluginMessages.NOT_ONLINE.sendWithPlaceholders(player);
return true;
}
@Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
@NotNull String label, @NotNull String[] args) {
if (!(sender instanceof Player) || args.length < 1) return false;
Player player = (Player) sender;
Player target = Bukkit.getPlayer(args[0]);
if (target == null) {
PluginMessages.NOT_ONLINE.sendWithPlaceholders(player);
return true;
}
TeleportRequest request = Main.getUserManager().getData(target).getReceivedRequests().get(player.getUniqueId());
if (request != null) {
PluginMessages.Request.DUPLICATE.sendWithPlaceholders(sender,
new String[]{"%(player)", "%(expire)"},
new Object[]{target.getName(), request.getRemainSeconds()}
);
return true;
}
if (command.getName().equalsIgnoreCase("tpa")) {
Main.getRequestManager().sendRequest(player, target, TeleportRequest.RequestType.TPA);
} else {
Main.getRequestManager().sendRequest(player, target, TeleportRequest.RequestType.TPA_HERE);
}
if (player == target) {
// fix #5 - 玩家给自己发送传送请求
PluginMessages.SELF_REQUEST.sendWithPlaceholders(player);
return true;
}
return true;
}
TeleportRequest request = Main.getUserManager().getData(target).getReceivedRequests().get(player.getUniqueId());
if (request != null) {
PluginMessages.Request.DUPLICATE.sendWithPlaceholders(sender,
new String[]{"%(player)", "%(expire)"},
new Object[]{target.getName(), request.getRemainSeconds()}
);
return true;
}
if (command.getName().equalsIgnoreCase("tpa")) {
Main.getRequestManager().sendRequest(player, target, TeleportRequest.RequestType.TPA);
} else {
Main.getRequestManager().sendRequest(player, target, TeleportRequest.RequestType.TPA_HERE);
}
return true;
}
}
@@ -6,24 +6,40 @@ import cc.carm.plugin.moeteleport.configuration.values.ConfigValueMap;
public class PluginConfig {
public static final ConfigValueMap<String, Integer> PERMISSIONS = new ConfigValueMap<>(
"permissions", s -> s, Integer.class
);
public static final ConfigValue<Boolean> DEBUG = new ConfigValue<>(
"debug", Boolean.class, false
);
public static final ConfigValueList<String> DANGEROUS_TYPES = new ConfigValueList<>(
"dangerous-blocks", String.class, new String[]{"LAVA"}
);
public static final ConfigValue<Boolean> METRICS = new ConfigValue<>(
"metrics", Boolean.class, true
);
public static final ConfigValue<Integer> EXPIRE_TIME = new ConfigValue<>(
"expireTime", Integer.class, 30
);
public static final ConfigValue<Boolean> CHECK_UPDATE = new ConfigValue<>(
"check-update", Boolean.class, true
);
public static final ConfigValue<Integer> DEFAULT_HOME = new ConfigValue<>(
"defaultHome", Integer.class, 1
);
public static final ConfigValue<String> STORAGE_METHOD = new ConfigValue<>(
"storage.method", String.class, "YAML"
);
public static final ConfigValue<Boolean> DEATH_GO_BACK = new ConfigValue<>(
"death-back", Boolean.class, true
);
public static final ConfigValueMap<Integer, String> PERMISSIONS = new ConfigValueMap<>(
"permissions", Integer::parseInt, String.class
);
public static final ConfigValueList<String> DANGEROUS_TYPES = new ConfigValueList<>(
"dangerous-blocks", String.class, new String[]{"LAVA"}
);
public static final ConfigValue<Integer> EXPIRE_TIME = new ConfigValue<>(
"expireTime", Integer.class, 30
);
public static final ConfigValue<Integer> DEFAULT_HOME = new ConfigValue<>(
"defaultHome", Integer.class, 1
);
public static final ConfigValue<Boolean> DEATH_GO_BACK = new ConfigValue<>(
"death-back", Boolean.class, true
);
}
@@ -5,53 +5,55 @@ import cc.carm.plugin.moeteleport.configuration.message.ConfigMessageList;
public class PluginMessages {
public static final ConfigMessageList NO_LAST_LOCATION = new ConfigMessageList("no-last-location");
public static final ConfigMessageList NO_LAST_LOCATION = new ConfigMessageList("no-last-location");
public static final ConfigMessageList NOT_ONLINE = new ConfigMessageList("not-online");
public static final ConfigMessageList NOT_ONLINE = new ConfigMessageList("not-online");
public static final ConfigMessageList SELF_REQUEST = new ConfigMessageList("self-request");
public static final ConfigMessageList TPA = new ConfigMessageList("tpa");
public static final ConfigMessageList TPA_HERE = new ConfigMessageList("tpahere");
public static final ConfigMessageList TPA = new ConfigMessageList("tpa");
public static final ConfigMessageList TPA_HERE = new ConfigMessageList("tpahere");
public static final ConfigMessageList TP_ACCEPT = new ConfigMessageList("tpaccept");
public static final ConfigMessageList TP_DENY = new ConfigMessageList("tpdeny");
public static final ConfigMessageList TP_ACCEPT = new ConfigMessageList("tpaccept");
public static final ConfigMessageList TP_DENY = new ConfigMessageList("tpdeny");
public static final ConfigMessageList ACCEPTED = new ConfigMessageList("accepted");
public static final ConfigMessageList DENIED = new ConfigMessageList("denied");
public static final ConfigMessageList ACCEPTED = new ConfigMessageList("accepted");
public static final ConfigMessageList DENIED = new ConfigMessageList("denied");
public static final ConfigMessageList TELEPORTING = new ConfigMessageList("teleporting");
public static final ConfigMessageList DANGEROUS = new ConfigMessageList("dangerous");
public static final ConfigMessageList DANGEROUS_HERE = new ConfigMessageList("dangerous-here");
public static final ConfigMessageList TELEPORTING = new ConfigMessageList("teleporting");
public static final ConfigMessageList DANGEROUS = new ConfigMessageList("dangerous");
public static final ConfigMessageList DANGEROUS_HERE = new ConfigMessageList("dangerous-here");
public static final ConfigMessageList NOT_AVAILABLE = new ConfigMessageList("notAvailable");
public static final ConfigMessageList NOT_AVAILABLE = new ConfigMessageList("notAvailable");
public static final ConfigMessageList DEATH_BACK = new ConfigMessageList("death-back");
public static final ConfigMessageList DEATH_BACK = new ConfigMessageList("death-back");
public static class Request {
public static final ConfigMessageList DUPLICATE = new ConfigMessageList("request-duplicate");
public static final ConfigMessageList OFFLINE = new ConfigMessageList("offline");
public static class Request {
public static final ConfigMessageList DUPLICATE = new ConfigMessageList("request-duplicate");
public static final ConfigMessageList OFFLINE = new ConfigMessageList("offline");
public static final ConfigMessageList SENT = new ConfigMessageList("request-sent");
public static final ConfigMessageList MULTI = new ConfigMessageList("multi-requests");
public static final ConfigMessageList SENT_TIMEOUT = new ConfigMessageList("request-sent-timeout");
public static final ConfigMessageList RECEIVED_TIMEOUT = new ConfigMessageList("request-received-timeout");
public static final ConfigMessageList SENT = new ConfigMessageList("request-sent");
public static final ConfigMessageList MULTI = new ConfigMessageList("multi-requests");
public static final ConfigMessageList SENT_TIMEOUT = new ConfigMessageList("request-sent-timeout");
public static final ConfigMessageList RECEIVED_TIMEOUT = new ConfigMessageList("request-received-timeout");
public static final ConfigMessageList NOT_FOUND = new ConfigMessageList("no-request");
public static final ConfigMessageList NOT_FOUND_PLAYER = new ConfigMessageList("no-request-player");
}
public static final ConfigMessageList NOT_FOUND = new ConfigMessageList("no-request");
public static final ConfigMessageList NOT_FOUND_PLAYER = new ConfigMessageList("no-request-player");
}
public static class Home {
public static final ConfigMessageList HEADER = new ConfigMessageList("home-list-header");
public static final ConfigMessage LIST_OBJECT = new ConfigMessage("home-list-object");
public static class Home {
public static final ConfigMessageList HEADER = new ConfigMessageList("home-list-header");
public static final ConfigMessage LIST_OBJECT = new ConfigMessage("home-list-object");
public static final ConfigMessageList OVER_LIMIT = new ConfigMessageList("home-over-limit");
public static final ConfigMessageList OVER_LIMIT = new ConfigMessageList("home-over-limit");
public static final ConfigMessageList NAME_TOO_LONG = new ConfigMessageList("name-too-long");
public static final ConfigMessageList NOT_FOUND = new ConfigMessageList("home-not-found");
public static final ConfigMessageList SET = new ConfigMessageList("home-set");
public static final ConfigMessageList NOT_FOUND = new ConfigMessageList("home-not-found");
public static final ConfigMessageList SET = new ConfigMessageList("home-set");
public static final ConfigMessageList REMOVED = new ConfigMessageList("home-removed");
public static final ConfigMessageList REMOVED = new ConfigMessageList("home-removed");
}
}
}
@@ -10,55 +10,55 @@ import java.io.IOException;
public class FileConfig {
private final JavaPlugin plugin;
private final String fileName;
private final JavaPlugin plugin;
private final String fileName;
private File file;
private FileConfiguration config;
private File file;
private FileConfiguration config;
public FileConfig(final JavaPlugin plugin) {
this(plugin, "config.yml");
}
public FileConfig(final JavaPlugin plugin) {
this(plugin, "config.yml");
}
public FileConfig(final JavaPlugin plugin, final String name) {
this.plugin = plugin;
this.fileName = name;
initFile();
}
public FileConfig(final JavaPlugin plugin, final String name) {
this.plugin = plugin;
this.fileName = name;
initFile();
}
private void initFile() {
this.file = new File(plugin.getDataFolder(), fileName);
if (!this.file.exists()) {
if (!this.file.getParentFile().exists()) {
boolean success = this.file.getParentFile().mkdirs();
}
plugin.saveResource(fileName, true);
}
this.config = YamlConfiguration.loadConfiguration(this.file);
}
private void initFile() {
this.file = new File(plugin.getDataFolder(), fileName);
if (!this.file.exists()) {
if (!this.file.getParentFile().exists()) {
boolean success = this.file.getParentFile().mkdirs();
}
plugin.saveResource(fileName, true);
}
this.config = YamlConfiguration.loadConfiguration(this.file);
}
public File getFile() {
return file;
}
public File getFile() {
return file;
}
public FileConfiguration getConfig() {
return config;
}
public FileConfiguration getConfig() {
return config;
}
public void save() {
try {
getConfig().save(getFile());
} catch (IOException e) {
e.printStackTrace();
}
}
public void save() {
try {
getConfig().save(getFile());
} catch (IOException e) {
e.printStackTrace();
}
}
public void reload() {
if (getFile().exists()) {
this.config = YamlConfiguration.loadConfiguration(getFile());
} else {
initFile();
}
}
public void reload() {
if (getFile().exists()) {
this.config = YamlConfiguration.loadConfiguration(getFile());
} else {
initFile();
}
}
}
@@ -13,160 +13,158 @@ import java.util.Objects;
public class DataLocation implements Cloneable {
public static final DecimalFormat format = new DecimalFormat("0.00");
private String worldName;
private double x;
private double y;
private double z;
private float yaw;
private float pitch;
public static final DecimalFormat format = new DecimalFormat("0.00");
private final String worldName;
private double x;
private double y;
private double z;
private float yaw;
private float pitch;
public DataLocation(Location location) {
this(location.getWorld() != null ? location.getWorld().getName() : "", location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
}
public DataLocation(Location location) {
this(location.getWorld() != null ? location.getWorld().getName() : "", location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
}
public DataLocation(final String worldName, final double x, final double y, final double z) {
this(worldName, x, y, z, 0, 0);
}
public DataLocation(final String worldName, final double x, final double y, final double z) {
this(worldName, x, y, z, 0, 0);
}
public DataLocation(final String worldName, final double x, final double y, final double z, final float yaw, final float pitch) {
this.worldName = worldName;
this.x = x;
this.y = y;
this.z = z;
this.pitch = pitch;
this.yaw = yaw;
}
public DataLocation(final String worldName, final double x, final double y, final double z, final float yaw, final float pitch) {
this.worldName = worldName;
this.x = x;
this.y = y;
this.z = z;
this.pitch = pitch;
this.yaw = yaw;
}
public String getWorldName() {
return worldName;
}
public static DataLocation deserializeText(String s) {
if (s == null || !s.contains(";")) return null;
String[] args = StringUtils.split(s, ";");
if (args.length < 4) return null;
try {
String worldName = args[0];
double x = NumberConversions.toDouble(args[1]);
double y = NumberConversions.toDouble(args[2]);
double z = NumberConversions.toDouble(args[3]);
float yaw = 0;
float pitch = 0;
if (args.length == 6) {
yaw = NumberConversions.toFloat(args[4]);
pitch = NumberConversions.toFloat(args[5]);
}
return new DataLocation(worldName, x, y, z, yaw, pitch);
} catch (Exception ex) {
return null;
}
}
public double getX() {
return x;
}
@Deprecated
public static DataLocation parseString(String s) {
return deserializeText(s);
}
public void setX(double x) {
this.x = x;
}
public String getWorldName() {
return worldName;
}
public double getY() {
return y;
}
public double getX() {
return x;
}
public void setY(double y) {
this.y = y;
}
public void setX(double x) {
this.x = x;
}
public double getZ() {
return z;
}
public double getY() {
return y;
}
public void setZ(double z) {
this.z = z;
}
public void setY(double y) {
this.y = y;
}
public float getYaw() {
return yaw;
}
public double getZ() {
return z;
}
public void setYaw(float yaw) {
this.yaw = yaw;
}
public void setZ(double z) {
this.z = z;
}
public float getPitch() {
return pitch;
}
public float getYaw() {
return yaw;
}
public void setPitch(float pitch) {
this.pitch = pitch;
}
public void setYaw(float yaw) {
this.yaw = yaw;
}
public float getPitch() {
return pitch;
}
public @NotNull Location getBukkitLocation(World world) {
return new Location(world, getX(), getY(), getZ(), getYaw(), getPitch());
}
public void setPitch(float pitch) {
this.pitch = pitch;
}
public @NotNull Location getBukkitLocation(World world) {
return new Location(world, getX(), getY(), getZ(), getYaw(), getPitch());
}
public @Nullable Location getBukkitLocation() {
World world = Bukkit.getWorld(getWorldName());
if (world == null) return null;
else return new Location(world, getX(), getY(), getZ(), getYaw(), getPitch());
}
public @Nullable Location getBukkitLocation() {
World world = Bukkit.getWorld(getWorldName());
if (world == null) return null;
else return new Location(world, getX(), getY(), getZ(), getYaw(), getPitch());
}
@Override
public Object clone() {
try {
return super.clone();
} catch (Exception ex) {
return null;
}
}
@Override
public Object clone() {
try {
return super.clone();
} catch (Exception ex) {
return null;
}
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof DataLocation)) return false;
DataLocation that = (DataLocation) o;
return that.worldName.equals(worldName)
&& Double.compare(that.x, x) == 0
&& Double.compare(that.y, y) == 0
&& Double.compare(that.z, z) == 0
&& Float.compare(that.pitch, pitch) == 0
&& Float.compare(that.yaw, yaw) == 0;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof DataLocation)) return false;
DataLocation that = (DataLocation) o;
return that.worldName.equals(worldName)
&& Double.compare(that.x, x) == 0
&& Double.compare(that.y, y) == 0
&& Double.compare(that.z, z) == 0
&& Float.compare(that.pitch, pitch) == 0
&& Float.compare(that.yaw, yaw) == 0;
}
@Override
public int hashCode() {
return Objects.hash(x, y, z, yaw, pitch);
}
@Override
public int hashCode() {
return Objects.hash(x, y, z, yaw, pitch);
}
@Override
public String toString() {
return worldName + " " + x + " " + y + " " + z + " " + yaw + " " + pitch;
}
@Override
public String toString() {
return worldName + " " + x + " " + y + " " + z + " " + yaw + " " + pitch;
}
public String toFlatString() {
return worldName + "@" + format.format(x) + ", " + format.format(y) + ", " + format.format(z);
}
public String toFlatString() {
return worldName + "@" + format.format(x) + ", " + format.format(y) + ", " + format.format(z);
}
@Deprecated
public String toSerializedString() {
return serializeToText();
}
@Deprecated
public String toSerializedString() {
return serializeToText();
}
public String serializeToText() {
if (getYaw() != 0 || getPitch() != 0) {
return worldName + ";" + x + ";" + y + ";" + z + ";" + yaw + ";" + pitch;
} else {
return worldName + ";" + x + ";" + y + ";" + z;
}
}
public static DataLocation deserializeText(String s) {
if (s == null || !s.contains(";")) return null;
String[] args = StringUtils.split(s, ";");
if (args.length < 4) return null;
try {
String worldName = args[0];
double x = NumberConversions.toDouble(args[1]);
double y = NumberConversions.toDouble(args[2]);
double z = NumberConversions.toDouble(args[3]);
float yaw = 0;
float pitch = 0;
if (args.length == 6) {
yaw = NumberConversions.toFloat(args[4]);
pitch = NumberConversions.toFloat(args[5]);
}
return new DataLocation(worldName, x, y, z, yaw, pitch);
} catch (Exception ex) {
return null;
}
}
@Deprecated
public static DataLocation parseString(String s) {
return deserializeText(s);
}
public String serializeToText() {
if (getYaw() != 0 || getPitch() != 0) {
return worldName + ";" + x + ";" + y + ";" + z + ";" + yaw + ";" + pitch;
} else {
return worldName + ";" + x + ";" + y + ";" + z;
}
}
}
@@ -9,24 +9,24 @@ import java.util.Collections;
public class ConfigMessage extends ConfigValue<String> {
public ConfigMessage(String configSection) {
this(configSection, null);
}
public ConfigMessage(String configSection) {
this(configSection, null);
}
public ConfigMessage(String configSection, String defaultValue) {
super(ConfigManager.getMessageConfig(), configSection, String.class, defaultValue);
}
public ConfigMessage(String configSection, String defaultValue) {
super(ConfigManager.getMessageConfig(), configSection, String.class, defaultValue);
}
public void send(CommandSender sender) {
MessageUtil.send(sender, get());
}
public void send(CommandSender sender) {
MessageUtil.send(sender, get());
}
public void sendWithPlaceholders(CommandSender sender) {
MessageUtil.sendWithPlaceholders(sender, get());
}
public void sendWithPlaceholders(CommandSender sender) {
MessageUtil.sendWithPlaceholders(sender, get());
}
public void sendWithPlaceholders(CommandSender sender, String[] params, Object[] values) {
MessageUtil.sendWithPlaceholders(sender, Collections.singletonList(get()), params, values);
}
public void sendWithPlaceholders(CommandSender sender, String[] params, Object[] values) {
MessageUtil.sendWithPlaceholders(sender, Collections.singletonList(get()), params, values);
}
}
@@ -8,23 +8,23 @@ import org.jetbrains.annotations.Nullable;
public class ConfigMessageList extends ConfigValueList<String> {
public ConfigMessageList(String configSection) {
super(ConfigManager.getMessageConfig(), configSection, String.class);
}
public ConfigMessageList(String configSection) {
super(ConfigManager.getMessageConfig(), configSection, String.class);
}
public ConfigMessageList(String configSection, String[] defaultValue) {
super(ConfigManager.getMessageConfig(), configSection, String.class, defaultValue);
}
public ConfigMessageList(String configSection, String[] defaultValue) {
super(ConfigManager.getMessageConfig(), configSection, String.class, defaultValue);
}
public void send(@Nullable CommandSender sender) {
MessageUtil.send(sender, get());
}
public void send(@Nullable CommandSender sender) {
MessageUtil.send(sender, get());
}
public void sendWithPlaceholders(@Nullable CommandSender sender) {
MessageUtil.sendWithPlaceholders(sender, get());
}
public void sendWithPlaceholders(@Nullable CommandSender sender) {
MessageUtil.sendWithPlaceholders(sender, get());
}
public void sendWithPlaceholders(@Nullable CommandSender sender, String[] params, Object[] values) {
MessageUtil.sendWithPlaceholders(sender, get(), params, values);
}
public void sendWithPlaceholders(@Nullable CommandSender sender, String[] params, Object[] values) {
MessageUtil.sendWithPlaceholders(sender, get(), params, values);
}
}
@@ -9,63 +9,63 @@ import java.util.Arrays;
import java.util.List;
public class ConfigValueList<V> {
FileConfig source;
String configSection;
Class<V> clazz;
FileConfig source;
String configSection;
Class<V> clazz;
V[] defaultValue;
V[] defaultValue;
public ConfigValueList(String configSection, Class<V> clazz) {
this(ConfigManager.getPluginConfig(), configSection, clazz);
}
public ConfigValueList(String configSection, Class<V> clazz) {
this(ConfigManager.getPluginConfig(), configSection, clazz);
}
public ConfigValueList(String configSection, Class<V> clazz, V[] defaultValue) {
this(ConfigManager.getPluginConfig(), configSection, clazz, defaultValue);
}
public ConfigValueList(String configSection, Class<V> clazz, V[] defaultValue) {
this(ConfigManager.getPluginConfig(), configSection, clazz, defaultValue);
}
public ConfigValueList(FileConfig configuration, String configSection, Class<V> clazz) {
this(configuration, configSection, clazz, null);
}
public ConfigValueList(FileConfig configuration, String configSection, Class<V> clazz) {
this(configuration, configSection, clazz, null);
}
public ConfigValueList(FileConfig configuration, String configSection, Class<V> clazz, V[] defaultValue) {
this.source = configuration;
this.configSection = configSection;
this.clazz = clazz;
this.defaultValue = defaultValue;
}
public ConfigValueList(FileConfig configuration, String configSection, Class<V> clazz, V[] defaultValue) {
this.source = configuration;
this.configSection = configSection;
this.clazz = clazz;
this.defaultValue = defaultValue;
}
public FileConfiguration getConfiguration() {
return this.source.getConfig();
}
public FileConfiguration getConfiguration() {
return this.source.getConfig();
}
public ArrayList<V> get() {
List<?> list = getConfiguration().getList(this.configSection);
if (list == null) {
if (defaultValue != null) {
return new ArrayList<>(Arrays.asList(defaultValue));
} else {
return new ArrayList<>();
}
} else {
ArrayList<V> result = new ArrayList<>();
public ArrayList<V> get() {
List<?> list = getConfiguration().getList(this.configSection);
if (list == null) {
if (defaultValue != null) {
return new ArrayList<>(Arrays.asList(defaultValue));
} else {
return new ArrayList<>();
}
} else {
ArrayList<V> result = new ArrayList<>();
for (Object object : list) {
if (this.clazz.isInstance(object)) {
result.add(this.clazz.cast(object));
}
}
return result;
}
}
for (Object object : list) {
if (this.clazz.isInstance(object)) {
result.add(this.clazz.cast(object));
}
}
return result;
}
}
public void set(ArrayList<V> value) {
getConfiguration().set(this.configSection, value);
this.save();
}
public void set(ArrayList<V> value) {
getConfiguration().set(this.configSection, value);
this.save();
}
public void save() {
this.source.save();
}
public void save() {
this.source.save();
}
}
@@ -7,7 +7,6 @@ import org.bukkit.configuration.file.FileConfiguration;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
@@ -15,65 +14,66 @@ import java.util.function.Function;
public class ConfigValueMap<K, V> {
@NotNull FileConfig source;
@NotNull String configSection;
@NotNull FileConfig source;
@NotNull String configSection;
@NotNull Function<String, K> keyCast;
@NotNull Class<V> valueClazz;
@NotNull Function<String, K> keyCast;
@NotNull Class<V> valueClazz;
@Nullable LinkedHashMap<K, V> valueCache;
@Nullable LinkedHashMap<K, V> valueCache;
public ConfigValueMap(@NotNull String configSection, @NotNull Function<String, K> keyCast,
@NotNull Class<V> valueClazz) {
this(ConfigManager.getPluginConfig(), configSection, keyCast, valueClazz);
}
public ConfigValueMap(@NotNull String configSection, @NotNull Function<String, K> keyCast,
@NotNull Class<V> valueClazz) {
this(ConfigManager.getPluginConfig(), configSection, keyCast, valueClazz);
}
public ConfigValueMap(@NotNull FileConfig configuration, @NotNull String configSection,
@NotNull Function<String, K> keyCast, @NotNull Class<V> valueClazz) {
this.source = configuration;
this.configSection = configSection;
this.keyCast = keyCast;
this.valueClazz = valueClazz;
}
public ConfigValueMap(@NotNull FileConfig configuration, @NotNull String configSection,
@NotNull Function<String, K> keyCast, @NotNull Class<V> valueClazz) {
this.source = configuration;
this.configSection = configSection;
this.keyCast = keyCast;
this.valueClazz = valueClazz;
}
public @NotNull FileConfiguration getConfiguration() {
return this.source.getConfig();
}
public @NotNull FileConfiguration getConfiguration() {
return this.source.getConfig();
}
public void clearCache() {
this.valueCache = null;
}
public void clearCache() {
this.valueCache = null;
}
@NotNull
public Map<K, V> get() {
if (valueCache != null) return valueCache;
ConfigurationSection section = getConfiguration().getConfigurationSection(this.configSection);
if (section == null) return new LinkedHashMap<>();
Set<String> keys = getConfiguration().getKeys(false);
if (keys.isEmpty()) return new LinkedHashMap<>();
else {
LinkedHashMap<K, V> result = new LinkedHashMap<>();
for (String key : keys) {
K finalKey = keyCast.apply(key);
Object val = getConfiguration().get(this.configSection);
V finalValue = this.valueClazz.isInstance(val) ? this.valueClazz.cast(val) : null;
if (finalKey != null && finalValue != null) {
result.put(finalKey, finalValue);
}
}
this.valueCache = result;
return result;
}
}
@NotNull
public Map<K, V> get() {
if (valueCache != null) return valueCache;
ConfigurationSection section = getConfiguration().getConfigurationSection(this.configSection);
if (section == null) return new LinkedHashMap<>();
Set<String> keys = section.getKeys(false);
if (keys.isEmpty()) return new LinkedHashMap<>();
else {
LinkedHashMap<K, V> result = new LinkedHashMap<>();
for (String key : keys) {
K finalKey = keyCast.apply(key);
Object val = section.get(key);
V finalValue = this.valueClazz.isInstance(val) ? this.valueClazz.cast(val) : null;
if (finalKey != null && finalValue != null) {
result.put(finalKey, finalValue);
}
}
this.valueCache = result;
return result;
}
}
public void set(HashMap<K, V> valuesMap) {
getConfiguration().createSection(this.configSection, valuesMap);
this.save();
}
public void set(LinkedHashMap<K, V> valuesMap) {
this.valueCache = valuesMap;
getConfiguration().createSection(this.configSection, valuesMap);
this.save();
}
public void save() {
this.source.save();
}
public void save() {
this.source.save();
}
}
@@ -3,7 +3,6 @@ package cc.carm.plugin.moeteleport.listener;
import cc.carm.plugin.moeteleport.Main;
import cc.carm.plugin.moeteleport.configuration.PluginConfig;
import cc.carm.plugin.moeteleport.configuration.PluginMessages;
import cc.carm.plugin.moeteleport.model.UserData;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
@@ -11,32 +10,27 @@ import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import java.util.UUID;
public class UserListener implements Listener {
@EventHandler
public void onJoin(PlayerJoinEvent event) {
UUID uuid = event.getPlayer().getUniqueId();
UserData data = Main.getUserManager().loadData(uuid);
Main.getUserManager().getUserDataMap().put(uuid, data);
}
@EventHandler
public void onJoin(PlayerJoinEvent event) {
Main.getUserManager().loadData(event.getPlayer().getUniqueId());
}
@EventHandler
public void onDeath(PlayerQuitEvent event) {
Player player = event.getPlayer();
Main.getRequestManager().cancelAllRequests(player);
Main.getUserManager().getData(player).save(); //保存
Main.getUserManager().getUserDataMap().remove(player.getUniqueId());
}
@EventHandler
public void onQuit(PlayerQuitEvent event) {
Player player = event.getPlayer();
Main.getRequestManager().cancelAllRequests(player);
Main.getUserManager().unloadData(player.getUniqueId());
}
@EventHandler
public void onDeath(PlayerDeathEvent event) {
if (PluginConfig.DEATH_GO_BACK.get()) {
Player player = event.getEntity();
Main.getUserManager().getData(player).setLastLocation(player.getLocation());
PluginMessages.DEATH_BACK.send(player);
}
}
@EventHandler
public void onDeath(PlayerDeathEvent event) {
if (PluginConfig.DEATH_GO_BACK.get()) {
Player player = event.getEntity();
Main.getUserManager().getData(player).setLastLocation(player.getLocation());
PluginMessages.DEATH_BACK.send(player);
}
}
}
@@ -6,32 +6,32 @@ import cc.carm.plugin.moeteleport.configuration.file.FileConfig;
public class ConfigManager {
private static FileConfig config;
private static FileConfig messageConfig;
private static FileConfig config;
private static FileConfig messageConfig;
public static void initConfig() {
ConfigManager.config = new FileConfig(Main.getInstance(), "config.yml");
ConfigManager.messageConfig = new FileConfig(Main.getInstance(), "messages.yml");
}
public static void initConfig() {
ConfigManager.config = new FileConfig(Main.getInstance(), "config.yml");
ConfigManager.messageConfig = new FileConfig(Main.getInstance(), "messages.yml");
}
public static FileConfig getPluginConfig() {
return config;
}
public static FileConfig getPluginConfig() {
return config;
}
public static FileConfig getMessageConfig() {
return messageConfig;
}
public static FileConfig getMessageConfig() {
return messageConfig;
}
public static void reload() {
getPluginConfig().reload();
getMessageConfig().reload();
PluginConfig.PERMISSIONS.clearCache();
}
public static void reload() {
getPluginConfig().reload();
getMessageConfig().reload();
PluginConfig.PERMISSIONS.clearCache();
}
public static void saveConfig() {
getPluginConfig().save();
getMessageConfig().save();
}
public static void saveConfig() {
getPluginConfig().save();
getMessageConfig().save();
}
}
@@ -14,127 +14,127 @@ import java.util.UUID;
public class RequestManager {
public BukkitRunnable checkRunnable;
public BukkitRunnable checkRunnable;
public RequestManager(Main main) {
this.checkRunnable = new BukkitRunnable() {
@Override
public void run() {
checkRequests();
}
};
this.checkRunnable.runTaskTimerAsynchronously(main, 100L, 20L);
}
public RequestManager(Main main) {
this.checkRunnable = new BukkitRunnable() {
@Override
public void run() {
checkRequests();
}
};
this.checkRunnable.runTaskTimerAsynchronously(main, 100L, 20L);
}
public void shutdown() {
if (!this.checkRunnable.isCancelled()) {
this.checkRunnable.cancel();
}
}
public void shutdown() {
if (!this.checkRunnable.isCancelled()) {
this.checkRunnable.cancel();
}
}
public void checkRequests() {
Main.getUserManager().getUserDataMap().values()
.forEach(data -> data.getReceivedRequests().entrySet().stream()
.filter(entry -> entry.getValue().isExpired())
.peek(entry -> PluginMessages.Request.SENT_TIMEOUT.sendWithPlaceholders(
entry.getValue().getSender(), new String[]{"%(player)"},
new Object[]{entry.getValue().getReceiver().getName()}))
.peek(entry -> PluginMessages.Request.RECEIVED_TIMEOUT.sendWithPlaceholders(
entry.getValue().getReceiver(), new String[]{"%(player)"},
new Object[]{entry.getValue().getSender().getName()}))
.peek(entry -> Main.getUserManager()
.getData(entry.getValue().getSender()).getSentRequests()
.remove(entry.getKey()))
.forEach(entry -> data.getReceivedRequests().remove(entry.getKey()))
);
}
public void checkRequests() {
Main.getUserManager().getUserDataMap().values()
.forEach(data -> data.getReceivedRequests().entrySet().stream()
.filter(entry -> entry.getValue().isExpired())
.peek(entry -> PluginMessages.Request.SENT_TIMEOUT.sendWithPlaceholders(
entry.getValue().getSender(), new String[]{"%(player)"},
new Object[]{entry.getValue().getReceiver().getName()}))
.peek(entry -> PluginMessages.Request.RECEIVED_TIMEOUT.sendWithPlaceholders(
entry.getValue().getReceiver(), new String[]{"%(player)"},
new Object[]{entry.getValue().getSender().getName()}))
.peek(entry -> Main.getUserManager()
.getData(entry.getValue().getSender()).getSentRequests()
.remove(entry.getKey()))
.forEach(entry -> data.getReceivedRequests().remove(entry.getKey()))
);
}
public void sendRequest(Player sender, Player receiver, TeleportRequest.RequestType type) {
int expireTime = PluginConfig.EXPIRE_TIME.get();
public void sendRequest(Player sender, Player receiver, TeleportRequest.RequestType type) {
int expireTime = PluginConfig.EXPIRE_TIME.get();
PluginMessages.Request.SENT.sendWithPlaceholders(sender,
new String[]{"%(player)", "%(expire)"},
new Object[]{receiver.getName(), expireTime}
);
PluginMessages.Request.SENT.sendWithPlaceholders(sender,
new String[]{"%(player)", "%(expire)"},
new Object[]{receiver.getName(), expireTime}
);
switch (type) {
case TPA: {
PluginMessages.TPA.sendWithPlaceholders(receiver,
new String[]{"%(player)", "%(expire)"},
new Object[]{sender.getName(), expireTime}
);
break;
}
case TPA_HERE: {
PluginMessages.TPA_HERE.sendWithPlaceholders(receiver,
new String[]{"%(player)", "%(expire)"},
new Object[]{sender.getName(), expireTime}
);
break;
}
}
switch (type) {
case TPA: {
PluginMessages.TPA.sendWithPlaceholders(receiver,
new String[]{"%(player)", "%(expire)"},
new Object[]{sender.getName(), expireTime}
);
break;
}
case TPA_HERE: {
PluginMessages.TPA_HERE.sendWithPlaceholders(receiver,
new String[]{"%(player)", "%(expire)"},
new Object[]{sender.getName(), expireTime}
);
break;
}
}
TeleportRequest request = new TeleportRequest(sender, receiver, type);
Main.getUserManager().getData(receiver).getReceivedRequests().put(sender.getUniqueId(), request);
Main.getUserManager().getData(sender).getSentRequests().add(receiver.getUniqueId());
TeleportRequest request = new TeleportRequest(sender, receiver, type);
Main.getUserManager().getData(receiver).getReceivedRequests().put(sender.getUniqueId(), request);
Main.getUserManager().getData(sender).getSentRequests().add(receiver.getUniqueId());
}
}
public void acceptRequest(TeleportRequest request) {
PluginMessages.ACCEPTED.sendWithPlaceholders(request.getSender(),
new String[]{"%(player)"},
new Object[]{request.getReceiver().getName()}
);
PluginMessages.TP_ACCEPT.sendWithPlaceholders(request.getReceiver(),
new String[]{"%(player)"},
new Object[]{request.getSender().getName()}
);
TeleportManager.teleport(request.getTeleportPlayer(), request.getTeleportLocation(), true);
removeRequests(request);
}
public void acceptRequest(TeleportRequest request) {
PluginMessages.ACCEPTED.sendWithPlaceholders(request.getSender(),
new String[]{"%(player)"},
new Object[]{request.getReceiver().getName()}
);
PluginMessages.TP_ACCEPT.sendWithPlaceholders(request.getReceiver(),
new String[]{"%(player)"},
new Object[]{request.getSender().getName()}
);
TeleportManager.teleport(request.getTeleportPlayer(), request.getTeleportLocation(), true);
removeRequests(request);
}
public void denyRequest(TeleportRequest request) {
PluginMessages.DENIED.sendWithPlaceholders(request.getSender(),
new String[]{"%(player)"},
new Object[]{request.getReceiver().getName()}
);
PluginMessages.TP_DENY.sendWithPlaceholders(request.getReceiver(),
new String[]{"%(player)"},
new Object[]{request.getSender().getName()}
);
removeRequests(request);
}
public void denyRequest(TeleportRequest request) {
PluginMessages.DENIED.sendWithPlaceholders(request.getSender(),
new String[]{"%(player)"},
new Object[]{request.getReceiver().getName()}
);
PluginMessages.TP_DENY.sendWithPlaceholders(request.getReceiver(),
new String[]{"%(player)"},
new Object[]{request.getSender().getName()}
);
removeRequests(request);
}
public void removeRequests(TeleportRequest request) {
Main.getUserManager().getData(request.getSender())
.getSentRequests()
.remove(request.getReceiver().getUniqueId());
Main.getUserManager().getData(request.getReceiver())
.getReceivedRequests()
.remove(request.getSender().getUniqueId());
}
public void removeRequests(TeleportRequest request) {
Main.getUserManager().getData(request.getSender())
.getSentRequests()
.remove(request.getReceiver().getUniqueId());
Main.getUserManager().getData(request.getReceiver())
.getReceivedRequests()
.remove(request.getSender().getUniqueId());
}
public void cancelAllRequests(Player player) {
UUID playerUUID = player.getUniqueId();
UserData data = Main.getUserManager().getData(player);
data.getReceivedRequests().keySet().stream()
.peek(senderUUID -> PluginMessages.Request.OFFLINE.sendWithPlaceholders(
Bukkit.getPlayer(senderUUID),
new String[]{"%(player)"}, new Object[]{player.getName()}
)).map(senderUUID -> Main.getUserManager().getData(senderUUID))
.filter(Objects::nonNull).map(UserData::getSentRequests)
.forEach(receivers -> receivers.remove(playerUUID));
public void cancelAllRequests(Player player) {
UUID playerUUID = player.getUniqueId();
UserData data = Main.getUserManager().getData(player);
data.getReceivedRequests().keySet().stream()
.peek(senderUUID -> PluginMessages.Request.OFFLINE.sendWithPlaceholders(
Bukkit.getPlayer(senderUUID),
new String[]{"%(player)"}, new Object[]{player.getName()}
)).map(senderUUID -> Main.getUserManager().getData(senderUUID))
.filter(Objects::nonNull).map(UserData::getSentRequests)
.forEach(receivers -> receivers.remove(playerUUID));
data.getSentRequests().stream()
.peek(receiverUUID -> PluginMessages.Request.OFFLINE.sendWithPlaceholders(
Bukkit.getPlayer(receiverUUID),
new String[]{"%(player)"}, new Object[]{player.getName()}
)).map(receiverUUID -> Main.getUserManager().getData(receiverUUID))
.filter(Objects::nonNull).map(UserData::getReceivedRequests)
.forEach(senders -> senders.remove(playerUUID));
data.getSentRequests().stream()
.peek(receiverUUID -> PluginMessages.Request.OFFLINE.sendWithPlaceholders(
Bukkit.getPlayer(receiverUUID),
new String[]{"%(player)"}, new Object[]{player.getName()}
)).map(receiverUUID -> Main.getUserManager().getData(receiverUUID))
.filter(Objects::nonNull).map(UserData::getReceivedRequests)
.forEach(senders -> senders.remove(playerUUID));
data.getSentRequests().clear();
data.getReceivedRequests().clear();
}
data.getSentRequests().clear();
data.getReceivedRequests().clear();
}
}
@@ -11,51 +11,50 @@ import org.bukkit.entity.Player;
public class TeleportManager {
public static void teleport(Player player, DataLocation targetLocation, boolean onlySafety) {
Location location = targetLocation.getBukkitLocation();
if (location == null) {
PluginMessages.NOT_AVAILABLE.sendWithPlaceholders(player,
new String[]{"%(location)"},
new Object[]{targetLocation.toFlatString()}
);
} else {
teleport(player, location, onlySafety);
}
}
public static void teleport(Player player, DataLocation targetLocation, boolean onlySafety) {
Location location = targetLocation.getBukkitLocation();
if (location == null) {
PluginMessages.NOT_AVAILABLE.sendWithPlaceholders(player,
new String[]{"%(location)"},
new Object[]{targetLocation.toFlatString()}
);
} else {
teleport(player, location, onlySafety);
}
}
public static void teleport(Player player, Location targetLocation, boolean onlySafety) {
if (targetLocation.isWorldLoaded()) {
if (!onlySafety || TeleportManager.isSafeLocation(targetLocation)) {
Main.getUserManager().getData(player).setLastLocation(player.getLocation());
player.teleport(targetLocation);
PluginMessages.TELEPORTING.sendWithPlaceholders(player,
new String[]{"%(location)"},
new Object[]{new DataLocation(targetLocation).toFlatString()}
);
} else {
PluginMessages.DANGEROUS.send(player);
}
} else {
PluginMessages.NOT_AVAILABLE.sendWithPlaceholders(player,
new String[]{"%(location)"},
new Object[]{new DataLocation(targetLocation).toFlatString()}
);
}
}
public static void teleport(Player player, Location targetLocation, boolean onlySafety) {
if (targetLocation.isWorldLoaded()) {
if (!onlySafety || TeleportManager.isSafeLocation(targetLocation)) {
Main.getUserManager().getData(player).setLastLocation(player.getLocation());
player.teleport(targetLocation);
PluginMessages.TELEPORTING.sendWithPlaceholders(player,
new String[]{"%(location)"},
new Object[]{new DataLocation(targetLocation).toFlatString()}
);
} else {
PluginMessages.DANGEROUS.send(player);
}
} else {
PluginMessages.NOT_AVAILABLE.sendWithPlaceholders(player,
new String[]{"%(location)"},
new Object[]{new DataLocation(targetLocation).toFlatString()}
);
}
}
public static boolean isSafeLocation(Location location) {
Block leg = location.getBlock();
if (!leg.getType().isAir()) {
return false; // not transparent (will suffocate)
}
Block head = leg.getRelative(BlockFace.UP);
if (!head.getType().isAir()) {
return false; // not transparent (will suffocate)
}
Block ground = leg.getRelative(BlockFace.DOWN);
return ground.getType().isSolid()
&& !PluginConfig.DANGEROUS_TYPES.get().contains(ground.getType().name());
}
public static boolean isSafeLocation(Location location) {
Block leg = location.getBlock();
if (!leg.getType().isAir()) {
return false; // not transparent (will suffocate)
}
Block head = leg.getRelative(BlockFace.UP);
if (!head.getType().isAir()) {
return false; // not transparent (will suffocate)
}
Block ground = leg.getRelative(BlockFace.DOWN);
return !PluginConfig.DANGEROUS_TYPES.get().contains(ground.getType().name());
}
}
@@ -3,61 +3,138 @@ package cc.carm.plugin.moeteleport.manager;
import cc.carm.plugin.moeteleport.Main;
import cc.carm.plugin.moeteleport.configuration.PluginConfig;
import cc.carm.plugin.moeteleport.model.UserData;
import cc.carm.plugin.moeteleport.storage.DataStorage;
import cc.carm.plugin.moeteleport.util.DataTaskRunner;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
public class UserManager {
private final File dataFolder;
private final HashMap<UUID, UserData> userDataMap;
private final HashMap<UUID, UserData> userDataMap = new HashMap<>();
public UserManager() {
this.userDataMap = new HashMap<>();
}
public UserManager(Main main) {
this.dataFolder = new File(main.getDataFolder() + "/data");
if (!dataFolder.isDirectory() || !dataFolder.exists()) {
boolean success = dataFolder.mkdir();
}
}
@NotNull
public UserData readData(UUID userUUID) {
try {
long start = System.currentTimeMillis();
DataStorage storage = Main.getStorage();
Main.debug("正通过 " + storage.getClass().getSimpleName() + " 读取 " + userUUID + " 的用户数据...(" + System.currentTimeMillis() + ")");
@NotNull
public UserData loadData(UUID userUUID) {
return new UserData(getDataFolder(), userUUID);
}
UserData data = storage.loadData(userUUID);
@Nullable
public UserData getData(UUID userUUID) {
return getUserDataMap().get(userUUID);
}
if (data == null) {
Main.debug("当前还不存在玩家 " + userUUID + " 的数据,视作新档。");
return new UserData(userUUID);
}
@NotNull
public UserData getData(Player player) {
return getUserDataMap().get(player.getUniqueId());
}
Main.debug("通过 " + storage.getClass().getSimpleName() + "读取 " + userUUID + " 的用户数据完成,"
+ "耗时 " + (System.currentTimeMillis() - start) + "ms。");
public int getMaxHome(Player player) {
Map<String, Integer> permissions = PluginConfig.PERMISSIONS.get();
int value = PluginConfig.DEFAULT_HOME.get();
for (Map.Entry<String, Integer> entry : permissions.entrySet()) {
if (entry.getValue() > value && player.hasPermission(
Main.getInstance().getName() + "." + entry.getKey()
)) {
value = entry.getValue();
}
}
return value;
}
return data;
} catch (Exception e) {
Main.error("无法正常读取玩家数据,玩家操作将不会被保存,请检查数据配置!");
Main.error("Could not load user's data, please check the data configuration!");
e.printStackTrace();
return new UserData(userUUID);
}
}
public HashMap<UUID, UserData> getUserDataMap() {
return userDataMap;
}
public void saveData(UserData data) {
try {
long start = System.currentTimeMillis();
DataStorage storage = Main.getStorage();
Main.debug("正通过 " + storage.getClass().getSimpleName() + " 保存 " + data.getUserUUID() + " 的用户数据...(" + System.currentTimeMillis() + ")");
storage.saveUserData(data);
Main.debug("通过 " + storage.getClass().getSimpleName() + " 保存 " + data.getUserUUID() + " 的用户数据完成," +
"耗时 " + (System.currentTimeMillis() - start) + "ms。");
} catch (Exception e) {
Main.error("无法正常保存玩家数据,请检查数据配置!");
Main.error("Could not save user's data, please check the data configuration!");
e.printStackTrace();
}
}
public void loadData(UUID userUUID) {
getUserDataMap().put(userUUID, readData(userUUID));
}
public void unloadData(UUID userUUID) {
unloadData(userUUID, true);
}
public void unloadData(UUID userUUID, boolean save) {
UserData data = getData(userUUID);
if (data == null) return;
if (save) saveData(data);
getUserDataMap().remove(userUUID);
}
public void loadAll() {
for (Player player : Bukkit.getOnlinePlayers()) {
if (getUserDataMap().containsKey(player.getUniqueId())) continue;
loadData(player.getUniqueId());
}
}
public void saveAll() {
getUserDataMap().values().forEach(this::saveData);
}
public void unloadAll(boolean save) {
if (save) saveAll();
getUserDataMap().clear();
}
@Nullable
public UserData getData(UUID userUUID) {
return getUserDataMap().get(userUUID);
}
@NotNull
public UserData getData(Player player) {
return getUserDataMap().get(player.getUniqueId());
}
public int getMaxHome(Player player) {
Map<Integer, String> permissions = PluginConfig.PERMISSIONS.get();
int current = PluginConfig.DEFAULT_HOME.get();
for (Map.Entry<Integer, String> entry : permissions.entrySet()) {
if (entry.getKey() > current && player.hasPermission(entry.getValue())) {
current = entry.getKey();
}
}
return current;
}
public void editData(@NotNull DataTaskRunner task) {
try {
task.run(Main.getStorage());
} catch (Exception exception) {
Main.error("无法正常更改玩家数据,请检查数据配置!");
Main.error("Could not edit user's data, please check the data configuration!");
exception.printStackTrace();
}
}
public void editDataAsync(@NotNull DataTaskRunner task) {
Main.getScheduler().runAsync(() -> editData(task));
}
public HashMap<UUID, UserData> getUserDataMap() {
return userDataMap;
}
public File getDataFolder() {
return dataFolder;
}
}
@@ -7,65 +7,65 @@ import org.jetbrains.annotations.NotNull;
public class TeleportRequest {
final @NotNull Player sender;
final @NotNull Player receiver;
final @NotNull RequestType type;
final @NotNull Player sender;
final @NotNull Player receiver;
final @NotNull RequestType type;
final long createTime;
final long createTime;
public TeleportRequest(@NotNull Player sender,
@NotNull Player receiver,
@NotNull RequestType type) {
this.sender = sender;
this.receiver = receiver;
this.type = type;
this.createTime = System.currentTimeMillis();
}
public TeleportRequest(@NotNull Player sender,
@NotNull Player receiver,
@NotNull RequestType type) {
this.sender = sender;
this.receiver = receiver;
this.type = type;
this.createTime = System.currentTimeMillis();
}
public @NotNull Player getSender() {
return sender;
}
public @NotNull Player getSender() {
return sender;
}
public @NotNull Player getReceiver() {
return receiver;
}
public @NotNull Player getReceiver() {
return receiver;
}
public @NotNull Player getTeleportPlayer() {
return getType() == RequestType.TPA ? getSender() : getReceiver();
}
public @NotNull Player getTeleportPlayer() {
return getType() == RequestType.TPA ? getSender() : getReceiver();
}
public @NotNull Location getTeleportLocation() {
return getType() == RequestType.TPA_HERE ? getSender().getLocation() : getReceiver().getLocation();
}
public @NotNull Location getTeleportLocation() {
return getType() == RequestType.TPA_HERE ? getSender().getLocation() : getReceiver().getLocation();
}
public @NotNull RequestType getType() {
return type;
}
public @NotNull RequestType getType() {
return type;
}
public long getCreateTime() {
return createTime;
}
public long getCreateTime() {
return createTime;
}
public long getActiveTime() {
return System.currentTimeMillis() - getCreateTime();
}
public long getActiveTime() {
return System.currentTimeMillis() - getCreateTime();
}
public long getRemainTime() {
return PluginConfig.EXPIRE_TIME.get() * 1000 - getActiveTime();
}
public long getRemainTime() {
return PluginConfig.EXPIRE_TIME.get() * 1000 - getActiveTime();
}
public long getRemainSeconds() {
return getRemainTime() / 1000;
}
public long getRemainSeconds() {
return getRemainTime() / 1000;
}
public boolean isExpired() {
return getActiveTime() > PluginConfig.EXPIRE_TIME.get() * 1000;
}
public boolean isExpired() {
return getActiveTime() > PluginConfig.EXPIRE_TIME.get() * 1000;
}
public enum RequestType {
TPA,
TPA_HERE
}
public enum RequestType {
TPA,
TPA_HERE
}
}
@@ -3,134 +3,92 @@ package cc.carm.plugin.moeteleport.model;
import cc.carm.plugin.moeteleport.Main;
import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
import org.bukkit.Location;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.io.IOException;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
public class UserData {
private final @NotNull File dataFile;
private final @NotNull FileConfiguration dataConfig;
protected final @NotNull UUID userUUID;
private @Nullable Location lastLocation;
public boolean enableAutoSelect = false;
private @Nullable Location lastLocation;
private final LinkedHashMap<String, DataLocation> homeLocations;
private LinkedHashMap<String, DataLocation> homeLocations;
private final HashSet<UUID/*receiverUUID*/> sentRequests = new HashSet<>(); // 记录发出的请求
private final ConcurrentHashMap<UUID/*senderUUID*/, TeleportRequest> receivedRequests = new ConcurrentHashMap<>(); // 记录收到的传送请求
private final HashSet<UUID/*receiverUUID*/> sentRequests = new HashSet<>(); // 记录发出的请求
private final ConcurrentHashMap<UUID/*senderUUID*/, TeleportRequest> receivedRequests = new ConcurrentHashMap<>(); // 记录收到的传送请求
public UserData(@NotNull UUID userUUID) {
this(userUUID, null, new LinkedHashMap<>());
}
public boolean enableAutoSelect = false;
public UserData(@NotNull UUID userUUID,
@Nullable DataLocation lastLocation,
@NotNull LinkedHashMap<String, DataLocation> homeLocations) {
this.userUUID = userUUID;
this.lastLocation = Optional.ofNullable(lastLocation).map(DataLocation::getBukkitLocation).orElse(null);
this.homeLocations = homeLocations;
}
public UserData(@NotNull File dataFolder, @NotNull UUID uuid) {
this(new File(dataFolder, uuid + ".yml"));
}
public @NotNull UUID getUserUUID() {
return userUUID;
}
public UserData(@NotNull File file) {
if (!file.exists()) {
try {
boolean success = file.createNewFile();
} catch (IOException e) {
Main.error("在加载用户 " + file.getName() + " 的数据时出现异常。");
Main.error(e.getLocalizedMessage());
}
}
this.dataFile = file;
this.dataConfig = YamlConfiguration.loadConfiguration(dataFile);
loadHomeData();
}
public LinkedHashMap<String, DataLocation> getHomeLocations() {
return homeLocations;
}
public void loadHomeData() {
LinkedHashMap<String, DataLocation> data = new LinkedHashMap<>();
Optional.ofNullable(getDataConfig().getConfigurationSection("homes"))
.ifPresent(section -> section.getKeys(false).forEach(homeName -> {
DataLocation location = DataLocation.deserializeText(section.getString(homeName));
if (location != null) data.put(homeName, location);
}));
this.homeLocations = data;
}
public void setHomeLocation(String homeName, Location location) {
delHomeLocation(homeName);
getHomeLocations().put(homeName, new DataLocation(location));
Main.getUserManager().editData((storage) -> storage.setHome(userUUID, homeName, new DataLocation(location)));
}
public LinkedHashMap<String, DataLocation> getHomeLocations() {
return homeLocations;
}
public void delHomeLocation(String homeName) {
Map.Entry<String, DataLocation> lastLocation = getHomeLocation(homeName);
if (lastLocation != null) getHomeLocations().remove(lastLocation.getKey());
Main.getUserManager().editData((storage) -> storage.delHome(userUUID, homeName));
}
public void setHomeLocation(String homeName, Location location) {
delHomeLocation(homeName);
getHomeLocations().put(homeName, new DataLocation(location));
}
public Map.Entry<String, DataLocation> getHomeLocation(@Nullable String homeName) {
LinkedHashMap<String, DataLocation> homes = getHomeLocations();
if (homeName == null) {
if (homes.containsKey("home")) {
return new AbstractMap.SimpleEntry<>("home", homes.get("home"));
} else {
return homes.entrySet().stream().findFirst().orElse(null);
}
} else {
return homes.entrySet().stream()
.filter(entry -> entry.getKey().equalsIgnoreCase(homeName))
.findFirst().orElse(null);
}
}
public void delHomeLocation(String homeName) {
Map.Entry<String, DataLocation> lastLocation = getHomeLocation(homeName);
if (lastLocation != null) getHomeLocations().remove(lastLocation.getKey());
}
public @Nullable Location getLastLocation() {
return lastLocation;
}
public Map.Entry<String, DataLocation> getHomeLocation(@Nullable String homeName) {
LinkedHashMap<String, DataLocation> homes = getHomeLocations();
if (homeName == null) {
if (homes.containsKey("home")) {
return new AbstractMap.SimpleEntry<>("home", homes.get("home"));
} else {
return homes.entrySet().stream().findFirst().orElse(null);
}
} else {
return homes.entrySet().stream()
.filter(entry -> entry.getKey().equalsIgnoreCase(homeName))
.findFirst().orElse(null);
}
}
public void setLastLocation(@Nullable Location lastLocation) {
this.lastLocation = lastLocation;
}
public @Nullable Location getLastLocation() {
return lastLocation;
}
public HashSet<UUID> getSentRequests() {
return sentRequests;
}
public void setLastLocation(@Nullable Location lastLocation) {
this.lastLocation = lastLocation;
}
public ConcurrentHashMap<UUID, TeleportRequest> getReceivedRequests() {
return receivedRequests;
}
public HashSet<UUID> getSentRequests() {
return sentRequests;
}
public boolean isEnableAutoSelect() {
return enableAutoSelect;
}
public ConcurrentHashMap<UUID, TeleportRequest> getReceivedRequests() {
return receivedRequests;
}
public void setEnableAutoSelect(boolean enableAutoSelect) {
this.enableAutoSelect = enableAutoSelect;
}
public void setEnableAutoSelect(boolean enableAutoSelect) {
this.enableAutoSelect = enableAutoSelect;
}
public boolean isEnableAutoSelect() {
return enableAutoSelect;
}
public @NotNull File getDataFile() {
return dataFile;
}
public @NotNull FileConfiguration getDataConfig() {
return dataConfig;
}
public LinkedHashMap<String, String> saveToMap() {
LinkedHashMap<String, DataLocation> homeLocations = getHomeLocations();
LinkedHashMap<String, String> data = new LinkedHashMap<>();
if (homeLocations.isEmpty()) return data;
homeLocations.forEach((name, loc) -> data.put(name, loc.serializeToText()));
return data;
}
public void save() {
try {
getDataConfig().createSection("homes", saveToMap());
getDataConfig().save(getDataFile());
} catch (Exception ex) {
Main.error("在保存 " + getDataFile().getName() + " 时出现异常。");
Main.error(ex.getLocalizedMessage());
}
}
}
@@ -0,0 +1,29 @@
package cc.carm.plugin.moeteleport.storage;
import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
import org.bukkit.Location;
import org.jetbrains.annotations.Nullable;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Optional;
public class DataSerializer {
public static Map<String, String> serializeLocationsMap(LinkedHashMap<String, DataLocation> data) {
LinkedHashMap<String, String> after = new LinkedHashMap<>();
if (data == null || data.isEmpty()) return after;
data.forEach((name, loc) -> after.put(name, loc.serializeToText()));
return after;
}
public static @Nullable String serializeLocation(@Nullable DataLocation loc) {
return Optional.ofNullable(loc).map(DataLocation::serializeToText).orElse(null);
}
public static @Nullable String serializeLocation(@Nullable Location loc) {
return serializeLocation(Optional.ofNullable(loc).map(DataLocation::new).orElse(null));
}
}
@@ -0,0 +1,68 @@
package cc.carm.plugin.moeteleport.storage;
import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
import cc.carm.plugin.moeteleport.manager.UserManager;
import cc.carm.plugin.moeteleport.model.UserData;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.UUID;
public interface DataStorage {
/**
* 在插件加载存储源时执行。
*
* @return 是否初始化成功
*/
boolean initialize();
/**
* 在插件被卸载时执行。
*/
void shutdown();
/**
* 用于加载用户数据的方法。<b>该方法将会被异步运行!</b>
* <br>该方法一般无需自行执行,见 {@link UserManager#loadData(UUID)}
* <br>
* <br>若不存在该用户的数据,请返回 null 。
* <br>若加载出现任何错误,请抛出异常。
*
* @param uuid 用户UUID
* @throws Exception 当出现任何错误时抛出
*/
@Nullable
UserData loadData(@NotNull UUID uuid) throws Exception;
/**
* 用于保存用户数据的方法。 <b>该方法将会被异步运行!</b>
* <br>该方法一般无需自行执行,见 {@link UserManager#saveData(UserData)}
*
* @param data 用户数据
* @throws Exception 当出现任何错误时抛出
*/
void saveUserData(@NotNull UserData data) throws Exception;
/**
* 为某用户设定一个家的位置。
*
* @param uuid 用户UUID
* @param homeName 家的名称
* @param homeLocation 家的位置
* @throws Exception 当出现任何错误时抛出
*/
void setHome(@NotNull UUID uuid, @NotNull String homeName, @NotNull DataLocation homeLocation) throws Exception;
/**
* 为某用户移除一个家的位置。
*
* @param uuid 用户UUID
* @param homeName 家的名称
* @return 是否有一个家被移除
* @throws Exception 当出现任何错误时抛出
*/
boolean delHome(@NotNull UUID uuid, @NotNull String homeName) throws Exception;
}
@@ -0,0 +1,81 @@
package cc.carm.plugin.moeteleport.storage;
import cc.carm.plugin.moeteleport.storage.database.MySQLStorage;
import cc.carm.plugin.moeteleport.storage.extension.EssentialXStorage;
import cc.carm.plugin.moeteleport.storage.file.JSONStorage;
import cc.carm.plugin.moeteleport.storage.file.YAMLStorage;
import cc.carm.plugin.moeteleport.storage.custom.CustomStorage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Arrays;
import java.util.Optional;
import java.util.function.Supplier;
public enum StorageMethod {
CUSTOM(0, new String[]{}, CustomStorage::new),
YAML(1, new String[]{"yml"}, YAMLStorage::new),
JSON(2, new String[]{}, JSONStorage::new),
MYSQL(3, new String[]{"my-sql", "mariadb", "sql", "database"}, MySQLStorage::new),
ESSENTIALS(11, new String[]{"essential", "ess", "EssentialsX", "essX"}, EssentialXStorage::new);
private final int id;
private final String[] alias;
private @NotNull Supplier<@NotNull DataStorage> storageSupplier;
StorageMethod(int id, String[] alias, @NotNull Supplier<@NotNull DataStorage> storageSupplier) {
this.id = id;
this.alias = alias;
this.storageSupplier = storageSupplier;
}
public int getID() {
return id;
}
public String[] getAlias() {
return alias;
}
public @NotNull Supplier<@NotNull DataStorage> getStorageSupplier() {
return storageSupplier;
}
public void setStorageSupplier(@NotNull Supplier<@NotNull DataStorage> storageSupplier) {
this.storageSupplier = storageSupplier;
}
public @NotNull DataStorage createStorage() {
return getStorageSupplier().get();
}
public static @NotNull StorageMethod read(String s) {
StorageMethod byName = readByName(s);
if (byName != null) return byName;
StorageMethod byAlias = readByAlias(s);
if (byAlias != null) return byAlias;
try {
return Optional.ofNullable(readByID(Integer.parseInt(s))).orElse(YAML);
} catch (Exception ex) {
return YAML;
}
}
public static @Nullable StorageMethod readByName(String name) {
return Arrays.stream(values()).filter(value -> value.name().equalsIgnoreCase(name)).findFirst().orElse(null);
}
public static @Nullable StorageMethod readByAlias(String name) {
return Arrays.stream(values())
.filter(value -> Arrays.stream(value.getAlias()).anyMatch(alias -> alias.equalsIgnoreCase(name)))
.findFirst().orElse(null);
}
public static @Nullable StorageMethod readByID(int id) {
return Arrays.stream(values()).filter(value -> value.getID() == id).findFirst().orElse(null);
}
}
@@ -0,0 +1,50 @@
package cc.carm.plugin.moeteleport.storage.custom;
import cc.carm.plugin.moeteleport.Main;
import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
import cc.carm.plugin.moeteleport.model.UserData;
import cc.carm.plugin.moeteleport.storage.DataStorage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import java.util.UUID;
public class CustomStorage implements DataStorage {
@Override
@TestOnly
public boolean initialize() {
Main.error("您选择使用自定义存储,但并没有应用成功。");
Main.error("You are using CustomStorage, but not overwrite the methods.");
return false;
}
@Override
@TestOnly
public void shutdown() {
}
@Override
@TestOnly
public @Nullable UserData loadData(@NotNull UUID uuid) {
return null;
}
@Override
@TestOnly
public void saveUserData(@NotNull UserData data) {
}
@Override
public void setHome(@NotNull UUID uuid, @NotNull String homeName, @NotNull DataLocation homeLocation) throws Exception {
}
@Override
public boolean delHome(@NotNull UUID uuid, @NotNull String homeName) {
return true;
}
}
@@ -0,0 +1,37 @@
package cc.carm.plugin.moeteleport.storage.database;
import cc.carm.plugin.moeteleport.configuration.values.ConfigValue;
public class DBConfiguration {
protected static final ConfigValue<String> DRIVER_NAME = new ConfigValue<>(
"storage.mysql.driver", String.class,
"com.mysql.cj.jdbc.Driver"
);
protected static final ConfigValue<String> HOST = new ConfigValue<>(
"storage.mysql.host", String.class,
"127.0.0.1"
);
protected static final ConfigValue<Integer> PORT = new ConfigValue<>(
"storage.mysql.port", Integer.class,
3306
);
protected static final ConfigValue<String> DATABASE = new ConfigValue<>(
"storage.mysql.database", String.class,
"minecraft"
);
protected static final ConfigValue<String> USERNAME = new ConfigValue<>(
"storage.mysql.username", String.class,
"root"
);
protected static final ConfigValue<String> PASSWORD = new ConfigValue<>(
"storage.mysql.password", String.class,
"password"
);
}
@@ -0,0 +1,52 @@
package cc.carm.plugin.moeteleport.storage.database;
import cc.carm.plugin.moeteleport.configuration.values.ConfigValue;
public class DBTables {
protected static class UserLastLocations {
protected static final ConfigValue<String> TABLE_NAME = new ConfigValue<>(
"storage.mysql.tables.last-location", String.class,
"mt_user_last_locations"
);
protected static final String[] TABLE_COLUMNS = new String[]{
"`uuid` VARCHAR(36) NOT NULL PRIMARY KEY", // 用户的UUID
"`world` VARCHAR(128) NOT NULL",// 最后地址的所在世界
"`x` DOUBLE NOT NULL",// 最后地址的X坐标
"`y` DOUBLE NOT NULL",// 最后地址的Y坐标
"`z` DOUBLE NOT NULL",// 最后地址的Z坐标
"`yaw` DOUBLE NOT NULL",// 最后地址的Yaw角度
"`pitch` DOUBLE NOT NULL",// 最后地址的Pitch角度
"`update` DATETIME NOT NULL " +
"DEFAULT CURRENT_TIMESTAMP " +
"ON UPDATE CURRENT_TIMESTAMP "
};
}
protected static class UserHomes {
protected static final ConfigValue<String> TABLE_NAME = new ConfigValue<>(
"storage.mysql.tables.home", String.class,
"mt_user_homes"
);
protected static final String[] TABLE_COLUMNS = new String[]{
"`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY COMMENT '背包ID'",
"`uuid` VARCHAR(36) NOT NULL", // 用户的UUID
"`name` VARCHAR(32) NOT NULL",
"`world` VARCHAR(128) NOT NULL",
"`x` DOUBLE NOT NULL",
"`y` DOUBLE NOT NULL",
"`z` DOUBLE NOT NULL",
"`yaw` DOUBLE NOT NULL",
"`pitch` DOUBLE NOT NULL",
"INDEX `user`(`uuid`)",
"UNIQUE KEY `home`(`uuid`,`name`)"
};
}
}
@@ -0,0 +1,156 @@
package cc.carm.plugin.moeteleport.storage.database;
import cc.carm.lib.easysql.EasySQL;
import cc.carm.lib.easysql.api.SQLManager;
import cc.carm.plugin.moeteleport.Main;
import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
import cc.carm.plugin.moeteleport.model.UserData;
import cc.carm.plugin.moeteleport.storage.DataStorage;
import org.bukkit.Location;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.LinkedHashMap;
import java.util.UUID;
public class MySQLStorage implements DataStorage {
SQLManager sqlManager;
@Override
public boolean initialize() {
try {
Main.log(" 尝试连接到数据库...");
String url = String.format("jdbc:mysql://%s:%s/%s?useSSL=false",
DBConfiguration.HOST.get(), DBConfiguration.PORT.get(), DBConfiguration.DATABASE.get()
);
this.sqlManager = EasySQL.createManager(
DBConfiguration.DRIVER_NAME.get(), url,
DBConfiguration.USERNAME.get(), DBConfiguration.PASSWORD.get()
);
} catch (Exception exception) {
Main.error("无法连接到数据库,请检查配置文件。");
exception.printStackTrace();
return false;
}
try {
Main.log(" 创建插件所需表...");
getSQLManager().createTable(DBTables.UserLastLocations.TABLE_NAME.get())
.setColumns(DBTables.UserLastLocations.TABLE_COLUMNS)
.build().execute();
getSQLManager().createTable(DBTables.UserHomes.TABLE_NAME.get())
.setColumns(DBTables.UserHomes.TABLE_COLUMNS)
.build().execute();
} catch (SQLException exception) {
Main.error("无法创建插件所需的表,请检查数据库权限。");
exception.printStackTrace();
return false;
}
return true;
}
@Override
public void shutdown() {
Main.log(" 关闭数据库连接...");
EasySQL.shutdownManager(getSQLManager());
this.sqlManager = null;
}
@Override
public @Nullable UserData loadData(@NotNull UUID uuid) throws Exception {
LinkedHashMap<String, DataLocation> homes = loadHomes(uuid);
DataLocation lastLocation = loadLastLocation(uuid);
return new UserData(uuid, lastLocation, homes);
}
@Override
public void saveUserData(@NotNull UserData data) throws Exception {
Location location = data.getLastLocation();
if (location != null && location.getWorld() != null) {
getSQLManager().createReplace(DBTables.UserLastLocations.TABLE_NAME.get())
.setColumnNames("uuid", "world", "x", "y", "z", "yaw", "pitch")
.setParams(
data.getUserUUID(), location.getWorld().getName(),
location.getX(), location.getY(), location.getZ(),
location.getYaw(), location.getPitch()
).execute();
} else {
getSQLManager().createDelete(DBTables.UserLastLocations.TABLE_NAME.get())
.addCondition("uuid", data.getUserUUID()).setLimit(1)
.build().execute();
}
}
private @NotNull LinkedHashMap<String, DataLocation> loadHomes(@NotNull UUID uuid) throws Exception {
return getSQLManager().createQuery().inTable(DBTables.UserHomes.TABLE_NAME.get())
.addCondition("uuid", uuid).build()
.executeFunction((query) -> {
LinkedHashMap<String, DataLocation> homes = new LinkedHashMap<>();
ResultSet resultSet = query.getResultSet();
if (resultSet == null) return homes;
while (resultSet.next()) {
String name = resultSet.getString("name");
if (name == null) continue;
homes.put(name, new DataLocation(
resultSet.getString("world"),
resultSet.getDouble("x"),
resultSet.getDouble("y"),
resultSet.getDouble("z"),
resultSet.getFloat("yaw"),
resultSet.getFloat("pitch")
));
}
return homes;
}, new LinkedHashMap<>());
}
private @Nullable DataLocation loadLastLocation(@NotNull UUID uuid) throws Exception {
return getSQLManager().createQuery().inTable(DBTables.UserLastLocations.TABLE_NAME.get())
.addCondition("uuid", uuid).setLimit(1).build()
.executeFunction((query) -> {
ResultSet resultSet = query.getResultSet();
if (resultSet == null || !resultSet.next()) return null;
return new DataLocation(
resultSet.getString("world"),
resultSet.getDouble("x"),
resultSet.getDouble("y"),
resultSet.getDouble("z"),
resultSet.getFloat("yaw"),
resultSet.getFloat("pitch")
);
});
}
@Override
public void setHome(@NotNull UUID uuid, @NotNull String homeName, @NotNull DataLocation location) throws Exception {
getSQLManager().createReplace(DBTables.UserHomes.TABLE_NAME.get())
.setColumnNames("uuid", "name", "world", "x", "y", "z", "yaw", "pitch")
.setParams(
uuid, homeName, location.getWorldName(),
location.getX(), location.getY(), location.getZ(),
location.getYaw(), location.getPitch()
).execute();
}
@Override
public boolean delHome(@NotNull UUID uuid, @NotNull String homeName) throws Exception {
return getSQLManager().createDelete(DBTables.UserHomes.TABLE_NAME.get())
.addCondition("uuid", uuid)
.addCondition("name", homeName)
.setLimit(1)
.build().executeFunction((i) -> i > 0, false);
}
public SQLManager getSQLManager() {
return sqlManager;
}
}
@@ -0,0 +1,86 @@
package cc.carm.plugin.moeteleport.storage.extension;
import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
import cc.carm.plugin.moeteleport.model.UserData;
import cc.carm.plugin.moeteleport.storage.impl.PluginBasedStorage;
import com.earth2me.essentials.Essentials;
import com.earth2me.essentials.User;
import org.bukkit.Location;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.LinkedHashMap;
import java.util.UUID;
public class EssentialXStorage extends PluginBasedStorage {
public EssentialXStorage() {
super("Essentials");
}
private Essentials essentials;
@Override
public boolean initialize() {
return super.initialize() && (this.essentials = (Essentials) getDependPlugin()) != null;
}
@Override
public @Nullable UserData loadData(@NotNull UUID uuid) {
return new EssentialUserData(uuid, getEssentials());
}
public Essentials getEssentials() {
return essentials;
}
public static class EssentialUserData extends UserData {
User essentialsUser;
public EssentialUserData(@NotNull UUID userUUID, Essentials essentials) {
super(userUUID);
this.essentialsUser = essentials.getUser(userUUID);
}
public User getEssUser() {
return essentialsUser;
}
@Override
public LinkedHashMap<String, DataLocation> getHomeLocations() {
LinkedHashMap<String, DataLocation> homes = new LinkedHashMap<>();
getEssUser().getHomes().forEach(homeName -> {
Location homeLocation = getEssUser().getHome(homeName);
if (homeLocation != null) homes.put(homeName, new DataLocation(homeLocation));
});
return homes;
}
@Override
public void setHomeLocation(String homeName, Location location) {
getEssUser().setHome(homeName, location);
}
@Override
public void delHomeLocation(String homeName) {
try {
getEssUser().delHome(homeName);
} catch (Exception ignored) {
}
}
@Override
public void setLastLocation(@Nullable Location lastLocation) {
getEssUser().setLastLocation(lastLocation);
}
@Override
public @Nullable Location getLastLocation() {
return getEssUser().getLastLocation();
}
}
}
@@ -0,0 +1,71 @@
package cc.carm.plugin.moeteleport.storage.file;
import cc.carm.plugin.moeteleport.Main;
import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
import cc.carm.plugin.moeteleport.model.UserData;
import cc.carm.plugin.moeteleport.storage.DataSerializer;
import cc.carm.plugin.moeteleport.storage.impl.FileBasedStorage;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.util.LinkedHashMap;
import java.util.UUID;
public class JSONStorage extends FileBasedStorage {
protected static final Gson GSON = new Gson();
protected static final JsonParser PARSER = new JsonParser();
@Override
public @Nullable UserData loadData(@NotNull UUID uuid) throws Exception {
File userDataFile = new File(getDataFolder(), uuid + ".json");
if (!userDataFile.exists()) {
Main.debug("当前文件夾内不存在玩家 " + uuid + " 的数据,视作新档。");
return null;
}
JsonElement dataElement = PARSER.parse(new FileReader(userDataFile));
if (!dataElement.isJsonObject()) throw new NullPointerException(userDataFile.getName());
JsonObject dataObject = dataElement.getAsJsonObject();
DataLocation lastLocation = null;
if (dataObject.has("lastLocation")) {
lastLocation = DataLocation.deserializeText(dataObject.get("lastLocation").getAsString());
}
LinkedHashMap<String, DataLocation> homeData = new LinkedHashMap<>();
if (dataObject.has("homes")) {
JsonObject homesObject = dataObject.getAsJsonObject("homes");
if (homesObject != null) {
homesObject.entrySet().forEach(entry -> {
DataLocation location = DataLocation.deserializeText(entry.getValue().getAsString());
if (location != null) homeData.put(entry.getKey(), location);
});
}
}
return new UserData(uuid, lastLocation, homeData);
}
@Override
public void saveUserData(@NotNull UserData data) throws Exception {
JsonObject dataObject = new JsonObject();
if (data.getLastLocation() != null) {
dataObject.addProperty("lastLocation", DataSerializer.serializeLocation(data.getLastLocation()));
}
dataObject.add("homes", GSON.toJsonTree(DataSerializer.serializeLocationsMap(data.getHomeLocations())));
FileWriter writer = new FileWriter(new File(getDataFolder(), data.getUserUUID() + ".json"));
writer.write(GSON.toJson(dataObject));
writer.flush();
writer.close();
}
}
@@ -0,0 +1,62 @@
package cc.carm.plugin.moeteleport.storage.file;
import cc.carm.plugin.moeteleport.Main;
import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
import cc.carm.plugin.moeteleport.model.UserData;
import cc.carm.plugin.moeteleport.storage.DataSerializer;
import cc.carm.plugin.moeteleport.storage.impl.FileBasedStorage;
import org.bukkit.configuration.file.YamlConfiguration;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.util.LinkedHashMap;
import java.util.Optional;
import java.util.UUID;
public class YAMLStorage extends FileBasedStorage {
@Override
public @Nullable UserData loadData(@NotNull UUID uuid) {
if (getDataFolder() == null || !getDataFolder().exists() || !getDataFolder().isDirectory()) {
throw new NullPointerException("Storage data folder is not initialized.");
}
File userDataFile = new File(getDataFolder(), uuid + ".yml");
if (!userDataFile.exists()) {
Main.debug("当前文件夾内不存在玩家 " + uuid + " 的数据,视作新档。");
return null;
}
YamlConfiguration userConfiguration = YamlConfiguration.loadConfiguration(userDataFile);
DataLocation lastLocation = Optional
.ofNullable(userConfiguration.getString("lastLocation"))
.map(DataLocation::deserializeText)
.orElse(null);
LinkedHashMap<String, DataLocation> homeData = new LinkedHashMap<>();
Optional.ofNullable(userConfiguration.getConfigurationSection("homes")).ifPresent(
section -> section.getKeys(false).forEach(homeName -> {
DataLocation location = DataLocation.deserializeText(section.getString(homeName));
if (location != null) homeData.put(homeName, location);
}));
return new UserData(uuid, lastLocation, homeData);
}
@Override
public void saveUserData(@NotNull UserData data) throws Exception {
if (getDataFolder() == null || !getDataFolder().exists() || !getDataFolder().isDirectory()) {
throw new NullPointerException("Storage data folder is not initialized.");
}
YamlConfiguration userConfiguration = new YamlConfiguration();
if (data.getLastLocation() != null) {
userConfiguration.set("lastLocation", DataSerializer.serializeLocation(data.getLastLocation()));
}
userConfiguration.createSection("homes", DataSerializer.serializeLocationsMap(data.getHomeLocations()));
userConfiguration.save(new File(getDataFolder(), data.getUserUUID() + ".yml"));
}
}
@@ -0,0 +1,56 @@
package cc.carm.plugin.moeteleport.storage.impl;
import cc.carm.plugin.moeteleport.Main;
import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
import cc.carm.plugin.moeteleport.configuration.values.ConfigValue;
import cc.carm.plugin.moeteleport.storage.DataStorage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.util.UUID;
public abstract class FileBasedStorage implements DataStorage {
private static final ConfigValue<String> FILE_PATH = new ConfigValue<>(
"storage.file-path", String.class, "data"
);
protected @Nullable File dataFolder;
@Override
public boolean initialize() {
try {
this.dataFolder = new File(Main.getInstance().getDataFolder(), FILE_PATH.get());
if (!dataFolder.exists()) {
return dataFolder.mkdir();
} else {
return dataFolder.isDirectory();
}
} catch (Exception ex) {
return false;
}
}
@Override
public void shutdown() {
// 似乎没什么需要做的?
dataFolder = null;
}
@Override
public void setHome(@NotNull UUID uuid, @NotNull String homeName, @NotNull DataLocation homeLocation) throws Exception {
// saveData 方法即保存所有数据,不需要针对单个数据进行变更。
}
@Override
public boolean delHome(@NotNull UUID uuid, @NotNull String homeName) {
// saveData 方法即保存所有数据,不需要针对单个数据进行变更。
return true;
}
public @Nullable File getDataFolder() {
return dataFolder;
}
}
@@ -0,0 +1,50 @@
package cc.carm.plugin.moeteleport.storage.impl;
import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
import cc.carm.plugin.moeteleport.model.UserData;
import cc.carm.plugin.moeteleport.storage.DataStorage;
import org.bukkit.Bukkit;
import org.bukkit.plugin.Plugin;
import org.jetbrains.annotations.NotNull;
import java.util.UUID;
public abstract class PluginBasedStorage implements DataStorage {
protected Plugin dependPlugin;
public PluginBasedStorage(String dependPluginName) {
this.dependPlugin = Bukkit.getPluginManager().getPlugin(dependPluginName);
}
@Override
public boolean initialize() {
return dependPlugin != null;
}
public Plugin getDependPlugin() {
return dependPlugin;
}
@Override
public void shutdown() {
// 一般啥也不需要我们做
}
@Override
public void saveUserData(@NotNull UserData data) {
// 一般都由其他插件自行保存,不需要实现。
}
@Override
public void setHome(@NotNull UUID uuid, @NotNull String homeName, @NotNull DataLocation homeLocation) {
// 一般都由其他插件自行保存,不需要实现。
}
@Override
public boolean delHome(@NotNull UUID uuid, @NotNull String homeName) {
// 一般都由其他插件自行保存,不需要实现。
return true;
}
}
@@ -1,4 +1,3 @@
package cc.carm.plugin.moeteleport.util;
import java.util.regex.Matcher;
@@ -7,8 +6,7 @@ import java.util.regex.Pattern;
public class ColorParser {
public static String parse(String text) {
text = parseHexColor(text);
return parseColor(text);
return parseColor(parseHexColor(text));
}
public static String parseColor(final String text) {
@@ -0,0 +1,8 @@
package cc.carm.plugin.moeteleport.util;
import cc.carm.plugin.moeteleport.storage.DataStorage;
@FunctionalInterface
public interface DataTaskRunner {
void run(DataStorage storage) throws Exception;
}
@@ -0,0 +1,105 @@
package cc.carm.plugin.moeteleport.util;
import org.jetbrains.annotations.Nullable;
import java.io.*;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
import java.util.Scanner;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
@SuppressWarnings("ResultOfMethodCallIgnored")
public class JarResourceUtils {
public static final char JAR_SEPARATOR = '/';
public static @Nullable String[] readResource(@Nullable InputStream resourceStream) {
if (resourceStream == null) return null;
try (Scanner scanner = new Scanner(resourceStream, "UTF-8")) {
List<String> contents = new ArrayList<>();
while (scanner.hasNextLine()) {
contents.add(scanner.nextLine());
}
return contents.toArray(new String[0]);
} catch (Exception e) {
return null;
}
}
public static void copyFolderFromJar(String folderName, File destFolder, CopyOption option)
throws IOException {
copyFolderFromJar(folderName, destFolder, option, null);
}
public static void copyFolderFromJar(String folderName, File destFolder,
CopyOption option, PathTrimmer trimmer) throws IOException {
if (!destFolder.exists())
destFolder.mkdirs();
byte[] buffer = new byte[1024];
File fullPath;
String path = JarResourceUtils.class.getProtectionDomain().getCodeSource().getLocation().getPath();
if (trimmer != null)
path = trimmer.trim(path);
try {
if (!path.startsWith("file"))
path = "file://" + path;
fullPath = new File(new URI(path));
} catch (URISyntaxException e) {
e.printStackTrace();
return;
}
ZipInputStream zis = new ZipInputStream(new FileInputStream(fullPath));
ZipEntry entry;
while ((entry = zis.getNextEntry()) != null) {
if (!entry.getName().startsWith(folderName + JAR_SEPARATOR))
continue;
String fileName = entry.getName();
if (fileName.charAt(fileName.length() - 1) == JAR_SEPARATOR) {
File file = new File(destFolder + File.separator + fileName);
if (file.isFile()) {
file.delete();
}
file.mkdirs();
continue;
}
File file = new File(destFolder + File.separator + fileName);
if (option == CopyOption.COPY_IF_NOT_EXIST && file.exists())
continue;
if (!file.getParentFile().exists())
file.getParentFile().mkdirs();
if (!file.exists())
file.createNewFile();
FileOutputStream fos = new FileOutputStream(file);
int len;
while ((len = zis.read(buffer)) > 0) {
fos.write(buffer, 0, len);
}
fos.close();
}
zis.closeEntry();
zis.close();
}
public enum CopyOption {
COPY_IF_NOT_EXIST, REPLACE_IF_EXIST
}
@FunctionalInterface
public interface PathTrimmer {
String trim(String original);
}
}
@@ -1,5 +1,6 @@
package cc.carm.plugin.moeteleport.util;
import de.themoep.minedown.MineDown;
import me.clip.placeholderapi.PlaceholderAPI;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
@@ -10,67 +11,67 @@ import java.util.*;
public class MessageUtil {
public static boolean hasPlaceholderAPI() {
return Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null;
}
public static boolean hasPlaceholderAPI() {
return Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null;
}
public static void send(@Nullable CommandSender sender, List<String> messages) {
if (messages == null || messages.isEmpty() || sender == null) return;
for (String s : messages) {
sender.sendMessage(ColorParser.parse(s));
}
}
public static void send(@Nullable CommandSender sender, List<String> messages) {
if (messages == null || messages.isEmpty() || sender == null) return;
for (String s : messages) {
sender.spigot().sendMessage(MineDown.parse(s));
}
}
public static void send(@Nullable CommandSender sender, String... messages) {
send(sender, Arrays.asList(messages));
}
public static void send(@Nullable CommandSender sender, String... messages) {
send(sender, Arrays.asList(messages));
}
public static void sendWithPlaceholders(CommandSender sender, String... messages) {
sendWithPlaceholders(sender, Arrays.asList(messages));
}
public static void sendWithPlaceholders(CommandSender sender, String... messages) {
sendWithPlaceholders(sender, Arrays.asList(messages));
}
public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages) {
if (messages == null || messages.isEmpty() || sender == null) return;
if (hasPlaceholderAPI() && sender instanceof Player) {
send(sender, PlaceholderAPI.setPlaceholders((Player) sender, messages));
} else {
send(sender, messages);
}
}
public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages) {
if (messages == null || messages.isEmpty() || sender == null) return;
if (hasPlaceholderAPI() && sender instanceof Player) {
send(sender, PlaceholderAPI.setPlaceholders((Player) sender, messages));
} else {
send(sender, messages);
}
}
public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages, String param, Object value) {
sendWithPlaceholders(sender, messages, new String[]{param}, new Object[]{value});
}
public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages, String param, Object value) {
sendWithPlaceholders(sender, messages, new String[]{param}, new Object[]{value});
}
public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages, String[] params, Object[] values) {
sendWithPlaceholders(sender, setCustomParams(messages, params, values));
}
public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages, String[] params, Object[] values) {
sendWithPlaceholders(sender, setCustomParams(messages, params, values));
}
public static List<String> setCustomParams(List<String> messages, String param, Object value) {
return setCustomParams(messages, new String[]{param}, new Object[]{value});
}
public static List<String> setCustomParams(List<String> messages, String param, Object value) {
return setCustomParams(messages, new String[]{param}, new Object[]{value});
}
public static List<String> setCustomParams(List<String> messages, String[] params, Object[] values) {
if (params.length != values.length) return messages;
HashMap<String, Object> paramsMap = new HashMap<>();
for (int i = 0; i < params.length; i++) {
paramsMap.put(params[i], values[i]);
}
return setCustomParams(messages, paramsMap);
}
public static List<String> setCustomParams(List<String> messages, String[] params, Object[] values) {
if (params.length != values.length) return messages;
HashMap<String, Object> paramsMap = new HashMap<>();
for (int i = 0; i < params.length; i++) {
paramsMap.put(params[i], values[i]);
}
return setCustomParams(messages, paramsMap);
}
public static List<String> setCustomParams(List<String> messages, HashMap<String, Object> params) {
List<String> list = new ArrayList<>();
for (String message : messages) {
String afterMessage = message;
for (Map.Entry<String, Object> entry : params.entrySet()) {
afterMessage = afterMessage.replace(entry.getKey(), entry.getValue().toString());
}
list.add(afterMessage);
}
return list;
}
public static List<String> setCustomParams(List<String> messages, HashMap<String, Object> params) {
List<String> list = new ArrayList<>();
for (String message : messages) {
String afterMessage = message;
for (Map.Entry<String, Object> entry : params.entrySet()) {
afterMessage = afterMessage.replace(entry.getKey(), entry.getValue().toString());
}
list.add(afterMessage);
}
return list;
}
}
@@ -0,0 +1,250 @@
package cc.carm.plugin.moeteleport.util;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.Queue;
import java.util.concurrent.Callable;
import org.bukkit.Bukkit;
import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.scheduler.BukkitRunnable;
public class SchedulerUtils {
private final JavaPlugin plugin;
public SchedulerUtils(JavaPlugin plugin) {
this.plugin = plugin;
}
private JavaPlugin getPlugin() {
return this.plugin;
}
public void run(Runnable runnable) {
Bukkit.getScheduler().runTask(this.getPlugin(), runnable);
}
public void runAsync(Runnable runnable) {
Bukkit.getScheduler().runTaskAsynchronously(this.getPlugin(), runnable);
}
public void runLater(long delay, Runnable runnable) {
Bukkit.getScheduler().runTaskLater(this.getPlugin(), runnable, delay);
}
public void runLaterAsync(long delay, Runnable runnable) {
Bukkit.getScheduler().runTaskLaterAsynchronously(this.getPlugin(), runnable, delay);
}
public void runAtInterval(long interval, Runnable... tasks) {
this.runAtInterval(0L, interval, tasks);
}
public void runAtInterval(long delay, long interval, Runnable... tasks) {
(new BukkitRunnable() {
private int index;
public void run() {
if (this.index >= tasks.length) {
this.cancel();
} else {
tasks[this.index].run();
++this.index;
}
}
}).runTaskTimer(this.getPlugin(), delay, interval);
}
public void runAtIntervalAsync(long interval, Runnable... tasks) {
this.runAtIntervalAsync(0L, interval, tasks);
}
public void runAtIntervalAsync(long delay, long interval, Runnable... tasks) {
(new BukkitRunnable() {
private int index;
public void run() {
if (this.index >= tasks.length) {
this.cancel();
} else {
tasks[this.index].run();
++this.index;
}
}
}).runTaskTimerAsynchronously(this.getPlugin(), delay, interval);
}
public void repeat(int repetitions, long interval, Runnable task, Runnable onComplete) {
(new BukkitRunnable() {
private int index;
public void run() {
++this.index;
if (this.index >= repetitions) {
this.cancel();
if (onComplete != null) {
onComplete.run();
}
} else {
task.run();
}
}
}).runTaskTimer(this.getPlugin(), 0L, interval);
}
public void repeatAsync(int repetitions, long interval, Runnable task, Runnable onComplete) {
(new BukkitRunnable() {
private int index;
public void run() {
++this.index;
if (this.index >= repetitions) {
this.cancel();
if (onComplete != null) {
onComplete.run();
}
} else {
task.run();
}
}
}).runTaskTimerAsynchronously(this.getPlugin(), 0L, interval);
}
public void repeatWhile(long interval, Callable<Boolean> predicate, Runnable task, Runnable onComplete) {
(new BukkitRunnable() {
public void run() {
try {
if (!(Boolean)predicate.call()) {
this.cancel();
if (onComplete == null) {
return;
}
onComplete.run();
return;
}
task.run();
} catch (Exception var2) {
var2.printStackTrace();
}
}
}).runTaskTimer(this.getPlugin(), 0L, interval);
}
public void repeatWhileAsync(long interval, Callable<Boolean> predicate, Runnable task, Runnable onComplete) {
(new BukkitRunnable() {
public void run() {
try {
if (!(Boolean)predicate.call()) {
this.cancel();
if (onComplete == null) {
return;
}
onComplete.run();
return;
}
task.run();
} catch (Exception var2) {
var2.printStackTrace();
}
}
}).runTaskTimerAsynchronously(this.getPlugin(), 0L, interval);
}
public class TaskBuilder {
private final Queue<SchedulerUtils.Task> taskList = new LinkedList<>();
public TaskBuilder() {
}
public SchedulerUtils.TaskBuilder append(SchedulerUtils.TaskBuilder builder) {
this.taskList.addAll(builder.taskList);
return this;
}
public SchedulerUtils.TaskBuilder appendDelay(long delay) {
this.taskList.add((onComplete) -> SchedulerUtils.this.runLater(delay, onComplete));
return this;
}
public SchedulerUtils.TaskBuilder appendTask(Runnable task) {
this.taskList.add((onComplete) -> {
task.run();
onComplete.run();
});
return this;
}
public SchedulerUtils.TaskBuilder appendTask(SchedulerUtils.Task task) {
this.taskList.add(task);
return this;
}
public SchedulerUtils.TaskBuilder appendDelayedTask(long delay, Runnable task) {
this.taskList.add((onComplete) -> SchedulerUtils.this.runLater(delay, () -> {
task.run();
onComplete.run();
}));
return this;
}
public SchedulerUtils.TaskBuilder appendTasks(long delay, long interval, Runnable... tasks) {
this.taskList.add((onComplete) -> {
Runnable[] all = Arrays.copyOf(tasks, tasks.length + 1);
all[all.length - 1] = onComplete;
SchedulerUtils.this.runAtInterval(delay, interval, all);
});
return this;
}
public SchedulerUtils.TaskBuilder appendRepeatingTask(int repetitions, long interval, Runnable task) {
this.taskList.add((onComplete) -> SchedulerUtils.this.repeat(repetitions, interval, task, onComplete));
return this;
}
public SchedulerUtils.TaskBuilder appendConditionalRepeatingTask(long interval, Callable<Boolean> predicate, Runnable task) {
this.taskList.add((onComplete) -> SchedulerUtils.this.repeatWhile(interval, predicate, task, onComplete));
return this;
}
public SchedulerUtils.TaskBuilder waitFor(Callable<Boolean> predicate) {
this.taskList.add((onComplete) -> (new BukkitRunnable() {
public void run() {
try {
if (!(Boolean)predicate.call()) {
return;
}
this.cancel();
onComplete.run();
} catch (Exception var2) {
var2.printStackTrace();
}
}
}).runTaskTimer(SchedulerUtils.this.getPlugin(), 0L, 1L));
return this;
}
public void runTasks() {
this.startNext();
}
private void startNext() {
SchedulerUtils.Task task = this.taskList.poll();
if (task != null) {
task.start(this::startNext);
}
}
}
public interface Task {
void start(Runnable onComplete);
}
}
+6
View File
@@ -0,0 +1,6 @@
&d _____ &5 _____ _ _
&d| |___ ___&5|_ _|___| |___ ___ ___ ___| |_
&d| | | | . | -_|&5 | | | -_| | -_| . | . | _| _|
&d|_|_|_|___|___|&5 |_| |___|_|___| _|___|_| |_|
&d &5 |_|
&f 查看更多信息请访问项目主页&d https://github.com/CarmJos/MoeTeleport
+45 -4
View File
@@ -1,11 +1,52 @@
# ${project.name} - ${project.description}
# 项目地址: ${project.url}
# 下载地址: ${project.distributionManagement.downloadUrl}
version: ${project.version}
debug: false
# 统计数据设定
# 该选项用于帮助开发者统计插件版本与使用情况,且绝不会影响性能与使用体验。
# 当然,您也可以选择在这里关闭,或在plugins/bStats下的配置文件中关闭。
metrics: true
# 检查更新设定
# 该选项用于插件判断是否要检查更新,若您不希望插件检查更新并提示您,可以选择关闭。
# 检查更新为异步操作,绝不会影响性能与使用体验。
check-update: true
# 存储相关配置
# 注意:存储配置不会通过重载指令生效,如有修改请重新启动服务器。
storage:
# 存储方式,可选 [ yaml | json | mysql | Essential(须安装ess插件) ]
method: yaml
# 选择 yaml/json 存储方式时的存储路径
# 默认为相对路径,相对于插件生成的配置文件夹下的路径
# 支持绝对路径,如 “/var/data/ud/"(linux) 或 "D:\data\ud\"(windows)
# 使用绝对路径时请注意权限问题
file-path: data
# 选择 database 存储方式时的数据库配置
mysql:
# 数据库驱动路径
driver: "com.mysql.cj.jdbc.Driver"
# 数据库连接配置
host: "127.0.0.1"
port: 3306
database: "minecraft"
username: "username"
password: "password"
# 插件相关表的名称
tables:
last-location: "mt_last_locations"
home: "mt_homes"
# 默认玩家可设置多少家
defaultHome: 1
permissions:
# 以下命令全部为 MoeTeleport 的子节点
# 如 "home.vip" 的权限全拼就是 "MoeTeleport.home.vip"
"home.vip": 10 # 最多可以设置10个家
10: "MoeTeleport.home.vip" # 最多可以设置10个家
# 传送请求过期时间
expireTime: 30
@@ -17,4 +58,4 @@ death-back: true
# 危险的方块类型,将判断目的地脚下的方块的类型是否在这个列表中
dangerous-blocks:
- LAVA
- AIR
- AIR
+15 -9
View File
@@ -2,18 +2,22 @@ no-last-location:
- "&f您当前没有进行传送,无法返回上个地点。"
death-back:
- "&f您可以输入 &5/back &f返回您的死亡地点。"
- "&f您可以输入 &5/back &f或 [&d&l点击这里](show_text=点击返回到死亡地点 run_command=/back) &f返回您的死亡地点。"
not-online:
- "&f目标玩家并不在线,无法发送请求。"
self-request:
- "&f您不能向自己发送请求。"
tpa:
- "&d%(player) &f请求传送到您身边,您有 &5%(expire)秒 &f的时间回应。"
- "&a&l[同意] &f输入 &5/tpaccept &f同意该请求。"
- "&c&l[拒绝] &f输入 &5/tpdeny &f拒绝该请求。"
- "[&a&l[同意]](show_text=点击同意请求 run_command=/tpAccept %(player)) &f输入 &5/tpAccept &f同意该请求。"
- "[&c&l[拒绝]](show_text=点击拒绝请求 run_command=/tpDeny %(player)) &f输入 &5/tpDeny &f拒绝该请求。"
tpahere:
- "&d%(player) &f请求传送您到Ta身边,您有 &5%(expire)秒 &f的时间回应。"
- "&a&l[同意] &f输入 &5/tpaccept &f同意该请求。"
- "&c&l[拒绝] &f输入 &5/tpdeny &f拒绝该请求。"
- "[&a&l[同意]](show_text=点击同意请求 run_command=/tpAccept %(player)) &f输入 &5/tpAccept &f同意该请求。"
- "[&c&l[拒绝]](show_text=点击拒绝请求 run_command=/tpDeny %(player)) &f输入 &5/tpDeny &f拒绝该请求。"
tpaccept:
- "&f您同意了 &d%(player) &f的传送请求。"
tpdeny:
@@ -38,7 +42,7 @@ no-request-player:
- "&f您当前没有收到来自 &d%(player) &f的传送请求。"
multi-requests:
- "&f您当前有&d%(num)条请求&f待处理,请输入 &5/%(command) <玩家名> &f决定回应谁的请求。"
- "&f您也可以再次输入 &5/%(command) &f直接回应最近的一条请求。"
- "&f您也可以再次输入 &5/%(command) &f快速回应最近的一条请求。"
request-sent-timeout:
- "&f发往 &d%(player) &f的传送请求已超时。"
request-received-timeout:
@@ -48,15 +52,17 @@ teleporting:
dangerous:
- "&f目标地点不安全,传送被取消。"
dangerous-here:
- "&f当前地点不安全,无法发送传送请求。"
- "&f当前地点不安全,传送被取消。"
notAvailable:
- "&f目标地点暂时无法前往,传送被取消。"
home-list-header:
- "&f您当前设定的所有家:"
home-list-object: "&8#&f%(id) &d%(location)"
home-list-object: "&8# &f%(id) &d%(location) [&7✈](show_text=点击返回家 %(id) run_command=/home %(id))"
home-not-found:
- "&f您还没有设置这个家,请先输入 &5/setHome <家名称> &f设置一个吧!"
name-too-long:
- "&f您所输入的家的名字太长,家的名称不应当超过 &d30 &f个字符。"
home-set:
- "&f成功设定名为 &d%(name) &f的家传送点。"
home-removed:
@@ -65,4 +71,4 @@ home-removed:
home-over-limit:
- "&f您最多只能设置 &d%(max) &f个家传送点!"
- "&7可以输入 &5/delHome <家名称> &7删除之前的家传送点,"
- "&7或输入 &5/setHome <家名称> &7覆盖之前的家传送点。"
- "&7或输入 &5/setHome <家名称> &7覆盖之前的家传送点。"
+13 -1
View File
@@ -1,19 +1,31 @@
main: cc.carm.plugin.moeteleport.Main
name: ${project.name}
name: MoeTeleport
version: ${project.version}
author: CarmJos
website: ${project.url}
description: ${project.description}
api-version: 1.13
softdepend:
- PlaceholderAPI
- Essentials
permissions:
"MoeTeleport":
description: "插件的主权限节点"
default: false
"MoeTeleport.admin":
description: "插件的管理员权限节点"
default: op
commands:
"MoeTeleport":
description: "插件的主命令,用于重载插件或查看插件信息。"
permission: "MoeTeleport.admin"
usage: "/MoeTeleport reload"
"back":
description: 返回传送前的上一个地点。