diff --git a/.idea/.gitignore b/.idea/.gitignore index b6b1ecf..baf8096 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -8,3 +8,6 @@ /dataSources.local.xml # 基于编辑器的 HTTP 客户端请求 /httpRequests/ + +# 忽略target目录 +/target/ diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml index 4e91c03..12f3a21 100644 --- a/dependency-reduced-pom.xml +++ b/dependency-reduced-pom.xml @@ -4,7 +4,7 @@ top.gtb520.java.minecraft.plugins DisableCreeperBoom DisableCreeperBoom - 1.0-SNAPSHOT + 1.1-SNAPSHOT clean package diff --git a/pom.xml b/pom.xml index f72b7d3..7596088 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,11 @@ top.gtb520.java.minecraft.plugins DisableCreeperBoom - 1.0-SNAPSHOT + + + + 1.1-SNAPSHOT + jar DisableCreeperBoom diff --git a/src/main/java/top/gtb520/java/minecraft/plugins/disableCreeperBoom/Event/CreeperBoom.java b/src/main/java/top/gtb520/java/minecraft/plugins/disableCreeperBoom/Event/CreeperBoom.java index 3fe77e5..97eb9d9 100644 --- a/src/main/java/top/gtb520/java/minecraft/plugins/disableCreeperBoom/Event/CreeperBoom.java +++ b/src/main/java/top/gtb520/java/minecraft/plugins/disableCreeperBoom/Event/CreeperBoom.java @@ -1,6 +1,7 @@ package top.gtb520.java.minecraft.plugins.disableCreeperBoom.Event; import org.bukkit.entity.Creeper; +import org.bukkit.entity.EntityType; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -67,6 +68,10 @@ public class CreeperBoom implements Listener { // 如果开启debug模式，输出日志 if (main.instance.getConfig().getBoolean("config.debug", false)) { main.getInstance().getLogger().info("已阻止苦力怕对 " + event.getEntity().getType() + " 造成伤害"); + // 如果是玩家，输出玩家名称 + if (event.getEntity().getType() == EntityType.PLAYER) { + main.getInstance().getLogger().info("已阻止苦力怕对玩家 " + event.getEntity().getName() + " 造成伤害"); + } } } } diff --git a/src/main/java/top/gtb520/java/minecraft/plugins/disableCreeperBoom/main.java b/src/main/java/top/gtb520/java/minecraft/plugins/disableCreeperBoom/main.java index d301adf..57eba8f 100644 --- a/src/main/java/top/gtb520/java/minecraft/plugins/disableCreeperBoom/main.java +++ b/src/main/java/top/gtb520/java/minecraft/plugins/disableCreeperBoom/main.java @@ -37,10 +37,9 @@ public final class main extends JavaPlugin { " | (_) | '_ \\/ -_) ' \\\\__ \\/ _ \\ || | '_/ _/ -_)\n" + " \\___/| .__/\\___|_||_|___/\\___/\\_,_|_| \\__\\___|\n" + " |_| \n"); - GetLoggerPlus("&f========DisableCreeperBoom========" + "\n" + - "禁用苦力怕爆炸破坏" + "\n" + - "&f========DisableCreeperBoom========\"" - ); + GetLoggerPlus("&f========DisableCreeperBoom========"); + GetLoggerPlus("禁用苦力怕爆炸破坏"); + GetLoggerPlus("&f========DisableCreeperBoom========"); // 加载配置文件及初始化目录等 File Folder = new File(String.valueOf(getDataFolder())); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index e9d5463..285e78e 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -10,7 +10,7 @@ commands: creeperboom: description: 苦力怕爆炸控制插件主命令 usage: / [reload|status] - aliases: [cb, creeper] + aliases: [cboom, creeper] permission: disablecreeperboom.admin permission-message: "你没有权限使用此命令" diff --git a/target/DisableCreeperBoom-1.0-SNAPSHOT-shaded.jar b/target/DisableCreeperBoom-1.0-SNAPSHOT-shaded_Bukkit-1.21.8.jar similarity index 100% rename from target/DisableCreeperBoom-1.0-SNAPSHOT-shaded.jar rename to target/DisableCreeperBoom-1.0-SNAPSHOT-shaded_Bukkit-1.21.8.jar diff --git a/target/DisableCreeperBoom-1.0-SNAPSHOT.jar b/target/DisableCreeperBoom-1.0-SNAPSHOT_Bukkit-1.21.8.jar similarity index 100% rename from target/DisableCreeperBoom-1.0-SNAPSHOT.jar rename to target/DisableCreeperBoom-1.0-SNAPSHOT_Bukkit-1.21.8.jar diff --git a/target/DisableCreeperBoom-1.1-SNAPSHOT.jar b/target/DisableCreeperBoom-1.1-SNAPSHOT.jar new file mode 100644 index 0000000..4c16d4c Binary files /dev/null and b/target/DisableCreeperBoom-1.1-SNAPSHOT.jar differ diff --git a/target/classes/plugin.yml b/target/classes/plugin.yml index e468bb9..b0109d7 100644 --- a/target/classes/plugin.yml +++ b/target/classes/plugin.yml @@ -1,5 +1,5 @@ name: DisableCreeperBoom -version: '1.0-SNAPSHOT' +version: '1.1-SNAPSHOT' main: top.gtb520.java.minecraft.plugins.disableCreeperBoom.main api-version: '1.21' authors: [gtb520] diff --git a/target/classes/top/gtb520/java/minecraft/plugins/disableCreeperBoom/Event/CreeperBoom.class b/target/classes/top/gtb520/java/minecraft/plugins/disableCreeperBoom/Event/CreeperBoom.class index 7dfc0a2..531f8dd 100644 Binary files a/target/classes/top/gtb520/java/minecraft/plugins/disableCreeperBoom/Event/CreeperBoom.class and b/target/classes/top/gtb520/java/minecraft/plugins/disableCreeperBoom/Event/CreeperBoom.class differ diff --git a/target/classes/top/gtb520/java/minecraft/plugins/disableCreeperBoom/main.class b/target/classes/top/gtb520/java/minecraft/plugins/disableCreeperBoom/main.class index 9bca59b..40a37e1 100644 Binary files a/target/classes/top/gtb520/java/minecraft/plugins/disableCreeperBoom/main.class and b/target/classes/top/gtb520/java/minecraft/plugins/disableCreeperBoom/main.class differ diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties index 17471a2..58dcc98 100644 --- a/target/maven-archiver/pom.properties +++ b/target/maven-archiver/pom.properties @@ -1,3 +1,3 @@ artifactId=DisableCreeperBoom groupId=top.gtb520.java.minecraft.plugins -version=1.0-SNAPSHOT +version=1.1-SNAPSHOT diff --git a/target/original-DisableCreeperBoom-1.0-SNAPSHOT.jar b/target/original-DisableCreeperBoom-1.0-SNAPSHOT_Bukkit-1.21.8.jar similarity index 100% rename from target/original-DisableCreeperBoom-1.0-SNAPSHOT.jar rename to target/original-DisableCreeperBoom-1.0-SNAPSHOT_Bukkit-1.21.8.jar diff --git a/target/original-DisableCreeperBoom-1.1-SNAPSHOT.jar b/target/original-DisableCreeperBoom-1.1-SNAPSHOT.jar new file mode 100644 index 0000000..93698aa Binary files /dev/null and b/target/original-DisableCreeperBoom-1.1-SNAPSHOT.jar differ