diff --git a/Parchment-Common/build.gradle.kts b/Parchment-Common/build.gradle.kts deleted file mode 100644 index fc00571..0000000 --- a/Parchment-Common/build.gradle.kts +++ /dev/null @@ -1,41 +0,0 @@ -import java.util.Locale -import java.net.URI - -plugins { - `maven-publish` -} - -java { - withSourcesJar() - withJavadocJar() -} - -dependencies { - val annotations = "org.jetbrains:annotations:21.0.1" - compileOnly(annotations) - testCompileOnly(annotations) -} - -configure { - publications.create("maven") { - from(components["java"]) - groupId = project.group as String? - artifactId = "Parchment-Common" - version = "1.17-R0.1-SNAPSHOT" - - pom { - name.set(project.name) - description.set("Common annotations for Parchment and other software") - } - } - - repositories { - maven { - credentials { - username = properties["edenusr"] as String? - password = properties["edenpwd"] as String? - } - url = URI.create("https://sonatype.projecteden.gg/repository/maven-snapshots/") - } - } -} \ No newline at end of file diff --git a/Parchment-Common/src/main/java/gg/projecteden/common/HasUniqueId.java b/Parchment-Common/src/main/java/gg/projecteden/common/HasUniqueId.java deleted file mode 100644 index 3e557bb..0000000 --- a/Parchment-Common/src/main/java/gg/projecteden/common/HasUniqueId.java +++ /dev/null @@ -1,17 +0,0 @@ -package gg.projecteden.common; - -import org.jetbrains.annotations.NotNull; - -import java.util.UUID; - -/** - * Represents an object that has a {@link UUID} - */ -public interface HasUniqueId extends OptionalUniqueId { - /** - * Returns a unique and persistent id for this object - * - * @return unique id - */ - @NotNull UUID getUniqueId(); // named getUniqueId to maintain compatibility with Bukkit -} diff --git a/Parchment-Common/src/main/java/gg/projecteden/common/OptionalUniqueId.java b/Parchment-Common/src/main/java/gg/projecteden/common/OptionalUniqueId.java deleted file mode 100644 index 09600e8..0000000 --- a/Parchment-Common/src/main/java/gg/projecteden/common/OptionalUniqueId.java +++ /dev/null @@ -1,17 +0,0 @@ -package gg.projecteden.common; - -import org.jetbrains.annotations.Nullable; - -import java.util.UUID; - -/** - * Represents an object that may have a {@link UUID} - */ -public interface OptionalUniqueId { - /** - * Returns a unique and persistent id for this object which may be null - * - * @return unique id or null - */ - @Nullable UUID getUniqueId(); // named getUniqueId to maintain compatibility with Bukkit -} diff --git a/build.gradle.kts b/build.gradle.kts index f8b10f1..e67fa15 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -46,6 +46,7 @@ subprojects { repositories { mavenCentral() maven("https://papermc.io/repo/repository/maven-public/") + maven("https://sonatype.projecteden.gg/repository/maven-public/") } } diff --git a/patches/api/0001-Build-changes.patch b/patches/api/0001-Build-changes.patch index 054cf42..88d4f6f 100644 --- a/patches/api/0001-Build-changes.patch +++ b/patches/api/0001-Build-changes.patch @@ -12,7 +12,7 @@ index a23b2bd8e1ca1ff8d0ad5ed5d5e41c89e4795090..590754921a6c7de54fa79d0a15c95a96 } dependencies { -+ api(project(":Parchment-Common")) // Parchment ++ api("gg.projecteden:eden-common:2.0.0-SNAPSHOT") // Parchment // api dependencies are listed transitively to API consumers api("commons-lang:commons-lang:2.6") api("com.google.guava:guava:31.0.1-jre") diff --git a/settings.gradle.kts b/settings.gradle.kts index cd331be..8570343 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,4 +7,4 @@ pluginManagement { rootProject.name = "Parchment" -include("Parchment-Common", "Parchment-API", "Parchment-Server") +include("Parchment-API", "Parchment-Server")