diff --git a/Plan/build.gradle b/Plan/build.gradle index 6608deebb..d47690ee9 100644 --- a/Plan/build.gradle +++ b/Plan/build.gradle @@ -8,7 +8,7 @@ buildscript { plugins { id "com.github.johnrengelman.shadow" version "7.0.0" apply false - id "io.github.slimjar" version "1.2.1" apply false + id "io.github.slimjar" version "1.2.2" apply false id "java" id "jacoco" id "checkstyle" @@ -100,6 +100,7 @@ subprojects { maven { url = "https://repo.md-5.net/content/repositories/snapshots/" } // RedisBungee maven { url = "https://repo.velocitypowered.com/snapshots/" } // Velocity maven { url = "https://repo.playeranalytics.net/releases" } // Plan + maven { url = " https://repo.vshnv.tech/"} // slimjar } dependencies { diff --git a/Plan/bukkit/src/main/java/com/djrapitops/plan/Plan.java b/Plan/bukkit/src/main/java/com/djrapitops/plan/Plan.java index 34eec8519..bac579340 100644 --- a/Plan/bukkit/src/main/java/com/djrapitops/plan/Plan.java +++ b/Plan/bukkit/src/main/java/com/djrapitops/plan/Plan.java @@ -26,6 +26,7 @@ import com.djrapitops.plan.settings.locale.Locale; import com.djrapitops.plan.settings.locale.lang.PluginLang; import com.djrapitops.plan.settings.theme.PlanColorScheme; import io.github.slimjar.app.builder.ApplicationBuilder; +import io.github.slimjar.resolver.data.Repository; import net.playeranalytics.plugin.BukkitPlatformLayer; import net.playeranalytics.plugin.PlatformAbstractionLayer; import net.playeranalytics.plugin.scheduling.RunnableFactory; @@ -37,8 +38,10 @@ import org.bukkit.plugin.java.JavaPlugin; import java.io.IOException; import java.net.URISyntaxException; +import java.net.URL; import java.nio.file.Paths; import java.security.NoSuchAlgorithmException; +import java.util.Collections; import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; @@ -71,6 +74,8 @@ public class Plan extends JavaPlugin implements PlanPlugin { try { ApplicationBuilder.appending("Plan") .logger((message, args) -> getLogger().log(Level.INFO, message, args)) + // Use paper repository for downloading slimjar dependencies + .internalRepositories(Collections.singletonList(new Repository(new URL("https://papermc.io/repo/repository/maven-public/")))) .downloadDirectoryPath(Paths.get(getDataFolder().getAbsolutePath()).resolve("libraries")) .build(); } catch (IOException | ReflectiveOperationException | URISyntaxException | NoSuchAlgorithmException e) { diff --git a/Plan/bungeecord/src/main/java/com/djrapitops/plan/PlanBungee.java b/Plan/bungeecord/src/main/java/com/djrapitops/plan/PlanBungee.java index 0cbaf3934..2f1160c61 100644 --- a/Plan/bungeecord/src/main/java/com/djrapitops/plan/PlanBungee.java +++ b/Plan/bungeecord/src/main/java/com/djrapitops/plan/PlanBungee.java @@ -24,6 +24,7 @@ import com.djrapitops.plan.settings.locale.Locale; import com.djrapitops.plan.settings.locale.lang.PluginLang; import com.djrapitops.plan.settings.theme.PlanColorScheme; import io.github.slimjar.app.builder.ApplicationBuilder; +import io.github.slimjar.resolver.data.Repository; import net.md_5.bungee.api.plugin.Plugin; import net.playeranalytics.plugin.BungeePlatformLayer; import net.playeranalytics.plugin.PlatformAbstractionLayer; @@ -33,8 +34,10 @@ import net.playeranalytics.plugin.server.PluginLogger; import java.io.IOException; import java.io.InputStream; import java.net.URISyntaxException; +import java.net.URL; import java.nio.file.Paths; import java.security.NoSuchAlgorithmException; +import java.util.Collections; import java.util.logging.Level; import java.util.logging.Logger; @@ -62,6 +65,8 @@ public class PlanBungee extends Plugin implements PlanPlugin { try { ApplicationBuilder.appending("Plan") .logger((message, args) -> getLogger().log(Level.INFO, message, args)) + // Use paper repository for downloading slimjar dependencies + .internalRepositories(Collections.singletonList(new Repository(new URL("https://papermc.io/repo/repository/maven-public/")))) .downloadDirectoryPath(Paths.get(getDataFolder().getAbsolutePath()).resolve("libraries")) .build(); } catch (IOException | ReflectiveOperationException | URISyntaxException | NoSuchAlgorithmException e) { diff --git a/Plan/common/build.gradle b/Plan/common/build.gradle index bcbb3a7c3..668e9d00b 100644 --- a/Plan/common/build.gradle +++ b/Plan/common/build.gradle @@ -13,6 +13,7 @@ dependencies { implementation "org.slf4j:slf4j-api:$slf4jVersion" implementation "com.maxmind.geoip2:geoip2:$geoIpVersion" implementation "com.google.code.gson:gson:$gsonVersion" + implementation slimjar("1.2.5") testImplementation project(":api") testImplementation "com.google.code.gson:gson:$gsonVersion" diff --git a/Plan/nukkit/src/main/java/com/djrapitops/plan/PlanNukkit.java b/Plan/nukkit/src/main/java/com/djrapitops/plan/PlanNukkit.java index 5112d0d5f..92d7087e1 100644 --- a/Plan/nukkit/src/main/java/com/djrapitops/plan/PlanNukkit.java +++ b/Plan/nukkit/src/main/java/com/djrapitops/plan/PlanNukkit.java @@ -30,6 +30,7 @@ import com.djrapitops.plan.settings.locale.lang.PluginLang; import com.djrapitops.plan.settings.theme.PlanColorScheme; import com.djrapitops.plan.utilities.logging.ErrorContext; import io.github.slimjar.app.builder.ApplicationBuilder; +import io.github.slimjar.resolver.data.Repository; import net.playeranalytics.plugin.NukkitPlatformLayer; import net.playeranalytics.plugin.PlatformAbstractionLayer; import net.playeranalytics.plugin.scheduling.RunnableFactory; @@ -37,12 +38,10 @@ import net.playeranalytics.plugin.server.PluginLogger; import java.io.IOException; import java.net.URISyntaxException; +import java.net.URL; import java.nio.file.Paths; import java.security.NoSuchAlgorithmException; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; +import java.util.*; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; @@ -76,6 +75,8 @@ public class PlanNukkit extends PluginBase implements PlanPlugin { try { ApplicationBuilder.appending("Plan") .logger((message, args) -> Logger.getGlobal().log(Level.INFO, message, args)) + // Use paper repository for downloading slimjar dependencies + .internalRepositories(Collections.singletonList(new Repository(new URL("https://papermc.io/repo/repository/maven-public/")))) .downloadDirectoryPath(Paths.get(getDataFolder().getAbsolutePath()).resolve("libraries")) .build(); } catch (IOException | ReflectiveOperationException | URISyntaxException | NoSuchAlgorithmException e) { diff --git a/Plan/sponge/src/main/java/com/djrapitops/plan/PlanSponge.java b/Plan/sponge/src/main/java/com/djrapitops/plan/PlanSponge.java index aa1184635..da6585336 100644 --- a/Plan/sponge/src/main/java/com/djrapitops/plan/PlanSponge.java +++ b/Plan/sponge/src/main/java/com/djrapitops/plan/PlanSponge.java @@ -25,6 +25,7 @@ import com.djrapitops.plan.settings.locale.Locale; import com.djrapitops.plan.settings.locale.lang.PluginLang; import com.djrapitops.plan.settings.theme.PlanColorScheme; import io.github.slimjar.app.builder.ApplicationBuilder; +import io.github.slimjar.resolver.data.Repository; import net.playeranalytics.plugin.PlatformAbstractionLayer; import net.playeranalytics.plugin.SpongePlatformLayer; import net.playeranalytics.plugin.scheduling.RunnableFactory; @@ -48,8 +49,10 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.net.URISyntaxException; +import java.net.URL; import java.nio.file.Paths; import java.security.NoSuchAlgorithmException; +import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Optional; @@ -125,6 +128,8 @@ public class PlanSponge implements PlanPlugin { try { ApplicationBuilder.appending("Plan") .logger((message, args) -> java.util.logging.Logger.getGlobal().log(Level.INFO, message, args)) + // Use paper repository for downloading slimjar dependencies + .internalRepositories(Collections.singletonList(new Repository(new URL("https://papermc.io/repo/repository/maven-public/")))) .downloadDirectoryPath(Paths.get(getDataFolder().getAbsolutePath()).resolve("libraries")) .build(); } catch (IOException | ReflectiveOperationException | URISyntaxException | NoSuchAlgorithmException e) { diff --git a/Plan/velocity/src/main/java/com/djrapitops/plan/PlanVelocity.java b/Plan/velocity/src/main/java/com/djrapitops/plan/PlanVelocity.java index 8e3bb8c9f..8cc969391 100644 --- a/Plan/velocity/src/main/java/com/djrapitops/plan/PlanVelocity.java +++ b/Plan/velocity/src/main/java/com/djrapitops/plan/PlanVelocity.java @@ -32,6 +32,7 @@ import com.velocitypowered.api.plugin.Plugin; import com.velocitypowered.api.plugin.annotation.DataDirectory; import com.velocitypowered.api.proxy.ProxyServer; import io.github.slimjar.app.builder.ApplicationBuilder; +import io.github.slimjar.resolver.data.Repository; import net.playeranalytics.plugin.PlatformAbstractionLayer; import net.playeranalytics.plugin.VelocityPlatformLayer; import net.playeranalytics.plugin.scheduling.RunnableFactory; @@ -43,9 +44,11 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.net.URISyntaxException; +import java.net.URL; import java.nio.file.Path; import java.nio.file.Paths; import java.security.NoSuchAlgorithmException; +import java.util.Collections; import java.util.logging.Level; /** @@ -108,6 +111,8 @@ public class PlanVelocity implements PlanPlugin { try { ApplicationBuilder.appending("Plan") .logger((message, args) -> java.util.logging.Logger.getGlobal().log(Level.INFO, message, args)) + // Use paper repository for downloading slimjar dependencies + .internalRepositories(Collections.singletonList(new Repository(new URL("https://papermc.io/repo/repository/maven-public/")))) .downloadDirectoryPath(Paths.get(getDataFolder().getAbsolutePath()).resolve("libraries")) .build(); } catch (IOException | ReflectiveOperationException | URISyntaxException | NoSuchAlgorithmException e) {