merge modules

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<JavaCompile> {
@@ -42,19 +54,40 @@ tasks.withType<JavaCompile> {
 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<MavenPublication>("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"
+                    }
+                }
+            }
         }
     }
 }

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();
 }

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<C> implements CommandFeature<C> {
-
     protected final CustomCropsCommandManager<C> commandManager;
     protected CommandConfig<C> commandConfig;
 

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"

common/build.gradle.kts

@@ -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<JavaCompile> {
-    options.encoding = "UTF-8"
-    options.release.set(17)
-    dependsOn(tasks.clean)
-}

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")
 }

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;

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")

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")
 }

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")
 }

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")
 }

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")
 }

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")

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

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"))
 

settings.gradle.kts

@@ -1,5 +1,4 @@
 rootProject.name = "CustomCrops"
-include(":common")
 include(":api")
 include(":plugin")
 include(":compatibility")