Last active
June 7, 2019 22:36
-
-
Save Byteflux/16107300bc605c4f04b1125660cc663c to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/pom.xml b/pom.xml | |
index 4bfafb88..89a147c5 100644 | |
--- a/pom.xml | |
+++ b/pom.xml | |
@@ -101,7 +101,7 @@ | |
</relocation> | |
<relocation> | |
<pattern>org.apache.commons</pattern> | |
- <shadedPattern>me.glaremasters.guilds.libs.commons-io</shadedPattern> | |
+ <shadedPattern>me.glaremasters.guilds.libs.commonsio</shadedPattern> | |
</relocation> | |
<relocation> | |
<pattern>com.google.common</pattern> | |
diff --git a/src/main/java/me/glaremasters/guilds/Guilds.java b/src/main/java/me/glaremasters/guilds/Guilds.java | |
index 15dfbbea..385f5e34 100644 | |
--- a/src/main/java/me/glaremasters/guilds/Guilds.java | |
+++ b/src/main/java/me/glaremasters/guilds/Guilds.java | |
@@ -142,7 +142,7 @@ public final class Guilds extends JavaPlugin { | |
* @param loader the loader to add to | |
*/ | |
private void loadDepLibs(LibraryLoader loader) { | |
- loader.loadLibrary(Library.builder().groupId("commons-io").artifactId("commons-io").version("2.6").checksum("+HfTBGYKwqFC84ZbrfyXHex+1zx0fH+NXS9ROcpzZRM=").relocate("org.apache.commons", "me.glaremasters.guilds.libs.commons-io").build()); | |
+ loader.loadLibrary(Library.builder().groupId("commons-io").artifactId("commons-io").version("2.6").checksum("+HfTBGYKwqFC84ZbrfyXHex+1zx0fH+NXS9ROcpzZRM=").relocate("org{}apache{}commons", "me.glaremasters.guilds.libs.commonsio").build()); | |
loader.loadLibrary(Library.builder().groupId("co.aikar").artifactId("taskchain-core").version("3.7.2").checksum("OpSCCN+7v6gqFpsU/LUNOOXzjImwjyE2ShHZ5xFUj/Q=").build()); | |
loader.loadLibrary(Library.builder().groupId("co.aikar").artifactId("taskchain-bukkit").version("3.7.2").checksum("B/O3+zWGalLs8otAr8tdNnIc/39FDRh6tN5qvNgfEaI=").build()); | |
loader.loadLibrary(Library.builder().groupId("net.lingala.zip4j").artifactId("zip4j").version("1.3.2").checksum("xnCY1DDFdDEUMnKOvUx8RWcvnM9cZHAutq+4gWwirQg=").build()); | |
@@ -151,9 +151,9 @@ public final class Guilds extends JavaPlugin { | |
loader.loadLibrary(Library.builder().groupId("net.minidev").artifactId("json-smart").version("1.1.1").checksum("zr2iXDGRqkQWc8Q9elqVZ6pdhqEBAa6RWohckLzuh3E=").build()); | |
loader.loadLibrary(Library.builder().groupId("org.codemc.worldguardwrapper").artifactId("worldguardwrapper").version("1.1.6-SNAPSHOT").checksum("G023FrJyvpmZxVWeXcGUCBipNB3BSA3rKcKPnCP7Sac=").build()); | |
loader.loadLibrary(Library.builder().groupId("org.javassist").artifactId("javassist").version("3.21.0-GA").checksum("eqWeAx+UGYSvB9rMbKhebcm9OkhemqJJTLwDTvoSJdA=").build()); | |
- loader.loadLibrary(Library.builder().groupId("org.reflections").artifactId("reflections").version("0.9.11").checksum("zKiEKPiokZ34hRBYM9Rf8HvSb5hflu5VaQVRIWtYtKE=").build()); | |
+ loader.loadLibrary(Library.builder().groupId("org.reflections").artifactId("reflections").version("0.9.11").checksum("zKiEKPiokZ34hRBYM9Rf8HvSb5hflu5VaQVRIWtYtKE=").relocate("com{}google{}common", "me.glaremasters.guilds.libs.guava").build()); | |
loader.loadLibrary(Library.builder().groupId("ch.jalu").artifactId("configme").version("1.1.0").checksum("c3EUKZSs/xPSHwn/K0KMf9hTbN0ijRXyIBtOg5PxUnI=").build()); | |
- loader.loadLibrary(Library.builder().groupId("com.google.guava").artifactId("guava").version("21.0").checksum("lyE5cYq8ikiT+njLqM97LJA/Ncl6r0T6MDGwZplItIA=").relocate("com.google.common", "me.glaremasters.guilds.libs.guava").build()); | |
+ loader.loadLibrary(Library.builder().groupId("com.google.guava").artifactId("guava").version("21.0").checksum("lyE5cYq8ikiT+njLqM97LJA/Ncl6r0T6MDGwZplItIA=").relocate("com{}google{}common", "me.glaremasters.guilds.libs.guava").build()); | |
} | |
/** | |
diff --git a/src/main/java/me/glaremasters/guilds/dependency/Relocation.java b/src/main/java/me/glaremasters/guilds/dependency/Relocation.java | |
index c19d2248..e6cdf53a 100644 | |
--- a/src/main/java/me/glaremasters/guilds/dependency/Relocation.java | |
+++ b/src/main/java/me/glaremasters/guilds/dependency/Relocation.java | |
@@ -15,8 +15,8 @@ public class Relocation { | |
private final Collection<String> excludes; | |
private Relocation(String pattern, String relocatedPattern, Collection<String> includes, Collection<String> excludes) { | |
- this.pattern = requireNonNull(pattern, "pattern"); | |
- this.relocatedPattern = requireNonNull(relocatedPattern, "relocatedPattern"); | |
+ this.pattern = requireNonNull(pattern, "pattern").replace("{}", "."); | |
+ this.relocatedPattern = requireNonNull(relocatedPattern, "relocatedPattern").replace("{}", "."); | |
this.includes = includes != null ? Collections.unmodifiableList(new LinkedList<>(includes)) : Collections.emptyList(); | |
this.excludes = excludes != null ? Collections.unmodifiableList(new LinkedList<>(excludes)) : Collections.emptyList(); | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment