diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 61a3389..509ba8e 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -1,5 +1,4 @@ plugins { - id("io.github.goooler.shadow") version "8.1.8" id("maven-publish") } @@ -9,10 +8,10 @@ repositories { maven("https://repo.papermc.io/repository/maven-public/") maven("https://repo.rapture.pw/repository/maven-releases/") // flow nbt maven("https://repo.extendedclip.com/content/repositories/placeholderapi/") + maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") } dependencies { - implementation(project(":common")) implementation("com.flowpowered:flow-nbt:${rootProject.properties["flow_nbt_version"]}") implementation(files("libs/boosted-yaml-${rootProject.properties["boosted_yaml_version"]}.jar")) compileOnly("net.kyori:adventure-api:${rootProject.properties["adventure_bundle_version"]}") { @@ -20,9 +19,21 @@ dependencies { exclude(module = "checker-qual") exclude(module = "annotations") } + compileOnly("net.kyori:adventure-text-minimessage:${rootProject.properties["adventure_bundle_version"]}") + compileOnly("net.kyori:adventure-text-serializer-gson:${rootProject.properties["adventure_bundle_version"]}") compileOnly("dev.folia:folia-api:${rootProject.properties["paper_version"]}-R0.1-SNAPSHOT") compileOnly("me.clip:placeholderapi:${rootProject.properties["placeholder_api_version"]}") compileOnly("com.github.Xiao-MoMi:Sparrow-Heart:${rootProject.properties["sparrow_heart_version"]}") + compileOnly("org.incendo:cloud-core:${rootProject.properties["cloud_core_version"]}") + compileOnly("org.incendo:cloud-minecraft-extras:${rootProject.properties["cloud_minecraft_extras_version"]}") + compileOnly("org.jetbrains:annotations:${rootProject.properties["jetbrains_annotations_version"]}") + compileOnly("org.slf4j:slf4j-api:${rootProject.properties["slf4j_version"]}") + compileOnly("org.apache.logging.log4j:log4j-core:${rootProject.properties["log4j_version"]}") + compileOnly("com.google.code.gson:gson:${rootProject.properties["gson_version"]}") + compileOnly("com.github.ben-manes.caffeine:caffeine:${rootProject.properties["caffeine_version"]}") + compileOnly("com.saicone.rtag:rtag:${rootProject.properties["rtag_version"]}") + compileOnly("net.objecthunter:exp4j:${rootProject.properties["exp4j_version"]}") + compileOnly("com.google.guava:guava:${rootProject.properties["guava_version"]}") } java { @@ -31,6 +42,7 @@ java { toolchain { languageVersion = JavaLanguageVersion.of(17) } + withSourcesJar() } tasks.withType { @@ -42,19 +54,40 @@ tasks.withType { tasks { shadowJar { archiveClassifier = "" - archiveFileName = "CustomCrops-${rootProject.properties["project_version"]}.jar" + archiveFileName = "custom-crops-${rootProject.properties["project_version"]}.jar" relocate("net.kyori", "net.momirealms.customcrops.libraries") relocate("dev.dejvokep", "net.momirealms.customcrops.libraries") } } publishing { + repositories { + maven { + url = uri("https://repo.momirealms.net/releases") + credentials(PasswordCredentials::class) { + username = System.getenv("REPO_USERNAME") + password = System.getenv("REPO_PASSWORD") + } + } + } publications { create("mavenJava") { groupId = "net.momirealms" - artifactId = "CustomCrops" - version = rootProject.version.toString() - artifact(tasks.shadowJar) + artifactId = "custom-crops" + version = rootProject.properties["project_version"].toString() + artifact(tasks["sourcesJar"]) + from(components["shadow"]) + pom { + name = "CustomNameplates API" + url = "https://github.com/Xiao-MoMi/Custom-Crops" + licenses { + license { + name = "GNU General Public License v3.0" + url = "https://www.gnu.org/licenses/gpl-3.0.html" + distribution = "repo" + } + } + } } } -} +} \ No newline at end of file diff --git a/api/src/main/java/net/momirealms/customcrops/api/core/mechanic/fertilizer/FertilizerConfig.java b/api/src/main/java/net/momirealms/customcrops/api/core/mechanic/fertilizer/FertilizerConfig.java index 5c7a2ed..5d4bef7 100644 --- a/api/src/main/java/net/momirealms/customcrops/api/core/mechanic/fertilizer/FertilizerConfig.java +++ b/api/src/main/java/net/momirealms/customcrops/api/core/mechanic/fertilizer/FertilizerConfig.java @@ -20,7 +20,6 @@ package net.momirealms.customcrops.api.core.mechanic.fertilizer; import net.momirealms.customcrops.api.action.Action; import net.momirealms.customcrops.api.requirement.Requirement; import org.bukkit.entity.Player; -import org.jetbrains.annotations.Nullable; import java.util.Set; @@ -144,5 +143,5 @@ public interface FertilizerConfig { * * @return An array of doubles representing the quality ratio override, or null if not applicable. */ - double @Nullable [] overrideQualityRatio(); + double[] overrideQualityRatio(); } \ No newline at end of file diff --git a/common/src/main/java/net/momirealms/customcrops/common/annotation/DoNotUse.java b/api/src/main/java/net/momirealms/customcrops/common/annotation/DoNotUse.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/annotation/DoNotUse.java rename to api/src/main/java/net/momirealms/customcrops/common/annotation/DoNotUse.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/command/AbstractCommandFeature.java b/api/src/main/java/net/momirealms/customcrops/common/command/AbstractCommandFeature.java similarity index 99% rename from common/src/main/java/net/momirealms/customcrops/common/command/AbstractCommandFeature.java rename to api/src/main/java/net/momirealms/customcrops/common/command/AbstractCommandFeature.java index e2ab75e..3c79711 100644 --- a/common/src/main/java/net/momirealms/customcrops/common/command/AbstractCommandFeature.java +++ b/api/src/main/java/net/momirealms/customcrops/common/command/AbstractCommandFeature.java @@ -25,7 +25,6 @@ import org.incendo.cloud.CommandManager; import org.incendo.cloud.context.CommandContext; public abstract class AbstractCommandFeature implements CommandFeature { - protected final CustomCropsCommandManager commandManager; protected CommandConfig commandConfig; diff --git a/common/src/main/java/net/momirealms/customcrops/common/command/AbstractCommandManager.java b/api/src/main/java/net/momirealms/customcrops/common/command/AbstractCommandManager.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/command/AbstractCommandManager.java rename to api/src/main/java/net/momirealms/customcrops/common/command/AbstractCommandManager.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/command/CommandBuilder.java b/api/src/main/java/net/momirealms/customcrops/common/command/CommandBuilder.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/command/CommandBuilder.java rename to api/src/main/java/net/momirealms/customcrops/common/command/CommandBuilder.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/command/CommandConfig.java b/api/src/main/java/net/momirealms/customcrops/common/command/CommandConfig.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/command/CommandConfig.java rename to api/src/main/java/net/momirealms/customcrops/common/command/CommandConfig.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/command/CommandFeature.java b/api/src/main/java/net/momirealms/customcrops/common/command/CommandFeature.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/command/CommandFeature.java rename to api/src/main/java/net/momirealms/customcrops/common/command/CommandFeature.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/command/CustomCropsCommandManager.java b/api/src/main/java/net/momirealms/customcrops/common/command/CustomCropsCommandManager.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/command/CustomCropsCommandManager.java rename to api/src/main/java/net/momirealms/customcrops/common/command/CustomCropsCommandManager.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/config/ConfigLoader.java b/api/src/main/java/net/momirealms/customcrops/common/config/ConfigLoader.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/config/ConfigLoader.java rename to api/src/main/java/net/momirealms/customcrops/common/config/ConfigLoader.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/dependency/Dependency.java b/api/src/main/java/net/momirealms/customcrops/common/dependency/Dependency.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/dependency/Dependency.java rename to api/src/main/java/net/momirealms/customcrops/common/dependency/Dependency.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/dependency/DependencyDownloadException.java b/api/src/main/java/net/momirealms/customcrops/common/dependency/DependencyDownloadException.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/dependency/DependencyDownloadException.java rename to api/src/main/java/net/momirealms/customcrops/common/dependency/DependencyDownloadException.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/dependency/DependencyManager.java b/api/src/main/java/net/momirealms/customcrops/common/dependency/DependencyManager.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/dependency/DependencyManager.java rename to api/src/main/java/net/momirealms/customcrops/common/dependency/DependencyManager.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/dependency/DependencyManagerImpl.java b/api/src/main/java/net/momirealms/customcrops/common/dependency/DependencyManagerImpl.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/dependency/DependencyManagerImpl.java rename to api/src/main/java/net/momirealms/customcrops/common/dependency/DependencyManagerImpl.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/dependency/DependencyRegistry.java b/api/src/main/java/net/momirealms/customcrops/common/dependency/DependencyRegistry.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/dependency/DependencyRegistry.java rename to api/src/main/java/net/momirealms/customcrops/common/dependency/DependencyRegistry.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/dependency/DependencyRepository.java b/api/src/main/java/net/momirealms/customcrops/common/dependency/DependencyRepository.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/dependency/DependencyRepository.java rename to api/src/main/java/net/momirealms/customcrops/common/dependency/DependencyRepository.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/dependency/classloader/IsolatedClassLoader.java b/api/src/main/java/net/momirealms/customcrops/common/dependency/classloader/IsolatedClassLoader.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/dependency/classloader/IsolatedClassLoader.java rename to api/src/main/java/net/momirealms/customcrops/common/dependency/classloader/IsolatedClassLoader.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/dependency/relocation/Relocation.java b/api/src/main/java/net/momirealms/customcrops/common/dependency/relocation/Relocation.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/dependency/relocation/Relocation.java rename to api/src/main/java/net/momirealms/customcrops/common/dependency/relocation/Relocation.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/dependency/relocation/RelocationHandler.java b/api/src/main/java/net/momirealms/customcrops/common/dependency/relocation/RelocationHandler.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/dependency/relocation/RelocationHandler.java rename to api/src/main/java/net/momirealms/customcrops/common/dependency/relocation/RelocationHandler.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/dependency/relocation/RelocationHelper.java b/api/src/main/java/net/momirealms/customcrops/common/dependency/relocation/RelocationHelper.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/dependency/relocation/RelocationHelper.java rename to api/src/main/java/net/momirealms/customcrops/common/dependency/relocation/RelocationHelper.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/helper/AdventureHelper.java b/api/src/main/java/net/momirealms/customcrops/common/helper/AdventureHelper.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/helper/AdventureHelper.java rename to api/src/main/java/net/momirealms/customcrops/common/helper/AdventureHelper.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/helper/ExpressionHelper.java b/api/src/main/java/net/momirealms/customcrops/common/helper/ExpressionHelper.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/helper/ExpressionHelper.java rename to api/src/main/java/net/momirealms/customcrops/common/helper/ExpressionHelper.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/helper/GsonHelper.java b/api/src/main/java/net/momirealms/customcrops/common/helper/GsonHelper.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/helper/GsonHelper.java rename to api/src/main/java/net/momirealms/customcrops/common/helper/GsonHelper.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/helper/VersionHelper.java b/api/src/main/java/net/momirealms/customcrops/common/helper/VersionHelper.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/helper/VersionHelper.java rename to api/src/main/java/net/momirealms/customcrops/common/helper/VersionHelper.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/item/AbstractItem.java b/api/src/main/java/net/momirealms/customcrops/common/item/AbstractItem.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/item/AbstractItem.java rename to api/src/main/java/net/momirealms/customcrops/common/item/AbstractItem.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/item/ComponentKeys.java b/api/src/main/java/net/momirealms/customcrops/common/item/ComponentKeys.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/item/ComponentKeys.java rename to api/src/main/java/net/momirealms/customcrops/common/item/ComponentKeys.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/item/Item.java b/api/src/main/java/net/momirealms/customcrops/common/item/Item.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/item/Item.java rename to api/src/main/java/net/momirealms/customcrops/common/item/Item.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/item/ItemFactory.java b/api/src/main/java/net/momirealms/customcrops/common/item/ItemFactory.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/item/ItemFactory.java rename to api/src/main/java/net/momirealms/customcrops/common/item/ItemFactory.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/locale/CustomCropsCaptionFormatter.java b/api/src/main/java/net/momirealms/customcrops/common/locale/CustomCropsCaptionFormatter.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/locale/CustomCropsCaptionFormatter.java rename to api/src/main/java/net/momirealms/customcrops/common/locale/CustomCropsCaptionFormatter.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/locale/CustomCropsCaptionKeys.java b/api/src/main/java/net/momirealms/customcrops/common/locale/CustomCropsCaptionKeys.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/locale/CustomCropsCaptionKeys.java rename to api/src/main/java/net/momirealms/customcrops/common/locale/CustomCropsCaptionKeys.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/locale/CustomCropsCaptionProvider.java b/api/src/main/java/net/momirealms/customcrops/common/locale/CustomCropsCaptionProvider.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/locale/CustomCropsCaptionProvider.java rename to api/src/main/java/net/momirealms/customcrops/common/locale/CustomCropsCaptionProvider.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/locale/MessageConstants.java b/api/src/main/java/net/momirealms/customcrops/common/locale/MessageConstants.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/locale/MessageConstants.java rename to api/src/main/java/net/momirealms/customcrops/common/locale/MessageConstants.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/locale/MiniMessageTranslationRegistry.java b/api/src/main/java/net/momirealms/customcrops/common/locale/MiniMessageTranslationRegistry.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/locale/MiniMessageTranslationRegistry.java rename to api/src/main/java/net/momirealms/customcrops/common/locale/MiniMessageTranslationRegistry.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/locale/MiniMessageTranslationRegistryImpl.java b/api/src/main/java/net/momirealms/customcrops/common/locale/MiniMessageTranslationRegistryImpl.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/locale/MiniMessageTranslationRegistryImpl.java rename to api/src/main/java/net/momirealms/customcrops/common/locale/MiniMessageTranslationRegistryImpl.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/locale/MiniMessageTranslator.java b/api/src/main/java/net/momirealms/customcrops/common/locale/MiniMessageTranslator.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/locale/MiniMessageTranslator.java rename to api/src/main/java/net/momirealms/customcrops/common/locale/MiniMessageTranslator.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/locale/MiniMessageTranslatorImpl.java b/api/src/main/java/net/momirealms/customcrops/common/locale/MiniMessageTranslatorImpl.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/locale/MiniMessageTranslatorImpl.java rename to api/src/main/java/net/momirealms/customcrops/common/locale/MiniMessageTranslatorImpl.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/locale/TranslationManager.java b/api/src/main/java/net/momirealms/customcrops/common/locale/TranslationManager.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/locale/TranslationManager.java rename to api/src/main/java/net/momirealms/customcrops/common/locale/TranslationManager.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/plugin/CustomCropsPlugin.java b/api/src/main/java/net/momirealms/customcrops/common/plugin/CustomCropsPlugin.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/plugin/CustomCropsPlugin.java rename to api/src/main/java/net/momirealms/customcrops/common/plugin/CustomCropsPlugin.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/plugin/CustomCropsProperties.java b/api/src/main/java/net/momirealms/customcrops/common/plugin/CustomCropsProperties.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/plugin/CustomCropsProperties.java rename to api/src/main/java/net/momirealms/customcrops/common/plugin/CustomCropsProperties.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/plugin/classpath/ClassPathAppender.java b/api/src/main/java/net/momirealms/customcrops/common/plugin/classpath/ClassPathAppender.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/plugin/classpath/ClassPathAppender.java rename to api/src/main/java/net/momirealms/customcrops/common/plugin/classpath/ClassPathAppender.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/plugin/classpath/ReflectionClassPathAppender.java b/api/src/main/java/net/momirealms/customcrops/common/plugin/classpath/ReflectionClassPathAppender.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/plugin/classpath/ReflectionClassPathAppender.java rename to api/src/main/java/net/momirealms/customcrops/common/plugin/classpath/ReflectionClassPathAppender.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/plugin/classpath/URLClassLoaderAccess.java b/api/src/main/java/net/momirealms/customcrops/common/plugin/classpath/URLClassLoaderAccess.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/plugin/classpath/URLClassLoaderAccess.java rename to api/src/main/java/net/momirealms/customcrops/common/plugin/classpath/URLClassLoaderAccess.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/plugin/feature/Reloadable.java b/api/src/main/java/net/momirealms/customcrops/common/plugin/feature/Reloadable.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/plugin/feature/Reloadable.java rename to api/src/main/java/net/momirealms/customcrops/common/plugin/feature/Reloadable.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/plugin/logging/JavaPluginLogger.java b/api/src/main/java/net/momirealms/customcrops/common/plugin/logging/JavaPluginLogger.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/plugin/logging/JavaPluginLogger.java rename to api/src/main/java/net/momirealms/customcrops/common/plugin/logging/JavaPluginLogger.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/plugin/logging/Log4jPluginLogger.java b/api/src/main/java/net/momirealms/customcrops/common/plugin/logging/Log4jPluginLogger.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/plugin/logging/Log4jPluginLogger.java rename to api/src/main/java/net/momirealms/customcrops/common/plugin/logging/Log4jPluginLogger.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/plugin/logging/PluginLogger.java b/api/src/main/java/net/momirealms/customcrops/common/plugin/logging/PluginLogger.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/plugin/logging/PluginLogger.java rename to api/src/main/java/net/momirealms/customcrops/common/plugin/logging/PluginLogger.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/plugin/logging/Slf4jPluginLogger.java b/api/src/main/java/net/momirealms/customcrops/common/plugin/logging/Slf4jPluginLogger.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/plugin/logging/Slf4jPluginLogger.java rename to api/src/main/java/net/momirealms/customcrops/common/plugin/logging/Slf4jPluginLogger.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/plugin/scheduler/AbstractJavaScheduler.java b/api/src/main/java/net/momirealms/customcrops/common/plugin/scheduler/AbstractJavaScheduler.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/plugin/scheduler/AbstractJavaScheduler.java rename to api/src/main/java/net/momirealms/customcrops/common/plugin/scheduler/AbstractJavaScheduler.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/plugin/scheduler/RegionExecutor.java b/api/src/main/java/net/momirealms/customcrops/common/plugin/scheduler/RegionExecutor.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/plugin/scheduler/RegionExecutor.java rename to api/src/main/java/net/momirealms/customcrops/common/plugin/scheduler/RegionExecutor.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/plugin/scheduler/SchedulerAdapter.java b/api/src/main/java/net/momirealms/customcrops/common/plugin/scheduler/SchedulerAdapter.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/plugin/scheduler/SchedulerAdapter.java rename to api/src/main/java/net/momirealms/customcrops/common/plugin/scheduler/SchedulerAdapter.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/plugin/scheduler/SchedulerTask.java b/api/src/main/java/net/momirealms/customcrops/common/plugin/scheduler/SchedulerTask.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/plugin/scheduler/SchedulerTask.java rename to api/src/main/java/net/momirealms/customcrops/common/plugin/scheduler/SchedulerTask.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/sender/AbstractSender.java b/api/src/main/java/net/momirealms/customcrops/common/sender/AbstractSender.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/sender/AbstractSender.java rename to api/src/main/java/net/momirealms/customcrops/common/sender/AbstractSender.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/sender/DummyConsoleSender.java b/api/src/main/java/net/momirealms/customcrops/common/sender/DummyConsoleSender.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/sender/DummyConsoleSender.java rename to api/src/main/java/net/momirealms/customcrops/common/sender/DummyConsoleSender.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/sender/Sender.java b/api/src/main/java/net/momirealms/customcrops/common/sender/Sender.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/sender/Sender.java rename to api/src/main/java/net/momirealms/customcrops/common/sender/Sender.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/sender/SenderFactory.java b/api/src/main/java/net/momirealms/customcrops/common/sender/SenderFactory.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/sender/SenderFactory.java rename to api/src/main/java/net/momirealms/customcrops/common/sender/SenderFactory.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/util/ArrayUtils.java b/api/src/main/java/net/momirealms/customcrops/common/util/ArrayUtils.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/util/ArrayUtils.java rename to api/src/main/java/net/momirealms/customcrops/common/util/ArrayUtils.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/util/ClassUtils.java b/api/src/main/java/net/momirealms/customcrops/common/util/ClassUtils.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/util/ClassUtils.java rename to api/src/main/java/net/momirealms/customcrops/common/util/ClassUtils.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/util/CompletableFutures.java b/api/src/main/java/net/momirealms/customcrops/common/util/CompletableFutures.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/util/CompletableFutures.java rename to api/src/main/java/net/momirealms/customcrops/common/util/CompletableFutures.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/util/Either.java b/api/src/main/java/net/momirealms/customcrops/common/util/Either.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/util/Either.java rename to api/src/main/java/net/momirealms/customcrops/common/util/Either.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/util/EitherImpl.java b/api/src/main/java/net/momirealms/customcrops/common/util/EitherImpl.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/util/EitherImpl.java rename to api/src/main/java/net/momirealms/customcrops/common/util/EitherImpl.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/util/FileUtils.java b/api/src/main/java/net/momirealms/customcrops/common/util/FileUtils.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/util/FileUtils.java rename to api/src/main/java/net/momirealms/customcrops/common/util/FileUtils.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/util/Key.java b/api/src/main/java/net/momirealms/customcrops/common/util/Key.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/util/Key.java rename to api/src/main/java/net/momirealms/customcrops/common/util/Key.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/util/ListUtils.java b/api/src/main/java/net/momirealms/customcrops/common/util/ListUtils.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/util/ListUtils.java rename to api/src/main/java/net/momirealms/customcrops/common/util/ListUtils.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/util/Pair.java b/api/src/main/java/net/momirealms/customcrops/common/util/Pair.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/util/Pair.java rename to api/src/main/java/net/momirealms/customcrops/common/util/Pair.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/util/QuadConsumer.java b/api/src/main/java/net/momirealms/customcrops/common/util/QuadConsumer.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/util/QuadConsumer.java rename to api/src/main/java/net/momirealms/customcrops/common/util/QuadConsumer.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/util/RandomUtils.java b/api/src/main/java/net/momirealms/customcrops/common/util/RandomUtils.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/util/RandomUtils.java rename to api/src/main/java/net/momirealms/customcrops/common/util/RandomUtils.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/util/TriConsumer.java b/api/src/main/java/net/momirealms/customcrops/common/util/TriConsumer.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/util/TriConsumer.java rename to api/src/main/java/net/momirealms/customcrops/common/util/TriConsumer.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/util/TriFunction.java b/api/src/main/java/net/momirealms/customcrops/common/util/TriFunction.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/util/TriFunction.java rename to api/src/main/java/net/momirealms/customcrops/common/util/TriFunction.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/util/Tristate.java b/api/src/main/java/net/momirealms/customcrops/common/util/Tristate.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/util/Tristate.java rename to api/src/main/java/net/momirealms/customcrops/common/util/Tristate.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/util/Tuple.java b/api/src/main/java/net/momirealms/customcrops/common/util/Tuple.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/util/Tuple.java rename to api/src/main/java/net/momirealms/customcrops/common/util/Tuple.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/util/UUIDUtils.java b/api/src/main/java/net/momirealms/customcrops/common/util/UUIDUtils.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/util/UUIDUtils.java rename to api/src/main/java/net/momirealms/customcrops/common/util/UUIDUtils.java diff --git a/common/src/main/java/net/momirealms/customcrops/common/util/WeightUtils.java b/api/src/main/java/net/momirealms/customcrops/common/util/WeightUtils.java similarity index 100% rename from common/src/main/java/net/momirealms/customcrops/common/util/WeightUtils.java rename to api/src/main/java/net/momirealms/customcrops/common/util/WeightUtils.java diff --git a/build.gradle.kts b/build.gradle.kts index a3ec23b..cd1bbb8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,6 +3,7 @@ import java.io.ByteArrayOutputStream plugins { id("java") + id("com.gradleup.shadow") version "9.0.0-beta6" } val git : String = versionBanner() @@ -11,9 +12,8 @@ ext["git_version"] = git ext["builder"] = builder subprojects { - apply(plugin = "java") - apply(plugin = "java-library") + apply(plugin = "com.gradleup.shadow") tasks.processResources { filteringCharset = "UTF-8" diff --git a/common/build.gradle.kts b/common/build.gradle.kts deleted file mode 100644 index cd6333b..0000000 --- a/common/build.gradle.kts +++ /dev/null @@ -1,39 +0,0 @@ -repositories { - mavenCentral() - maven("https://jitpack.io/") // rtag -} - -dependencies { - compileOnly("net.kyori:adventure-api:${rootProject.properties["adventure_bundle_version"]}") { - exclude(module = "adventure-bom") - exclude(module = "checker-qual") - exclude(module = "annotations") - } - compileOnly("org.incendo:cloud-core:${rootProject.properties["cloud_core_version"]}") - compileOnly("org.incendo:cloud-minecraft-extras:${rootProject.properties["cloud_minecraft_extras_version"]}") - compileOnly("dev.dejvokep:boosted-yaml:${rootProject.properties["boosted_yaml_version"]}") - compileOnly("org.jetbrains:annotations:${rootProject.properties["jetbrains_annotations_version"]}") - compileOnly("org.slf4j:slf4j-api:${rootProject.properties["slf4j_version"]}") - compileOnly("org.apache.logging.log4j:log4j-core:${rootProject.properties["log4j_version"]}") - compileOnly("net.kyori:adventure-text-minimessage:${rootProject.properties["adventure_bundle_version"]}") - compileOnly("net.kyori:adventure-text-serializer-gson:${rootProject.properties["adventure_bundle_version"]}") - compileOnly("com.google.code.gson:gson:${rootProject.properties["gson_version"]}") - compileOnly("com.github.ben-manes.caffeine:caffeine:${rootProject.properties["caffeine_version"]}") - compileOnly("com.saicone.rtag:rtag:${rootProject.properties["rtag_version"]}") - compileOnly("net.objecthunter:exp4j:${rootProject.properties["exp4j_version"]}") - compileOnly("com.google.guava:guava:${rootProject.properties["guava_version"]}") -} - -java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - toolchain { - languageVersion = JavaLanguageVersion.of(17) - } -} - -tasks.withType { - options.encoding = "UTF-8" - options.release.set(17) - dependsOn(tasks.clean) -} \ No newline at end of file diff --git a/compatibility-asp-r1/build.gradle.kts b/compatibility-asp-r1/build.gradle.kts index afff1d1..478584f 100644 --- a/compatibility-asp-r1/build.gradle.kts +++ b/compatibility-asp-r1/build.gradle.kts @@ -7,7 +7,6 @@ repositories { dependencies { compileOnly(project(":api")) - compileOnly(project(":common")) compileOnly("dev.folia:folia-api:1.20.4-R0.1-SNAPSHOT") compileOnly("com.infernalsuite.aswm:api:1.20.4-R0.1-SNAPSHOT") } diff --git a/compatibility-asp-r1/src/main/java/net/momirealms/customcrops/bukkit/integration/adaptor/asp_r1/SlimeWorldAdaptorR1.java b/compatibility-asp-r1/src/main/java/net/momirealms/customcrops/bukkit/integration/adaptor/asp_r1/SlimeWorldAdaptorR1.java index 64c2df5..6b887aa 100644 --- a/compatibility-asp-r1/src/main/java/net/momirealms/customcrops/bukkit/integration/adaptor/asp_r1/SlimeWorldAdaptorR1.java +++ b/compatibility-asp-r1/src/main/java/net/momirealms/customcrops/bukkit/integration/adaptor/asp_r1/SlimeWorldAdaptorR1.java @@ -30,7 +30,6 @@ import net.momirealms.customcrops.api.util.TagUtils; import net.momirealms.customcrops.common.helper.GsonHelper; import net.momirealms.customcrops.common.util.Key; import org.bukkit.Bukkit; -import org.bukkit.Chunk; import org.bukkit.World; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/compatibility-crucible-r1/build.gradle.kts b/compatibility-crucible-r1/build.gradle.kts index 8ed7a91..9632812 100644 --- a/compatibility-crucible-r1/build.gradle.kts +++ b/compatibility-crucible-r1/build.gradle.kts @@ -6,7 +6,6 @@ repositories { dependencies { compileOnly(project(":api")) - compileOnly(project(":common")) compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT") compileOnly("io.lumine:Mythic-Dist:5.7.1") compileOnly("io.lumine:MythicCrucible-Dist:2.1.0-SNAPSHOT") diff --git a/compatibility-itemsadder-r1/build.gradle.kts b/compatibility-itemsadder-r1/build.gradle.kts index 18aec11..568d5ec 100644 --- a/compatibility-itemsadder-r1/build.gradle.kts +++ b/compatibility-itemsadder-r1/build.gradle.kts @@ -6,7 +6,6 @@ repositories { dependencies { compileOnly(project(":api")) - compileOnly(project(":common")) compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT") compileOnly("com.github.LoneDev6:api-itemsadder:3.6.3-beta-14") } diff --git a/compatibility-nexo-r1/build.gradle.kts b/compatibility-nexo-r1/build.gradle.kts index b8b3a38..9d07097 100644 --- a/compatibility-nexo-r1/build.gradle.kts +++ b/compatibility-nexo-r1/build.gradle.kts @@ -6,7 +6,6 @@ repositories { dependencies { compileOnly(project(":api")) - compileOnly(project(":common")) compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT") compileOnly("com.nexomc:nexo:0.8.0-dev.5") } diff --git a/compatibility-oraxen-r1/build.gradle.kts b/compatibility-oraxen-r1/build.gradle.kts index 1c3cabc..e896439 100644 --- a/compatibility-oraxen-r1/build.gradle.kts +++ b/compatibility-oraxen-r1/build.gradle.kts @@ -6,7 +6,6 @@ repositories { dependencies { compileOnly(project(":api")) - compileOnly(project(":common")) compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT") compileOnly("io.th0rgal:oraxen:1.180.0") } diff --git a/compatibility-oraxen-r2/build.gradle.kts b/compatibility-oraxen-r2/build.gradle.kts index 170df2e..efdb0b6 100644 --- a/compatibility-oraxen-r2/build.gradle.kts +++ b/compatibility-oraxen-r2/build.gradle.kts @@ -6,7 +6,6 @@ repositories { dependencies { compileOnly(project(":api")) - compileOnly(project(":common")) compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT") compileOnly("io.th0rgal:oraxen:2.0-SNAPSHOT") } diff --git a/compatibility/build.gradle.kts b/compatibility/build.gradle.kts index 4239b6a..d6afdf5 100644 --- a/compatibility/build.gradle.kts +++ b/compatibility/build.gradle.kts @@ -14,10 +14,10 @@ repositories { maven("https://repo.dmulloy2.net/repository/public/") // betonquest needs packet wrapper? maven("https://oss.sonatype.org/content/repositories/snapshots") maven("https://repo.rapture.pw/repository/maven-releases/") // flow nbt + maven("https://repo.momirealms.net/releases/") // CustomFishing } dependencies { - compileOnly(project(":common")) compileOnly(project(":api")) compileOnly("dev.dejvokep:boosted-yaml:${rootProject.properties["boosted_yaml_version"]}") compileOnly("com.flowpowered:flow-nbt:${rootProject.properties["flow_nbt_version"]}") @@ -53,7 +53,7 @@ dependencies { compileOnly("io.lumine:MythicLib-dist:1.6.2-SNAPSHOT") compileOnly("pers.neige.neigeitems:NeigeItems:1.17.13") compileOnly("io.lumine:Mythic-Dist:5.6.2") - compileOnly("com.github.Xiao-MoMi:Custom-Fishing:2.2.19") + compileOnly("net.momirealms:custom-fishing:2.3.3") compileOnly("com.github.LoneDev6:api-itemsadder:3.6.3-beta-14") // eco compileOnly("com.willfp:eco:6.70.1") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 71f2d66..b5007e0 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-8.12-bin.zip +distributionUrl=https://services.gradle.org/distributions/gradle-8.12.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index e004c06..deb0e90 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -1,9 +1,3 @@ -val commitID: String by project - -plugins { - id("io.github.goooler.shadow") version "8.1.8" -} - repositories { mavenCentral() maven("https://repo.rapture.pw/repository/maven-releases/") @@ -16,11 +10,10 @@ repositories { dependencies { // Platform compileOnly("dev.folia:folia-api:1.20.4-R0.1-SNAPSHOT") - + // Some sub projects implementation(project(":api")) { exclude("dev.dejvokep", "boosted-yaml") } - implementation(project(":common")) implementation(project(":compatibility")) implementation(project(":compatibility-asp-r1")) diff --git a/common/src/main/resources/custom-crops.properties b/plugin/src/main/resources/custom-crops.properties similarity index 100% rename from common/src/main/resources/custom-crops.properties rename to plugin/src/main/resources/custom-crops.properties diff --git a/common/src/main/resources/translations/en.yml b/plugin/src/main/resources/translations/en.yml similarity index 100% rename from common/src/main/resources/translations/en.yml rename to plugin/src/main/resources/translations/en.yml diff --git a/common/src/main/resources/translations/zh_cn.yml b/plugin/src/main/resources/translations/zh_cn.yml similarity index 100% rename from common/src/main/resources/translations/zh_cn.yml rename to plugin/src/main/resources/translations/zh_cn.yml diff --git a/settings.gradle.kts b/settings.gradle.kts index 0d12ecc..0bf5d95 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,4 @@ rootProject.name = "CustomCrops" -include(":common") include(":api") include(":plugin") include(":compatibility")