From 5f3992fd60aeb8d127b075b8eeb9a0f6e8963da1 Mon Sep 17 00:00:00 2001 From: bloodshot Date: Wed, 11 Dec 2019 11:51:39 -0500 Subject: [PATCH] Add MC 1.15 support. --- .../java/com/griefdefender/GDBootstrap.java | 2 + bukkit/src/main/resources/1.15.json | 271 ++++++++++++++++++ gradle.properties | 6 +- 3 files changed, 276 insertions(+), 3 deletions(-) create mode 100644 bukkit/src/main/resources/1.15.json diff --git a/bukkit/src/main/java/com/griefdefender/GDBootstrap.java b/bukkit/src/main/java/com/griefdefender/GDBootstrap.java index 5ed8e85..27d078a 100644 --- a/bukkit/src/main/java/com/griefdefender/GDBootstrap.java +++ b/bukkit/src/main/java/com/griefdefender/GDBootstrap.java @@ -82,6 +82,8 @@ public void onEnable() { bukkitJsonVersion = "1.14.3"; } else if (Bukkit.getVersion().contains("1.14.4")) { bukkitJsonVersion = "1.14.4"; + } else if (Bukkit.getVersion().contains("1.15")) { + bukkitJsonVersion = "1.15"; } else { this.getLogger().severe("Detected unsupported version '" + Bukkit.getVersion() + "'. GriefDefender only supports 1.8.8, 1.12.2, 1.13.2, and 1.14.2. GriefDefender will NOT load."); return; diff --git a/bukkit/src/main/resources/1.15.json b/bukkit/src/main/resources/1.15.json new file mode 100644 index 0000000..dfa5d0b --- /dev/null +++ b/bukkit/src/main/resources/1.15.json @@ -0,0 +1,271 @@ +{ + "version": "1.14.4", + "libraries": [ + { + "name": "com.griefdefender:adapter:1.15", + "sha1": "0748b075602fa13448f94cfb2fca0b2db58795b6", + "path": "com/griefdefender/adapter/1.15-SNAPSHOT/adapter-1.15-20191211.164543-1.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter/1.15-SNAPSHOT/adapter-1.15-20191211.164543-1.jar" + }, + { + "name": "com.griefdefender:api:1.0.0", + "sha1": "6a52235cf4323e29572c1d45cdc56373404448b4", + "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20190906.173641-10.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20190906.173641-10.jar" + }, + { + "name": "com.griefdefender:reflect-helper:1.0", + "sha1": "7a50bffa9f0062ac4ca376d95a0e6599aa5f3257", + "path": "com/griefdefender/reflect-helper/1.0/reflect-helper-1.0.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/reflect-helper/1.0/reflect-helper-1.0.jar" + }, + { + "name": "com.griefdefender:reflect-helper:2.0", + "sha1": "ee45d077344ae67e155e37eb61025401944ffabc", + "path": "com/griefdefender/reflect-helper/2.0/reflect-helper-2.0.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/reflect-helper/2.0/reflect-helper-2.0.jar" + }, + { + "name": "org.checkerframework:checker-qual:2.10.0", + "sha1": "5786699a0cb71f9dc32e6cca1d665eef07a0882f", + "path": "org/checkerframework/checker-qual/2.10.0/checker-qual-2.10.0.jar", + "relocate": "javax.inject:javaxinject", + "url": "https://repo1.maven.org/maven2/org/checkerframework/checker-qual/2.10.0/checker-qual-2.10.0.jar" + }, + { + "name": "org.ow2.asm:asm-debug-all:5.2", + "sha1": "3354e11e2b34215f06dab629ab88e06aca477c19", + "path": "org/ow2/asm/asm-debug-all/5.2/asm-debug-all-5.2.jar", + "relocate": "org.ow2.asm:asm", + "url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-debug-all/5.2/asm-debug-all-5.2.jar" + }, + { + "name": "me.lucko:jar-relocator:1.3", + "sha1": "90c6b66b8535f2f5eefc108e34e50f3e02e1f4cf", + "path": "me/lucko/jar-relocator/1.3/jar-relocator-1.3.jar", + "relocate": "me.lucko:lucko", + "url": "https://repo1.maven.org/maven2/me/lucko/jar-relocator/1.3/jar-relocator-1.3.jar" + }, + { + "name": "co.aikar:acf-core:0.5.0-SNAPSHOT", + "sha1": "d640d058f08da1be6b4483ac7a665d0b4bb22044", + "path": "co/aikar/acf-core/0.5.0-SNAPSHOT/acf-core-0.5.0-20190617.211117-148.jar", + "url": "https://repo.glaremasters.me/repository/public/co/aikar/acf-core/0.5.0-SNAPSHOT/acf-core-0.5.0-20190617.211117-148.jar" + }, + { + "name": "co.aikar:acf-bukkit:0.5.0-SNAPSHOT", + "sha1": "0af5d53de31ebf4e19100cc0654b88cc9c9c07fb", + "path": "co/aikar/acf-bukkit/0.5.0-SNAPSHOT/acf-bukkit-0.5.0-20190607.112608-152.jar", + "url": "https://repo.glaremasters.me/repository/public/co/aikar/acf-bukkit/0.5.0-SNAPSHOT/acf-bukkit-0.5.0-20190607.112608-152.jar" + }, + { + "name": "co.aikar:acf-paper:0.5.0-SNAPSHOT", + "sha1": "5df2f2f0c7190f4b867af20ff57f9fde012a4e2c", + "path": "co/aikar/acf-paper/0.5.0-SNAPSHOT/acf-paper-0.5.0-20190607.112622-147.jar", + "url": "https://repo.glaremasters.me/repository/public/co/aikar/acf-paper/0.5.0-SNAPSHOT/acf-paper-0.5.0-20190607.112622-147.jar" + }, + { + "name": "co.aikar:locales:1.0-SNAPSHOT", + "sha1": "09c89ff1a611600186edf8482d1059544875582b", + "path": "co/aikar/locales/1.0-SNAPSHOT/locales-1.0-20181221.115311-17.jar", + "url": "https://repo.glaremasters.me/repository/public/co/aikar/locales/1.0-SNAPSHOT/locales-1.0-20181221.115311-17.jar" + }, + { + "name": "co.aikar:minecraft-timings:1.0.4", + "sha1": "7ed9d44840cd2c0f77b7c5276d60ca901b146332", + "path": "co/aikar/minecraft-timings/1.0.4/minecraft-timings-1.0.4.jar", + "url": "https://repo.glaremasters.me/repository/public/co/aikar/minecraft-timings/1.0.4/minecraft-timings-1.0.4.jar" + }, + { + "name": "co.aikar:Table:1.0.0-SNAPSHOT", + "sha1": "ccbfaea11c65e6d7173226d318c577c439673b3a", + "path": "co/aikar/Table/1.0.0-SNAPSHOT/Table-1.0.0-20180331.054128-7.jar", + "url": "https://repo.glaremasters.me/repository/public/co/aikar/Table/1.0.0-SNAPSHOT/Table-1.0.0-20180331.054128-7.jar" + }, + { + "name": "net.jodah:expiringmap:0.5.9", + "sha1": "b93ac8a915e38beadc20c3cc284506e15478fd7b", + "path": "net/jodah/expiringmap/0.5.9/expiringmap-0.5.9.jar", + "relocate": "net.jodah:jodah", + "url": "https://repo1.maven.org/maven2/net/jodah/expiringmap/0.5.9/expiringmap-0.5.9.jar" + }, + { + "name": "aopalliance:aopalliance:1.0", + "sha1": "0235ba8b489512805ac13a8f9ea77a1ca5ebe3e8", + "path": "aopalliance/aopalliance/1.0/aopalliance-1.0.jar", + "relocate": "org.aopalliance:aopalliance", + "url": "https://repo1.maven.org/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" + }, + { + "name": "com.flowpowered:flow-math:1.0.3", + "sha1": "d98020239e5015091ad3be927cef9dea0d61a234", + "path": "com/flowpowered/flow-math/1.0.3/flow-math-1.0.3.jar", + "url": "https://repo1.maven.org/maven2/com/flowpowered/flow-math/1.0.3/flow-math-1.0.3.jar" + }, + { + "name": "com.google.inject:guice:4.1.0", + "sha1": "eeb69005da379a10071aa4948c48d89250febb07", + "path": "com/google/inject/guice/4.1.0/guice-4.1.0.jar", + "relocate": "com.google.inject:googleinject", + "url": "https://repo1.maven.org/maven2/com/google/inject/guice/4.1.0/guice-4.1.0.jar" + }, + { + "name": "javax.inject:javax.inject:1", + "sha1": "6975da39a7040257bd51d21a231b76c915872d38", + "path": "javax/inject/javax.inject/1/javax.inject-1.jar", + "relocate": "javax.inject:javaxinject", + "url": "https://repo1.maven.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar" + }, + { + "name": "com.squareup.okhttp3:okhttp:3.14.2", + "sha1": "eaed79ed6bc1e14fad462172b6a09524545b165c", + "path": "com/squareup/okhttp3/okhttp/3.14.2/okhttp-3.14.2.jar", + "relocate": "okhttp3:okhttp3", + "url": "https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp/3.14.2/okhttp-3.14.2.jar" + }, + { + "name": "com.squareup.okio:okio:2.2.2", + "sha1": "36f483536153f15339a8b48d508e22be7c9c531a", + "path": "com/squareup/okio/okio/2.2.2/okio-2.2.2.jar", + "relocate": "okio:okio", + "url": "https://repo1.maven.org/maven2/com/squareup/okio/okio/2.2.2/okio-2.2.2.jar" + }, + { + "name": "me.lucko.luckperms:luckperms-api:4.4", + "sha1": "e0356ab83e426ff5e51b3c596ffac8750905af64", + "path": "me/lucko/luckperms/luckperms-api/4.4/luckperms-api-4.4.jar", + "relocate": "me.lucko:lucko", + "url": "https://repo1.maven.org/maven2/me/lucko/luckperms/luckperms-api/4.4/luckperms-api-4.4.jar" + }, + { + "name": "com.github.ben-manes.caffeine:caffeine:2.7.0", + "sha1": "c3af06be4a7d4e769fce2cef5e77d3becad9818a", + "path": "com/github/ben-manes/caffeine/caffeine/2.7.0/caffeine-2.7.0.jar", + "relocate": "com.github.benmanes.caffeine:caffeine", + "url": "https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/2.7.0/caffeine-2.7.0.jar" + }, + { + "name": "commons-io:commons-io:2.6", + "sha1": "815893df5f31da2ece4040fe0a12fd44b577afaf", + "path": "org/apache/commons/commons-io/2.6/commons-io-2.6.jar", + "relocate": "org.apache.commons.io:commonsio", + "url": "https://repo1.maven.org/maven2/commons-io/commons-io/2.6/commons-io-2.6.jar" + }, + { + "name": "org.apache.commons:commons-lang3:3.9", + "sha1": "0122c7cee69b53ed4a7681c03d4ee4c0e2765da5", + "path": "org/apache/commons/commons-lang3/3.9/commons-lang3-3.9.jar", + "relocate": "org.apache.commons.lang3:commonslang3", + "url": "https://repo1.maven.org/maven2/org/apache/commons/commons-lang3/3.9/commons-lang3-3.9.jar" + }, + { + "name": "org.spongepowered:configurate-core:3.7-SNAPSHOT", + "sha1": "e596c439ac71fa2ea5c48f8ba97a7dc6f4c77b16", + "path": "org/spongepowered/configurate-core/3.7-SNAPSHOT/configurate-core-3.7-20190531.182437-11.jar", + "relocate": "ninja.leaping.configurate:configurate", + "url": "https://repo.spongepowered.org/maven/org/spongepowered/configurate-core/3.7-SNAPSHOT/configurate-core-3.7-20190531.182437-11.jar" + }, + { + "name": "org.spongepowered:configurate-gson:3.7-SNAPSHOT", + "sha1": "265a94f16583621f497eeecc356f35f983484dde", + "path": "org/spongepowered/configurate-gson/3.7-SNAPSHOT/configurate-gson-3.7-20190531.182438-11.jar", + "relocate": "ninja.leaping.configurate:configurate", + "url": "https://repo.spongepowered.org/maven/org/spongepowered/configurate-gson/3.7-SNAPSHOT/configurate-gson-3.7-20190531.182438-11.jar" + }, + { + "name": "org.spongepowered:configurate-hocon:3.7-SNAPSHOT", + "sha1": "af48dcb9e7456f2f81a633f62ae5c55e5215c4af", + "path": "org/spongepowered/configurate-hocon/3.7-SNAPSHOT/configurate-hocon-3.7-20190531.182439-11.jar", + "relocate": "ninja.leaping.configurate:configurate", + "url": "https://repo.spongepowered.org/maven/org/spongepowered/configurate-hocon/3.7-SNAPSHOT/configurate-hocon-3.7-20190531.182439-11.jar" + }, + { + "name": "org.spongepowered:configurate-yaml:3.7-SNAPSHOT", + "sha1": "c66110f5ae0098c450e048f78b322590d2e24d06", + "path": "org/spongepowered/configurate-yaml/3.7-SNAPSHOT/configurate-yaml-3.7-20190531.182442-11.jar", + "relocate": "ninja.leaping.configurate:configurate", + "url": "https://repo.spongepowered.org/maven/org/spongepowered/configurate-yaml/3.7-SNAPSHOT/configurate-yaml-3.7-20190531.182442-11.jar" + }, + { + "name": "com.typesafe:config:1.3.1", + "sha1": "2cf7a6cc79732e3bdf1647d7404279900ca63eb0", + "path": "com/typesafe/config/1.3.1/config-1.3.1.jar", + "relocate": "com.typesafe:typesafe", + "url": "https://repo1.maven.org/maven2/com/typesafe/config/1.3.1/config-1.3.1.jar" + }, + { + "name": "it.unimi.dsi:fastutil:8.2.3", + "sha1": "f3a26db2204f1779c9958a914422f84284e53a84", + "path": "it/unimi/dsi/fastutil/8.2.3/fastutil-8.2.3.jar", + "relocate": "it.unimi.dsi:fastutil", + "url": "https://repo1.maven.org/maven2/it/unimi/dsi/fastutil/8.2.3/fastutil-8.2.3.jar" + }, + { + "name": "org.jetbrains.kotlin:kotlin-stdlib:1.3.31", + "sha1": "11289d20fd95ae219333f3456072be9f081c30cc", + "path": "org/jetbrains/kotlin/kotlin-stdlib/1.3.31/kotlin-stdlib-1.3.31.jar", + "relocate": "org.jetbrains:jetbrains", + "url": "https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.31/kotlin-stdlib-1.3.31.jar" + }, + { + "name": "net.kyori:event-api:3.0.0", + "sha1": "4e207f07d2adaa15e174a085f65bc6ae5a81029e", + "path": "net/kyori/event-api/3.0.0/event-api-3.0.0.jar", + "url": "https://repo1.maven.org/maven2/net/kyori/event-api/3.0.0/event-api-3.0.0.jar" + }, + { + "name": "net.kyori:event-method:3.0.0", + "sha1": "85fe9bbf8ebadde4c82602af29352ba5db06e8e5", + "path": "net/kyori/event-method/3.0.0/event-method-3.0.0.jar", + "url": "https://repo1.maven.org/maven2/net/kyori/event-method/3.0.0/event-method-3.0.0.jar" + }, + { + "name": "net.kyori:event-method-asm:3.0.0", + "sha1": "69113430c1ba05c9d9fa6e48028edd53e3e16723", + "path": "net/kyori/event-method-asm/3.0.0/event-method-asm-3.0.0.jar", + "url": "https://repo1.maven.org/maven2/net/kyori/event-method-asm/3.0.0/event-method-asm-3.0.0.jar" + }, + { + "name": "net.kyori:text-adapter-bukkit:3.0.3", + "sha1": "37033ab1173d73a62a087cbd5c8d356774f4cee3", + "path": "net/kyori/text-adapter-bukkit/3.0.3/text-adapter-bukkit-3.0.3.jar", + "url": "https://repo1.maven.org/maven2/net/kyori/text-adapter-bukkit/3.0.3/text-adapter-bukkit-3.0.3.jar" + }, + { + "name": "net.kyori:text-adapter-bungeecord:3.0.2", + "sha1": "d57c245bdc182bdf37d1b7a32691859add018a2b", + "path": "net/kyori/text-adapter-bungeecord/3.0.2/text-adapter-bungeecord-3.0.2.jar", + "url": "https://repo1.maven.org/maven2/net/kyori/text-adapter-bungeecord/3.0.2/text-adapter-bungeecord-3.0.2.jar" + }, + { + "name": "net.kyori:text-adapter-spongeapi:3.0.2", + "sha1": "8562afb1594a9d34b891f23add503741d0656873", + "path": "net/kyori/text-adapter-spongeapi/3.0.2/text-adapter-spongeapi-3.0.2.jar", + "url": "https://repo1.maven.org/maven2/net/kyori/text-adapter-spongeapi/3.0.2/text-adapter-spongeapi-3.0.2.jar" + }, + { + "name": "net.kyori:text-api:3.0.2", + "sha1": "608cdb44a74bbd68745941760df730ed55e4b47c", + "path": "net/kyori/text-api/3.0.2/text-api-3.0.2.jar", + "url": "https://repo1.maven.org/maven2/net/kyori/text-api/3.0.2/text-api-3.0.2.jar" + }, + { + "name": "net.kyori:text-serializer-gson:3.0.2", + "sha1": "9ac22f04f3504c52ff1618c5a8d9a6145d8d9c9e", + "path": "net/kyori/text-serializer-gson/3.0.2/text-serializer-gson-3.0.2.jar", + "url": "https://repo1.maven.org/maven2/net/kyori/text-serializer-gson/3.0.2/text-serializer-gson-3.0.2.jar" + }, + { + "name": "net.kyori:text-serializer-legacy:3.0.2", + "sha1": "8acbfb36356259273a8e3a15782e4f2980375bc5", + "path": "net/kyori/text-serializer-legacy/3.0.2/text-serializer-legacy-3.0.2.jar", + "url": "https://repo1.maven.org/maven2/net/kyori/text-serializer-legacy/3.0.2/text-serializer-legacy-3.0.2.jar" + }, + { + "name": "net.kyori:text-serializer-plain:3.0.2", + "sha1": "8d60703f579019f7c26959d2e46501c3d389b48d", + "path": "net/kyori/text-serializer-plain/3.0.2/text-serializer-plain-3.0.2.jar", + "url": "https://repo1.maven.org/maven2/net/kyori/text-serializer-plain/3.0.2/text-serializer-plain-3.0.2.jar" + } + ] +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 7f4c986..f8fc964 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ name=GriefDefender group=com.griefdefender url=https://github.com/bloodmc/GriefDefender -version=1.2.2 -adapterVersion=1.14.4-20191030.135735-19 +version=1.2.3 +adapterVersion=1.15-20191211.164543-1 apiVersion=1.0.0-20190906.173641-10 -spigotVersion=1.14.4-R0.1-SNAPSHOT +spigotVersion=1.15-R0.1-SNAPSHOT org.gradle.jvmargs=-Xmx3G \ No newline at end of file