mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-20 11:22:56 +02:00
Mojang was sleeping even if we had no more requests to go after the current one finished, resulting in 100ms lost per profile lookup
118 lines
3.6 KiB
Bash
Executable File
118 lines
3.6 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
(
|
|
set -e
|
|
nms="net/minecraft/server"
|
|
export MODLOG=""
|
|
PS1="$"
|
|
basedir="$(cd "$1" && pwd -P)"
|
|
source "$basedir/scripts/functions.sh"
|
|
gitcmd="git -c commit.gpgsign=false"
|
|
|
|
workdir="$basedir/work"
|
|
minecraftversion=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
|
|
decompiledir="$workdir/Minecraft/$minecraftversion/forge"
|
|
|
|
export importedmcdev=""
|
|
function import {
|
|
export importedmcdev="$importedmcdev $1"
|
|
file="${1}.java"
|
|
target="$workdir/Spigot/Spigot-Server/src/main/java/$nms/$file"
|
|
base="$decompiledir/$nms/$file"
|
|
|
|
if [[ ! -f "$target" ]]; then
|
|
export MODLOG="$MODLOG Imported $file from mc-dev\n";
|
|
#echo "Copying $base to $target"
|
|
cp "$base" "$target" || exit 1
|
|
else
|
|
echo "UN-NEEDED IMPORT: $file"
|
|
fi
|
|
}
|
|
|
|
function importLibrary {
|
|
group=$1
|
|
lib=$2
|
|
prefix=$3
|
|
shift 3
|
|
for file in "$@"; do
|
|
file="$prefix/$file"
|
|
target="$workdir/Spigot/Spigot-Server/src/main/java/${file}"
|
|
targetdir=$(dirname "$target")
|
|
mkdir -p "${targetdir}"
|
|
base="$workdir/Minecraft/$minecraftversion/libraries/${group}/${lib}/$file"
|
|
if [ ! -f "$base" ]; then
|
|
echo "Missing $base"
|
|
exit 1
|
|
fi
|
|
export MODLOG="$MODLOG Imported $file from $lib\n";
|
|
cp "$base" "$target" || exit 1
|
|
done
|
|
}
|
|
|
|
(
|
|
cd "$workdir/Spigot/Spigot-Server/"
|
|
lastlog=$($gitcmd log -1 --oneline)
|
|
if [[ "$lastlog" = *"mc-dev Imports"* ]]; then
|
|
$gitcmd reset --hard HEAD^
|
|
fi
|
|
)
|
|
|
|
|
|
|
|
files=$(cat "$basedir/Spigot-Server-Patches/"* | grep "+++ b/src/main/java/net/minecraft/server/" | sort | uniq | sed 's/\+\+\+ b\/src\/main\/java\/net\/minecraft\/server\///g' | sed 's/.java//g')
|
|
|
|
nonnms=$(grep -R "new file mode" -B 1 "$basedir/Spigot-Server-Patches/" | grep -v "new file mode" | grep -oE "net\/minecraft\/server\/.*.java" | grep -oE "[A-Za-z]+?.java$" --color=none | sed 's/.java//g')
|
|
function containsElement {
|
|
local e
|
|
for e in "${@:2}"; do
|
|
[[ "$e" == "$1" ]] && return 0;
|
|
done
|
|
return 1
|
|
}
|
|
set +e
|
|
for f in $files; do
|
|
containsElement "$f" ${nonnms[@]}
|
|
if [ "$?" == "1" ]; then
|
|
if [ ! -f "$workdir/Spigot/Spigot-Server/src/main/java/net/minecraft/server/$f.java" ]; then
|
|
if [ ! -f "$decompiledir/$nms/$f.java" ]; then
|
|
echo "$(color 1 31) ERROR!!! Missing NMS$(color 1 34) $f $(colorend)";
|
|
else
|
|
import $f
|
|
fi
|
|
fi
|
|
fi
|
|
done
|
|
|
|
########################################################
|
|
########################################################
|
|
########################################################
|
|
# NMS IMPORTS
|
|
# Temporarily add new NMS dev imports here before you run paper patch
|
|
# but after you have paper rb'd your changes, remove the line from this file before committing.
|
|
# we do not need any lines added to this file for NMS
|
|
|
|
# import FileName
|
|
|
|
|
|
|
|
########################################################
|
|
########################################################
|
|
########################################################
|
|
# LIBRARY IMPORTS
|
|
# These must always be mapped manually, no automatic stuff
|
|
#
|
|
# # group # lib # prefix # many files
|
|
|
|
# dont forget \ at end of each line but last
|
|
importLibrary com.mojang authlib com/mojang/authlib yggdrasil/YggdrasilGameProfileRepository.java
|
|
|
|
########################################################
|
|
########################################################
|
|
########################################################
|
|
set -e
|
|
cd "$workdir/Spigot/Spigot-Server/"
|
|
rm -rf nms-patches applyPatches.sh makePatches.sh >/dev/null 2>&1
|
|
$gitcmd add . -A >/dev/null 2>&1
|
|
echo -e "mc-dev Imports\n\n$MODLOG" | $gitcmd commit . -F -
|
|
)
|