修复了无法产生掉落物的问题

.gitea/workflows/build.yml

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

pom.xml

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

src/main/java/cn/lunadeer/liteworldedit/GiteaReleaseCheck.java

@@ -73,7 +73,7 @@ public class GiteaReleaseCheck {
             JSONObject latestRelease = (JSONObject) releaseList.get(0);
             GiteaRelease release = new GiteaRelease();
             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");
             JSONArray assets = (JSONArray) latestRelease.get("assets");
             if (assets.size() > 0) {
@@ -87,7 +87,11 @@ public class GiteaReleaseCheck {
             LoggerX.debug("HTML URL: " + latest_release.html_url);
             if (isNewVersion(current_version, 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);
             } else {
                 LoggerX.info("当前已是最新版本：" + current_version);

src/main/java/cn/lunadeer/liteworldedit/Jobs/Absorb.java

@@ -1,10 +1,7 @@
 package cn.lunadeer.liteworldedit.Jobs;
 
 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.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;

src/main/java/cn/lunadeer/liteworldedit/Jobs/Place.java

@@ -1,10 +1,7 @@
 package cn.lunadeer.liteworldedit.Jobs;
 
 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.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;

src/main/java/cn/lunadeer/liteworldedit/Jobs/Remove.java

@@ -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.*;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
 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;

src/main/java/cn/lunadeer/liteworldedit/Task.java

@@ -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;

src/main/resources/plugin.yml

@@ -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