mirror of
https://github.com/PaperMC/Waterfall.git
synced 2025-02-14 02:41:38 +01:00
25ecd402f3
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: 1a807731 #3567: Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.2 to 3.6.3 772ad995 #3566: Bump actions/setup-java from 3 to 4 2431c40a #3562: Bump io.netty:netty-bom from 4.1.100.Final to 4.1.101.Final 8144ae8d #3555: Bump com.mysql:mysql-connector-j from 8.1.0 to 8.2.0 0757c39a Attempt upgrade of resolver libraries
52 lines
2.4 KiB
Diff
52 lines
2.4 KiB
Diff
From f2f55cb7743a44bc8d0db757315cbfab4d43f22f Mon Sep 17 00:00:00 2001
|
|
From: Tux <write@imaginarycode.com>
|
|
Date: Thu, 19 May 2016 11:34:52 -0700
|
|
Subject: [PATCH] Fetch modules from the Waterfall API endpoint
|
|
|
|
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
|
|
index 2536435c..5bb86152 100644
|
|
--- a/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 @@
|
|
package net.md_5.bungee.module;
|
|
|
|
-import com.google.common.io.ByteStreams;
|
|
-import com.google.common.io.Files;
|
|
import java.io.IOException;
|
|
import java.net.URL;
|
|
import java.net.URLConnection;
|
|
+import java.nio.file.Files;
|
|
+import java.nio.file.StandardCopyOption;
|
|
import lombok.Data;
|
|
import net.md_5.bungee.Util;
|
|
|
|
@@ -18,13 +18,21 @@ public class JenkinsModuleSource implements ModuleSource
|
|
System.out.println( "Attempting to Jenkins download module " + module.getName() + " v" + version.getBuild() );
|
|
try
|
|
{
|
|
- URL website = new URL( "https://ci.md-5.net/job/BungeeCord/" + version.getBuild() + "/artifact/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
|
|
+ final String url = String.format(
|
|
+ "https://api.papermc.io/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();
|
|
// 15 second timeout at various stages
|
|
con.setConnectTimeout( 15000 );
|
|
con.setReadTimeout( 15000 );
|
|
+ con.setRequestProperty( "User-Agent", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36" );
|
|
|
|
- Files.write( ByteStreams.toByteArray( con.getInputStream() ), module.getFile() );
|
|
+ Files.copy( con.getInputStream(), module.getFile().toPath(), StandardCopyOption.REPLACE_EXISTING );
|
|
System.out.println( "Download complete" );
|
|
} catch ( IOException ex )
|
|
{
|
|
--
|
|
2.43.0
|
|
|