Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-27 11:07:39 +01:00
Code Issues Projects Releases Wiki Activity

Fetch modules from the API endpoint

Browse Source
This commit is contained in:
Riley Park 2020-12-29 16:06:30 -08:00
parent e6b1b105d0
commit a112cfe996
No known key found for this signature in database
GPG Key ID: D831AF236C834E45
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
BungeeCord-Patches/0006-Fetch-modules-from-the-Waterfall-CI.patch → BungeeCord-Patches/0006-Fetch-modules-from-the-Waterfall-API-endpoint.patch
View File

@ -1,12 +1,12 @@
From 6b7dd2468dbdf6289bf10352dd4f96b70fa39483 Mon Sep 17 00:00:00 2001 From 464a071b85e1669aa6dbdc1e1c2283807bbb5f0e Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 11:34:52 -0700 Date: Thu, 19 May 2016 11:34:52 -0700
Subject: [PATCH] Fetch modules from the Waterfall CI Subject: [PATCH] Fetch modules from the Waterfall API endpoint
Don't fetch from the BungeeCord CI, as that only has their modules Don't fetch from the BungeeCord CI, as that only has their modules
diff --git a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java diff --git a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
index 2536435c..9b20d0df 100644 index 2536435c..338c30d3 100644
--- a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java --- a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
+++ b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java +++ b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
@ -22,12 +22,19 @@ index 2536435c..9b20d0df 100644
import lombok.Data; import lombok.Data;
import net.md_5.bungee.Util; import net.md_5.bungee.Util;
@@ -18,13 +18,14 @@ public class JenkinsModuleSource implements ModuleSource @@ -18,13 +18,21 @@ public class JenkinsModuleSource implements ModuleSource
System.out.println( "Attempting to Jenkins download module " + module.getName() + " v" + version.getBuild() ); System.out.println( "Attempting to Jenkins download module " + module.getName() + " v" + version.getBuild() );
try try
{ {
- URL website = new URL( "https://ci.md-5.net/job/BungeeCord/" + version.getBuild() + "/artifact/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" ); - URL website = new URL( "https://ci.md-5.net/job/BungeeCord/" + version.getBuild() + "/artifact/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
+ URL website = new URL( "https://papermc.io/ci/job/Waterfall/" + version.getBuild() + "/artifact/Waterfall-Proxy/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" ); + final String url = String.format(
+ "https://papermc.io/api/v2/projects/%1$s/versions/%2$s/builds/%3$s/downloads/%4$s-%2$s-%3$s.jar",
+ "waterfall",
+ net.md_5.bungee.api.ProxyServer.getInstance().getVersion().split(":")[2].split("-")[0],
+ version.getBuild(),
+ module.getName()
+ );
+ URL website = new URL( url );
URLConnection con = website.openConnection(); URLConnection con = website.openConnection();
// 15 second timeout at various stages // 15 second timeout at various stages
con.setConnectTimeout( 15000 ); con.setConnectTimeout( 15000 );
@ -40,5 +47,5 @@ index 2536435c..9b20d0df 100644
} catch ( IOException ex ) } catch ( IOException ex )
{ {
-- --
2.20.1 2.29.2