新增权限节点

.gitea/workflows/build.yml

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

README.md

@@ -38,6 +38,7 @@
 7. 支持自动从背包里的潜影盒补充材料；
 8. 支持设置是否产生掉落物；
 9. 支持设置速度倍率（整数，默认1表示每tick操作一个方块，设置为2则每次操作两个方块）
+10. 选区可视
 
 ## 支持版本
 
@@ -139,7 +140,7 @@ Debug: false
 
 Mail: [zhangyuheng@lunadeer.cn](mailto:zhangyuheng@lunadeer.cn)
 
-QQ: 2751268851
+QQ群：309428300
 
 ## 统计
 

pom.xml

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

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

@@ -59,6 +59,12 @@ public class Events implements Listener {
         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);
         }
     }

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

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

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.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;
@@ -53,7 +50,9 @@ public class Remove extends Job {
                 raw_block.getWorld().dropItemNaturally(raw_block.getLocation(), new ItemStack(raw_block.getType()));
             }
             // 损坏镐
-            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