From 43737463a7ba6521e346f4633df09c5f4ab7b6d7 Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Wed, 10 May 2023 19:07:47 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +- build.gradle | 22 +++- gradle/wrapper/gradle-wrapper.properties | 2 +- hamster-auto-game-rule/build.gradle | 13 -- hamster-auto-log-clear/build.gradle | 13 -- hamster-auto-ore-remove/build.gradle | 2 + .../auto/ore/remove/OreRemovePlugin.java | 18 +++ .../src/main/resources/plugin.yml | 8 ++ hamster-auto-server-info/build.gradle | 3 - .../src/main/resources/bungee.yml | 5 + hamster-ball-bridge/build.gradle | 20 --- hamster-ore-remove/build.gradle | 14 -- .../mc/plugin/ore/remove/OreRemovePlugin.java | 121 ------------------ .../src/main/resources/plugin.yml | 4 - settings.gradle | 7 +- 15 files changed, 57 insertions(+), 199 deletions(-) create mode 100644 hamster-auto-ore-remove/build.gradle create mode 100644 hamster-auto-ore-remove/src/main/java/cn/hamster3/mc/plugin/auto/ore/remove/OreRemovePlugin.java create mode 100644 hamster-auto-ore-remove/src/main/resources/plugin.yml create mode 100644 hamster-auto-server-info/src/main/resources/bungee.yml delete mode 100644 hamster-ore-remove/build.gradle delete mode 100644 hamster-ore-remove/src/main/java/cn/hamster3/mc/plugin/ore/remove/OreRemovePlugin.java delete mode 100644 hamster-ore-remove/src/main/resources/plugin.yml diff --git a/README.md b/README.md index 19a0c16..7bef41a 100644 --- a/README.md +++ b/README.md @@ -23,12 +23,12 @@ | hamster-simple-data-manager | 依赖于 **仓鼠球** 实现的跨服简单数据管理插件 | | hamster-safe-mode | 依赖于 **仓鼠球** 实现的跨服 开/关 维护模式插件 | | [hamster-sudo](./hamster-sudo/README.md) | 依赖于 **仓鼠球** 实现的跨服强制执行命令插件 | -| hamster-auto-log-clear | 自动清理过期的系统日志 | +| hamster-auto-log-clear | 服务器启动后自动清理过期日志 | | hamster-auto-restart | 自动重启服务器 | | [hamster-auto-game-rule](/hamster-auto-game-rule) | 服务器启动后自动设置 GameRule | | hamster-protect-lock | 箱子锁保护 | | hamster-protect-explosion | 爆炸防护插件 | -| hamster-protect-farmland | 战斗中 actionbar 显示敌方血条 | +| hamster-battle-actionbar | 战斗中 actionbar 显示敌方血条 | | hamster-protect-farmland | 耕地践踏保护插件 | | hamster-protect-fire | 方块防火保护插件 | | hamster-ball-bridge | 让 **仓鼠球** 兼容旧版 HamsterService API | diff --git a/build.gradle b/build.gradle index 9cefb72..306fae7 100644 --- a/build.gradle +++ b/build.gradle @@ -27,8 +27,14 @@ subprojects { // https://mvnrepository.com/artifact/org.projectlombok/lombok compileOnly 'org.projectlombok:lombok:1.18.24' annotationProcessor 'org.projectlombok:lombok:1.18.24' + // https://mvnrepository.com/artifact/org.jetbrains/annotations compileOnly 'org.jetbrains:annotations:23.0.0' + + //noinspection VulnerableLibrariesLocal + compileOnly "org.spigotmc:spigot-api:${spigot_api_version}" + //noinspection VulnerableLibrariesLocal + compileOnly "net.md-5:bungeecord-api:${bungee_api_version}" } tasks.withType(JavaCompile).configureEach { @@ -37,17 +43,25 @@ subprojects { tasks.withType(Jar).configureEach { from([rootProject.file("LICENSE")]) - duplicatesStrategy(DuplicatesStrategy.EXCLUDE) + duplicatesStrategy = DuplicatesStrategy.EXCLUDE } java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 // withJavadocJar() withSourcesJar() } jar { - destinationDir(rootProject.buildDir) + destinationDirectory = rootProject.buildDir + } + + processResources { + inputs.property "version", project.version + filesMatching(["plugin.yml", "bungee.yml"]) { + expand "version": project.version + } + duplicatesStrategy = DuplicatesStrategy.EXCLUDE } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41dfb87..da1db5f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hamster-auto-game-rule/build.gradle b/hamster-auto-game-rule/build.gradle index 3eef294..f3c8cad 100644 --- a/hamster-auto-game-rule/build.gradle +++ b/hamster-auto-game-rule/build.gradle @@ -1,15 +1,2 @@ version = '1.0.0' setArchivesBaseName("HamsterAuto-GameRule") - -dependencies { - //noinspection VulnerableLibrariesLocal - compileOnly "org.spigotmc:spigot-api:${spigot_api_version}" -} - -processResources { - inputs.property "version", project.version - filesMatching("plugin.yml") { - expand "version": project.version - } - duplicatesStrategy(DuplicatesStrategy.EXCLUDE) -} diff --git a/hamster-auto-log-clear/build.gradle b/hamster-auto-log-clear/build.gradle index b4f5315..6eb6ee0 100644 --- a/hamster-auto-log-clear/build.gradle +++ b/hamster-auto-log-clear/build.gradle @@ -1,15 +1,2 @@ version = '1.0.0' setArchivesBaseName("HamsterAuto-LogClear") - -dependencies { - //noinspection VulnerableLibrariesLocal - compileOnly "org.spigotmc:spigot-api:${spigot_api_version}" -} - -processResources { - inputs.property "version", project.version - filesMatching("plugin.yml") { - expand "version": project.version - } - duplicatesStrategy(DuplicatesStrategy.EXCLUDE) -} diff --git a/hamster-auto-ore-remove/build.gradle b/hamster-auto-ore-remove/build.gradle new file mode 100644 index 0000000..5ca96ff --- /dev/null +++ b/hamster-auto-ore-remove/build.gradle @@ -0,0 +1,2 @@ +version = '1.0.0' +setArchivesBaseName("HamsterAuto-OreRemove") diff --git a/hamster-auto-ore-remove/src/main/java/cn/hamster3/mc/plugin/auto/ore/remove/OreRemovePlugin.java b/hamster-auto-ore-remove/src/main/java/cn/hamster3/mc/plugin/auto/ore/remove/OreRemovePlugin.java new file mode 100644 index 0000000..7196aa5 --- /dev/null +++ b/hamster-auto-ore-remove/src/main/java/cn/hamster3/mc/plugin/auto/ore/remove/OreRemovePlugin.java @@ -0,0 +1,18 @@ +package cn.hamster3.mc.plugin.auto.ore.remove; + +import org.bukkit.Bukkit; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.world.ChunkLoadEvent; +import org.bukkit.plugin.java.JavaPlugin; + +public class OreRemovePlugin extends JavaPlugin implements Listener { + @Override + public void onEnable() { + Bukkit.getPluginManager().registerEvents(this, this); + } + + @EventHandler(ignoreCancelled = true) + public void onChunkLoad(ChunkLoadEvent event) { + } +} diff --git a/hamster-auto-ore-remove/src/main/resources/plugin.yml b/hamster-auto-ore-remove/src/main/resources/plugin.yml new file mode 100644 index 0000000..a1b819b --- /dev/null +++ b/hamster-auto-ore-remove/src/main/resources/plugin.yml @@ -0,0 +1,8 @@ +name: HamsterAuto-OreRemove +main: cn.hamster3.mc.plugin.auto.ore.remove.OreRemovePlugin +version: ${version} +api-version: 1.13 + +author: MiniDay +website: https://github.com/MiniDay/hamster-little-plugins +description: 区块加载时自动将矿石替换成石头方块 diff --git a/hamster-auto-server-info/build.gradle b/hamster-auto-server-info/build.gradle index cd42d02..ed4e66a 100644 --- a/hamster-auto-server-info/build.gradle +++ b/hamster-auto-server-info/build.gradle @@ -2,8 +2,5 @@ version = '1.0.0' setArchivesBaseName("HamsterAuto-ServerInfo") dependencies { - //noinspection VulnerableLibrariesLocal - compileOnly "net.md-5:bungeecord-api:${bungee_api_version}" - compileOnly "cn.hamster3.mc.plugin.ball:common:${hamster_ball_version}" } diff --git a/hamster-auto-server-info/src/main/resources/bungee.yml b/hamster-auto-server-info/src/main/resources/bungee.yml new file mode 100644 index 0000000..18a3f78 --- /dev/null +++ b/hamster-auto-server-info/src/main/resources/bungee.yml @@ -0,0 +1,5 @@ +name: HamsterAuto-ServerInfo +main: cn.hamster3.mc.plugin.auto.server.info.ServerInfoPlugin +version: ${version} + +author: MiniDay diff --git a/hamster-ball-bridge/build.gradle b/hamster-ball-bridge/build.gradle index 42c8d52..adeb69c 100644 --- a/hamster-ball-bridge/build.gradle +++ b/hamster-ball-bridge/build.gradle @@ -2,28 +2,8 @@ version = '1.1.0' setArchivesBaseName("HamsterBall-Bridge") dependencies { - //noinspection VulnerableLibrariesLocal - compileOnly "org.spigotmc:spigot-api:${spigot_api_version}" - //noinspection VulnerableLibrariesLocal - compileOnly "net.md-5:bungeecord-api:${bungee_api_version}" - compileOnly "cn.hamster3.mc.plugin.ball:common:${hamster_ball_version}" compileOnly "cn.hamster3.mc.plugin.core:bukkit:${hamster_core_version}" compileOnly "me.clip:placeholderapi:${placeholder_api_version}" } - -processResources { - inputs.property "version", project.version - filesMatching("plugin.yml") { - expand "version": project.version - } - duplicatesStrategy(DuplicatesStrategy.EXCLUDE) -} - -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -// withJavadocJar() - withSourcesJar() -} diff --git a/hamster-ore-remove/build.gradle b/hamster-ore-remove/build.gradle deleted file mode 100644 index 4f0e0dc..0000000 --- a/hamster-ore-remove/build.gradle +++ /dev/null @@ -1,14 +0,0 @@ -version = '1.0.0' -setArchivesBaseName("HamsterOreRemove") - -dependencies { - compileOnly 'org.spigotmc:spigot-api:1.19.2-R0.1-SNAPSHOT' -} - -processResources { - inputs.property "version", project.version - filesMatching("plugin.yml") { - expand "version": project.version - } - duplicatesStrategy(DuplicatesStrategy.EXCLUDE) -} diff --git a/hamster-ore-remove/src/main/java/cn/hamster3/mc/plugin/ore/remove/OreRemovePlugin.java b/hamster-ore-remove/src/main/java/cn/hamster3/mc/plugin/ore/remove/OreRemovePlugin.java deleted file mode 100644 index 69ba822..0000000 --- a/hamster-ore-remove/src/main/java/cn/hamster3/mc/plugin/ore/remove/OreRemovePlugin.java +++ /dev/null @@ -1,121 +0,0 @@ -package cn.hamster3.mc.plugin.ore.remove; - -import org.bukkit.Bukkit; -import org.bukkit.Material; -import org.bukkit.block.BlockState; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.world.WorldInitEvent; -import org.bukkit.generator.BlockPopulator; -import org.bukkit.generator.LimitedRegion; -import org.bukkit.generator.WorldInfo; -import org.bukkit.plugin.java.JavaPlugin; -import org.jetbrains.annotations.NotNull; - -import java.util.Random; - -public class OreRemovePlugin extends JavaPlugin implements Listener { - @Override - public void onEnable() { - Bukkit.getPluginManager().registerEvents(this, this); - } - - @EventHandler(ignoreCancelled = true) - public void onWorldInit(WorldInitEvent event) { - event.getWorld().getPopulators().add(new BlockPopulator() { - @Override - public void populate(@NotNull WorldInfo worldInfo, @NotNull Random random, int chunkX, int chunkZ, @NotNull LimitedRegion limitedRegion) { - for (int x = 0; x < 16; x++) { - for (int y = -64; y < 255; y++) { - for (int z = 0; z < 16; z++) { - BlockState block = limitedRegion.getBlockState(x, y, z); - //noinspection EnhancedSwitchMigration - switch (block.getType()) { - case GRASS_BLOCK: - case DIRT: { - block.setType(Material.AIR); - break; - } - case COAL_ORE: - case COPPER_ORE: - case IRON_ORE: - case LAPIS_ORE: - case REDSTONE_ORE: - case GOLD_ORE: - case DIAMOND_ORE: - case EMERALD_ORE: { - block.setType(Material.STONE); - break; - } - case DEEPSLATE_COAL_ORE: - case DEEPSLATE_COPPER_ORE: - case DEEPSLATE_DIAMOND_ORE: - case DEEPSLATE_EMERALD_ORE: - case DEEPSLATE_GOLD_ORE: - case DEEPSLATE_IRON_ORE: - case DEEPSLATE_LAPIS_ORE: - case DEEPSLATE_REDSTONE_ORE: { - block.setType(Material.DEEPSLATE); - break; - } - case NETHER_GOLD_ORE: - case NETHER_QUARTZ_ORE: { - block.setType(Material.NETHERRACK); - break; - } - } - } - } - } - } - }); - } - /* - @EventHandler(ignoreCancelled = true) - public void onChunkPopulate(ChunkPopulateEvent event) { - Chunk chunk = event.getChunk(); - for (int x = 0; x < 16; x++) { - for (int y = -64; y < 255; y++) { - for (int z = 0; z < 16; z++) { - Block block = chunk.getBlock(x, y, z); - //noinspection EnhancedSwitchMigration - switch (block.getType()) { - case GRASS_BLOCK: - case DIRT: { - block.setType(Material.AIR); - break; - } - case COAL_ORE: - case COPPER_ORE: - case IRON_ORE: - case LAPIS_ORE: - case REDSTONE_ORE: - case GOLD_ORE: - case DIAMOND_ORE: - case EMERALD_ORE: { - block.setType(Material.STONE); - break; - } - case DEEPSLATE_COAL_ORE: - case DEEPSLATE_COPPER_ORE: - case DEEPSLATE_DIAMOND_ORE: - case DEEPSLATE_EMERALD_ORE: - case DEEPSLATE_GOLD_ORE: - case DEEPSLATE_IRON_ORE: - case DEEPSLATE_LAPIS_ORE: - case DEEPSLATE_REDSTONE_ORE: { - block.setType(Material.DEEPSLATE); - break; - } - case NETHER_GOLD_ORE: - case NETHER_QUARTZ_ORE: { - block.setType(Material.NETHERRACK); - break; - } - } - } - } - } - } - */ -} diff --git a/hamster-ore-remove/src/main/resources/plugin.yml b/hamster-ore-remove/src/main/resources/plugin.yml deleted file mode 100644 index df43946..0000000 --- a/hamster-ore-remove/src/main/resources/plugin.yml +++ /dev/null @@ -1,4 +0,0 @@ -name: HamsterOreRemove -main: cn.hamster3.mc.plugin.ore.remove.OreRemovePlugin -version: ${version} -api-version: 1.13 diff --git a/settings.gradle b/settings.gradle index a26c917..b14fd96 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,9 +1,8 @@ rootProject.name = 'hamster-little-plugins' -include 'hamster-sudo' -include 'hamster-ball-bridge' include 'hamster-auto-game-rule' -include 'hamster-ore-remove' include 'hamster-auto-log-clear' -include 'hamster-auto-restart' +include 'hamster-auto-ore-remove' include 'hamster-auto-server-info' +include 'hamster-ball-bridge' +include 'hamster-sudo'