mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
a919aa3119
Upstream has released updates that appears to apply and compile correctly Paper Changes: d35903e6 [CI-SKIP] Update README.md (1.16.3 release) (#4321) e6faa36e Cache DataFixerUpper Rewrite Rules on demand Tuinity Changes: ef4e59a Optimize tab complete
121 lines
4.3 KiB
Bash
Executable File
121 lines
4.3 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
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"
|
|
|
|
workdir=$basedir/Paper/work
|
|
minecraftversion=$(grep <"$basedir"/Paper/work/BuildData/info.json minecraftVersion | cut -d '"' -f 4)
|
|
decompiledir=$workdir/Minecraft/$minecraftversion/spigot
|
|
|
|
nms="net/minecraft/server"
|
|
export MODLOG=""
|
|
cd "$basedir" || exit
|
|
|
|
function containsElement() {
|
|
local e
|
|
for e in "${@:2}"; do
|
|
[[ "$e" == "$1" ]] && return 0
|
|
done
|
|
return 1
|
|
}
|
|
|
|
export importedmcdev=""
|
|
function import() {
|
|
if [ -f "$basedir/Paper/Paper-Server/src/main/java/net/minecraft/server/$1.java" ]; then
|
|
echo "ALREADY IMPORTED $1"
|
|
return 0
|
|
fi
|
|
export importedmcdev="$importedmcdev $1"
|
|
file="${1}.java"
|
|
target="$basedir/Paper/Paper-Server/src/main/java/$nms/$file"
|
|
base="$decompiledir/$nms/$file"
|
|
|
|
if [[ ! -f "$target" ]]; then
|
|
export MODLOG="$MODLOG Imported $file from mc-dev\n"
|
|
echo "$(bashColor 1 32) Copying $(bashColor 1 34)$base $(bashColor 1 32)to$(bashColor 1 34) $target $(bashColorReset)"
|
|
cp "$base" "$target"
|
|
else
|
|
echo "$(bashColor 1 33) UN-NEEDED IMPORT STATEMENT:$(bashColor 1 34) $file $(bashColorReset)"
|
|
fi
|
|
}
|
|
|
|
function importLibrary() {
|
|
group=$1
|
|
lib=$2
|
|
prefix=$3
|
|
shift 3
|
|
for file in "$@"; do
|
|
file="$prefix/$file"
|
|
target="$basedir/Paper/Paper-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"
|
|
sed 's/\r$//' "$base" >"$target" || exit 1
|
|
done
|
|
}
|
|
|
|
(
|
|
cd Paper/Paper-Server/ || exit
|
|
lastlog=$(git log -1 --oneline)
|
|
if [[ "$lastlog" == *"Purpur-Extra mc-dev Imports"* ]]; then
|
|
git reset --hard HEAD^
|
|
fi
|
|
)
|
|
|
|
files=$(cat patches/server/* | 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=$(cat patches/server/* | grep "create mode " | grep -Po "src/main/java/net/minecraft/server/(.*?).java" | sort | uniq | sed 's/src\/main\/java\/net\/minecraft\/server\///g' | sed 's/.java//g')
|
|
|
|
for f in $files; do
|
|
containsElement "$f" "${nonnms[@]}"
|
|
if [ "$?" == "1" ]; then
|
|
if [ ! -f "$basedir/Paper/Paper-Server/src/main/java/net/minecraft/server/$f.java" ]; then
|
|
if [ ! -f "$decompiledir/$nms/$f.java" ] && [ true ]; then
|
|
echo "$(bashColor 1 31) ERROR!!! Missing NMS$(bashColor 1 34) $f $(bashColorReset)"
|
|
else
|
|
import "$f"
|
|
fi
|
|
fi
|
|
fi
|
|
done
|
|
|
|
###############################################################################################
|
|
###############################################################################################
|
|
#################### ADD TEMPORARY ADDITIONS HERE #############################################
|
|
###############################################################################################
|
|
###############################################################################################
|
|
|
|
# import Foo
|
|
|
|
########################################################
|
|
########################################################
|
|
########################################################
|
|
# LIBRARY IMPORTS
|
|
# These must always be mapped manually, no automatic stuff
|
|
#
|
|
# # group # lib # prefix # many files
|
|
|
|
#importLibrary com.mojang datafixerupper com/mojang/datafixers/util Either.java
|
|
importLibrary com.mojang brigadier com/mojang/brigadier CommandDispatcher.java
|
|
importLibrary com.mojang brigadier com/mojang/brigadier/tree LiteralCommandNode.java
|
|
importLibrary com.mojang brigadier com/mojang/brigadier/suggestion SuggestionsBuilder.java
|
|
importLibrary com.mojang brigadier com/mojang/brigadier/arguments BoolArgumentType.java
|
|
|
|
################
|
|
(
|
|
cd Paper/Paper-Server/ || exit
|
|
rm -rf nms-patches
|
|
git add src -A
|
|
echo -e "Purpur-Extra mc-dev Imports\n\n$MODLOG" | git commit src -F -
|
|
)
|