Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated upstream

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-07 20:49:42 -05:00
committed by BillyGalbreath
parent b8fed8aaf2
commit 4944e87d37
6 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@@ -1,4 +1,4 @@
[submodule "Paper"] [submodule "Paper"]
path = Paper path = Paper
url = https://github.com/PaperMC/Paper.git url = https://github.com/PaperMC/Paper.git
branch = ver/1.14-pre5 branch = ver/1.14

2
Paper

Submodule Paper updated: bc024aec6e...427078900e

2
current-paper
View File

@@ -1 +1 @@
1.14--4168b329732ffe495224049fa0e0b8fec6acbb40 1.14--6d2fa1e300cfaf9bf99fb2a8f05f062f2aa3ba3b

19
patches/api/0001-Rebrand.patch
View File

@@ -1,12 +1,12 @@
From 7b6ccc334157135036716bd93907cbb34f28cd82 Mon Sep 17 00:00:00 2001 From 030c7d02cb82e6d69c78911fb6deaceabd05f7c7 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 00:57:16 -0500 Date: Sat, 4 May 2019 00:57:16 -0500
Subject: [PATCH] Rebrand Subject: [PATCH] Rebrand
--- ---
pom.xml | 9 ++++---- pom.xml | 9 ++++-----
.../command/defaults/VersionCommand.java | 21 +++++++++++-------- .../command/defaults/VersionCommand.java | 20 ++++++++++---------
2 files changed, 16 insertions(+), 14 deletions(-) 2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 81aefdf7..d73f48ae 100644 index 81aefdf7..d73f48ae 100644
@@ -36,7 +36,7 @@ index 81aefdf7..d73f48ae 100644
<properties> <properties>
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
index a36ab04c..42c88ae1 100644 index ece8d1c8..0c1b0a61 100644
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
@@ -211,8 +211,8 @@ public class VersionCommand extends BukkitCommand { @@ -211,8 +211,8 @@ public class VersionCommand extends BukkitCommand {
@@ -50,7 +50,7 @@ index a36ab04c..42c88ae1 100644
int distance = getDistance(null, parts[0]); int distance = getDistance(null, parts[0]);
switch (distance) { switch (distance) {
case -1: case -1:
@@ -263,13 +263,16 @@ public class VersionCommand extends BukkitCommand { @@ -263,13 +263,15 @@ public class VersionCommand extends BukkitCommand {
// Paper start // Paper start
private static int getDistance(@NotNull String repo, @NotNull String verInfo) { private static int getDistance(@NotNull String repo, @NotNull String verInfo) {
@@ -59,17 +59,16 @@ index a36ab04c..42c88ae1 100644
- return getFromJenkins(currentVer); - return getFromJenkins(currentVer);
- } catch (NumberFormatException ex) { - } catch (NumberFormatException ex) {
- verInfo = verInfo.replace("\"", ""); - verInfo = verInfo.replace("\"", "");
- return getFromRepo("PaperMC/Paper", "master", verInfo); - return getFromRepo("PaperMC/Paper", "ver/1.14", verInfo); // Just for now
- } - }
+ // Purpur start + // Purpur start
+ //try { + //try {
+ // int currentVer = Integer.decode(verInfo); + // int currentVer = Integer.decode(verInfo);
+ // return getFromJenkins(currentVer); + // return getFromJenkins(currentVer);
+ //} catch (NumberFormatException ex) { + //} catch (NumberFormatException ex) {
+ // verInfo = verInfo.replace("\"", ""); + //verInfo = verInfo.replace("\"", "");
+ // return getFromRepo("PaperMC/Paper", "master", verInfo); + return getFromRepo("pl3xgaming/Purpur", "ver/1.14", verInfo.replace("\"", ""));
+ //} + //}
+ return getFromRepo("pl3xgaming/Purpur", "master", verInfo.replace("\"", ""));
+ // Purpur end + // Purpur end
/* /*
BufferedReader reader = Resources.asCharSource( BufferedReader reader = Resources.asCharSource(

2
scripts/generatesources.sh
View File

@@ -13,7 +13,7 @@ cd $basedir
paperVer=$(cat current-paper) paperVer=$(cat current-paper)
minecraftversion=$(cat $basedir/Paper/work/BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4) minecraftversion=$(cat $basedir/Paper/work/BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4)
decompile="Paper/work/Minecraft/$minecraftversion/forge" decompile="Paper/work/Minecraft/$minecraftversion/spigot"
mkdir -p mc-dev/src/net/minecraft/server mkdir -p mc-dev/src/net/minecraft/server

2
scripts/upstream.sh
View File

@@ -11,7 +11,7 @@ done
if [[ "$1" == up* ]]; then if [[ "$1" == up* ]]; then
( (
cd "$basedir/Paper/" cd "$basedir/Paper/"
git fetch && git reset --hard origin/ver/1.14-pre5 git fetch && git reset --hard origin/ver/1.14
cd ../ cd ../
git add Paper git add Paper
) )