diff options
| -rw-r--r-- | build.gradle.kts | 2 | ||||
| -rw-r--r-- | patches/api/0006-Adventure.patch | 4 | ||||
| -rw-r--r-- | patches/api/0008-Use-ASM-for-event-executors.patch | 2 | ||||
| -rw-r--r-- | patches/api/0009-Paper-Plugins.patch | 2 | ||||
| -rw-r--r-- | patches/api/0070-Allow-plugins-to-use-SLF4J-for-logging.patch | 4 | ||||
| -rw-r--r-- | patches/server/0960-ItemStack-Tooltip-API.patch (renamed from patches/server/0961-ItemStack-Tooltip-API.patch) | 0 | ||||
| -rw-r--r-- | patches/server/0961-Add-getChunkSnapshot-includeLightData-parameter.patch (renamed from patches/server/0962-Add-getChunkSnapshot-includeLightData-parameter.patch) | 0 | ||||
| -rw-r--r-- | patches/server/0962-Add-FluidState-API.patch (renamed from patches/server/0963-Add-FluidState-API.patch) | 0 | ||||
| -rw-r--r-- | patches/server/0963-add-number-format-api.patch (renamed from patches/server/0964-add-number-format-api.patch) | 0 | ||||
| -rw-r--r-- | patches/server/0964-improve-BanList-types.patch (renamed from patches/server/0965-improve-BanList-types.patch) | 0 | ||||
| -rw-r--r-- | patches/server/0965-Expanded-Hopper-API.patch (renamed from patches/server/0966-Expanded-Hopper-API.patch) | 0 | ||||
| -rw-r--r-- | patches/server/0966-Add-BlockBreakProgressUpdateEvent.patch (renamed from patches/server/0967-Add-BlockBreakProgressUpdateEvent.patch) | 0 | ||||
| -rw-r--r-- | patches/server/0967-Deprecate-ItemStack-setType.patch (renamed from patches/server/0968-Deprecate-ItemStack-setType.patch) | 0 | ||||
| -rw-r--r-- | patches/server/0968-Add-CartographyItemEvent.patch (renamed from patches/server/0969-Add-CartographyItemEvent.patch) | 0 | ||||
| -rw-r--r-- | patches/server/0969-More-Raid-API.patch (renamed from patches/server/0970-More-Raid-API.patch) | 0 |
15 files changed, 8 insertions, 6 deletions
diff --git a/build.gradle.kts b/build.gradle.kts index 48ed69d962..4f552a4cf2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -54,6 +54,7 @@ subprojects { repositories { mavenCentral() maven(paperMavenPublicUrl) + maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") // TODO - Adventure snapshot } } @@ -118,6 +119,7 @@ tasks.generateDevelopmentBundle { libraryRepositories.addAll( "https://repo.maven.apache.org/maven2/", paperMavenPublicUrl, + "https://s01.oss.sonatype.org/content/repositories/snapshots/", // TODO - Adventure snapshot ) } diff --git a/patches/api/0006-Adventure.patch b/patches/api/0006-Adventure.patch index 48ae8876d3..6093772428 100644 --- a/patches/api/0006-Adventure.patch +++ b/patches/api/0006-Adventure.patch @@ -8,14 +8,14 @@ Co-authored-by: Jake Potrebic <[email protected]> Co-authored-by: Yannick Lamprecht <[email protected]> diff --git a/build.gradle.kts b/build.gradle.kts -index f605e7e0f812a2297b1cecf3f37b69a8edc6b4a5..e3748b4b39529fde27e5bb00597a56becdf0843c 100644 +index f605e7e0f812a2297b1cecf3f37b69a8edc6b4a5..ec60a4b804d9d077fdb7d88519b7fb8816aeab9f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,12 +11,28 @@ java { val annotationsVersion = "24.0.1" val bungeeCordChatVersion = "1.20-R0.2" -+val adventureVersion = "4.16.0" ++val adventureVersion = "4.17.0-SNAPSHOT" +val apiAndDocs: Configuration by configurations.creating { + attributes { + attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION)) diff --git a/patches/api/0008-Use-ASM-for-event-executors.patch b/patches/api/0008-Use-ASM-for-event-executors.patch index 65ce1716a1..16fad22249 100644 --- a/patches/api/0008-Use-ASM-for-event-executors.patch +++ b/patches/api/0008-Use-ASM-for-event-executors.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/build.gradle.kts b/build.gradle.kts -index e3748b4b39529fde27e5bb00597a56becdf0843c..2aca0a8feffc844ee19480d70a1a9971790d1621 100644 +index ec60a4b804d9d077fdb7d88519b7fb8816aeab9f..d64d927ddbb5fd968902c35496b24ce73fd5d588 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -47,6 +47,9 @@ dependencies { diff --git a/patches/api/0009-Paper-Plugins.patch b/patches/api/0009-Paper-Plugins.patch index 6f7e6ea926..214a9ca18e 100644 --- a/patches/api/0009-Paper-Plugins.patch +++ b/patches/api/0009-Paper-Plugins.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Paper Plugins diff --git a/build.gradle.kts b/build.gradle.kts -index 2aca0a8feffc844ee19480d70a1a9971790d1621..f9a9066e3e6a355acd5ddb3b0308b5b3b36b82f2 100644 +index d64d927ddbb5fd968902c35496b24ce73fd5d588..4c792921c7a93c9f9f1a137127edafad6498d30a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -52,7 +52,7 @@ dependencies { diff --git a/patches/api/0070-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/0070-Allow-plugins-to-use-SLF4J-for-logging.patch index 45f53dfcfd..d337e98fe2 100644 --- a/patches/api/0070-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/patches/api/0070-Allow-plugins-to-use-SLF4J-for-logging.patch @@ -14,13 +14,13 @@ it without having to shade it in the plugin and going through several layers of logging abstraction. diff --git a/build.gradle.kts b/build.gradle.kts -index f9a9066e3e6a355acd5ddb3b0308b5b3b36b82f2..04853c43b99951bf0d4c96ef73724625bdaf018f 100644 +index 4c792921c7a93c9f9f1a137127edafad6498d30a..3df0639bf4811e29bdef57474b9d9db808d5e62a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,6 +12,8 @@ java { val annotationsVersion = "24.0.1" val bungeeCordChatVersion = "1.20-R0.2" - val adventureVersion = "4.16.0" + val adventureVersion = "4.17.0-SNAPSHOT" +val slf4jVersion = "2.0.9" +val log4jVersion = "2.17.1" val apiAndDocs: Configuration by configurations.creating { diff --git a/patches/server/0961-ItemStack-Tooltip-API.patch b/patches/server/0960-ItemStack-Tooltip-API.patch index 36c7559e94..36c7559e94 100644 --- a/patches/server/0961-ItemStack-Tooltip-API.patch +++ b/patches/server/0960-ItemStack-Tooltip-API.patch diff --git a/patches/server/0962-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/0961-Add-getChunkSnapshot-includeLightData-parameter.patch index 70efa7282a..70efa7282a 100644 --- a/patches/server/0962-Add-getChunkSnapshot-includeLightData-parameter.patch +++ b/patches/server/0961-Add-getChunkSnapshot-includeLightData-parameter.patch diff --git a/patches/server/0963-Add-FluidState-API.patch b/patches/server/0962-Add-FluidState-API.patch index a50c185925..a50c185925 100644 --- a/patches/server/0963-Add-FluidState-API.patch +++ b/patches/server/0962-Add-FluidState-API.patch diff --git a/patches/server/0964-add-number-format-api.patch b/patches/server/0963-add-number-format-api.patch index d412b5f929..d412b5f929 100644 --- a/patches/server/0964-add-number-format-api.patch +++ b/patches/server/0963-add-number-format-api.patch diff --git a/patches/server/0965-improve-BanList-types.patch b/patches/server/0964-improve-BanList-types.patch index c40c336e4a..c40c336e4a 100644 --- a/patches/server/0965-improve-BanList-types.patch +++ b/patches/server/0964-improve-BanList-types.patch diff --git a/patches/server/0966-Expanded-Hopper-API.patch b/patches/server/0965-Expanded-Hopper-API.patch index 2b59ac9974..2b59ac9974 100644 --- a/patches/server/0966-Expanded-Hopper-API.patch +++ b/patches/server/0965-Expanded-Hopper-API.patch diff --git a/patches/server/0967-Add-BlockBreakProgressUpdateEvent.patch b/patches/server/0966-Add-BlockBreakProgressUpdateEvent.patch index f02afee856..f02afee856 100644 --- a/patches/server/0967-Add-BlockBreakProgressUpdateEvent.patch +++ b/patches/server/0966-Add-BlockBreakProgressUpdateEvent.patch diff --git a/patches/server/0968-Deprecate-ItemStack-setType.patch b/patches/server/0967-Deprecate-ItemStack-setType.patch index a0c8f6fbab..a0c8f6fbab 100644 --- a/patches/server/0968-Deprecate-ItemStack-setType.patch +++ b/patches/server/0967-Deprecate-ItemStack-setType.patch diff --git a/patches/server/0969-Add-CartographyItemEvent.patch b/patches/server/0968-Add-CartographyItemEvent.patch index a72a29d0dd..a72a29d0dd 100644 --- a/patches/server/0969-Add-CartographyItemEvent.patch +++ b/patches/server/0968-Add-CartographyItemEvent.patch diff --git a/patches/server/0970-More-Raid-API.patch b/patches/server/0969-More-Raid-API.patch index 3802319069..3802319069 100644 --- a/patches/server/0970-More-Raid-API.patch +++ b/patches/server/0969-More-Raid-API.patch |