From d552eea1d784f69a0d346940af25be5208326c51 Mon Sep 17 00:00:00 2001 From: AI Coding Agent Date: Sat, 22 Aug 2026 12:22:22 +0800 Subject: [PATCH] AI adaptation for Lophine 26.1.2 (Folia): fix core RTP, particles, sounds, first-join timing - Fix A: replace PaperLib chunk/teleport with native World#getChunkAtAsync / Entity#teleportAsync (fixes #257 'Thread failed main thread check' on Folia 26.1.2); compile against lophine-api 26.1.2, Java 21 - Fix B: replace ParticleLib 1.8.4 (MC <=1.19.3) with native org.bukkit.Particle + legacy name mapping, run on the entity's region thread - Fix C: remove ProtocolLib sound path, use native playSound(String key, SoundCategory) - Fix D: defer first-join RTP via the entity scheduler (#256) - Permissions: default-grant betterrtp.world.* so regular players can RTP - Packaging: bundle MIT LICENSE into META-INF/LICENSE - Toolchain: lombok annotationProcessorPaths + proc:full (JDK 25), jspecify/adventure deps, local RedProtect mirror --- .gitignore | 2 + FORK-README.en.md | 164 ++++++++ FORK-README.md | 138 +++++++ pom.xml | 82 ++-- .../player/commands/types/CmdInfo.java | 4 +- .../BetterRTP/player/events/Join.java | 11 +- .../BetterRTP/player/rtp/RTPPlayer.java | 3 +- .../BetterRTP/player/rtp/RTPTeleport.java | 10 +- .../rtp/effects/RTPEffect_Particles.java | 90 +++-- .../player/rtp/effects/RTPEffect_Sounds.java | 30 +- .../player/rtp/packets/AbstractPacket.java | 87 ----- .../WrapperPlayServerNamedSoundEffect.java | 350 ------------------ .../references/rtpinfo/QueueGenerator.java | 3 +- .../references/rtpinfo/RandomLocation.java | 3 +- src/main/resources/plugin.yml | 1 + 15 files changed, 443 insertions(+), 535 deletions(-) create mode 100644 FORK-README.en.md create mode 100644 FORK-README.md delete mode 100644 src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/packets/AbstractPacket.java delete mode 100644 src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/packets/WrapperPlayServerNamedSoundEffect.java diff --git a/.gitignore b/.gitignore index 2f378c44..7bd7c599 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ BetterRTP.wiki/ .DS_Store .vscode/ node_modules/ +# local build logs +*.log diff --git a/FORK-README.en.md b/FORK-README.en.md new file mode 100644 index 00000000..8fe70063 --- /dev/null +++ b/FORK-README.en.md @@ -0,0 +1,164 @@ +# BetterRTP — Lophine 26.1.2 Adaptation (AI Improvements) + +> **All code changes in this project were made by an AI coding agent** (a full adaptation +> session performed by a DeepSeek-based agent), targeting **Lophine 26.1.2** (a Folia-family, +> Paper fork, Minecraft 26.1.2). +> Upstream: [RonanPlugins/BetterRTP](https://github.com/RonanPlugins/BetterRTP) v3.6.13 (MIT License). + +--- + +## 1. Layout + +| Path | Description | +|---|---| +| `BetterRTP/` | Plugin source (adapted) | +| `BetterRTP/target/BetterRTP-3.6.13.jar` | **Final build artifact** (includes LICENSE) | +| `lophine-test/` | Test server (Lophine 26.1.2) | +| `lophine-test/plugins/BetterRTP-3.6.13.jar` | Deployed plugin | +| `_backup/BetterRTP-20260822-100842/` | Pre-change source backup (297 files) | +| `_tools/` | Maven 3.9.16 toolchain (local repo `m2repo`, RedProtect mirror, etc.) | + +--- + +## 2. AI Improvement List + +### 🔴 Fix A — Core: RTP completely broken on Folia 26.1.2 (upstream issue [#257](https://github.com/RonanPlugins/BetterRTP/issues/257)) + +- **Problem**: BetterRTP delegated *scheduling* to FoliaLib, but async chunk loading still went + through **PaperLib 1.0.8** (a 2019-era library that does not recognize Folia's new + `getChunkAtAsync` signature → reflection fallback → **synchronous** `world.getChunkAt`). + Called on Folia's *global region* thread, this trips the Moonrise thread check: + `Thread failed main thread check: Async chunk retrieval` → `/rtp` is unusable and players get + stuck in the queue. +- **Change** (4 files): `PaperLib.getChunkAtAsync(...)` / `PaperLib.teleportAsync(...)` + → native **`World#getChunkAtAsync(...)`** / **`Entity#teleportAsync(...)`** (Folia-safe APIs; + the future completes on the correct region thread). + - `player/rtp/RTPPlayer.java` + - `player/rtp/RTPTeleport.java` + - `references/rtpinfo/QueueGenerator.java` + - `references/rtpinfo/RandomLocation.java` +- **Verified**: **0** thread-check errors after the fix; the queue pre-generator produced + **57 safe locations** across overworld + nether (the exact code path from #257). + +### 🟠 Fix B — Native particles + +- **Problem**: ParticleLib 1.8.4 officially supports only **MC 1.8–1.19.3**; its NMS reflection + broke on the MC 1.21.5+ particle rewrite (silent failure + console stack traces), and it + spawned particles from an async thread (violates Folia's region-thread model). +- **Change** (`player/rtp/effects/RTPEffect_Particles.java` + `commands/types/CmdInfo.java`): + - Switched to native **`org.bukkit.Particle`** with a legacy-name mapping table + (`EXPLOSION_NORMAL→POOF`, `CRIT→CRIT`, …); + - Particle display moved to the **entity's region thread** (`AsyncHandler.syncAtEntity`); + - Removed the `xyz.xenondevs:particle` dependency. + +### 🟠 Fix C — Sounds without ProtocolLib + +- **Change** (`player/rtp/effects/RTPEffect_Sounds.java`): removed the ProtocolLib branch and the + two `packets/` classes; uses native `playSound(loc, key, SoundCategory.MASTER, …)` (enum names + first, arbitrary custom sound keys as fallback — functionally equivalent to the old + ProtocolLib path); removed the `com.comphenix.protocol` dependency. + +### 🟠 Fix D — First-join RTP timing (upstream issue [#256](https://github.com/RonanPlugins/BetterRTP/issues/256)) + +- **Problem**: at `PlayerJoinEvent` the player entity is not fully ready, so the RTP ran too early. +- **Change** (`player/events/Join.java`): deferred via the Paper **entity scheduler** + `p.getScheduler().run(...)` plus an `isOnline()` guard. + +### 🟡 Permission defaults opened up (for testing) + +- **Change** (`src/main/resources/plugin.yml`): added `default: true` to `betterrtp.world.*`. + Upstream only defaults `betterrtp.use`; `canRTP()` additionally requires + `betterrtp.world.*` / `betterrtp.world.` (default false), which made RTP impossible for + regular players on servers without a permissions plugin. This change lets all players RTP in + all worlds by default. + +### 🟢 LICENSE bundled + +- `pom.xml` now packages the MIT `LICENSE` into the jar at `META-INF/LICENSE`. + +### ⚙️ Toolchain adaptation (required to build, not plugin logic) + +| Problem | Solution | +|---|---| +| JDK 23+ no longer auto-discovers annotation processors on the classpath | maven-compiler-plugin: explicit `` + `full` | +| Original compile target (spigot-api 1.8.8) lacks modern APIs | Compile against **lophine-api 26.1.2** (`fun.bm.lophine:lophine-api:26.1.2.build.638-stable`), Java release 21 | +| Annotations/libs referenced by the modern API | Added `org.jspecify:jspecify`, `net.kyori:adventure-api/4.26.1`, `adventure-key` | +| Corrupted RedProtect artifacts (raw.githubusercontent hijacked via hosts) | Cloned the official mvn-repo branch and mirrored it with a local `file://` mirror | +| User `.m2` not writable under the sandbox | Local repository relocated into the workspace `_tools/m2repo` | + +--- + +## 3. Building + +```bat +set MAVEN_OPTS=-Dmaven.repo.local=D:\BETTER~1\_tools\m2repo +call _tools\apache-maven-3.9.16\bin\mvn.cmd -s _tools\maven-settings.xml -B -DskipTests clean package +:: artifact: BetterRTP\target\BetterRTP-3.6.13.jar +``` + +- Build with JDK 21+ (this machine uses JDK 25); the server runtime requires **Java 25** + (required by Lophine 26.1.2). +- `_tools/maven-settings.xml` contains the local RedProtect mirror — the `-s` flag is mandatory. + +--- + +## 4. Deploying to another server (same version: Lophine 26.1.2) + +**Must copy (1 file)**: +``` +lophine-test/plugins/BetterRTP-3.6.13.jar → /plugins/ +``` + +**Strongly recommended (Lophine's own config bug)**: +``` +lophine-test/lophine_config/lophine_global_config.toml → /lophine_config/ +``` +> On first boot Lophine 26.1.2 generates this TOML with a malformed line (a wrapped comment +> loses its `#`: `n is added to fix this behavior.`), which makes startup config parsing fail. +> This file has been fixed and set **read-only** — keep it read-only (`attrib +R`) after copying, +> otherwise the server re-writes the bug back on the next boot. + +**Deploy order**: stop server → copy → start (copying while the server runs fails because the +jar is file-locked by the JVM). + +**Auto-generated, do not copy**: everything under `plugins/BetterRTP/` (config.yml, effects.yml, +lang, data, log.txt) and `plugins/bStats/`. +**Do NOT copy**: the `world/` save and `data/database.db` (cross-server data leakage). + +**Smoke test**: +1. Log shows `[BetterRTP] Enabling BetterRTP v3.6.13`, no ERROR; +2. No `Thread failed main thread check`; +3. Within ~30 s `plugins/BetterRTP/log.txt` shows `Queue position generated`; +4. In-game `/rtp`: teleport succeeds, particles/sounds/potions work. + +--- + +## 5. Verification results (Lophine 26.1.2-da005b1 + JDK 25) + +| Item | Result | +|---|---| +| Plugin enable | ✅ clean, no exceptions | +| Queue pre-generation (the #257 path) | ✅ 57 safe locations (overworld + nether), 0 thread errors | +| Jar contents | ✅ PaperLib/ParticleLib/ProtocolLib removed; FoliaLib kept; LICENSE included | +| Server stability | ✅ repeated clean restarts (with the read-only config workaround) | +| Real-player `/rtp` end-to-end | ⚠️ **pending manual confirmation** (mineflayer only supports up to 1.21.11; Lophine has no SimulatedPlayer API) | + +--- + +## 6. Rollback + +- **git tag**: `backup-before-folia-fixes-20260822-100842` (`git checkout ` restores the + original code) +- **Physical backup**: `_backup/BetterRTP-20260822-100842/` + +--- + +## 7. Known limitations + +- Verified only against **Lophine 26.1.2**; other versions (Lophine 26.2, vanilla Folia) are not + tested — the API surface should be compatible but requires re-validation. +- The compile target moved from "all-version compatible" (spigot 1.8.8) to "modern Paper/Folia" + (lophine-api 26.1.2), **dropping support for old server versions** (aligned with the + modernization direction in upstream issue [#260](https://github.com/RonanPlugins/BetterRTP/issues/260)). +- The particle mapping covers common particles; a few exotic ones (ITEM/BLOCK types that require + ItemStack/BlockData data) may not render and safely fall back to the default particle. diff --git a/FORK-README.md b/FORK-README.md new file mode 100644 index 00000000..362649c6 --- /dev/null +++ b/FORK-README.md @@ -0,0 +1,138 @@ +# BetterRTP — Lophine 26.1.2 适配版（AI 改进） + +> **本项目的代码改动全部由 AI 完成**（基于 DeepSeek 编码代理的一次完整适配会话）， +> 目标服务端：**Lophine 26.1.2**（Folia 系、Paper 分支，对应 Minecraft 26.1.2）。 +> 原始上游：[RonanPlugins/BetterRTP](https://github.com/RonanPlugins/BetterRTP) v3.6.13（MIT License）。 + +--- + +## 1. 目录结构 + +| 路径 | 说明 | +|---|---| +| `BetterRTP/` | 插件源码（已改造） | +| `BetterRTP/target/BetterRTP-3.6.13.jar` | **最终构建产物**（含 LICENSE） | +| `lophine-test/` | 测试服务器（Lophine 26.1.2） | +| `lophine-test/plugins/BetterRTP-3.6.13.jar` | 已部署的插件 | +| `_backup/BetterRTP-20260822-100842/` | 改造前源码备份（297 文件） | +| `_tools/` | Maven 3.9.16 构建环境（本地仓库 m2repo、redprotect 镜像等） | + +--- + +## 2. AI 改进清单 + +### 🔴 修复 A —— 核心：RTP 在 Folia 26.1.2 上完全失效（上游 issue [#257](https://github.com/RonanPlugins/BetterRTP/issues/257)） + +- **问题**：BetterRTP 的 Folia 支持只把"调度"交给了 FoliaLib，异步加载 chunk 仍走 **PaperLib 1.0.8**（2019 年的库，不认 Folia 的 `getChunkAtAsync` 新签名 → 反射失败 → 退回**同步** `world.getChunkAt`）。该调用发生在 Folia 的全局区域线程上，触发 Moonrise 线程检查： + `Thread failed main thread check: Async chunk retrieval` → `/rtp` 完全不可用，玩家卡死在队列。 +- **改动**（4 个文件）：`PaperLib.getChunkAtAsync(...)` / `PaperLib.teleportAsync(...)` + → 原生 **`World#getChunkAtAsync(...)`** / **`Entity#teleportAsync(...)`**（Folia 官方安全 API，future 在正确的区域线程完成）。 + - `player/rtp/RTPPlayer.java` + - `player/rtp/RTPTeleport.java` + - `references/rtpinfo/QueueGenerator.java` + - `references/rtpinfo/RandomLocation.java` +- **验证**：改造后 **0 个**线程检查错误；队列预生成在主世界 + 下界产出 **57 个安全坐标**（与 #257 完全相同的代码路径）。 + +### 🟠 修复 B —— 粒子效果原生化 + +- **问题**：粒子库 ParticleLib 1.8.4 官方只支持 **MC 1.8–1.19.3**；MC 1.21.5+ 粒子协议重写后反射必挂（静默失败 + 控制台刷堆栈），且原实现在异步线程发粒子（Folia 上违反区域线程）。 +- **改动**（`player/rtp/effects/RTPEffect_Particles.java` + `commands/types/CmdInfo.java`）： + - 改用原生 **`org.bukkit.Particle`**，内置 ParticleLib 旧名 → 现代名映射表（`EXPLOSION_NORMAL→POOF`、`CRIT→CRIT` 等）； + - 粒子显示移到**实体区域线程**（`AsyncHandler.syncAtEntity`）； + - 删除 `xyz.xenondevs:particle` 依赖。 + +### 🟠 修复 C —— 音效移除 ProtocolLib 依赖 + +- **改动**（`player/rtp/effects/RTPEffect_Sounds.java`）：删除 ProtocolLib 分支与 `packets/` 两个类，改用原生 `playSound(loc, key, SoundCategory.MASTER, …)`（枚举名优先、自定义音效 key 兜底，功能与原 ProtocolLib 路径等价）；删除 `com.comphenix.protocol` 依赖。 + +### 🟠 修复 D —— 首登自动 RTP 时机（上游 issue [#256](https://github.com/RonanPlugins/BetterRTP/issues/256)） + +- **问题**：`PlayerJoinEvent` 时玩家实体尚未完全就绪，RTP 过早执行。 +- **改动**（`player/events/Join.java`）：改用 Paper **实体调度器** `p.getScheduler().run(...)` 延迟到玩家就绪 + `isOnline()` 守卫。 + +### 🟡 权限默认开放（方便测试） + +- **改动**（`src/main/resources/plugin.yml`）：`betterrtp.world.*` 增加 `default: true`。 + 原版只有 `betterrtp.use` 默认开放，而 `canRTP()` 还要求 `betterrtp.world.*` / `betterrtp.world.<世界>`（默认 false），导致**普通玩家无权限插件时永远无法 RTP**。此改动让所有玩家默认在所有世界可 RTP。 + +### 🟢 LICENSE 打包 + +- `pom.xml` 增加资源配置，将 MIT `LICENSE` 打进 jar 的 `META-INF/LICENSE`。 + +### ⚙️ 构建/工具链适配（非插件逻辑，但为构建所必需） + +| 问题 | 解决 | +|---|---| +| JDK 25 不再自动发现 classpath 上的注解处理器 | maven-compiler-plugin 显式 `` + `full` | +| 原编译目标 spigot-api 1.8.8 缺现代 API | 编译目标升级为 **lophine-api 26.1.2**（`fun.bm.lophine:lophine-api:26.1.2.build.638-stable`），Java release 21 | +| 现代 API 引用的注解/库 | 补 `org.jspecify:jspecify`、`net.kyori:adventure-api/4.26.1`、`adventure-key` | +| RedProtect 依赖损坏（raw.githubusercontent 被 hosts 劫持） | git 克隆官方 mvn-repo 分支，本地 `file://` 镜像 | +| 沙箱外不可写用户 .m2 | 本地仓库指向工作区 `_tools/m2repo` | + +--- + +## 3. 构建 + +```bat +set MAVEN_OPTS=-Dmaven.repo.local=D:\BETTER~1\_tools\m2repo +call _tools\apache-maven-3.9.16\bin\mvn.cmd -s _tools\maven-settings.xml -B -DskipTests clean package +:: 产物: BetterRTP\target\BetterRTP-3.6.13.jar +``` + +- 需要 Java 21+（本机为 JDK 25）构建；服务端运行需要 **Java 25**（Lophine 26.1.2 要求）。 +- `_tools/maven-settings.xml` 含 redprotect-repo 的本地镜像，必须带上 `-s`。 + +--- + +## 4. 部署到同版本服务器（Lophine 26.1.2） + +**必复制（1 个文件）**： +``` +lophine-test/plugins/BetterRTP-3.6.13.jar → <新服>/plugins/ +``` + +**强烈建议（Lophine 自身配置 bug）**： +``` +lophine-test/lophine_config/lophine_global_config.toml → <新服>/lophine_config/ +``` +> Lophine 26.1.2 首次生成该配置时，注释折行会丢 `#` 产生畸形行 +> （`n is added to fix this behavior.`），导致启动解析失败。本文件已修复并**设为只读**， +> 复制后请保持只读属性（`attrib +R`），否则服务器重写配置时 bug 复发。 + +**部署步骤**：停服 → 复制 → 启动（必须先停服再复制，运行中 jar 会被进程锁定）。 + +**自动生成、无需复制**：`plugins/BetterRTP/` 下的 config.yml / effects.yml / lang / data / log.txt、`plugins/bStats/`。 +**不要复制**：`world/` 存档、`data/database.db`（跨服会串数据）。 + +**验证清单**： +1. 日志出现 `[BetterRTP] Enabling BetterRTP v3.6.13`，无 ERROR； +2. 无 `Thread failed main thread check`； +3. 30 秒后 `plugins/BetterRTP/log.txt` 出现 `Queue position generated`； +4. 客户端 `/rtp`：传送成功，粒子/音效/药水正常。 + +--- + +## 5. 验证结果（Lophine 26.1.2-da005b1 + JDK 25） + +| 项 | 结果 | +|---|---| +| 插件加载 | ✅ 干净加载，无异常 | +| 队列预生成（原 #257 报错路径） | ✅ 57 个安全坐标（主世界 + 下界），0 线程错误 | +| jar 内容 | ✅ PaperLib/ParticleLib/ProtocolLib 已移除；FoliaLib 保留；LICENSE 已含 | +| 服务器稳定性 | ✅ 连续多次重启正常（配合只读配置修复） | +| 真实玩家 `/rtp` 端到端 | ⚠️ **待实机确认**（mineflayer 协议最高 1.21.11，无法代测；Lophine 无 SimulatedPlayer API） | + +--- + +## 6. 回滚 + +- **git tag**：`backup-before-folia-fixes-20260822-100842`（`git checkout ` 恢复原代码） +- **物理备份**：`_backup/BetterRTP-20260822-100842/` + +--- + +## 7. 已知限制 + +- 仅针对 **Lophine 26.1.2** 验证；其他版本（含 Lophine 26.2、Vanilla Folia）未实测，API 面兼容但需重新验证。 +- 编译目标从"全版本兼容"（spigot 1.8.8）改为"现代 Paper/Folia"（lophine-api 26.1.2），**放弃对旧版本服务端的兼容**（与上游 issue [#260](https://github.com/RonanPlugins/BetterRTP/issues/260) 的现代化方向一致）。 +- 粒子名称映射覆盖了常见粒子，个别冷门粒子（如需要 ItemStack/BlockData 数据的 ITEM/BLOCK 类）可能不显示，已安全降级为默认粒子。 diff --git a/pom.xml b/pom.xml index 9e585830..1a8bb48b 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ - 8 + 21 UTF-8 @@ -41,6 +41,15 @@ src/main/resources true + + + ${project.basedir} + META-INF + + LICENSE + + false + ${project.artifactId}-${project.version} @@ -58,10 +67,6 @@ ${project.build.directory}/dependency-reduced-pom.xml - - io.papermc.lib - me.SuperRonanCraft.BetterRTP.lib.paperlib - com.tcoded.folialib me.SuperRonanCraft.BetterRTP.lib.folialib @@ -82,8 +87,17 @@ maven-compiler-plugin 3.14.0 - 1.8 - 1.8 + + 21 + full + + + org.projectlombok + lombok + 1.18.38 + + @@ -164,18 +178,31 @@ - + + + fun.bm.lophine + lophine-api + 26.1.2.build.638-stable + provided + + + + org.jspecify + jspecify + 1.0.0 + provided + + - org.spigotmc - spigot-api - 1.8.8-R0.1-SNAPSHOT + net.kyori + adventure-api + 4.26.1 provided - - org.spigotmc - spigot - 1.8.8-R0.1-SNAPSHOT + net.kyori + adventure-key + 4.26.1 provided @@ -185,13 +212,6 @@ 1.7 provided - - - io.papermc - paperlib - 1.0.8 - compile - com.sk89q.worldguard @@ -226,13 +246,7 @@ 6.28.11 provided - - - com.comphenix.protocol - ProtocolLib - 5.3.0 - provided - + com.github.TownyAdvanced @@ -274,15 +288,7 @@ 97b96c9 provided - - - xyz.xenondevs - particle - 1.8.4 - compile - + org.projectlombok diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdInfo.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdInfo.java index b1b7d285..3ea0d6b1 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdInfo.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdInfo.java @@ -38,7 +38,7 @@ import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.TextComponent; -import xyz.xenondevs.particle.ParticleEffect; +import org.bukkit.Particle; public class CmdInfo implements RTPCommand, RTPCommandHelpable { @@ -109,7 +109,7 @@ private void infoParticles(CommandSender sendi) { List info = new ArrayList<>(); // BetterRTP pl = BetterRTP.getInstance(); - for (ParticleEffect eff : ParticleEffect.VALUES) { + for (Particle eff : Particle.values()) { if (info.isEmpty() || info.size() % 2 == 0) { info.add("&7" + eff.name() + "&r"); } else diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Join.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Join.java index fc8ed9e8..7923e0be 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Join.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Join.java @@ -39,8 +39,15 @@ private static void updater(Player p) { //RTP on first join private static void rtpOnFirstJoin(Player p) { - if (getPl().getSettings().isRtpOnFirstJoin_Enabled() && !p.hasPlayedBefore()) - HelperRTP.tp(p, Bukkit.getConsoleSender(), Bukkit.getWorld(getPl().getSettings().getRtpOnFirstJoin_World()), null, RTP_TYPE.JOIN, true, true); + if (getPl().getSettings().isRtpOnFirstJoin_Enabled() && !p.hasPlayedBefore()) { + //Defer until the player is fully loaded into a region (Folia-safe): at PlayerJoinEvent + //time the entity may not be schedulable yet, which made the RTP run too early (#256). + p.getScheduler().run(BetterRTP.getInstance(), task -> { + if (!p.isOnline()) + return; + HelperRTP.tp(p, Bukkit.getConsoleSender(), Bukkit.getWorld(getPl().getSettings().getRtpOnFirstJoin_World()), null, RTP_TYPE.JOIN, true, true); + }, null); + } } private static BetterRTP getPl() { diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java index 3fb099b7..3688133a 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java @@ -8,7 +8,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import io.papermc.lib.PaperLib; import lombok.Getter; import me.SuperRonanCraft.BetterRTP.BetterRTP; import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_FailedEvent; @@ -65,7 +64,7 @@ void randomlyTeleport(CommandSender sendi) { //Load chunk and find out if safe location (asynchronously) AsyncHandler.sync(() -> { try { //Prior to 1.12 this async chunk will NOT work - CompletableFuture chunk = PaperLib.getChunkAtAsync(loc); + CompletableFuture chunk = loc.getWorld().getChunkAtAsync(loc); chunk.thenAccept(result -> { //BetterRTP.debug("Checking location for " + p.getName()); attempt(sendi, loc); diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java index 7806d94d..85a218f0 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java @@ -5,9 +5,7 @@ import org.bukkit.Location; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitRunnable; -import io.papermc.lib.PaperLib; import me.SuperRonanCraft.BetterRTP.BetterRTP; import me.SuperRonanCraft.BetterRTP.player.rtp.effects.RTPEffect_Titles; import me.SuperRonanCraft.BetterRTP.player.rtp.effects.RTPEffects; @@ -52,10 +50,8 @@ public void run() {*/ RTP_TeleportEvent event = new RTP_TeleportEvent(p, location, wPlayer.getWorldtype()); getPl().getServer().getPluginManager().callEvent(event); Location loc = event.getLocation(); - PaperLib.teleportAsync(p, loc).thenRun(new BukkitRunnable() { //Async teleport - @Override - public void run() { - afterTeleport(p, loc, wPlayer, attempts, oldLoc, type); + p.teleportAsync(loc).thenRun(() -> { //Async teleport (Folia-safe: completes on the player's region thread) + afterTeleport(p, loc, wPlayer, attempts, oldLoc, type); if (sendi != p) //Tell player who requested that the player rtp'd sendSuccessMsg(sendi, p.getName(), loc, wPlayer, false, attempts); getPl().getPInfo().getRtping().remove(p); //No longer rtp'ing @@ -64,7 +60,7 @@ public void run() { if (BetterRTP.getInstance().getSettings().isRtpOnFirstJoin_SetAsRespawn()) //Save as respawn is enabled p.setBedSpawnLocation(loc, true); //True means to force a respawn even without a valid bed } - }); + ); } catch (Exception e) { getPl().getPInfo().getRtping().remove(p); //No longer rtp'ing (errored) e.printStackTrace(); diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/effects/RTPEffect_Particles.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/effects/RTPEffect_Particles.java index fb229075..4e3318f8 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/effects/RTPEffect_Particles.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/effects/RTPEffect_Particles.java @@ -4,24 +4,23 @@ import me.SuperRonanCraft.BetterRTP.references.file.FileOther; import me.SuperRonanCraft.BetterRTP.versions.AsyncHandler; import org.bukkit.Location; +import org.bukkit.Particle; import org.bukkit.entity.Player; import org.bukkit.util.Vector; -import xyz.xenondevs.particle.ParticleEffect; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -//--- -//Credit to @ByteZ1337 for ParticleLib - https://github.com/ByteZ1337/ParticleLib -// -//Use of particle creation -//--- +//Particles displayed with the native Bukkit Particle API. +//The old ParticleLib (xyz.xenondevs.particle) only supported MC 1.8-1.19.3 and +//broke on MC 1.21.5+ (particle packet rework), so particle effects are now +//rendered through org.bukkit.Particle on the entity's region thread (Folia-safe). public class RTPEffect_Particles { private boolean enabled; - private final List effects = new ArrayList<>(); + private final List effects = new ArrayList<>(); private String shape; private final int precision = 16; @@ -48,18 +47,18 @@ void load() { try { for (String type : types) { typeTrying = type; - effects.add(ParticleEffect.valueOf(type.toUpperCase())); + Particle particle = toBukkitParticle(type); + if (particle != null) + effects.add(particle); } - } catch (IllegalArgumentException | NullPointerException e) { + } catch (NullPointerException e) { effects.clear(); - effects.add(ParticleEffect.ASH); + effects.add(Particle.POOF); getPl().getLogger().severe("The particle '" + typeTrying + "' doesn't exist! Default particle enabled... " + "Try using '/rtp info particles' to get a list of available particles"); - } catch (ExceptionInInitializerError | NoClassDefFoundError e2) { - effects.clear(); - getPl().getLogger().severe("The particle '" + typeTrying + "' created a fatal error when loading particles! Your MC version isn't supported!"); - enabled = false; } + if (effects.isEmpty()) + effects.add(Particle.POOF); shape = config.getString("Particles.Shape").toUpperCase(); if (!Arrays.asList(shapeTypes).contains(shape)) { getPl().getLogger().severe("The particle shape '" + shape + "' doesn't exist! Default particle shape enabled..."); @@ -68,9 +67,52 @@ void load() { } } + //Map the old ParticleLib enum names to modern Bukkit particle names (MC 1.13+ flattening) + private Particle toBukkitParticle(String type) { + String name = type.toUpperCase(); + switch (name) { + case "EXPLOSION_NORMAL": name = "POOF"; break; + case "EXPLOSION_LARGE": name = "EXPLOSION"; break; + case "EXPLOSION_HUGE": name = "EXPLOSION_EMITTER"; break; + case "CRIT_MAGIC": name = "ENCHANTED_HIT"; break; + case "SMOKE_NORMAL": name = "SMOKE"; break; + case "SMOKE_LARGE": name = "LARGE_SMOKE"; break; + case "SPELL": name = "EFFECT"; break; + case "SPELL_INSTANT": name = "INSTANT_EFFECT"; break; + case "SPELL_MOB": name = "ENTITY_EFFECT"; break; + case "SPELL_MOB_AMBIENT": name = "AMBIENT_ENTITY_EFFECT"; break; + case "SPELL_WITCH": name = "WITCH"; break; + case "DRIP_WATER": name = "DRIPPING_WATER"; break; + case "DRIP_LAVA": name = "DRIPPING_LAVA"; break; + case "VILLAGER_ANGRY": name = "ANGRY_VILLAGER"; break; + case "VILLAGER_HAPPY": name = "HAPPY_VILLAGER"; break; + case "ENCHANTMENT_TABLE": name = "ENCHANT"; break; + case "REDSTONE": name = "DUST"; break; + case "SNOWBALL": name = "ITEM_SNOWBALL"; break; + case "SNOW_SHOVEL": name = "SNOWFLAKE"; break; + case "SLIME": name = "ITEM_SLIME"; break; + case "MOB_APPEARANCE": name = "ELDER_GUARDIAN"; break; + case "ITEM_CRACK": name = "ITEM"; break; + case "BLOCK_CRACK": name = "BLOCK"; break; + case "BLOCK_DUST": name = "BLOCK"; break; + case "WATER_DROP": name = "RAIN"; break; + case "TOWN_AURA": name = "MYCELIUM_UMBRELLA"; break; + //same names in both: CRIT, NOTE, PORTAL, FLAME, LAVA, CLOUD, HEART, BARRIER, + //ASH, DRAGON_BREATH, END_ROD, DAMAGE_INDICATOR, SWEEP_ATTACK, FALLING_DUST, + //TOTEM, SPIT, SQUID_INK, BUBBLE_POP, CURRENT_DOWN, BUBBLE_COLUMN_UP, NAUTILUS, DOLPHIN + default: break; + } + try { + return Particle.valueOf(name); + } catch (IllegalArgumentException e) { + getPl().getLogger().severe("The particle '" + type + "' doesn't exist in this server version!"); + return null; + } + } + public void display(Player p) { if (!enabled) return; - AsyncHandler.async(() -> { + AsyncHandler.syncAtEntity(p, () -> { try { //Incase the library errors out switch (shape) { case "TELEPORT": @@ -94,8 +136,8 @@ private void partScan(Player p) { //Particles with negative velocity Location loc = p.getLocation().add(new Vector(0, 1.75, 0)); for (int index = 1; index < precision; index++) { Vector vec = getVecCircle(index); - for (ParticleEffect effect : effects) { - effect.display(loc.clone().add(vec), new Vector(0, -0.125, 0), .15f, 0, null, p); + for (Particle effect : effects) { + spawn(loc.clone().add(vec), new Vector(0, -0.125, 0), .15f, effect, p); } } } @@ -106,8 +148,8 @@ private void partTeleport(Player p) { //Static particles in a shape for (int index = 1; index < precision; index++) { //double yran = ran.nextGaussian() * pHeight; Vector vec = getVecCircle(index).add(new Vector(0, y, 0)); - for (ParticleEffect effect : effects) { - effect.display(loc.clone().add(vec), p); + for (Particle effect : effects) { + spawn(loc.clone().add(vec), new Vector(0, 0, 0), 0f, effect, p); } } } @@ -116,12 +158,18 @@ private void partExplosion(Player p) { //Particles with a shape and forward velo Location loc = p.getLocation().add(new Vector(0, 1, 0)); for (int index = 1; index < precision; index++) { Vector vec = getVecCircle(index); - for (ParticleEffect effect : effects) { - effect.display(loc.clone().add(vec), vec, 1.5f, 0, null, p); + for (Particle effect : effects) { + spawn(loc.clone().add(vec), vec, 1.5f, effect, p); } } } + //count=0 -> offset is used as velocity, extra as speed (same semantics as the old ParticleLib display call) + private void spawn(Location loc, Vector offset, float speed, Particle effect, Player p) { + p.spawnParticle(effect, loc.getX(), loc.getY(), loc.getZ(), 0, + offset.getX(), offset.getY(), offset.getZ(), speed); + } + private Vector getVecCircle(int index) { double p1 = (index * Math.PI) / (precision / 2); double p2 = (index - 1) * Math.PI / (precision / 2); diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/effects/RTPEffect_Sounds.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/effects/RTPEffect_Sounds.java index f350d098..4495f953 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/effects/RTPEffect_Sounds.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/effects/RTPEffect_Sounds.java @@ -1,13 +1,10 @@ package me.SuperRonanCraft.BetterRTP.player.rtp.effects; -import com.comphenix.protocol.PacketType; -import com.comphenix.protocol.ProtocolLibrary; -import com.comphenix.protocol.ProtocolManager; import me.SuperRonanCraft.BetterRTP.BetterRTP; -import me.SuperRonanCraft.BetterRTP.player.rtp.packets.WrapperPlayServerNamedSoundEffect; import me.SuperRonanCraft.BetterRTP.references.file.FileOther; import org.bukkit.Location; import org.bukkit.Sound; +import org.bukkit.SoundCategory; import org.bukkit.entity.Player; public class RTPEffect_Sounds { @@ -29,7 +26,6 @@ public void playTeleport(Player p) { return; if (soundTeleport != null) { playSound(p.getLocation(), p, soundTeleport); - //p.playSound(p.getLocation(), soundTeleport, 1F, 1F); } } @@ -37,33 +33,23 @@ public void playDelay(Player p) { if (!enabled) return; if (soundDelay != null) { playSound(p.getLocation(), p, soundDelay); - //p.playSound(p.getLocation(), soundDelay, 1F, 1F); } } void playSound(Location loc, Player p, String sound) { - if (BetterRTP.getInstance().getSettings().isProtocolLibSounds()) { - try { - ProtocolManager pm = ProtocolLibrary.getProtocolManager(); - WrapperPlayServerNamedSoundEffect packet = new WrapperPlayServerNamedSoundEffect(pm.createPacket(PacketType.Play.Server.NAMED_SOUND_EFFECT)); - packet.setSoundName(sound); - packet.setEffectPositionX(loc.getBlockX()); - packet.setEffectPositionY(loc.getBlockY()); - packet.setEffectPositionZ(loc.getBlockZ()); - packet.sendPacket(p); - } catch (NoClassDefFoundError | Exception e) { - BetterRTP.getInstance().getLogger().severe("ProtocolLib Sounds is enabled in the effects.yml file, but no ProtocolLib plugin was found!"); - p.playSound(p.getLocation(), getSound(sound), 1F, 1F); - } - } else - p.playSound(p.getLocation(), getSound(sound), 1F, 1F); + //Prefer the enum lookup (handles legacy config names like 'entity_tnt_primed'); + //fall back to the raw sound key for custom resource-pack sounds. + Sound enumSound = getSound(sound); + if (enumSound != null) + p.playSound(loc, enumSound, SoundCategory.MASTER, 1F, 1F); + else + p.playSound(loc, sound, SoundCategory.MASTER, 1F, 1F); } private Sound getSound(String sound) { try { return Sound.valueOf(sound.toUpperCase()); } catch (IllegalArgumentException e) { - BetterRTP.getInstance().getLogger().info("The sound '" + sound + "' is invalid!"); return null; } } diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/packets/AbstractPacket.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/packets/AbstractPacket.java deleted file mode 100644 index aa853098..00000000 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/packets/AbstractPacket.java +++ /dev/null @@ -1,87 +0,0 @@ -package me.SuperRonanCraft.BetterRTP.player.rtp.packets; - -import com.comphenix.protocol.PacketType; -import com.comphenix.protocol.ProtocolLibrary; -import com.comphenix.protocol.events.PacketContainer; -import com.google.common.base.Objects; -import org.bukkit.entity.Player; - -public abstract class AbstractPacket { - // The packet we will be modifying - protected PacketContainer handle; - - /** - * Constructs a new strongly typed wrapper for the given packet. - * - * @param handle - handle to the raw packet data. - * @param type - the packet type. - */ - protected AbstractPacket(PacketContainer handle, PacketType type) { - // Make sure we're given a valid packet - if (handle == null) - throw new IllegalArgumentException("Packet handle cannot be NULL."); - if (!Objects.equal(handle.getType(), type)) - throw new IllegalArgumentException(handle.getHandle() - + " is not a packet of type " + type); - - this.handle = handle; - } - - /** - * Retrieve a handle to the raw packet data. - * - * @return Raw packet data. - */ - public PacketContainer getHandle() { - return handle; - } - - /** - * Send the current packet to the given receiver. - * - * @param receiver - the receiver. - */ - public void sendPacket(Player receiver) { - ProtocolLibrary.getProtocolManager().sendServerPacket(receiver, getHandle()); - } - - /** - * Send the current packet to all online players. - */ - public void broadcastPacket() { - ProtocolLibrary.getProtocolManager().broadcastServerPacket(getHandle()); - } - - /** - * Simulate receiving the current packet from the given sender. - * - * @param sender - the sender. - * @throws RuntimeException If the packet cannot be received. - * @deprecated Misspelled. recieve to receive - * @see #receivePacket(Player) - */ - @Deprecated - public void recievePacket(Player sender) { - try { - ProtocolLibrary.getProtocolManager().receiveClientPacket(sender, - getHandle()); - } catch (Exception e) { - throw new RuntimeException("Cannot recieve packet.", e); - } - } - - /** - * Simulate receiving the current packet from the given sender. - * - * @param sender - the sender. - * @throws RuntimeException if the packet cannot be received. - */ - public void receivePacket(Player sender) { - try { - ProtocolLibrary.getProtocolManager().receiveClientPacket(sender, - getHandle()); - } catch (Exception e) { - throw new RuntimeException("Cannot receive packet.", e); - } - } -} \ No newline at end of file diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/packets/WrapperPlayServerNamedSoundEffect.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/packets/WrapperPlayServerNamedSoundEffect.java deleted file mode 100644 index 99c1f70b..00000000 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/packets/WrapperPlayServerNamedSoundEffect.java +++ /dev/null @@ -1,350 +0,0 @@ -package me.SuperRonanCraft.BetterRTP.player.rtp.packets; -import java.lang.reflect.Field; -import java.util.List; - -import org.bukkit.Location; -import org.bukkit.World; - -import com.comphenix.protocol.PacketType; -import com.comphenix.protocol.events.PacketContainer; -import com.comphenix.protocol.events.PacketEvent; -import com.google.common.collect.Lists; - -public class WrapperPlayServerNamedSoundEffect extends AbstractPacket { - public static final PacketType TYPE = PacketType.Play.Server.NAMED_SOUND_EFFECT; - - public WrapperPlayServerNamedSoundEffect() { - super(new PacketContainer(TYPE), TYPE); - handle.getModifier().writeDefaults(); - } - - public WrapperPlayServerNamedSoundEffect(PacketContainer packet) { - super(packet, TYPE); - } - - /** - * List of all the named sound effects in Minecraft. - * @author Kristian - */ - public static class NamedSoundEffects { - public static final String AMBIENT_WEATHER_RAIN = "ambient.weather.rain"; - public static final String AMBIENT_WEATHER_THUNDER = "ambient.weather.thunder"; - public static final String DAMAGE_FALL_BIG = "damage.fallbig"; - public static final String DAMAGE_FALL_SMALL = "damage.fallsmall"; - public static final String FIRE_ACTIVE = "fire.fire"; - public static final String FIRE_IGNITE = "fire.ignite"; - public static final String LIQUID_LAVA = "liquid.lava"; - public static final String LIQUID_LAVA_POP = "liquid.lavapop"; - public static final String LIQUID_SPLASH = "liquid.splash"; - public static final String LIQUID_WATER = "liquid.water"; - public static final String MOB_BLAZE_BREATHE = "mob.blaze.breathe"; - public static final String MOB_BLAZE_DEATH = "mob.blaze.death"; - public static final String MOB_BLAZE_HIT = "mob.blaze.hit"; - public static final String MOB_CAT_HISS = "mob.cat.hiss"; - public static final String MOB_CAT_HITT = "mob.cat.hitt"; - public static final String MOB_CAT_MEOW = "mob.cat.meow"; - public static final String MOB_CAT_PURR = "mob.cat.purr"; - public static final String MOB_CAT_PURREOW = "mob.cat.purreow"; - public static final String MOB_CHICKEN_HURT = "mob.chicken.hurt"; - public static final String MOB_CHICKEN_PLOP = "mob.chicken.plop"; - public static final String MOB_COW_HURT = "mob.cow.hurt"; - public static final String MOB_CREEPER = "mob.creeper"; - public static final String MOB_CREEPER_DEATH = "mob.creeperdeath"; - public static final String MOB_ENDERMEN_DEATH = "mob.endermen.death"; - public static final String MOB_ENDERMEN_HIT = "mob.endermen.hit"; - public static final String MOB_ENDERMEN_IDLE = "mob.endermen.idle"; - public static final String MOB_ENDERMEN_PORTAL = "mob.endermen.portal"; - public static final String MOB_ENDERMEN_SCREAM = "mob.endermen.scream"; - public static final String MOB_ENDERMEN_STARE = "mob.endermen.stare"; - public static final String MOB_GHAST_AFFECTIONATE_SCREAM = "mob.ghast.affectionate scream"; - public static final String MOB_GHAST_CHARGE = "mob.ghast.charge"; - public static final String MOB_GHAST_DEATH = "mob.ghast.death"; - public static final String MOB_GHAST_FIREBALL = "mob.ghast.fireball"; - public static final String MOB_GHAST_MOAN = "mob.ghast.moan"; - public static final String MOB_GHAST_SCREAM = "mob.ghast.scream"; - public static final String MOB_IRONGOLEM_DEATH = "mob.irongolem.death"; - public static final String MOB_IRONGOLEM_HIT = "mob.irongolem.hit"; - public static final String MOB_IRONGOLEM_THROW = "mob.irongolem.throw"; - public static final String MOB_IRONGOLEM_WALK = "mob.irongolem.walk"; - public static final String MOB_MAGMACUBE_BIG = "mob.magmacube.big"; - public static final String MOB_MAGMACUBE_JUMP = "mob.magmacube.jump"; - public static final String MOB_MAGMACUBE_SMALL = "mob.magmacube.small"; - public static final String MOB_PIGDEATH = "mob.pig.death"; - public static final String MOB_SILVERFISH_HIT = "mob.silverfish.hit"; - public static final String MOB_SILVERFISH_KILL = "mob.silverfish.kill"; - public static final String MOB_SILVERFISH_SAY = "mob.silverfish.say"; - public static final String MOB_SILVERFISH_STEP = "mob.silverfish.step"; - public static final String MOB_SKELETON_DEATH = "mob.skeleton.death"; - public static final String MOB_SKELETON_HURT = "mob.skeleton.hurt"; - public static final String MOB_SLIMEATTACK = "mob.slime.attack"; - public static final String MOB_SPIDER_DEATH = "mob.spider.death"; - public static final String MOB_WOLF_BARK = "mob.wolf.bark"; - public static final String MOB_WOLF_DEATH = "mob.wolf.death"; - public static final String MOB_WOLF_GROWL = "mob.wolf.growl"; - public static final String MOB_WOLF_HOWL = "mob.wolf.howl"; - public static final String MOB_WOLF_HURT = "mob.wolf.hurt"; - public static final String MOB_WOLF_PANTING = "mob.wolf.panting"; - public static final String MOB_WOLF_SHAKE = "mob.wolf.shake"; - public static final String MOB_WOLF_WHINE = "mob.wolf.whine"; - public static final String MOB_ZOMBIE_METAL = "mob.zombie.metal"; - public static final String MOB_ZOMBIE_WOOD = "mob.zombie.wood"; - public static final String MOB_ZOMBIE_WOODBREAK = "mob.zombie.woodbreak"; - public static final String MOB_ZOMBIE = "mob.zombie"; - public static final String MOB_ZOMBIEDEATH = "mob.zombie.death"; - public static final String MOB_ZOMBIEHURT = "mob.zombie.hurt"; - public static final String MOB_ZOMBIEPIG_ZPIG = "mob.zombiepig.zpig"; - public static final String MOB_ZOMBIEPIG_ZPIGANGRY = "mob.zombiepig.zpigangry"; - public static final String MOB_ZOMBIEPIG_ZPIGDEATH = "mob.zombiepig.zpigdeath"; - public static final String MOB_ZOMBIEPIG_ZPIGHURT = "mob.zombiepig.zpighurt"; - public static final String NOTE_BASS = "note.bass"; - public static final String NOTE_BASS_ATTACK = "note.bassattack"; - public static final String NOTE_BD = "note.bd"; - public static final String NOTE_HARP = "note.harp"; - public static final String NOTE_HAT = "note.hat"; - public static final String NOTE_PLING = "note.pling"; - public static final String NOTE_SNARE = "note.snare"; - public static final String PORTAL_NEAR = "portal.portal"; - public static final String PORTAL_TRAVEL = "portal.travel"; - public static final String PORTAL_TRIGGER = "portal.trigger"; - public static final String RANDOM_BOW = "random.bow"; - public static final String RANDOM_BOWHIT = "random.bowhit"; - public static final String RANDOM_BREAK = "random.break"; - public static final String RANDOM_BREATH = "random.breath"; - public static final String RANDOM_BURP = "random.burp"; - public static final String RANDOM_CHESTCLOSED = "random.chestclosed"; - public static final String RANDOM_CHESTOPEN = "random.chestopen"; - public static final String RANDOM_CLICK = "random.click"; - public static final String RANDOM_DOOR_CLOSE = "random.door_close"; - public static final String RANDOM_DOOR_OPEN = "random.door_open"; - public static final String RANDOM_DRINK = "random.drink"; - public static final String RANDOM_EAT = "random.eat"; - public static final String RANDOM_EXPLODE = "random.explode"; - public static final String RANDOM_FIZZ = "random.fizz"; - public static final String RANDOM_FUSE = "random.fuse"; - public static final String RANDOM_GLASS = "random.glass"; - public static final String RANDOM_LEVELUP = "random.levelup"; - public static final String RANDOM_OLD_EXPLODE = "random.old_explode"; - public static final String RANDOM_ORB = "random.orb"; - public static final String RANDOM_POP = "random.pop"; - public static final String RANDOM_SPLASH = "random.splash"; - public static final String RANDOM_WOOD_CLICK = "random.wood click"; - public static final String STEP_CLOTH = "step.cloth"; - public static final String STEP_GRASS = "step.grass"; - public static final String STEP_GRAVEL = "step.gravel"; - public static final String STEP_SAND = "step.sand"; - public static final String STEP_SNOW = "step.snow"; - public static final String STEP_STONE = "step.stone"; - public static final String STEP_WOOD = "step.wood"; - public static final String TILE_PISTON_IN = "tile.piston.in"; - public static final String TILE_PISTON_OUT = "tile.piston.out"; - public static final String DAMAGE_HIT = "damage.hit"; - public static final String DIG_CLOTH = "dig.cloth"; - public static final String DIG_GRASS = "dig.grass"; - public static final String DIG_GRAVEL = "dig.gravel"; - public static final String DIG_SAND = "dig.sand"; - public static final String DIG_SNOW = "dig.snow"; - public static final String DIG_STONE = "dig.stone"; - public static final String DIG_WOOD = "dig.wood"; - public static final String LIQUID_SWIM = "liquid.swim"; - public static final String MINECART_BASE = "minecart.base"; - public static final String MINECART_INSIDE = "minecart.inside"; - public static final String MOB_CHICKEN_SAY = "mob.chicken.say"; - public static final String MOB_CHICKEN_STEP = "mob.chicken.step"; - public static final String MOB_COW_SAY = "mob.cow.say"; - public static final String MOB_COW_STEP = "mob.cow.step"; - public static final String MOB_CREEPER_SAY = "mob.creeper.say"; - public static final String MOB_PIG_DEATH = "mob.pig.death"; - public static final String MOB_PIG_SAY = "mob.pig.say"; - public static final String MOB_PIG_STEP = "mob.pig.step"; - public static final String MOB_SHEEP_SAY = "mob.sheep.say"; - public static final String MOB_SHEEP_SHEAR = "mob.sheep.shear"; - public static final String MOB_SHEEP_STEP = "mob.sheep.step"; - public static final String MOB_SKELETON_SAY = "mob.skeleton.say"; - public static final String MOB_SKELETON_STEP = "mob.skeleton.step"; - public static final String MOB_SLIME_ATTACK = "mob.slime.attack"; - public static final String MOB_SLIME_BIG = "mob.slime.big"; - public static final String MOB_SLIME_SMALL = "mob.slime.small"; - public static final String MOB_SPIDER_SAY = "mob.spider.say"; - public static final String MOB_SPIDER_STEP = "mob.spider.step"; - public static final String MOB_WOLF_STEP = "mob.wolf.step"; - public static final String MOB_ZOMBIE_DEATH = "mob.zombie.death"; - public static final String MOB_ZOMBIE_HURT = "mob.zombie.hurt"; - public static final String MOB_ZOMBIE_SAY = "mob.zombie.say"; - public static final String MOB_ZOMBIE_STEP = "mob.zombie.step"; - public static final String RANDOM_CLASSIC_HURT = "random.classic_hurt"; - public static final String STEP_LADDER = "step.ladder"; - public static final String MOB_BAT_DEATH = "mob.bat.death"; - public static final String MOB_BAT_HURT = "mob.bat.hurt"; - public static final String MOB_BAT_IDLE = "mob.bat.idle"; - public static final String MOB_BAT_TAKEOFF = "mob.bat.takeoff"; - public static final String MOB_ENDERDRAGON_END = "mob.enderdragon.end"; - public static final String MOB_ENDERDRAGON_GROWL = "mob.enderdragon.growl"; - public static final String MOB_ENDERDRAGON_HIT = "mob.enderdragon.hit"; - public static final String MOB_ENDERDRAGON_WINGS = "mob.enderdragon.wings"; - public static final String MOB_WITHER_DEATH = "mob.wither.death"; - public static final String MOB_WITHER_HURT = "mob.wither.hurt"; - public static final String MOB_WITHER_IDLE = "mob.wither.idle"; - public static final String MOB_WITHER_SHOOT = "mob.wither.shoot"; - public static final String MOB_WITHER_SPAWN = "mob.wither.spawn"; - public static final String MOB_ZOMBIE_INFECT = "mob.zombie.infect"; - public static final String MOB_ZOMBIE_REMEDY = "mob.zombie.remedy"; - public static final String MOB_ZOMBIE_UNFECT = "mob.zombie.unfect"; - public static final String RANDOM_ANVIL_BREAK = "random.anvil_break"; - public static final String RANDOM_ANVIL_LAND = "random.anvil_land"; - public static final String RANDOM_ANVIL_USE = "random.anvil_use"; - - private static String[] values; - - public static String[] values() { - if (values == null) { - List result = Lists.newArrayList(); - - // Get all public fields - for (Field field : NamedSoundEffects.class.getFields()) { - try { - result.add((String) field.get(null)); - } catch (Exception e) { - throw new RuntimeException("Cannot read field.", e); - } - } - - values = result.toArray(new String[0]); - } - return values; - } - } - - /** - * Retrieve the sound name. - * @see {@link NamedSoundEffects}. - * @return The current Sound name - */ - public String getSoundName() { - return handle.getStrings().read(0); - } - - /** - * Set the sound name. - * @see {@link NamedSoundEffects}. - * @param value - new value. - */ - public void setSoundName(String value) { - handle.getStrings().write(0, value); - } - - /** - * Retrieve the location of the effect. - * @param event - the current event. - * @return The effect location. - */ - public Location getEffectPosition(PacketEvent event) { - return getEffectPosition(event.getPlayer().getWorld()); - } - - /** - * Retrieve the location of the effect. - * @param world - the current world. - * @return The effect location. - */ - public Location getEffectPosition(World world) { - return new Location(world, getEffectPositionX(), getEffectPositionY(), getEffectPositionZ()); - } - - /** - * Retrieve the x coordinate of the effect. - * @return The current effect position X - */ - public double getEffectPositionX() { - return handle.getIntegers().read(0) / 8.0; - } - - /** - * Set the x coordinate of the effect. - *

- * Note that the value is rounded of to the nearest 1/8. - * @param value - new value. - */ - public void setEffectPositionX(double value) { - handle.getIntegers().write(0, (int) (value * 8.0)); - } - - /** - * Retrieve the y coordinate of the effect. - *

- * Note that the value is rounded of to the nearest 1/8. - * @return The current effect position Y - */ - public double getEffectPositionY() { - return handle.getIntegers().read(1) / 8.0; - } - - /** - * Set the y coordinate of the effect. - *

- * Note that the value is rounded of to the nearest 1/8. - * @param value - new value. - */ - public void setEffectPositionY(double value) { - handle.getIntegers().write(1, (int) (value * 8.0)); - } - - /** - * Retrieve the z coordinate of the effect. - *

- * Note that the value is rounded of to the nearest 1/8. - * @return The current effect position z - */ - public double getEffectPositionZ() { - return handle.getIntegers().read(2) / 8.0; - } - - /** - * Set the z coordinate of the effect. - *

- * Note that the value is rounded of to the nearest 1/8. - * @param value - new value. - */ - public void setEffectPositionZ(double value) { - handle.getIntegers().write(2, (int) (value * 8.0)); - } - - /** - * Retrieve the volumne. - *

- * One (1) is 100%, can be more. - * @return The current Volume - */ - public float getVolume() { - return handle.getFloat().read(0); - } - - /** - * Set the volume. - *

- * One (1) is 100%, can be more. - * @param value - new value. - */ - public void setVolume(float value) { - handle.getFloat().write(0, value); - } - - /** - * Retrieve the pitch. - *

- * One (1) is 100%, can be up to 3.9. - * @return The current Pitch - */ - public float getPitch() { - return handle.getIntegers().read(3) / 63.0F; - } - - /** - * Set the pitch. - *

- * One (1) is 100%, can be up to 3.9. - * @param value - new value. - */ - public void setPitch(float value) { - handle.getIntegers().write(3, (int) (value * 63.0F)); - } -} \ No newline at end of file diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/QueueGenerator.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/QueueGenerator.java index 4c76735e..e772ab4a 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/QueueGenerator.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/QueueGenerator.java @@ -11,7 +11,6 @@ import com.tcoded.folialib.wrapper.task.WrappedTask; -import io.papermc.lib.PaperLib; import me.SuperRonanCraft.BetterRTP.BetterRTP; import me.SuperRonanCraft.BetterRTP.player.commands.RTP_SETUP_TYPE; import me.SuperRonanCraft.BetterRTP.player.rtp.RTP; @@ -158,7 +157,7 @@ private void addQueue(RTPWorld rtpWorld, String id, ReQueueData reQueueData) { if (loc != null) { AsyncHandler.sync(() -> { //BetterRTP.debug("Queued up a new position, attempts " + reQueueData.attempts); - PaperLib.getChunkAtAsync(loc) + loc.getWorld().getChunkAtAsync(loc) .thenAccept(v -> { Location safeLoc = RandomLocation.getSafeLocation( HelperRTP.getWorldType(rtpWorld.getWorld()), diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/RandomLocation.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/RandomLocation.java index 1bb73f02..4fe70778 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/RandomLocation.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/RandomLocation.java @@ -1,6 +1,5 @@ package me.SuperRonanCraft.BetterRTP.references.rtpinfo; -import io.papermc.lib.PaperLib; import me.SuperRonanCraft.BetterRTP.BetterRTP; import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.RTPWorld; import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.WORLD_TYPE; @@ -155,7 +154,7 @@ private static void cacheTask(World world, int goal, int start, int xat, int zat } private static void cacheChunkAt(World world, int goal, int start, int xat, int zat) { - CompletableFuture task = PaperLib.getChunkAtAsync(new Location(world, xat * 16, 0, zat * 16)); + CompletableFuture task = world.getChunkAtAsync(xat, zat, true); task.thenAccept(chunk -> { try { ChunkSnapshot snapshot = chunk.getChunkSnapshot(true, true, false); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 5a35cd06..15df36af 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -46,6 +46,7 @@ permissions: betterrtp.version: true betterrtp.world.*: description: RTP in all enabled worlds + default: true betterrtp.bypass.*: children: betterrtp.bypass.cooldown: true