Compare commits

...

8 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
8 changed files with 78 additions and 51 deletions

View File

@ -35,8 +35,9 @@ jobs:
ln -s /usr/local/go/bin/go /usr/bin/go ln -s /usr/local/go/bin/go /usr/bin/go
go version go version
- name: "Release" - name: "Release"
uses: https://ssl.lunadeer.cn:14446/actions/release-action@main uses: https://ssl.lunadeer.cn:14446/zhangyuheng/release-action@main
with: with:
note: "带 `original-` 前缀的文件无法用于运行,请下载不带此前缀的版本。"
files: |- files: |-
staging/*.jar staging/*.jar
api_key: '${{secrets.RELEASE_TOKEN}}' api_key: '${{secrets.RELEASE_TOKEN}}'

View File

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

View File

@ -73,7 +73,7 @@ public class GiteaReleaseCheck {
JSONObject latestRelease = (JSONObject) releaseList.get(0); JSONObject latestRelease = (JSONObject) releaseList.get(0);
GiteaRelease release = new GiteaRelease(); GiteaRelease release = new GiteaRelease();
release.tag_name = (String) latestRelease.get("tag_name"); release.tag_name = (String) latestRelease.get("tag_name");
release.message = getTagMessage(release.tag_name); release.message = (String) latestRelease.get("body");
release.html_url = (String) latestRelease.get("html_url"); release.html_url = (String) latestRelease.get("html_url");
JSONArray assets = (JSONArray) latestRelease.get("assets"); JSONArray assets = (JSONArray) latestRelease.get("assets");
if (assets.size() > 0) { if (assets.size() > 0) {
@ -87,7 +87,11 @@ public class GiteaReleaseCheck {
LoggerX.debug("HTML URL: " + latest_release.html_url); LoggerX.debug("HTML URL: " + latest_release.html_url);
if (isNewVersion(current_version, latest_release.tag_name)) { if (isNewVersion(current_version, latest_release.tag_name)) {
LoggerX.info("发现新版本:" + latest_release.tag_name); LoggerX.info("发现新版本:" + latest_release.tag_name);
LoggerX.info("更新内容:" + latest_release.message); LoggerX.info("版本信息:");
String[] message = latest_release.message.split("\n");
for (String line : message) {
LoggerX.info("\t" + line);
}
LoggerX.info("下载页面:" + latest_release.html_url); LoggerX.info("下载页面:" + latest_release.html_url);
} else { } else {
LoggerX.info("当前已是最新版本:" + current_version); LoggerX.info("当前已是最新版本:" + current_version);

View File

@ -1,10 +1,7 @@
package cn.lunadeer.liteworldedit.Jobs; package cn.lunadeer.liteworldedit.Jobs;
import cn.lunadeer.liteworldedit.LoggerX; import cn.lunadeer.liteworldedit.LoggerX;
import org.bukkit.Bukkit; import org.bukkit.*;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.block.BlockPlaceEvent; 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); BlockPlaceEvent event = new BlockPlaceEvent(raw_block, raw_block.getState(), raw_block, new ItemStack(Material.SPONGE), _creator, true, null);
Bukkit.getPluginManager().callEvent(event); 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()) { if (!event.isCancelled()) {
raw_block.setType(Material.SPONGE); raw_block.setType(Material.SPONGE);
raw_block.setType(Material.AIR); raw_block.setType(Material.AIR);
// 损坏镐
if (!_creator.isOp() && _creator.getGameMode() != GameMode.CREATIVE) {
useNetherPickaxe(pickaxe);
}
return JobErrCode.OK; return JobErrCode.OK;
} else { } else {
return JobErrCode.NO_PERMISSION; return JobErrCode.NO_PERMISSION;

View File

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

View File

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

View File

@ -2,6 +2,11 @@ package cn.lunadeer.liteworldedit;
import cn.lunadeer.liteworldedit.Jobs.Job; import cn.lunadeer.liteworldedit.Jobs.Job;
import cn.lunadeer.liteworldedit.Jobs.JobErrCode; 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; import org.bukkit.entity.Player;
public class Task implements Runnable { public class Task implements Runnable {
@ -40,7 +45,8 @@ public class Task implements Runnable {
} }
Player player = job.get_creator(); Player player = job.get_creator();
if (re.canContinue()) { 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(); job = this.xPlayer.popJob();
if (job == null) { if (job == null) {
return; return;

View File

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