Skip to content

Commit a559313

Browse files
committed
Fix libraries not working due to upstream issue
1 parent 88686c5 commit a559313

6 files changed

Lines changed: 19 additions & 19 deletions

File tree

build.gradle.kts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id("maven-publish")
44
id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.10"
55
id("net.kyori.blossom") version "2.1.0"
6-
id("com.gradleup.shadow") version "9.0.0-beta12"
6+
id("com.gradleup.shadow") version "9.0.0-rc1"
77
}
88

99
group = "dev.plex"
@@ -26,10 +26,6 @@ subprojects {
2626
url = uri("https://repository.apache.org/content/repositories/snapshots/")
2727
}
2828

29-
maven {
30-
url = uri("https://repo.maven.apache.org/maven2/")
31-
}
32-
3329
maven {
3430
url = uri("https://jitpack.io")
3531
content {

gradle/wrapper/gradle-wrapper.jar

122 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@ dependencies {
1717
library("org.projectlombok:lombok:1.18.38")
1818
library("org.json:json:20250107")
1919
library("commons-io:commons-io:2.19.0")
20-
library("redis.clients:jedis:6.0.0-beta2")
21-
library("org.mariadb.jdbc:mariadb-java-client:3.5.3")
20+
library("redis.clients:jedis:6.0.0")
21+
library("org.mariadb.jdbc:mariadb-java-client:3.5.4")
2222
library("com.zaxxer:HikariCP:6.3.0")
23-
library("org.apache.maven.resolver:maven-resolver-transport-http:1.9.22")
23+
library("org.apache.maven.resolver:maven-resolver-transport-http:1.9.24")
2424
library("org.jetbrains:annotations:26.0.2")
25-
compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
25+
compileOnly("io.papermc.paper:paper-api:1.21.7-R0.1-SNAPSHOT")
2626
compileOnly("com.github.MilkBowl:VaultAPI:1.7.1") {
2727
exclude("org.bukkit", "bukkit")
2828
}
2929
compileOnly("net.coreprotect:coreprotect:22.4")
3030
compileOnly("network.darkhelmet.prism:Prism-Api:1.0.0")
31+
compileOnly("com.github.LeonMangler:SuperVanish:6.2.19")
3132

3233
implementation("org.bstats:bstats-base:3.1.0")
3334
implementation("org.bstats:bstats-bukkit:3.1.0")
3435

35-
implementation("com.github.LeonMangler:SuperVanish:6.2.18-3")
3636

3737
annotationProcessor("org.projectlombok:lombok:1.18.38")
3838
}

server/src/main/java/dev/plex/PlexLibraryManager.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
import io.papermc.paper.plugin.loader.PluginClasspathBuilder;
55
import io.papermc.paper.plugin.loader.PluginLoader;
66
import io.papermc.paper.plugin.loader.library.impl.MavenLibraryResolver;
7+
78
import java.io.File;
89
import java.io.IOException;
910
import java.io.InputStreamReader;
1011
import java.nio.charset.StandardCharsets;
1112
import java.util.List;
1213
import java.util.Map;
1314
import java.util.stream.Stream;
15+
1416
import org.eclipse.aether.artifact.DefaultArtifact;
1517
import org.eclipse.aether.graph.Dependency;
1618
import org.eclipse.aether.repository.RemoteRepository;
@@ -39,7 +41,12 @@ public PluginLibraries load()
3941
{
4042
try (var in = getClass().getResourceAsStream("/paper-libraries.json"))
4143
{
42-
return new Gson().fromJson(new InputStreamReader(in, StandardCharsets.UTF_8), PluginLibraries.class);
44+
PluginLibraries libraries = new Gson().fromJson(new InputStreamReader(in, StandardCharsets.UTF_8), PluginLibraries.class);
45+
46+
// Patch the MavenRepo to use the default mirror
47+
libraries.repositories.put("MavenRepo", MavenLibraryResolver.MAVEN_CENTRAL_DEFAULT_MIRROR);
48+
49+
return libraries;
4350
}
4451
catch (IOException e)
4552
{
@@ -51,14 +58,12 @@ private record PluginLibraries(Map<String, String> repositories, List<String> de
5158
{
5259
public Stream<Dependency> asDependencies()
5360
{
54-
return dependencies.stream()
55-
.map(d -> new Dependency(new DefaultArtifact(d), null));
61+
return dependencies.stream().map(d -> new Dependency(new DefaultArtifact(d), null));
5662
}
5763

5864
public Stream<RemoteRepository> asRepositories()
5965
{
60-
return repositories.entrySet().stream()
61-
.map(e -> new RemoteRepository.Builder(e.getKey(), "default", e.getValue()).build());
66+
return repositories.entrySet().stream().map(e -> new RemoteRepository.Builder(e.getKey(), "default", e.getValue()).build());
6267
}
6368
}
6469
}

0 commit comments

Comments
 (0)