[Purpur Changes] PlazmaMC/Purpur@ceeec1c: work PlazmaMC/Purpur@e8f8f93: Updated Upstream (Paper, Pufferfish) [Paper Changes] PaperMC/Paper@f175193: Expose server build information (#10729) PaperMC/Paper@d8d59e0: Fix NPE sending resource pack without prompt PaperMC/Paper@5a9afbe: Fixes issues in the suppress dismount cancellation patch (#10735) PaperMC/Paper@0ad09de: Make PaperSimplePluginClassLoader show class which is not found PaperMC/Paper@b3b3406: fix CompassMeta not being correct (#10737) PaperMC/Paper@591521e: Check for more correct profile validation (#10730) PaperMC/Paper@7d2e5c3: Add an 'empty' RecipeChoice for certain ingredient slots (#10710) PaperMC/Paper@9bf4855: Add a better warning message than "Server performance will be affected" for CommandRegisteredEvent use (#10754) PaperMC/Paper@66cb880: Remove ThreadedWorldUpgrader patch PaperMC/Paper@980cff9: Fix compile PaperMC/Paper@d3ffa62: fix default item attributes PaperMC/Paper@b149584: Always show command exception stack traces in logs (#10766) PaperMC/Paper@a9201d4: [ci skip] Move logic in our patches to ItemType/BlockType (#10772) PaperMC/Paper@3de408e: Fix equipment slot and group API (#10767) PaperMC/Paper@d408381: Print CommandRegisteredEvent deprecation warnings again (#10756) PaperMC/Paper@6de7a1f: Improve default item attributes API (#10765) PaperMC/Paper@2a90732: Remove incorrect logic for Fireball#setVelocity (#10764) PaperMC/Paper@5e7b65a: Allow using PluginLoader classpath API from Bukkit plugins (#10758) PaperMC/Paper@3004717: Do not re-wrap vanilla goals (#10751) PaperMC/Paper@377733d: Use getter/setter on Mob for equipment drop chances (#10780) PaperMC/Paper@dff591d: Allow to define new map cursor types (#10782) PaperMC/Paper@4fd3ac0: [ci skip] Update Player#getListeningPluginChannels Jdoc (#10778) PaperMC/Paper@535dca5: Fix a few issues with ItemMeta (#10740) PaperMC/Paper@26e90b9: Fix CraftMetaBlockState for data components (#10731) PaperMC/Paper@f0bd0cc: Expose anvil cost in the API (#10682) PaperMC/Paper@41bee55: Fix NPE for color-related metas PaperMC/Paper@4e10fad: reset meta block state on BlockStateMeta#setBlockState
99 lines
4.8 KiB
Diff
99 lines
4.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: AlphaKR93 <dev@alpha93.kr>
|
|
Date: Sun, 14 Jan 2024 19:51:19 +0900
|
|
Subject: [PATCH] Use Gradle Version Catalogs
|
|
|
|
|
|
diff --git a/build.gradle.kts b/build.gradle.kts
|
|
index 4c4d242475c5229e9cdae69fcc328d52af6df4b8..c2a0dd63fe700484ac9473733b10615375d7c2b4 100644
|
|
--- a/build.gradle.kts
|
|
+++ b/build.gradle.kts
|
|
@@ -14,65 +14,29 @@ val alsoShade: Configuration by configurations.creating
|
|
|
|
dependencies {
|
|
implementation(project(":purpur-api")) // Pufferfish // Purpur
|
|
- // Paper start
|
|
- implementation("org.jline:jline-terminal-jansi:3.21.0")
|
|
- implementation("net.minecrell:terminalconsoleappender:1.3.0")
|
|
- implementation("net.kyori:adventure-text-serializer-ansi:4.17.0") // Keep in sync with adventureVersion from Paper-API build file
|
|
- /*
|
|
- Required to add the missing Log4j2Plugins.dat file from log4j-core
|
|
- which has been removed by Mojang. Without it, log4j has to classload
|
|
- all its classes to check if they are plugins.
|
|
- Scanning takes about 1-2 seconds so adding this speeds up the server start.
|
|
- */
|
|
- implementation("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - implementation
|
|
- log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - Needed to generate meta for our Log4j plugins
|
|
- runtimeOnly(log4jPlugins.output)
|
|
- alsoShade(log4jPlugins.output)
|
|
- implementation("io.netty:netty-codec-haproxy:4.1.97.Final") // Paper - Add support for proxy protocol
|
|
- // Paper end
|
|
- implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion
|
|
- implementation("org.ow2.asm:asm-commons:9.7")
|
|
- implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
|
|
- implementation("commons-lang:commons-lang:2.6")
|
|
- runtimeOnly("org.xerial:sqlite-jdbc:3.45.3.0")
|
|
- runtimeOnly("com.mysql:mysql-connector-j:8.3.0")
|
|
- runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
|
|
- // Paper start - Use Velocity cipher
|
|
- implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT") {
|
|
- isTransitive = false
|
|
- }
|
|
- // Paper end - Use Velocity cipher
|
|
-
|
|
- runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
|
|
- runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
|
|
- runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
|
|
|
|
- // Pufferfish start
|
|
- implementation("org.yaml:snakeyaml:1.32")
|
|
- implementation ("me.carleslc.Simple-YAML:Simple-Yaml:1.8.4") {
|
|
- exclude(group="org.yaml", module="snakeyaml")
|
|
- }
|
|
- // Pufferfish end
|
|
- implementation("com.github.technove:Flare:34637f3f87") // Pufferfish - flare
|
|
-
|
|
- implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur
|
|
- implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
|
|
- implementation("dev.omega24:upnp4j:1.0") // Purpur
|
|
-
|
|
- testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
|
|
- testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
|
|
- testImplementation("org.hamcrest:hamcrest:2.2")
|
|
- testImplementation("org.mockito:mockito-core:5.11.0")
|
|
- testImplementation("org.ow2.asm:asm-tree:9.7")
|
|
- testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest
|
|
- implementation("net.neoforged:srgutils:1.0.9") // Paper - mappings handling
|
|
- implementation("net.neoforged:AutoRenamingTool:2.0.3") // Paper - remap plugins
|
|
- // Paper start - Remap reflection
|
|
- val reflectionRewriterVersion = "0.0.1"
|
|
- implementation("io.papermc:reflection-rewriter:$reflectionRewriterVersion")
|
|
- implementation("io.papermc:reflection-rewriter-runtime:$reflectionRewriterVersion")
|
|
- implementation("io.papermc:reflection-rewriter-proxy-generator:$reflectionRewriterVersion")
|
|
- // Paper end - Remap reflection
|
|
+ // Plazma start - Use Gradle Version Catalogs
|
|
+ implementation(common.snakeyaml)
|
|
+ implementation(common.asm.commons)
|
|
+ implementation(common.log4j.core)
|
|
+ implementation(common.log4j.iostreams)
|
|
+ implementation(common.commons.lang2)
|
|
+ implementation(common.adventure.serializer.ansi)
|
|
+ implementation(server.velocity) { isTransitive = false }
|
|
+ implementation(server.simpleyaml) { exclude(group="org.yaml", module="snakeyaml") }
|
|
+ implementation(server.bundles.implementation)
|
|
+
|
|
+ log4jPlugins.annotationProcessorConfigurationName(common.log4j.core)
|
|
+ alsoShade(log4jPlugins.output) // Plazma - Diff on patch
|
|
+ runtimeOnly(log4jPlugins.output) // Plazma - Diff on patch
|
|
+
|
|
+ runtimeOnly(common.maven.provider)
|
|
+ runtimeOnly(common.bundles.maven)
|
|
+ runtimeOnly(server.bundles.runtime)
|
|
+
|
|
+ testImplementation(common.bundles.test)
|
|
+ testImplementation(server.bundles.test)
|
|
+ // Plazma end - Use Gradle Version Catalogs
|
|
}
|
|
|
|
paperweight {
|