From 20517e72079e24ed1d83b71432a6cb2abc613352 Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Fri, 16 Jun 2023 19:29:00 +0800 Subject: [PATCH] =?UTF-8?q?build:=20=E6=9B=B4=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++++---- build.gradle | 2 +- .../build.gradle | 14 ++++++-------- .../plugin/core/bukkit/HamsterCorePlugin.java | 0 .../plugin/core/bukkit/api/CoreBukkitAPI.java | 0 .../core/bukkit/command/ChildCommand.java | 0 .../core/bukkit/command/ParentCommand.java | 0 .../bukkit/command/core/ParentCoreCommand.java | 0 .../bukkit/command/core/sub/EnvCommand.java | 0 .../core/bukkit/command/core/sub/GCCommand.java | 0 .../command/core/sub/InfoModeCommand.java | 0 .../bukkit/command/core/sub/MemoryCommand.java | 0 .../bukkit/command/core/sub/ReloadCommand.java | 0 .../bukkit/command/core/sub/SystemCommand.java | 0 .../bukkit/command/core/sub/YamlCommand.java | 0 .../bukkit/command/lore/ParentLoreCommand.java | 0 .../bukkit/command/lore/sub/LoreAddCommand.java | 0 .../command/lore/sub/LoreClearCommand.java | 0 .../lore/sub/LoreCustomModelDataCommand.java | 0 .../command/lore/sub/LoreFlagCommand.java | 0 .../command/lore/sub/LoreNameCommand.java | 0 .../command/lore/sub/LoreRemoveCommand.java | 0 .../bukkit/command/lore/sub/LoreSetCommand.java | 0 .../core/bukkit/constant/CoreMessage.java | 0 .../mc/plugin/core/bukkit/hook/EconomyAPI.java | 0 .../mc/plugin/core/bukkit/hook/PointAPI.java | 0 .../mc/plugin/core/bukkit/hook/VaultAPI.java | 0 .../core/bukkit/listener/CallbackListener.java | 0 .../core/bukkit/listener/DebugListener.java | 0 .../mc/plugin/core/bukkit/page/ButtonGroup.java | 0 .../mc/plugin/core/bukkit/page/PageConfig.java | 0 .../mc/plugin/core/bukkit/page/PageManager.java | 0 .../mc/plugin/core/bukkit/page/PluginPage.java | 0 .../bukkit/page/handler/FixedPageHandler.java | 0 .../core/bukkit/page/handler/PageHandler.java | 0 .../bukkit/page/handler/PageableHandler.java | 0 .../core/bukkit/page/listener/PageListener.java | 0 .../core/bukkit/util/CoreBukkitUtils.java | 0 .../util/serializer/ItemStackAdapter.java | 0 .../util/serializer/PotionEffectAdapter.java | 0 .../src/main/resources/config.yml | 0 .../src/main/resources/pages/FixedPage.yml | 0 .../src/main/resources/pages/PageablePage.yml | 0 .../src/main/resources/plugin.yml | 0 .../build.gradle | 17 +++++------------ .../plugin/core/bungee/HamsterCorePlugin.java | 0 .../plugin/core/bungee/api/CoreBungeeAPI.java | 0 .../core/bungee/util/CoreBungeeCordUtils.java | 0 .../src/main/resources/bungee.yml | 0 .../src/main/resources/config.yml | 0 .../build.gradle | 2 -- .../mc/plugin/core/common/api/CoreAPI.java | 8 -------- .../plugin/core/common/data/DisplayMessage.java | 0 .../core/common/thread/CountdownThread.java | 0 .../core/common/thread/NamedThreadFactory.java | 0 .../mc/plugin/core/common/util/Calculator.java | 0 .../mc/plugin/core/common/util/CoreUtils.java | 0 .../mc/plugin/core/common/util/Pair.java | 0 .../util/serializer/ComponentTypeAdapter.java | 0 .../util/serializer/MessageTypeAdapter.java | 0 settings.gradle | 6 +++--- 61 files changed, 19 insertions(+), 38 deletions(-) rename {hamster-core-bukkit => core-bukkit}/build.gradle (84%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/api/CoreBukkitAPI.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ChildCommand.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ParentCommand.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/ParentCoreCommand.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/EnvCommand.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/GCCommand.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/InfoModeCommand.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/MemoryCommand.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/ReloadCommand.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/SystemCommand.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/YamlCommand.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/ParentLoreCommand.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreAddCommand.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreClearCommand.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreCustomModelDataCommand.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreFlagCommand.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreNameCommand.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreRemoveCommand.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreSetCommand.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/constant/CoreMessage.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/hook/EconomyAPI.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/hook/PointAPI.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/hook/VaultAPI.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/listener/CallbackListener.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/listener/DebugListener.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/ButtonGroup.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/PageConfig.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/PageManager.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/PluginPage.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/FixedPageHandler.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageHandler.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageableHandler.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/listener/PageListener.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/serializer/ItemStackAdapter.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/serializer/PotionEffectAdapter.java (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/resources/config.yml (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/resources/pages/FixedPage.yml (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/resources/pages/PageablePage.yml (100%) rename {hamster-core-bukkit => core-bukkit}/src/main/resources/plugin.yml (100%) rename {hamster-core-bungeecord => core-bungeecord}/build.gradle (80%) rename {hamster-core-bungeecord => core-bungeecord}/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterCorePlugin.java (100%) rename {hamster-core-bungeecord => core-bungeecord}/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/CoreBungeeAPI.java (100%) rename {hamster-core-bungeecord => core-bungeecord}/src/main/java/cn/hamster3/mc/plugin/core/bungee/util/CoreBungeeCordUtils.java (100%) rename {hamster-core-bungeecord => core-bungeecord}/src/main/resources/bungee.yml (100%) rename {hamster-core-bungeecord => core-bungeecord}/src/main/resources/config.yml (100%) rename {hamster-core-common => core-common}/build.gradle (93%) rename {hamster-core-common => core-common}/src/main/java/cn/hamster3/mc/plugin/core/common/api/CoreAPI.java (70%) rename {hamster-core-common => core-common}/src/main/java/cn/hamster3/mc/plugin/core/common/data/DisplayMessage.java (100%) rename {hamster-core-common => core-common}/src/main/java/cn/hamster3/mc/plugin/core/common/thread/CountdownThread.java (100%) rename {hamster-core-common => core-common}/src/main/java/cn/hamster3/mc/plugin/core/common/thread/NamedThreadFactory.java (100%) rename {hamster-core-common => core-common}/src/main/java/cn/hamster3/mc/plugin/core/common/util/Calculator.java (100%) rename {hamster-core-common => core-common}/src/main/java/cn/hamster3/mc/plugin/core/common/util/CoreUtils.java (100%) rename {hamster-core-common => core-common}/src/main/java/cn/hamster3/mc/plugin/core/common/util/Pair.java (100%) rename {hamster-core-common => core-common}/src/main/java/cn/hamster3/mc/plugin/core/common/util/serializer/ComponentTypeAdapter.java (100%) rename {hamster-core-common => core-common}/src/main/java/cn/hamster3/mc/plugin/core/common/util/serializer/MessageTypeAdapter.java (100%) diff --git a/README.md b/README.md index 2fcd259..313f1d3 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,9 @@ repositories { dependencies { // 对于 Bukkit 插件 - compileOnly "cn.hamster3.mc.plugin:hamster-core-bukkit:1.0.0" + compileOnly "cn.hamster3.mc.plugin:core-bukkit:1.0.0" // 对于 BungeeCord 插件 - compileOnly "cn.hamster3.mc.plugin:hamster-core-bungeecord:1.0.0" + compileOnly "cn.hamster3.mc.plugin:core-bungeecord:1.0.0" } ``` @@ -40,13 +40,13 @@ dependencies { cn.hamster3.mc.plugin - hamster-core-bukkit + core-bukkit 1.0.0 cn.hamster3.mc.plugin - hamster-core-bungeecord + core-bungeecord 1.0.0 diff --git a/build.gradle b/build.gradle index 9c30614..7e5b644 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' } -group 'cn.hamster3.mc.plugin.core' +group 'cn.hamster3.mc.plugin' version '1.0.0-SNAPSHOT' subprojects { diff --git a/hamster-core-bukkit/build.gradle b/core-bukkit/build.gradle similarity index 84% rename from hamster-core-bukkit/build.gradle rename to core-bukkit/build.gradle index 60a5d78..c012d4e 100644 --- a/hamster-core-bukkit/build.gradle +++ b/core-bukkit/build.gradle @@ -6,7 +6,7 @@ plugins { } setArchivesBaseName("HamsterCore-Bukkit") -evaluationDependsOn(':hamster-core-common') +evaluationDependsOn(':core-common') dependencies { //noinspection VulnerableLibrariesLocal @@ -15,15 +15,15 @@ dependencies { compileOnly 'net.milkbowl.vault:VaultAPI:1.7' transitive false compileOnly 'org.black_ixx:playerpoints:2.1.3' transitive false - implementation project(":hamster-core-common") transitive false + implementation project(":core-common") transitive false //noinspection GradlePackageUpdate implementation "com.zaxxer:HikariCP:${HikariCP_version}" //noinspection VulnerableLibrariesLocal - implementation "net.kyori:adventure-platform-bukkit:${adventure_version}" exclude group: 'org.jetbrains' + implementation "net.kyori:adventure-platform-bukkit:${adventure_version}" exclude group: 'org.jetbrains' exclude group: 'com.google.code.gson' // https://mvnrepository.com/artifact/net.kyori/adventure-text-minimessage implementation "net.kyori:adventure-text-minimessage:${adventure_serializer_version}" exclude group: 'org.jetbrains' // https://mvnrepository.com/artifact/net.kyori/adventure-text-serializer-gson - implementation "net.kyori:adventure-text-serializer-gson:${adventure_serializer_version}" exclude group: 'org.jetbrains' + implementation "net.kyori:adventure-text-serializer-gson:${adventure_serializer_version}" exclude group: 'org.jetbrains' exclude group: 'com.google.code.gson' // https://mvnrepository.com/artifact/net.kyori/adventure-text-serializer-legacy implementation "net.kyori:adventure-text-serializer-legacy:${adventure_serializer_version}" exclude group: 'org.jetbrains' implementation "de.tr7zw:item-nbt-api:2.11.2" @@ -40,12 +40,12 @@ jar { classifier = 'dev' } -tasks.compileJava.dependsOn(":hamster-core-common:build") +tasks.compileJava.dependsOn(":core-common:build") shadowJar { classifier = '' dependencies { exclude(dependency { - it.moduleGroup == 'com.google.code.gson' || it.moduleName == 'org.jetbrains' + it.moduleGroup == 'com.google.code.gson' }) } relocate 'org.slf4j', 'cn.hamster3.mc.plugin.core.lib.slf4j' @@ -61,8 +61,6 @@ publishing { publications { shadow(MavenPublication) { publication -> { - def projectNameSplit = project.name.split('-') - artifactId = projectNameSplit[projectNameSplit.length - 1] from components.java } } diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/api/CoreBukkitAPI.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/api/CoreBukkitAPI.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/api/CoreBukkitAPI.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/api/CoreBukkitAPI.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ChildCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ChildCommand.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ChildCommand.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ChildCommand.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ParentCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ParentCommand.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ParentCommand.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ParentCommand.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/ParentCoreCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/ParentCoreCommand.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/ParentCoreCommand.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/ParentCoreCommand.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/EnvCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/EnvCommand.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/EnvCommand.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/EnvCommand.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/GCCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/GCCommand.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/GCCommand.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/GCCommand.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/InfoModeCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/InfoModeCommand.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/InfoModeCommand.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/InfoModeCommand.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/MemoryCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/MemoryCommand.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/MemoryCommand.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/MemoryCommand.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/ReloadCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/ReloadCommand.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/ReloadCommand.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/ReloadCommand.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/SystemCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/SystemCommand.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/SystemCommand.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/SystemCommand.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/YamlCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/YamlCommand.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/YamlCommand.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/core/sub/YamlCommand.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/ParentLoreCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/ParentLoreCommand.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/ParentLoreCommand.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/ParentLoreCommand.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreAddCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreAddCommand.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreAddCommand.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreAddCommand.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreClearCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreClearCommand.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreClearCommand.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreClearCommand.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreCustomModelDataCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreCustomModelDataCommand.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreCustomModelDataCommand.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreCustomModelDataCommand.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreFlagCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreFlagCommand.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreFlagCommand.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreFlagCommand.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreNameCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreNameCommand.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreNameCommand.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreNameCommand.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreRemoveCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreRemoveCommand.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreRemoveCommand.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreRemoveCommand.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreSetCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreSetCommand.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreSetCommand.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/sub/LoreSetCommand.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/constant/CoreMessage.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/constant/CoreMessage.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/constant/CoreMessage.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/constant/CoreMessage.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/hook/EconomyAPI.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/hook/EconomyAPI.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/hook/EconomyAPI.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/hook/EconomyAPI.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/hook/PointAPI.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/hook/PointAPI.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/hook/PointAPI.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/hook/PointAPI.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/hook/VaultAPI.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/hook/VaultAPI.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/hook/VaultAPI.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/hook/VaultAPI.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/listener/CallbackListener.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/listener/CallbackListener.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/listener/CallbackListener.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/listener/CallbackListener.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/listener/DebugListener.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/listener/DebugListener.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/listener/DebugListener.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/listener/DebugListener.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/ButtonGroup.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/ButtonGroup.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/ButtonGroup.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/ButtonGroup.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/PageConfig.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/PageConfig.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/PageConfig.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/PageConfig.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/PageManager.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/PageManager.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/PageManager.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/PageManager.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/PluginPage.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/PluginPage.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/PluginPage.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/PluginPage.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/FixedPageHandler.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/FixedPageHandler.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/FixedPageHandler.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/FixedPageHandler.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageHandler.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageHandler.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageHandler.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageHandler.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageableHandler.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageableHandler.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageableHandler.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageableHandler.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/listener/PageListener.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/listener/PageListener.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/listener/PageListener.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/listener/PageListener.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/serializer/ItemStackAdapter.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/serializer/ItemStackAdapter.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/serializer/ItemStackAdapter.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/serializer/ItemStackAdapter.java diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/serializer/PotionEffectAdapter.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/serializer/PotionEffectAdapter.java similarity index 100% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/serializer/PotionEffectAdapter.java rename to core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/serializer/PotionEffectAdapter.java diff --git a/hamster-core-bukkit/src/main/resources/config.yml b/core-bukkit/src/main/resources/config.yml similarity index 100% rename from hamster-core-bukkit/src/main/resources/config.yml rename to core-bukkit/src/main/resources/config.yml diff --git a/hamster-core-bukkit/src/main/resources/pages/FixedPage.yml b/core-bukkit/src/main/resources/pages/FixedPage.yml similarity index 100% rename from hamster-core-bukkit/src/main/resources/pages/FixedPage.yml rename to core-bukkit/src/main/resources/pages/FixedPage.yml diff --git a/hamster-core-bukkit/src/main/resources/pages/PageablePage.yml b/core-bukkit/src/main/resources/pages/PageablePage.yml similarity index 100% rename from hamster-core-bukkit/src/main/resources/pages/PageablePage.yml rename to core-bukkit/src/main/resources/pages/PageablePage.yml diff --git a/hamster-core-bukkit/src/main/resources/plugin.yml b/core-bukkit/src/main/resources/plugin.yml similarity index 100% rename from hamster-core-bukkit/src/main/resources/plugin.yml rename to core-bukkit/src/main/resources/plugin.yml diff --git a/hamster-core-bungeecord/build.gradle b/core-bungeecord/build.gradle similarity index 80% rename from hamster-core-bungeecord/build.gradle rename to core-bungeecord/build.gradle index f1972b1..82771c5 100644 --- a/hamster-core-bungeecord/build.gradle +++ b/core-bungeecord/build.gradle @@ -6,21 +6,21 @@ plugins { } setArchivesBaseName("HamsterCore-BungeeCord") -evaluationDependsOn(':hamster-core-common') +evaluationDependsOn(':core-common') dependencies { //noinspection VulnerableLibrariesLocal compileOnly 'net.md-5:bungeecord-api:1.19-R0.1-SNAPSHOT' - implementation project(":hamster-core-common") transitive false + implementation project(":core-common") transitive false //noinspection GradlePackageUpdate implementation "com.zaxxer:HikariCP:${HikariCP_version}" // https://mvnrepository.com/artifact/net.kyori/adventure-platform-bungeecord - implementation "net.kyori:adventure-platform-bungeecord:${adventure_version}" exclude group: 'org.jetbrains' + implementation "net.kyori:adventure-platform-bungeecord:${adventure_version}" exclude group: 'org.jetbrains' exclude group: 'com.google.code.gson' // https://mvnrepository.com/artifact/net.kyori/adventure-text-minimessage implementation "net.kyori:adventure-text-minimessage:${adventure_serializer_version}" exclude group: 'org.jetbrains' // https://mvnrepository.com/artifact/net.kyori/adventure-text-serializer-gson - implementation "net.kyori:adventure-text-serializer-gson:${adventure_serializer_version}" exclude group: 'org.jetbrains' + implementation "net.kyori:adventure-text-serializer-gson:${adventure_serializer_version}" exclude group: 'org.jetbrains' exclude group: 'com.google.code.gson' // https://mvnrepository.com/artifact/net.kyori/adventure-text-serializer-legacy implementation "net.kyori:adventure-text-serializer-legacy:${adventure_serializer_version}" exclude group: 'org.jetbrains' } @@ -36,14 +36,9 @@ jar { classifier = 'dev' } -tasks.compileJava.dependsOn(":hamster-core-common:build") +tasks.compileJava.dependsOn(":core-common:build") shadowJar { classifier = '' - dependencies { - exclude(dependency { - it.moduleGroup == 'com.google.code.gson' || it.moduleName == 'org.jetbrains' - }) - } relocate 'org.slf4j', 'cn.hamster3.mc.plugin.core.lib.slf4j' relocate 'net.kyori', 'cn.hamster3.mc.plugin.core.lib.kyori' relocate 'com.zaxxer.hikari', 'cn.hamster3.mc.plugin.core.lib.hikari' @@ -55,8 +50,6 @@ publishing { publications { shadow(MavenPublication) { publication -> { - def projectNameSplit = project.name.split('-') - artifactId = projectNameSplit[projectNameSplit.length - 1] from components.java } } diff --git a/hamster-core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterCorePlugin.java b/core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterCorePlugin.java similarity index 100% rename from hamster-core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterCorePlugin.java rename to core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterCorePlugin.java diff --git a/hamster-core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/CoreBungeeAPI.java b/core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/CoreBungeeAPI.java similarity index 100% rename from hamster-core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/CoreBungeeAPI.java rename to core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/CoreBungeeAPI.java diff --git a/hamster-core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/util/CoreBungeeCordUtils.java b/core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/util/CoreBungeeCordUtils.java similarity index 100% rename from hamster-core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/util/CoreBungeeCordUtils.java rename to core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/util/CoreBungeeCordUtils.java diff --git a/hamster-core-bungeecord/src/main/resources/bungee.yml b/core-bungeecord/src/main/resources/bungee.yml similarity index 100% rename from hamster-core-bungeecord/src/main/resources/bungee.yml rename to core-bungeecord/src/main/resources/bungee.yml diff --git a/hamster-core-bungeecord/src/main/resources/config.yml b/core-bungeecord/src/main/resources/config.yml similarity index 100% rename from hamster-core-bungeecord/src/main/resources/config.yml rename to core-bungeecord/src/main/resources/config.yml diff --git a/hamster-core-common/build.gradle b/core-common/build.gradle similarity index 93% rename from hamster-core-common/build.gradle rename to core-common/build.gradle index 2b82fd8..1d37993 100644 --- a/hamster-core-common/build.gradle +++ b/core-common/build.gradle @@ -29,8 +29,6 @@ test { publishing { publications { mavenJava(MavenPublication) { - def projectNameSplit = project.name.split('-') - artifactId = projectNameSplit[projectNameSplit.length - 1] from project.components.java } } diff --git a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/api/CoreAPI.java b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/api/CoreAPI.java similarity index 70% rename from hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/api/CoreAPI.java rename to core-common/src/main/java/cn/hamster3/mc/plugin/core/common/api/CoreAPI.java index 3c5b8e4..fa0c541 100644 --- a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/api/CoreAPI.java +++ b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/api/CoreAPI.java @@ -25,12 +25,4 @@ public abstract class CoreAPI { public Connection getConnection() throws SQLException { return getDataSource().getConnection(); } - - public void reportError(@NotNull String apiKey, @NotNull String projectID, @NotNull Throwable exception) { - // todo - } - - public void reportFile(@NotNull String apiKey, @NotNull String projectID, @NotNull String filename, byte @NotNull [] bytes) { - // todo - } } diff --git a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/data/DisplayMessage.java b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/data/DisplayMessage.java similarity index 100% rename from hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/data/DisplayMessage.java rename to core-common/src/main/java/cn/hamster3/mc/plugin/core/common/data/DisplayMessage.java diff --git a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/thread/CountdownThread.java b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/thread/CountdownThread.java similarity index 100% rename from hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/thread/CountdownThread.java rename to core-common/src/main/java/cn/hamster3/mc/plugin/core/common/thread/CountdownThread.java diff --git a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/thread/NamedThreadFactory.java b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/thread/NamedThreadFactory.java similarity index 100% rename from hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/thread/NamedThreadFactory.java rename to core-common/src/main/java/cn/hamster3/mc/plugin/core/common/thread/NamedThreadFactory.java diff --git a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/Calculator.java b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/Calculator.java similarity index 100% rename from hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/Calculator.java rename to core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/Calculator.java diff --git a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CoreUtils.java b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CoreUtils.java similarity index 100% rename from hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CoreUtils.java rename to core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CoreUtils.java diff --git a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/Pair.java b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/Pair.java similarity index 100% rename from hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/Pair.java rename to core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/Pair.java diff --git a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/serializer/ComponentTypeAdapter.java b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/serializer/ComponentTypeAdapter.java similarity index 100% rename from hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/serializer/ComponentTypeAdapter.java rename to core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/serializer/ComponentTypeAdapter.java diff --git a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/serializer/MessageTypeAdapter.java b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/serializer/MessageTypeAdapter.java similarity index 100% rename from hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/serializer/MessageTypeAdapter.java rename to core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/serializer/MessageTypeAdapter.java diff --git a/settings.gradle b/settings.gradle index 495ad8f..fabdccb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,5 @@ rootProject.name = 'hamster-core' -include 'hamster-core-common' -include 'hamster-core-bukkit' -include 'hamster-core-bungeecord' +include 'core-common' +include 'core-bukkit' +include 'core-bungeecord'