Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

update upstream and fix scripts

Browse Source
This commit is contained in:
ㄗㄠˋ ㄑㄧˊ
2020-04-11 13:13:24 +08:00
parent 15e263286f
commit 6a3b8598fb
6 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 23ee0a8a88...0ed6da7ab2

2
akarin
View File

@@ -12,7 +12,7 @@ case "$1" in
( (
set -e set -e
cd "$basedir" cd "$basedir"
scripts/rebuildPatches.sh "$basedir" $2 || exit 1 scripts/rebuildpatches.sh "$basedir" || exit 1
) || failed=1 ) || failed=1
;; ;;
"p" | "patch" | "apply") "p" | "patch" | "apply")

2
patches/server/0007-Remove-method-profiler-callers.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Remove method profiler callers
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 15450f36a40908e957cf3ee4e7e392989cdd3617..d9f9892880e894a3a4e7cabaef95b480d61b0ecc 100644 index bacfc4cba6d127460d293ee32ef5e73707f03b97..8b65ff1ac5f81b2f0ac1cac4a5485e8f59472233 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -588,33 +588,33 @@ public class ChunkProviderServer extends IChunkProvider { @@ -588,33 +588,33 @@ public class ChunkProviderServer extends IChunkProvider {

2
scripts/apply.sh
View File

@@ -5,8 +5,6 @@ basedir=$1
source "$basedir/scripts/functions.sh" source "$basedir/scripts/functions.sh"
. $basedir/functions.sh
paperVer=$(cat current-paper) paperVer=$(cat current-paper)
gpgsign="$(git config commit.gpgsign || echo "false")" gpgsign="$(git config commit.gpgsign || echo "false")"
echo "Rebuilding Forked projects.... " echo "Rebuilding Forked projects.... "

15
scripts/push.sh
View File

@@ -1,15 +1,12 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# get base dir regardless of execution location # get base dir regardless of execution location
SOURCE="${BASH_SOURCE[0]}" basedir=$1
while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" source "$basedir/scripts/functions.sh"
SOURCE="$(readlink "$SOURCE")"
[[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
done
. $(dirname $SOURCE)/init.sh
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)
basedir basedir
pushRepo ${FORK_NAME}-API $API_REPO master:$minecraftversion gitpush ${FORK_NAME}-API $API_REPO master:$minecraftversion
pushRepo ${FORK_NAME}-Server $SERVER_REPO master:$minecraftversion gitpush ${FORK_NAME}-Server $SERVER_REPO master:$minecraftversion

16
scripts/rebuildpatches.sh
View File

@@ -1,14 +1,10 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# get base dir regardless of execution location
SOURCE="${BASH_SOURCE[0]}"
while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
SOURCE="$(readlink "$SOURCE")"
[[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
done
. $(dirname $SOURCE)/init.sh
PS1="$" # get base dir regardless of execution location
basedir=$1
source "$basedir/scripts/functions.sh"
echo "Rebuilding patch files from current fork state..." echo "Rebuilding patch files from current fork state..."
function savePatches { function savePatches {
what=$1 what=$1
@@ -40,4 +36,4 @@ function savePatches {
savePatches ${FORK_NAME}-API api savePatches ${FORK_NAME}-API api
savePatches ${FORK_NAME}-Server server savePatches ${FORK_NAME}-Server server
$basedir/scripts/push.sh $basedir/scripts/push.sh "$basedir"