mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-26 18:39:23 +00:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@b0da38c2 Repository details in RuntimeException for MavenLibraryResolver#addRepository (#12939) PaperMC/Paper@1922be90 Update custom tags (#12183) PaperMC/Paper@79cf1353 Ignore HopperInventorySearchEvent when it has no listeners (#13009) PaperMC/Paper@ea014f7a feat: add stuckEntityPoiRetryDelay config (#12949) PaperMC/Paper@a9e76749 Support for showNotification in PlayerRecipeDiscoverEvent (#12992) PaperMC/Paper@5622c9dd Expose attribute sentiment (#12974) PaperMC/Paper@42b653b1 Expose more argument types (#12665) PaperMC/Paper@52d9a221 [ci/skip] Fix typo in Display javadoc (#13010) PaperMC/Paper@614e9acf Improve APIs around riptide tridents (#12996) PaperMC/Paper@51706e5a Fixed DyeItem sheep dye hunk
This commit is contained in:
@@ -10,7 +10,7 @@ This able to switch back to maven central repo, to prevent
|
||||
situation that dependencies exist in maven central, but not in mirror.
|
||||
|
||||
diff --git a/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java b/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java
|
||||
index c1fccd64b1329e31ccf7e6a11853ce3a749b7ea4..6e0be8c43502aece01371554c3ff60cb97f12944 100644
|
||||
index 298bb04c294a89ad783eb3dac73faf47fa5fb1ba..bb715d2ee5b0c548ac2d2d07bfaa2cb456794bb9 100644
|
||||
--- a/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java
|
||||
+++ b/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java
|
||||
@@ -122,7 +122,7 @@ public class MavenLibraryResolver implements ClassPathLibrary {
|
||||
@@ -19,6 +19,6 @@ index c1fccd64b1329e31ccf7e6a11853ce3a749b7ea4..6e0be8c43502aece01371554c3ff60cb
|
||||
LOGGER.warn(
|
||||
- "Use of Maven Central as a CDN is against the Maven Central Terms of Service. Use MavenLibraryResolver.MAVEN_CENTRAL_DEFAULT_MIRROR instead.",
|
||||
+ "Use of Maven Central as a CDN is against the Maven Central Terms of Service. Use MavenLibraryResolver.MAVEN_CENTRAL_DEFAULT_MIRROR instead. DO NOT report this to Paper or Leaf! Please contact plugin's support to adapt this change.", // Leaf - Better warning message for discouraging Maven Central as CDN
|
||||
new RuntimeException("Plugin used Maven Central for library resolution")
|
||||
new RuntimeException("Plugin used Maven Central for library resolution (%s)".formatted(remoteRepository.toString()))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ Add JVM flag `-DLeaf.library-download-repo=link` to choose library download repo
|
||||
e.g. `-DLeaf.library-download-repo=https://maven.aliyun.com/repository/public`
|
||||
|
||||
diff --git a/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java b/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java
|
||||
index 0c0c14936bf5a45ac7e2bf486cdb82da31b33b46..68400696343ab0846d3a4c9bb29c98e1f0d83584 100644
|
||||
index bb715d2ee5b0c548ac2d2d07bfaa2cb456794bb9..91fcd904bc01be3e05e64023e31ce08cc2a836c9 100644
|
||||
--- a/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java
|
||||
+++ b/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java
|
||||
@@ -59,12 +59,25 @@ public class MavenLibraryResolver implements ClassPathLibrary {
|
||||
@@ -54,7 +54,7 @@ index 0c0c14936bf5a45ac7e2bf486cdb82da31b33b46..68400696343ab0846d3a4c9bb29c98e1
|
||||
+ // Leaf end - Configurable LibraryLoader maven repos
|
||||
LOGGER.warn(
|
||||
"Use of Maven Central as a CDN is against the Maven Central Terms of Service. Use MavenLibraryResolver.MAVEN_CENTRAL_DEFAULT_MIRROR instead. DO NOT report this to Paper or Leaf! Please contact plugin's support to adapt this change.", // Leaf - Better warning message for discouraging Maven Central as CDN
|
||||
new RuntimeException("Plugin used Maven Central for library resolution")
|
||||
new RuntimeException("Plugin used Maven Central for library resolution (%s)".formatted(remoteRepository.toString()))
|
||||
);
|
||||
+ // Leaf start - Configurable LibraryLoader maven repos
|
||||
+ }
|
||||
|
||||
Reference in New Issue
Block a user