Compare commits

..

16 Commits

Author SHA1 Message Date
7fd8f8450c 修复了无法产生掉落物的问题
All checks were successful
Java CI-CD with Maven / build (push) Successful in 17m12s
2024-09-19 22:58:16 +08:00
198c4dd426 新增权限节点
All checks were successful
Java CI-CD with Maven / build (push) Successful in 7m17s
2024-07-08 14:09:49 +08:00
e7cb4cfb80 新增op与创造玩家可以无损使用lwe
Some checks failed
Java CI-CD with Maven / build (push) Failing after 32m39s
2024-07-01 15:46:41 +08:00
3038fc6e3c 修改警告提示位置
All checks were successful
Java CI-CD with Maven / build (push) Successful in 6m26s
2024-05-30 11:05:04 +08:00
17bb269f76 吸水新增消耗下届合金耐久度
All checks were successful
Java CI-CD with Maven / build (push) Successful in 5m38s
2024-05-30 10:55:26 +08:00
acae6d5ec7 更新了下载提示信息 2024-05-01 10:06:48 +08:00
d7362c2f0d 更新了自动更新脚本提示信息
All checks were successful
Java CI-CD with Maven / build (push) Successful in 8m18s
2024-04-28 17:49:58 +08:00
4767d270f2 更新了自动更新脚本提示信息
All checks were successful
Java CI-CD with Maven / build (push) Successful in 6m7s
2024-04-28 17:35:59 +08:00
eb431c65cf 修复了避免选取过大造成的卡顿
All checks were successful
Java CI-CD with Maven / build (push) Successful in 57m14s
2024-04-26 22:39:11 +08:00
f3fb232fa6 update readme 2024-04-26 16:25:03 +08:00
055953958a update readme 2024-04-26 15:50:11 +08:00
c5eb4e6035 新增选取可视化功能
All checks were successful
Java CI-CD with Maven / build (push) Successful in 34m8s
2024-04-26 13:10:43 +08:00
f68b80a30a 更新readme 2024-04-24 16:17:42 +08:00
127a91c46f 新增版本检查功能
All checks were successful
Java CI-CD with Maven / build (push) Successful in 1h0m46s
2024-04-07 15:35:52 +08:00
3ac5df6179 update README.md & logo 2024-03-28 11:13:11 +08:00
609a090235 update README.md 2024-03-28 01:00:38 +08:00
17 changed files with 378 additions and 56 deletions

View File

@ -9,34 +9,35 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- name: "Pull & Checkout"
uses: https://ssl.lunadeer.cn:14446/actions/checkout@v3
with:
fetch-depth: 0
- name: "Set up Maven"
uses: https://ssl.lunadeer.cn:14446/actions/setup-maven@v4
- name: "Set up JDK 17"
uses: https://ssl.lunadeer.cn:14446/actions/setup-java@v3
with:
java-version: '17'
distribution: 'zulu'
cache: maven
- name: "Build with Maven"
run: mvn -B package --file pom.xml
- name: "Copy jar to staging"
run: mkdir staging && cp target/*.jar staging
- name: "Build & test"
run: |
echo "done!"
- name: "setup go for release script"
run: |
wget --no-check-certificate https://golang.google.cn/dl/go1.21.6.linux-amd64.tar.gz
rm -rf /usr/local/go && tar -C /usr/local -xzf go1.21.6.linux-amd64.tar.gz
ln -s /usr/local/go/bin/go /usr/bin/go
go version
- name: "Release"
uses: https://ssl.lunadeer.cn:14446/actions/release-action@main
with:
files: |-
staging/*.jar
api_key: '${{secrets.RELEASE_TOKEN}}'
- name: "Pull & Checkout"
uses: https://ssl.lunadeer.cn:14446/actions/checkout@v3
with:
fetch-depth: 0
- name: "Set up Maven"
uses: https://ssl.lunadeer.cn:14446/actions/setup-maven@v4
- name: "Set up JDK 17"
uses: https://ssl.lunadeer.cn:14446/actions/setup-java@v3
with:
java-version: '17'
distribution: 'zulu'
cache: maven
- name: "Build with Maven"
run: mvn -B package --file pom.xml
- name: "Copy jar to staging"
run: mkdir staging && cp target/*.jar staging
- name: "Build & test"
run: |
echo "done!"
- name: "setup go for release script"
run: |
wget --no-check-certificate https://golang.google.cn/dl/go1.21.6.linux-amd64.tar.gz
rm -rf /usr/local/go && tar -C /usr/local -xzf go1.21.6.linux-amd64.tar.gz
ln -s /usr/local/go/bin/go /usr/bin/go
go version
- name: "Release"
uses: https://ssl.lunadeer.cn:14446/zhangyuheng/release-action@main
with:
note: "带 `original-` 前缀的文件无法用于运行,请下载不带此前缀的版本。"
files: |-
staging/*.jar
api_key: '${{secrets.RELEASE_TOKEN}}'

View File

@ -1,8 +1,13 @@
# LiteWorldEdit
开源地址:[Gitea](https://ssl.lunadeer.cn:14446/zhangyuheng/LiteWorldEdit)
<div style="text-align: center;">
文档地址:[Doc](https://ssl.lunadeer.cn:14448/doc/3/)
<img src="https://ssl.lunadeer.cn:14437/i/2024/03/28/6604dfebcffd8.png" alt="" width="70%">
### [开源地址](https://ssl.lunadeer.cn:14446/zhangyuheng/LiteWorldEdit) | [文档地址](https://ssl.lunadeer.cn:14448/doc/3/)
### [下载页面](https://ssl.lunadeer.cn:14446/zhangyuheng/LiteWorldEdit/releases)
### [统计页面](https://bstats.org/plugin/bukkit/LiteWorldEdit/21436) | [Hangar](https://hangar.papermc.io/zhangyuheng/LiteWorldEdit)
</div>
## 轻量创世神
@ -30,9 +35,10 @@
4. 支持填充操作,填充操作需要消耗玩家物品栏中的物品;
5. 支持自动从背包中的盒子里提取物品;
6. 禁止超视距操作128以外防止玩家利用创世神插件加载大量区块导致服务器卡顿
6. 支持自动从背包里的潜影盒补充材料;
7. 支持设置是否产生掉落物;
8. 支持设置速度倍率整数默认1表示每tick操作一个方块设置为2则每次操作两个方块
7. 支持自动从背包里的潜影盒补充材料;
8. 支持设置是否产生掉落物;
9. 支持设置速度倍率整数默认1表示每tick操作一个方块设置为2则每次操作两个方块
10. 选区可视
## 支持版本
@ -115,6 +121,8 @@ DropItems: false
Multiplier: 1
CheckUpdate: true
Debug: false
```
@ -122,8 +130,18 @@ Debug: false
- [X] 从潜影盒中自动补充材料
- [ ] 选区可视化
- [X] 选区可视化
- [X] 可手动暂停、恢复任务
- [ ] 更多的任务类型支持(如画圆、弧线)
## 建议与反馈
Mail: [zhangyuheng@lunadeer.cn](mailto:zhangyuheng@lunadeer.cn)
QQ群309428300
## 统计
![bstats](https://bstats.org/signatures/bukkit/LiteWorldEdit.svg)

View File

@ -6,7 +6,7 @@
<groupId>cn.lunadeer</groupId>
<artifactId>LiteWorldEdit</artifactId>
<version>2.4.1.10</version>
<version>2.4.3.8</version>
<packaging>jar</packaging>
<name>LiteWorldEdit</name>

BIN
resources/logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.9 KiB

3
resources/logo.svg Normal file

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 14 KiB

BIN
resources/logo2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

View File

@ -55,5 +55,17 @@ public class Events implements Listener {
Notification.info(player, "已选择第二个点: " + x + " " + y + " " + z);
xplayer.addPoint(2, point);
}
if (xplayer.getPoints().get(1) != null && xplayer.getPoints().get(2) != null) {
Point p1 = xplayer.getPoints().get(1);
Point p2 = xplayer.getPoints().get(2);
int deltaX = Math.abs(p1.x - p2.x);
int deltaY = Math.abs(p1.y - p2.y);
int deltaZ = Math.abs(p1.z - p2.z);
if (deltaX > LiteWorldEdit.config.getXMax() || deltaY > LiteWorldEdit.config.getYMax() || deltaZ > LiteWorldEdit.config.getZMax()) {
return;
}
ParticleRender.showBoxBorder(LiteWorldEdit.instance, player.getWorld().getName(), p1.x, p1.y, p1.z, p2.x, p2.y, p2.z);
}
}
}

View File

@ -0,0 +1,199 @@
package cn.lunadeer.liteworldedit;
import org.bukkit.plugin.java.JavaPlugin;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import javax.net.ssl.HttpsURLConnection;
import java.io.BufferedReader;
import java.io.DataOutputStream;
import java.io.File;
import java.io.InputStreamReader;
import java.net.URL;
import java.nio.file.Files;
import java.util.concurrent.TimeUnit;
public class GiteaReleaseCheck {
private static class GiteaRelease {
public String tag_name;
public String message;
public String html_url;
public String download_url;
}
public GiteaReleaseCheck(JavaPlugin plugin, String giteaServer, String owner, String repo) {
this.gitea_server = giteaServer;
this.owner = owner;
this.repo = repo;
this.plugin = plugin;
this.current_version = plugin.getPluginMeta().getVersion();
// 异步每12小时检查一次更新
plugin.getServer().getAsyncScheduler().runAtFixedRate(plugin, (instance) -> {
getLatestRelease();
if (auto_update) {
downloadUpdate();
}
}, 10, 60 * 60 * 12, TimeUnit.SECONDS);
}
public void enableAutoUpdate() {
auto_update = true;
}
private String repoReleases() {
return gitea_server + "/api/v1/repos/" + owner + "/" + repo + "/releases";
}
private String tag(String tagName) {
return gitea_server + "/api/v1/repos/" + owner + "/" + repo + "/tags/" + tagName;
}
private void getLatestRelease() {
LoggerX.info("================================");
LoggerX.info("正在检查更新...");
// send get request to repoReleases()
try {
// 发送 GET 请求
HttpsURLConnection connection = (HttpsURLConnection) new URL(repoReleases()).openConnection();
connection.setRequestMethod("GET");
connection.setConnectTimeout(5000);
connection.setReadTimeout(5000);
connection.connect();
// 获取响应
StringBuilder builder = new StringBuilder();
try (BufferedReader bufferedReader =
new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
String line;
while ((line = bufferedReader.readLine()) != null) {
builder.append(line);
}
}
JSONArray releaseList = (JSONArray) new JSONParser().parse(builder.toString());
JSONObject latestRelease = (JSONObject) releaseList.get(0);
GiteaRelease release = new GiteaRelease();
release.tag_name = (String) latestRelease.get("tag_name");
release.message = (String) latestRelease.get("body");
release.html_url = (String) latestRelease.get("html_url");
JSONArray assets = (JSONArray) latestRelease.get("assets");
if (assets.size() > 0) {
JSONObject asset = (JSONObject) assets.get(0);
release.download_url = (String) asset.get("browser_download_url");
}
latest_release = release;
LoggerX.debug("Latest release: " + latest_release.tag_name);
LoggerX.debug("Message: " + latest_release.message);
LoggerX.debug("Download URL: " + latest_release.download_url);
LoggerX.debug("HTML URL: " + latest_release.html_url);
if (isNewVersion(current_version, latest_release.tag_name)) {
LoggerX.info("发现新版本:" + latest_release.tag_name);
LoggerX.info("版本信息:");
String[] message = latest_release.message.split("\n");
for (String line : message) {
LoggerX.info("\t" + line);
}
LoggerX.info("下载页面:" + latest_release.html_url);
} else {
LoggerX.info("当前已是最新版本:" + current_version);
}
LoggerX.info("================================");
} catch (Exception e) {
LoggerX.err("Failed to get latest release: " + e.getMessage());
}
}
private String getTagMessage(String tagName) {
try {
// 发送 GET 请求
HttpsURLConnection connection = (HttpsURLConnection) new URL(tag(tagName)).openConnection();
connection.setRequestMethod("GET");
connection.setConnectTimeout(5000);
connection.setReadTimeout(5000);
connection.connect();
// 获取响应
StringBuilder builder = new StringBuilder();
try (BufferedReader bufferedReader =
new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
String line;
while ((line = bufferedReader.readLine()) != null) {
builder.append(line);
}
}
JSONObject tag = (JSONObject) new JSONParser().parse(builder.toString());
return (String) tag.get("message");
} catch (Exception e) {
LoggerX.debug("Failed to get tag message: " + e.getMessage());
return "null";
}
}
private void downloadUpdate() {
if (latest_release == null) {
getLatestRelease();
if (latest_release == null)
return;
}
if (!isNewVersion(current_version, latest_release.tag_name)) {
LoggerX.info("当前已是最新版本");
return;
}
if (latest_release.download_url == null) {
LoggerX.err("下载地址不可用");
return;
}
try {
LoggerX.info("================================");
LoggerX.info("正在下载更新...");
File pluginsFolder = plugin.getDataFolder().getParentFile();
File newJarFile = new File(pluginsFolder, latest_release.download_url.substring(latest_release.download_url.lastIndexOf("/") + 1));
// send get request to download_url
HttpsURLConnection connection = (HttpsURLConnection) new URL(latest_release.download_url).openConnection();
connection.setRequestMethod("GET");
connection.setConnectTimeout(5000);
connection.setReadTimeout(5000);
connection.connect();
// 获取响应写入文件到 newJarFile
try (DataOutputStream outputStream = new DataOutputStream(Files.newOutputStream(newJarFile.toPath()))) {
byte[] buffer = new byte[1024];
int length;
while ((length = connection.getInputStream().read(buffer)) != -1) {
outputStream.write(buffer, 0, length);
}
}
LoggerX.info("更新下载完成");
LoggerX.info("新版本:" + latest_release.tag_name);
LoggerX.info("请删除旧版本插件,然后重启服务器。");
LoggerX.info("================================");
} catch (Exception e) {
LoggerX.err("Failed to auto update: " + e.getMessage());
}
}
private String gitea_server;
private String owner;
private String repo;
private JavaPlugin plugin;
private String current_version;
private GiteaRelease latest_release = null;
private boolean auto_update = false;
private boolean isNewVersion(String current, String in_coming) {
// 只保留数字和点号
current = current.replaceAll("[^0-9.]", "");
in_coming = in_coming.replaceAll("[^0-9.]", "");
LoggerX.debug("Current version: " + current);
LoggerX.debug("In-coming version: " + in_coming);
String[] current_version = current.split("\\.");
String[] in_coming_version = in_coming.split("\\.");
for (int i = 0; i < Math.min(current_version.length, in_coming_version.length); i++) {
int current_v = Integer.parseInt(current_version[i]);
int in_coming_v = Integer.parseInt(in_coming_version[i]);
if (current_v < in_coming_v) {
return true;
} else if (current_v > in_coming_v) {
return false;
}
}
return current_version.length < in_coming_version.length;
}
}

View File

@ -1,10 +1,7 @@
package cn.lunadeer.liteworldedit.Jobs;
import cn.lunadeer.liteworldedit.LoggerX;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.*;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.event.block.BlockPlaceEvent;
@ -40,9 +37,23 @@ public class Absorb extends Job {
// 模拟海绵吸水事件
BlockPlaceEvent event = new BlockPlaceEvent(raw_block, raw_block.getState(), raw_block, new ItemStack(Material.SPONGE), _creator, true, null);
Bukkit.getPluginManager().callEvent(event);
// 获取玩家背包中的下届合金镐
HashMap<Integer, ?> pickaxes = getNetherPickaxes(_creator);
if (pickaxes.size() == 0) {
return JobErrCode.NO_PICKAXE;
}
ItemStack pickaxe = getUsableNetherPickaxe(pickaxes, _creator);
// 没有合适的镐
if (pickaxe == null) {
return JobErrCode.NOT_ENOUGH_DURATION;
}
if (!event.isCancelled()) {
raw_block.setType(Material.SPONGE);
raw_block.setType(Material.AIR);
// 损坏镐
if (!_creator.isOp() && _creator.getGameMode() != GameMode.CREATIVE) {
useNetherPickaxe(pickaxe);
}
return JobErrCode.OK;
} else {
return JobErrCode.NO_PERMISSION;

View File

@ -1,10 +1,7 @@
package cn.lunadeer.liteworldedit.Jobs;
import cn.lunadeer.liteworldedit.LoggerX;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.*;
import org.bukkit.block.Block;
import org.bukkit.block.ShulkerBox;
import org.bukkit.entity.Player;
@ -75,7 +72,9 @@ public class Place extends Job {
Bukkit.getPluginManager().callEvent(event);
if (!event.isCancelled()) {
raw_block.setType(_block);
stack.setAmount(stack.getAmount() - 1);
if (!_creator.isOp() && _creator.getGameMode() != GameMode.CREATIVE) {
stack.setAmount(stack.getAmount() - 1);
}
return JobErrCode.OK;
} else {
return JobErrCode.NO_PERMISSION;

View File

@ -2,10 +2,7 @@ package cn.lunadeer.liteworldedit.Jobs;
import cn.lunadeer.liteworldedit.LiteWorldEdit;
import cn.lunadeer.liteworldedit.LoggerX;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.*;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.event.block.BlockBreakEvent;
@ -48,12 +45,15 @@ public class Remove extends Job {
BlockBreakEvent event = new BlockBreakEvent(raw_block, _creator);
Bukkit.getPluginManager().callEvent(event);
if (!event.isCancelled()) {
Material block_type = raw_block.getType();
raw_block.setType(Material.AIR);
if (LiteWorldEdit.instance.getConfigMgr().isDropItems()) {
raw_block.getWorld().dropItemNaturally(raw_block.getLocation(), new ItemStack(raw_block.getType()));
raw_block.getWorld().dropItemNaturally(raw_block.getLocation(), new ItemStack(block_type));
}
// 损坏镐
useNetherPickaxe(pickaxe);
if (!_creator.isOp() && _creator.getGameMode() != GameMode.CREATIVE) {
useNetherPickaxe(pickaxe);
}
return JobErrCode.OK;
} else {
return JobErrCode.NO_PERMISSION;

View File

@ -21,6 +21,12 @@ public final class LiteWorldEdit extends JavaPlugin {
Objects.requireNonNull(Bukkit.getPluginCommand("LiteWorldEdit")).setTabCompleter(new Commands());
Metrics metrics = new Metrics(this, 21436);
if (config.isCheckUpdate()) {
giteaReleaseCheck = new GiteaReleaseCheck(this,
"https://ssl.lunadeer.cn:14446",
"zhangyuheng",
"LiteWorldEdit");
}
LoggerX.info("LiteWorldEdit 已加载");
LoggerX.info("版本: " + getPluginMeta().getVersion());
@ -52,4 +58,5 @@ public final class LiteWorldEdit extends JavaPlugin {
public static LiteWorldEdit instance;
public static ConfigManager config;
private Cache _cache;
private GiteaReleaseCheck giteaReleaseCheck;
}

View File

@ -18,6 +18,7 @@ public class ConfigManager {
_z_max = _file.getInt("MaxZ", 64);
_multiplier = _file.getInt("Multiplier", 1);
_drop_items = _file.getBoolean("DropItems", false);
_check_update = _file.getBoolean("CheckUpdate", true);
_plugin.saveConfig();
}
@ -68,6 +69,10 @@ public class ConfigManager {
_plugin.saveConfig();
}
public Boolean isCheckUpdate() {
return _check_update;
}
private final LiteWorldEdit _plugin = LiteWorldEdit.instance;
private FileConfiguration _file;
@ -81,4 +86,6 @@ public class ConfigManager {
private Boolean _drop_items;
private Integer _multiplier;
private Boolean _check_update;
}

View File

@ -0,0 +1,51 @@
package cn.lunadeer.liteworldedit;
import org.bukkit.Location;
import org.bukkit.Particle;
import org.bukkit.World;
import org.bukkit.plugin.java.JavaPlugin;
public class ParticleRender {
public static void showBoxBorder(JavaPlugin plugin, String world, int x1, int y1, int z1, int x2, int y2, int z2) {
showBoxBorder(plugin, new Location(plugin.getServer().getWorld(world), x1, y1, z1),
new Location(plugin.getServer().getWorld(world), x2, y2, z2));
}
public static void showBoxBorder(JavaPlugin plugin, Location loc1, Location loc2) {
plugin.getServer().getGlobalRegionScheduler().run(LiteWorldEdit.instance, (instance) -> {
if (!loc1.getWorld().equals(loc2.getWorld())) {
return;
}
int minX = Math.min(loc1.getBlockX(), loc2.getBlockX());
int minY = Math.min(loc1.getBlockY(), loc2.getBlockY());
int minZ = Math.min(loc1.getBlockZ(), loc2.getBlockZ());
int maxX = Math.max(loc1.getBlockX(), loc2.getBlockX()) + 1;
int maxY = Math.max(loc1.getBlockY(), loc2.getBlockY()) + 1;
int maxZ = Math.max(loc1.getBlockZ(), loc2.getBlockZ()) + 1;
World world = loc1.getWorld();
for (int x = minX; x <= maxX; x++) {
spawnParticle(world, x, minY, minZ);
spawnParticle(world, x, minY, maxZ);
spawnParticle(world, x, maxY, minZ);
spawnParticle(world, x, maxY, maxZ);
}
for (int y = minY; y <= maxY; y++) {
spawnParticle(world, minX, y, minZ);
spawnParticle(world, minX, y, maxZ);
spawnParticle(world, maxX, y, minZ);
spawnParticle(world, maxX, y, maxZ);
}
for (int z = minZ; z <= maxZ; z++) {
spawnParticle(world, minX, minY, z);
spawnParticle(world, minX, maxY, z);
spawnParticle(world, maxX, minY, z);
spawnParticle(world, maxX, maxY, z);
}
});
}
private static void spawnParticle(World world, double x, double y, double z) {
world.spawnParticle(Particle.FLAME, x, y, z, 10, 0, 0, 0, 0);
}
}

View File

@ -2,6 +2,11 @@ package cn.lunadeer.liteworldedit;
import cn.lunadeer.liteworldedit.Jobs.Job;
import cn.lunadeer.liteworldedit.Jobs.JobErrCode;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.format.Style;
import net.kyori.adventure.text.format.TextColor;
import net.kyori.adventure.text.format.TextDecoration;
import org.bukkit.entity.Player;
public class Task implements Runnable {
@ -40,7 +45,8 @@ public class Task implements Runnable {
}
Player player = job.get_creator();
if (re.canContinue()) {
Notification.titleWarn(player, "警告", re.getMessage());
TextComponent warn = Component.text("警告:" + re.getMessage(), Style.style(TextColor.color(TextColor.color(255, 185, 69)), TextDecoration.BOLD));
player.sendActionBar(warn);
job = this.xPlayer.popJob();
if (job == null) {
return;

View File

@ -8,4 +8,6 @@ Multiplier: 1
DropItems: false
CheckUpdate: true
Debug: false

View File

@ -12,4 +12,10 @@ commands:
LiteWorldEdit:
description: 简易创世神命令
usage: /lwe <cmd>
aliases: [lwe]
aliases: [ lwe ]
permission: lwe.command
permission-message: 你没有权限使用这个命令。
permissions:
lwe.command:
description: 是否允许使用 LiteWorldEdit
default: true