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

54 Commits

Author SHA1 Message Date
renovate[bot] 6019410f0c chore(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.5.5 2026-03-10 08:06:00 +08:00
renovate[bot] 03346ecfcd chore(deps): update dependency org.bstats:bstats-bukkit to v3.2.1 2026-03-10 08:05:53 +08:00
renovate[bot] 1720572f4d chore(deps): update actions/upload-artifact action to v7 2026-03-10 08:05:44 +08:00
renovate[bot] 81d0b8869d chore(deps): update dependency org.apache.maven.plugins:maven-shade-plugin to v3.6.2 2026-03-10 08:05:35 +08:00
renovate[bot] d620109904 chore(deps): update actions/upload-artifact action to v6 2026-02-21 00:57:39 +08:00
renovate[bot] d11e5a44b8 chore(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.15.0 2026-02-21 00:57:33 +08:00
renovate[bot] d404e36805 fix(deps): update dependency me.clip:placeholderapi to v2.12.2 2026-02-21 00:57:27 +08:00
renovate[bot] 0d9f34c135 fix(deps): update dependency org.jetbrains:annotations to v26.1.0 2026-02-21 00:57:21 +08:00
renovate[bot] 1b6bd72570 chore(deps): update actions/upload-artifact action to v5 2025-12-01 09:32:26 +08:00
renovate[bot] e148747a0b fix(deps): update dependency me.clip:placeholderapi to v2.11.7 2025-12-01 09:32:20 +08:00
renovate[bot] 2d55ac35f8 fix(deps): update dependency org.spigotmc:spigot-api to v1.19-r0.1-20220725.090125-47 2025-12-01 09:32:14 +08:00
renovate[bot] d826abdecc chore(deps): update dependency org.apache.maven.plugins:maven-jar-plugin to v3.5.0 2025-12-01 09:32:07 +08:00
renovate[bot] b63e130b15 chore(deps): update actions/checkout action to v6 2025-12-01 09:32:00 +08:00
renovate[bot] 8f8d5c7016 chore(deps): update dependency org.apache.maven.plugins:maven-source-plugin to v3.4.0 2025-12-01 09:31:53 +08:00
renovate[bot] 813dbd8b83 chore(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.14.1 2025-09-24 09:19:31 +08:00
renovate[bot] 0db564c027 chore(deps): update dependency org.apache.maven.plugins:maven-shade-plugin to v3.6.1 2025-09-14 16:56:47 +08:00
renovate[bot] b50d2f216d chore(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.5.4 2025-09-14 16:56:41 +08:00
renovate[bot] 8d0cb0365a fix(deps): update dependency org.jetbrains:annotations to v26.0.2-1 2025-09-12 08:52:20 +08:00
renovate[bot] 0a3b1c0017 chore(deps): update dependency cc.carm.lib:mineconfiguration-bukkit to v3.1.3 2025-08-21 23:44:22 +08:00
renovate[bot] c8b2e03efe chore(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.5.3 2025-08-21 23:44:13 +08:00
renovate[bot] e917d2a5b3 chore(deps): update deps.easyplugin.version to v1.5.14 2025-08-21 23:44:06 +08:00
renovate[bot] c6fec42aa4 fix(deps): update dependency net.essentialsx:essentialsx to v2.21.2 2025-08-21 23:44:00 +08:00
renovate[bot] 73489054a1 chore(deps): update dependency org.apache.maven.plugins:maven-clean-plugin to v3.5.0 2025-08-21 23:43:52 +08:00
renovate[bot] 6344dfe2d9 fix(deps): update dependency com.comphenix.protocol:protocollib to v5 2025-08-21 23:43:45 +08:00
renovate[bot] 3d7bb0292a chore(deps): update actions/checkout action to v5 2025-08-21 23:43:40 +08:00
renovate[bot] 52d806f5d4 chore(deps): update actions/setup-java action to v5 2025-08-21 23:43:33 +08:00
renovate[bot] 3f2713389b chore(deps): update dependency cc.carm.lib:mineconfiguration-bukkit to v3.1.1 2025-04-18 10:56:06 +08:00
renovate[bot] 97781fc1aa fix(deps): update dependency net.essentialsx:essentialsx to v2.21.0 2025-04-18 10:56:01 +08:00
renovate[bot] 74d083f51f chore(deps): update dependency org.apache.maven.plugins:maven-clean-plugin to v3.4.1 2025-03-12 04:38:20 +08:00
renovate[bot] a073ebf34c chore(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.14.0 2025-03-12 04:38:17 +08:00
renovate[bot] 1a8fb8459e chore(deps): update dependency cc.carm.lib:mineconfiguration-bukkit to v3 2025-03-12 04:38:13 +08:00
renovate[bot] db53b416c7 fix(deps): update dependency org.jetbrains:annotations to v26.0.2 2025-02-06 16:37:03 +08:00
renovate[bot] ef56193d7f fix(deps): update dependency org.jetbrains:annotations to v26 2025-01-18 02:24:27 +08:00
renovate[bot] 103b4bb734 chore(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v3 2025-01-18 02:22:50 +08:00
renovate[bot] c4adadf24f chore(deps): update dependency org.apache.maven.plugins:maven-clean-plugin to v3 2025-01-18 02:22:47 +08:00
renovate[bot] 61c7e4e7da chore(deps): update actions/upload-artifact action to v4 2025-01-18 02:22:44 +08:00
renovate[bot] 17d8e6847b chore(deps): update actions/setup-java action to v4 2025-01-18 02:22:41 +08:00
renovate[bot] eaff4d066c chore(deps): update actions/checkout action to v4 2025-01-18 02:22:38 +08:00
renovate[bot] 3cc6485d3d fix(deps): update dependency org.jetbrains:annotations to v23.1.0 2025-01-18 02:22:35 +08:00
renovate[bot] 665fa3f53d fix(deps): update dependency net.essentialsx:essentialsx to v2.20.1 2025-01-18 02:22:31 +08:00
renovate[bot] c481db7827 chore(deps): update dependency org.bstats:bstats-bukkit to v3.1.0 2025-01-18 02:21:54 +08:00
renovate[bot] 08a308c88d chore(deps): update dependency org.apache.maven.plugins:maven-source-plugin to v3.3.1 2025-01-18 02:21:51 +08:00
renovate[bot] 6b0c9e2a2c chore(deps): update dependency org.apache.maven.plugins:maven-jar-plugin to v3.4.2 2025-01-18 02:21:36 +08:00
renovate[bot] a01746348e chore(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.13.0 2025-01-18 02:21:33 +08:00
renovate[bot] 104e9ae4ce chore(deps): update dependency org.apache.maven.plugins:maven-clean-plugin to v2.6.1 2025-01-18 02:21:30 +08:00
renovate[bot] 979417cc2a chore(deps): update dependency cc.carm.lib:mineconfiguration-bukkit to v2.9.3 2025-01-18 02:21:27 +08:00
renovate[bot] dba6eb9af5 chore(deps): update deps.easyplugin.version to v1.5.12 2025-01-18 02:21:23 +08:00
renovate[bot] 743cca2238 chore(deps): update dependency xyz.xenondevs:particle to v1.8.4 2025-01-18 02:21:20 +08:00
renovate[bot] eb9f5bd4ad chore(deps): update dependency org.apache.maven.plugins:maven-shade-plugin to v3.6.0 2025-01-18 02:10:09 +08:00
renovate[bot] 7515e7e271 fix(deps): update dependency me.clip:placeholderapi to v2.11.6 2025-01-18 01:06:59 +08:00
renovate[bot] 3f0a47d5cd chore(deps): update dependency cc.carm.lib:easysql-beecp to v0.4.7 2025-01-18 00:10:22 +08:00
renovate[bot] d896be6f98 chore(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v2.22.2 2025-01-18 00:10:10 +08:00
renovate[bot] 392e16c165 Add renovate.json 2025-01-18 00:01:06 +08:00
carm f4e3dabb29 fix(cancel): 修复取消传送功能异常的问题 (#13) 2023-04-03 17:10:07 +08:00
5 changed files with 30 additions and 25 deletions
+3 -3
View File
@@ -14,9 +14,9 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v6
- name: "Set up JDK" - name: "Set up JDK"
uses: actions/setup-java@v2 uses: actions/setup-java@v5
with: with:
java-version: '11' java-version: '11'
distribution: 'adopt' distribution: 'adopt'
@@ -37,7 +37,7 @@ jobs:
cp -vrf asset/*.jar artifacts cp -vrf asset/*.jar artifacts
- name: "Upload artifact" - name: "Upload artifact"
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v7
with: with:
name: Artifact name: Artifact
path: artifacts path: artifacts
+2 -2
View File
@@ -11,9 +11,9 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v6
- name: "Set up JDK" - name: "Set up JDK"
uses: actions/setup-java@v2 uses: actions/setup-java@v5
with: with:
java-version: '11' java-version: '11'
distribution: 'adopt' distribution: 'adopt'
+17 -17
View File
@@ -11,14 +11,14 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding> <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<deps.easyplugin.version>1.5.5</deps.easyplugin.version> <deps.easyplugin.version>1.5.14</deps.easyplugin.version>
<deps.easysql.version>0.4.6</deps.easysql.version> <deps.easysql.version>0.4.7</deps.easysql.version>
<deps.mineconfig.version>2.5.0</deps.mineconfig.version> <deps.mineconfig.version>3.1.3</deps.mineconfig.version>
</properties> </properties>
<groupId>cc.carm.plugin</groupId> <groupId>cc.carm.plugin</groupId>
<artifactId>moeteleport</artifactId> <artifactId>moeteleport</artifactId>
<version>4.0.2</version> <version>4.0.3</version>
<name>MoeTeleport</name> <name>MoeTeleport</name>
<description>喵喵传送,简单的传送、设置家的插件。</description> <description>喵喵传送,简单的传送、设置家的插件。</description>
@@ -141,7 +141,7 @@
<dependency> <dependency>
<groupId>net.essentialsx</groupId> <groupId>net.essentialsx</groupId>
<artifactId>EssentialsX</artifactId> <artifactId>EssentialsX</artifactId>
<version>2.19.2</version> <version>2.21.2</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@@ -180,7 +180,7 @@
<dependency> <dependency>
<groupId>xyz.xenondevs</groupId> <groupId>xyz.xenondevs</groupId>
<artifactId>particle</artifactId> <artifactId>particle</artifactId>
<version>1.8.3</version> <version>1.8.4</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
@@ -188,21 +188,21 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId> <artifactId>spigot-api</artifactId>
<version>1.17-R0.1-SNAPSHOT</version> <version>1.19-R0.1-20220725.090125-47</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.comphenix.protocol</groupId> <groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib</artifactId> <artifactId>ProtocolLib</artifactId>
<version>4.8.0</version> <version>5.3.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bstats</groupId> <groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId> <artifactId>bstats-bukkit</artifactId>
<version>3.0.0</version> <version>3.2.1</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
@@ -210,7 +210,7 @@
<dependency> <dependency>
<groupId>me.clip</groupId> <groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId> <artifactId>placeholderapi</artifactId>
<version>2.10.9</version> <version>2.12.2</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@@ -224,7 +224,7 @@
<dependency> <dependency>
<groupId>org.jetbrains</groupId> <groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId> <artifactId>annotations</artifactId>
<version>23.0.0</version> <version>26.1.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@@ -235,7 +235,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId> <artifactId>maven-clean-plugin</artifactId>
<version>2.5</version> <version>3.5.0</version>
<configuration> <configuration>
<filesets> <filesets>
<fileset> <fileset>
@@ -258,7 +258,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version> <version>3.15.0</version>
<configuration> <configuration>
<source>${project.jdk.version}</source> <source>${project.jdk.version}</source>
<target>${project.jdk.version}</target> <target>${project.jdk.version}</target>
@@ -269,12 +269,12 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version> <version>3.5.0</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>
<version>3.2.0</version> <version>3.4.0</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
@@ -287,7 +287,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.2.3</version> <version>3.6.2</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
@@ -336,7 +336,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version> <version>3.5.5</version>
<configuration> <configuration>
<useSystemClassLoader>false</useSystemClassLoader> <useSystemClassLoader>false</useSystemClassLoader>
</configuration> </configuration>
+6
View File
@@ -0,0 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended"
]
}
@@ -104,12 +104,11 @@ public class RequestManager {
} }
public void cancelRequest(TeleportRequest request) { public void cancelRequest(TeleportRequest request) {
PluginMessages.REQUESTS.WAS_ACCEPTED.send(request.getSender(), request.getReceiver().getName()); PluginMessages.REQUESTS.SENT_CANCELLED.send(request.getSender(), request.getReceiver().getName());
PluginMessages.REQUESTS.ACCEPTED.send(request.getReceiver(), request.getSender().getName()); PluginMessages.REQUESTS.RECEIVED_CANCELLED.send(request.getReceiver(), request.getSender().getName());
PluginConfig.REQUEST.SOUND.CANCELLED.playTo(request.getSender()); PluginConfig.REQUEST.SOUND.CANCELLED.playTo(request.getSender());
PluginConfig.REQUEST.SOUND.CANCELLED.playTo(request.getReceiver()); PluginConfig.REQUEST.SOUND.CANCELLED.playTo(request.getReceiver());
removeRequests(request); removeRequests(request);
MoeTeleport.getTeleportManager().queueTeleport(request);
} }
public void denyRequest(TeleportRequest request) { public void denyRequest(TeleportRequest request) {