Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-28 13:15:31 +01:00
Code Issues Projects Releases Wiki Activity

Update jenkins and urls to point towards papermc

Browse Source
This commit is contained in:
Shane Freeder 2019-01-13 22:17:54 +00:00
parent f3b7697bbf
commit 85d4001642
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BungeeCord-Patches/0006-Fetch-modules-from-the-Waterfall-CI.patch
View File

@ -1,4 +1,4 @@
From f8f184cb101633ece93dd65d1d7cf8f54d41ebe5 Mon Sep 17 00:00:00 2001 From 6b7dd2468dbdf6289bf10352dd4f96b70fa39483 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 CI
@ -6,7 +6,7 @@ Subject: [PATCH] Fetch modules from the Waterfall CI
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..e1cf0010 100644 index 2536435c..9b20d0df 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 @@
@ -27,7 +27,7 @@ index 2536435c..e1cf0010 100644
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://ci.destroystokyo.com/job/Waterfall/" + version.getBuild() + "/artifact/Waterfall-Proxy/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" );
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 +40,5 @@ index 2536435c..e1cf0010 100644
} catch ( IOException ex ) } catch ( IOException ex )
{ {
-- --
2.19.0 2.20.1

6
BungeeCord-Patches/0035-Improve-outdated-build-message.patch
View File

@ -1,11 +1,11 @@
From 0d2024006bef83ca8ead4c18e644db6caf406fd2 Mon Sep 17 00:00:00 2001 From 73a8aa42b159f0d2c1e0b0f1ade0e52f7c5a2b93 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk> From: Jamie Mansfield <dev@jamierocks.uk>
Date: Sat, 10 Jun 2017 20:56:02 +0100 Date: Sat, 10 Jun 2017 20:56:02 +0100
Subject: [PATCH] Improve outdated build message Subject: [PATCH] Improve outdated build message
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
index 20681838..31cde42d 100644 index 20681838..e615f1ff 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
@@ -42,9 +42,9 @@ public class BungeeCordLauncher @@ -42,9 +42,9 @@ public class BungeeCordLauncher
@ -16,7 +16,7 @@ index 20681838..31cde42d 100644
- System.err.println( "*** Please download a new build from https://ci.destroystokyo.com/job/Waterfall/ ***" ); - System.err.println( "*** Please download a new build from https://ci.destroystokyo.com/job/Waterfall/ ***" );
- System.err.println( "*** You will get NO support regarding this build ***" ); - System.err.println( "*** You will get NO support regarding this build ***" );
+ System.err.println( "*** Hey! This build is potentially outdated :( ***" ); + System.err.println( "*** Hey! This build is potentially outdated :( ***" );
+ System.err.println( "*** Please check for a new build from https://ci.destroystokyo.com/job/Waterfall/ ***" ); + System.err.println( "*** Please check for a new build from https://papermc.io/ci/job/Waterfall/ ***" );
+ System.err.println( "*** Should this build be outdated, you will get NO support for it. ***" ); + System.err.println( "*** Should this build be outdated, you will get NO support for it. ***" );
System.err.println( "*** Server will start in 10 seconds ***" ); System.err.println( "*** Server will start in 10 seconds ***" );
Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) ); Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) );

2
README.md
View File

@ -1,4 +1,4 @@
Waterfall [![Build Status](https://ci.destroystokyo.com/job/Waterfall/badge/icon)](https://ci.destroystokyo.com/job/Waterfall/) Waterfall [![Build Status](https://papermc.io/ci/job/Waterfall/badge/icon)](https://papermc.io/ci/job/Waterfall/)
========= =========
Waterfall is a fork of the well-known [BungeeCord](https://github.com/SpigotMC/BungeeCord) server teleportation suite. Waterfall is a fork of the well-known [BungeeCord](https://github.com/SpigotMC/BungeeCord) server teleportation suite.