diff --git a/bukkit/loader/src/main/resources/craft-engine.properties b/bukkit/loader/src/main/resources/craft-engine.properties index 826fd18e4..5901f43dd 100644 --- a/bukkit/loader/src/main/resources/craft-engine.properties +++ b/bukkit/loader/src/main/resources/craft-engine.properties @@ -32,31 +32,4 @@ lz4=${lz4_version} netty-codec-http2=${netty_version} reactive-streams=${reactive_streams_version} amazon-sdk-s3=${amazon_awssdk_version} -amazon-sdk-netty-nio-client=${amazon_awssdk_version} -amazon-sdk-core=${amazon_awssdk_version} -amazon-sdk-auth=${amazon_awssdk_version} -amazon-sdk-regions=${amazon_awssdk_version} -amazon-sdk-identity-spi=${amazon_awssdk_version} -amazon-sdk-http-client-spi=${amazon_awssdk_version} -amazon-sdk-protocol-core=${amazon_awssdk_version} -amazon-sdk-aws-xml-protocol=${amazon_awssdk_version} -amazon-sdk-json-utils=${amazon_awssdk_version} -amazon-sdk-aws-core=${amazon_awssdk_version} -amazon-sdk-utils=${amazon_awssdk_version} -amazon-sdk-annotations=${amazon_awssdk_version} -amazon-sdk-crt-core=${amazon_awssdk_version} -amazon-sdk-checksums=${amazon_awssdk_version} -amazon-sdk-profiles=${amazon_awssdk_version} -amazon-sdk-retries=${amazon_awssdk_version} -amazon-sdk-endpoints-spi=${amazon_awssdk_version} -amazon-sdk-arns=${amazon_awssdk_version} -amazon-sdk-aws-query-protocol=${amazon_awssdk_version} -amazon-sdk-http-auth-aws=${amazon_awssdk_version} -amazon-sdk-http-auth-spi=${amazon_awssdk_version} -amazon-sdk-http-auth=${amazon_awssdk_version} -amazon-sdk-http-auth-aws-eventstream=${amazon_awssdk_version} -amazon-sdk-checksums-spi=${amazon_awssdk_version} -amazon-sdk-retries-spi=${amazon_awssdk_version} -amazon-sdk-metrics-spi=${amazon_awssdk_version} -amazon-sdk-third-party-jackson-core=${amazon_awssdk_version} amazon-sdk-eventstream=${amazon_awssdk_eventstream_version} \ No newline at end of file diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java index 31cd4fca5..974e9c294 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java @@ -279,7 +279,6 @@ public abstract class CraftEngine implements Plugin { Dependencies.BSTATS_BASE, Dependencies.CAFFEINE, Dependencies.GEANTY_REF, - Dependencies.NETTY_HTTP, Dependencies.CLOUD_CORE, Dependencies.CLOUD_SERVICES, Dependencies.GSON, Dependencies.SLF4J_API, Dependencies.SLF4J_SIMPLE, diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/dependency/Dependencies.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/dependency/Dependencies.java index 9699da54b..e9861fc2a 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/dependency/Dependencies.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/dependency/Dependencies.java @@ -14,6 +14,7 @@ public class Dependencies { "asm", Collections.emptyList() ); + public static final Dependency ASM_COMMONS = new Dependency( "asm-commons", "org.ow2.asm", @@ -21,6 +22,7 @@ public class Dependencies { "asm-commons", Collections.emptyList() ); + public static final Dependency JAR_RELOCATOR = new Dependency( "jar-relocator", "me.lucko", @@ -28,13 +30,7 @@ public class Dependencies { "jar-relocator", Collections.emptyList() ); - public static final Dependency NETTY_HTTP = new Dependency( - "netty-codec-http", - "io.netty", - "netty-codec-http", - "netty-codec-http", - Collections.emptyList() - ); + public static final Dependency GEANTY_REF = new Dependency( "geantyref", "io{}leangen{}geantyref", @@ -42,6 +38,7 @@ public class Dependencies { "geantyref", List.of(Relocation.of("geantyref", "io{}leangen{}geantyref")) ); + public static final Dependency CLOUD_CORE = new Dependency( "cloud-core", "org{}incendo", @@ -50,6 +47,7 @@ public class Dependencies { List.of(Relocation.of("cloud", "org{}incendo{}cloud"), Relocation.of("geantyref", "io{}leangen{}geantyref")) ); + public static final Dependency CLOUD_BRIGADIER = new Dependency( "cloud-brigadier", "org{}incendo", @@ -58,6 +56,7 @@ public class Dependencies { List.of(Relocation.of("cloud", "org{}incendo{}cloud"), Relocation.of("geantyref", "io{}leangen{}geantyref")) ); + public static final Dependency CLOUD_SERVICES = new Dependency( "cloud-services", "org{}incendo", @@ -66,6 +65,7 @@ public class Dependencies { List.of(Relocation.of("cloud", "org{}incendo{}cloud"), Relocation.of("geantyref", "io{}leangen{}geantyref")) ); + public static final Dependency CLOUD_BUKKIT = new Dependency( "cloud-bukkit", "org{}incendo", @@ -77,6 +77,7 @@ public class Dependencies { Relocation.of("examination", "net{}kyori{}examination"), Relocation.of("option", "net{}kyori{}option")) ); + public static final Dependency CLOUD_PAPER = new Dependency( "cloud-paper", "org{}incendo", @@ -88,6 +89,7 @@ public class Dependencies { Relocation.of("examination", "net{}kyori{}examination"), Relocation.of("option", "net{}kyori{}option")) ); + public static final Dependency CLOUD_MINECRAFT_EXTRAS = new Dependency( "cloud-minecraft-extras", "org{}incendo", @@ -99,6 +101,7 @@ public class Dependencies { Relocation.of("examination", "net{}kyori{}examination"), Relocation.of("option", "net{}kyori{}option")) ); + public static final Dependency BOOSTED_YAML = new Dependency( "boosted-yaml", "dev{}dejvokep", @@ -106,6 +109,7 @@ public class Dependencies { "boosted-yaml", List.of(Relocation.of("boostedyaml", "dev{}dejvokep{}boostedyaml")) ); + public static final Dependency BSTATS_BASE = new Dependency( "bstats-base", "org{}bstats", @@ -113,6 +117,7 @@ public class Dependencies { "bstats-base", List.of(Relocation.of("bstats", "org{}bstats")) ); + public static final Dependency BSTATS_BUKKIT = new Dependency( "bstats-bukkit", "org{}bstats", @@ -125,6 +130,7 @@ public class Dependencies { return Dependencies.BSTATS_BASE.getVersion(); } }; + public static final Dependency GSON = new Dependency( "gson", "com.google.code.gson", @@ -132,6 +138,7 @@ public class Dependencies { "gson", Collections.emptyList() ); + public static final Dependency CAFFEINE = new Dependency( "caffeine", "com{}github{}ben-manes{}caffeine", @@ -139,6 +146,7 @@ public class Dependencies { "caffeine", List.of(Relocation.of("caffeine", "com{}github{}benmanes{}caffeine")) ); + public static final Dependency ZSTD = new Dependency( "zstd-jni", "com.github.luben", @@ -146,6 +154,7 @@ public class Dependencies { "zstd-jni", Collections.emptyList() ); + public static final Dependency SLF4J_API = new Dependency( "slf4j-api", "org.slf4j", @@ -153,6 +162,7 @@ public class Dependencies { "slf4j-api", Collections.emptyList() ); + public static final Dependency SLF4J_SIMPLE = new Dependency( "slf4j-simple", "org.slf4j", @@ -165,6 +175,7 @@ public class Dependencies { return Dependencies.SLF4J_API.getVersion(); } }; + public static final Dependency COMMONS_IO = new Dependency( "commons-io", "commons-io", @@ -172,6 +183,7 @@ public class Dependencies { "commons-io", List.of(Relocation.of("commons", "org{}apache{}commons")) ); + public static final Dependency BYTE_BUDDY = new Dependency( "byte-buddy", "net{}bytebuddy", @@ -179,6 +191,7 @@ public class Dependencies { "byte-buddy", List.of(Relocation.of("bytebuddy", "net{}bytebuddy")) ); + public static final Dependency SNAKE_YAML = new Dependency( "snake-yaml", "org{}yaml", @@ -186,6 +199,7 @@ public class Dependencies { "snakeyaml", List.of(Relocation.of("snakeyaml", "org{}yaml{}snakeyaml")) ); + public static final Dependency MINIMESSAGE = new Dependency( "adventure-text-minimessage", "net{}kyori", @@ -193,6 +207,7 @@ public class Dependencies { "adventure-text-minimessage", List.of(Relocation.of("adventure", "net{}kyori{}adventure")) ); + public static final Dependency TEXT_SERIALIZER_GSON = new Dependency( "adventure-text-serializer-gson", "net{}kyori", @@ -200,6 +215,7 @@ public class Dependencies { "adventure-text-serializer-gson", List.of(Relocation.of("adventure", "net{}kyori{}adventure")) ); + public static final Dependency TEXT_SERIALIZER_GSON_LEGACY = new Dependency( "adventure-text-serializer-json-legacy-impl", "net{}kyori", @@ -207,6 +223,7 @@ public class Dependencies { "adventure-text-serializer-json-legacy-impl", List.of(Relocation.of("adventure", "net{}kyori{}adventure")) ); + public static final Dependency TEXT_SERIALIZER_JSON = new Dependency( "adventure-text-serializer-json", "net{}kyori", @@ -214,6 +231,7 @@ public class Dependencies { "adventure-text-serializer-json", List.of(Relocation.of("adventure", "net{}kyori{}adventure")) ); + public static final Dependency AHO_CORASICK = new Dependency( "ahocorasick", "org{}ahocorasick", @@ -221,6 +239,7 @@ public class Dependencies { "aho-corasick", List.of(Relocation.of("ahocorasick", "org{}ahocorasick")) ); + public static final Dependency LZ4 = new Dependency( "lz4", "org{}lz4", @@ -265,7 +284,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_SDK_CORE = new Dependency( "amazon-sdk-core", @@ -276,7 +300,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_AUTH = new Dependency( "amazon-sdk-auth", @@ -287,7 +316,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_REGIONS = new Dependency( "amazon-sdk-regions", @@ -298,7 +332,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_IDENTITY_SPI = new Dependency( "amazon-sdk-identity-spi", @@ -309,7 +348,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_HTTP_CLIENT_SPI = new Dependency( "amazon-sdk-http-client-spi", @@ -320,7 +364,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_PROTOCOL_CORE = new Dependency( "amazon-sdk-protocol-core", @@ -331,7 +380,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_AWS_XML_PROTOCOL = new Dependency( "amazon-sdk-aws-xml-protocol", @@ -342,7 +396,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_JSON_UTILS = new Dependency( "amazon-sdk-json-utils", @@ -353,7 +412,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_AWS_CORE = new Dependency( "amazon-sdk-aws-core", @@ -364,7 +428,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_UTILS = new Dependency( "amazon-sdk-utils", @@ -375,7 +444,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_ANNOTATIONS = new Dependency( "amazon-sdk-annotations", @@ -386,7 +460,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_CRT_CORE = new Dependency( "amazon-sdk-crt-core", @@ -397,7 +476,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_CHECKSUMS = new Dependency( "amazon-sdk-checksums", @@ -408,7 +492,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_EVENTSTREAM = new Dependency( "amazon-sdk-eventstream", @@ -430,7 +519,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_RETRIES = new Dependency( "amazon-sdk-retries", @@ -441,7 +535,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_ENDPOINTS_SPI = new Dependency( "amazon-sdk-endpoints-spi", @@ -452,7 +551,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_ARNS = new Dependency( "amazon-sdk-arns", @@ -463,7 +567,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_AWS_QUERY_PROTOCOL = new Dependency( "amazon-sdk-aws-query-protocol", @@ -474,7 +583,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_HTTP_AUTH_AWS = new Dependency( "amazon-sdk-http-auth-aws", @@ -485,7 +599,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_HTTP_AUTH_SPI = new Dependency( "amazon-sdk-http-auth-spi", @@ -496,7 +615,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_HTTP_AUTH = new Dependency( "amazon-sdk-http-auth", @@ -507,7 +631,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_HTTP_AUTH_AWS_EVENTSTREAM = new Dependency( "amazon-sdk-http-auth-aws-eventstream", @@ -518,7 +647,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_CHECKSUMS_SPI = new Dependency( "amazon-sdk-checksums-spi", @@ -529,7 +663,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_RETRIES_SPI = new Dependency( "amazon-sdk-retries-spi", @@ -540,7 +679,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_METRICS_SPI = new Dependency( "amazon-sdk-metrics-spi", @@ -551,7 +695,12 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; public static final Dependency AMAZON_AWSSDK_THIRD_PARTY_JACKSON_CORE = new Dependency( "amazon-sdk-third-party-jackson-core", @@ -562,5 +711,10 @@ public class Dependencies { Relocation.of("awssdk", "software{}amazon{}awssdk"), Relocation.of("reactivestreams", "org{}reactivestreams") ) - ); + ) { + @Override + public String getVersion() { + return AMAZON_AWSSDK_S3.getVersion(); + } + }; } \ No newline at end of file