Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@5613ed6d Provide env environment variable and copy spigots sys prop for overriding default repository
PaperMC/Paper@62b7f86d Avoid and discourage use of Maven Central as a CDN (#12689)
PaperMC/Paper@f5534cb7 [ci/skip] Run generators (#12691)
This commit is contained in:
granny
2025-06-18 18:20:38 -07:00
parent 46a28b93bd
commit 162bd2883b
2 changed files with 4 additions and 4 deletions

View File

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.21.6-R0.1-SNAPSHOT
mcVersion = 1.21.6
paperCommit = 8980ead7ea8dddf4a1a37de7fc5d0d6fe7f86a37
paperCommit = f5534cb7c72733f193b535c9ff5eeacfae44992b
org.gradle.configuration-cache = true
org.gradle.caching = true

View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
@@ -63,6 +_,7 @@
@@ -66,6 +_,7 @@
session.setTransferListener(new AbstractTransferListener() {
@Override
public void transferStarted(@NotNull TransferEvent event) {
@@ -8,7 +8,7 @@
logger.log(Level.INFO, "Downloading {0}", event.getResource().getRepositoryUrl() + event.getResource().getResourceName());
}
});
@@ -88,6 +_,7 @@
@@ -91,6 +_,7 @@
// Paper end - plugin loader api
return null;
}
@@ -16,7 +16,7 @@
logger.log(Level.INFO, "[{0}] Loading {1} libraries... please wait", new Object[]
{
java.util.Objects.requireNonNullElseGet(desc.getPrefix(), desc::getName), desc.getLibraries().size() // Paper - use configured log prefix
@@ -140,6 +_,7 @@
@@ -143,6 +_,7 @@
}
jarFiles.add(url);