Revert de5f4e469...c270abe96
This commit is contained in:
parent
6870db6137
commit
cf4dc464a8
8 changed files with 12 additions and 20 deletions
|
@ -1 +0,0 @@
|
||||||
R0.2
|
|
|
@ -97,10 +97,9 @@ echo "Importing MC Dev"
|
||||||
applyPatch "work/Spigot/Spigot-API" Paper-API HEAD &&
|
applyPatch "work/Spigot/Spigot-API" Paper-API HEAD &&
|
||||||
applyPatch "work/Spigot/Spigot-Server" Paper-Server HEAD
|
applyPatch "work/Spigot/Spigot-Server" Paper-Server HEAD
|
||||||
cd "$basedir"
|
cd "$basedir"
|
||||||
revision="$(cat "$basedir"/revision.txt | tr -d '\n')"
|
|
||||||
|
|
||||||
# if we have previously ran ./paper mcdev, update it
|
# if we have previously ran ./paper mcdev, update it
|
||||||
if [ -d "$workdir/Minecraft/$minecraftversion-$revision/src" ]; then
|
if [ -d "$workdir/Minecraft/$minecraftversion/src" ]; then
|
||||||
./scripts/makemcdevsrc.sh "$basedir"
|
./scripts/makemcdevsrc.sh "$basedir"
|
||||||
fi
|
fi
|
||||||
) || (
|
) || (
|
||||||
|
|
|
@ -5,10 +5,9 @@ set -e
|
||||||
PS1="$"
|
PS1="$"
|
||||||
basedir="$(cd "$1" && pwd -P)"
|
basedir="$(cd "$1" && pwd -P)"
|
||||||
workdir="$basedir/work"
|
workdir="$basedir/work"
|
||||||
revision="$(cat "$basedir"/revision.txt | tr -d '\n')"
|
|
||||||
minecraftversion=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
|
minecraftversion=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
|
||||||
windows="$([[ "$OSTYPE" == "cygwin" || "$OSTYPE" == "msys" ]] && echo "true" || echo "false")"
|
windows="$([[ "$OSTYPE" == "cygwin" || "$OSTYPE" == "msys" ]] && echo "true" || echo "false")"
|
||||||
decompiledir="$workdir/Minecraft/$minecraftversion-$revision"
|
decompiledir="$workdir/Minecraft/$minecraftversion"
|
||||||
spigotdecompiledir="$decompiledir/spigot"
|
spigotdecompiledir="$decompiledir/spigot"
|
||||||
forgedecompiledir="$decompiledir/forge"
|
forgedecompiledir="$decompiledir/forge"
|
||||||
forgeflowerversion="1.5.380.19"
|
forgeflowerversion="1.5.380.19"
|
||||||
|
@ -21,7 +20,7 @@ forgefloweroptions="-dgs=1 -hdc=0 -asc=1 -udv=1 -jvn=1"
|
||||||
forgeflowercachefile="$decompiledir/forgeflowercache"
|
forgeflowercachefile="$decompiledir/forgeflowercache"
|
||||||
forgeflowercachevalue="$forgeflowerurl - $forgeflowerversion - $forgefloweroptions";
|
forgeflowercachevalue="$forgeflowerurl - $forgeflowerversion - $forgefloweroptions";
|
||||||
classdir="$decompiledir/classes"
|
classdir="$decompiledir/classes"
|
||||||
versionjson="$workdir/Minecraft/$minecraftversion-$revision/$minecraftversion.json"
|
versionjson="$workdir/Minecraft/$minecraftversion/$minecraftversion.json"
|
||||||
|
|
||||||
if [[ ! -f "$versionjson" ]]; then
|
if [[ ! -f "$versionjson" ]]; then
|
||||||
echo "Downloading $minecraftversion JSON Data"
|
echo "Downloading $minecraftversion JSON Data"
|
||||||
|
@ -139,9 +138,9 @@ fi
|
||||||
currentlink="$workdir/Minecraft/current"
|
currentlink="$workdir/Minecraft/current"
|
||||||
if ([ ! -e "$currentlink" ] || [ -L "$currentlink" ]) && [ "$windows" == "false" ]; then
|
if ([ ! -e "$currentlink" ] || [ -L "$currentlink" ]) && [ "$windows" == "false" ]; then
|
||||||
set +e
|
set +e
|
||||||
echo "Pointing $currentlink to $minecraftversion-$revision"
|
echo "Pointing $currentlink to $minecraftversion"
|
||||||
rm -rf "$currentlink" || true
|
rm -rf "$currentlink" || true
|
||||||
ln -sfn "$minecraftversion-$revision" "$currentlink" || echo "Failed to set current symlink"
|
ln -sfn "$minecraftversion" "$currentlink" || echo "Failed to set current symlink"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
|
@ -11,10 +11,9 @@ gitcmd="git -c commit.gpgsign=false"
|
||||||
|
|
||||||
workdir="$basedir/work"
|
workdir="$basedir/work"
|
||||||
minecraftversion=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
|
minecraftversion=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
|
||||||
revision="$(cat "$basedir"/revision.txt | tr -d '\n')"
|
decompiledir="$workdir/Minecraft/$minecraftversion/forge"
|
||||||
decompiledir="$workdir/Minecraft/$minecraftversion-$revision/forge"
|
|
||||||
# replace for now
|
# replace for now
|
||||||
decompiledir="$workdir/Minecraft/$minecraftversion-$revision/spigot"
|
decompiledir="$workdir/Minecraft/$minecraftversion/spigot"
|
||||||
export importedmcdev=""
|
export importedmcdev=""
|
||||||
function import {
|
function import {
|
||||||
export importedmcdev="$importedmcdev $1"
|
export importedmcdev="$importedmcdev $1"
|
||||||
|
@ -42,7 +41,7 @@ function importLibrary {
|
||||||
target="$workdir/Spigot/Spigot-Server/src/main/java/${file}"
|
target="$workdir/Spigot/Spigot-Server/src/main/java/${file}"
|
||||||
targetdir=$(dirname "$target")
|
targetdir=$(dirname "$target")
|
||||||
mkdir -p "${targetdir}"
|
mkdir -p "${targetdir}"
|
||||||
base="$workdir/Minecraft/$minecraftversion-$revision/libraries/${group}/${lib}/$file"
|
base="$workdir/Minecraft/$minecraftversion/libraries/${group}/${lib}/$file"
|
||||||
if [ ! -f "$base" ]; then
|
if [ ! -f "$base" ]; then
|
||||||
echo "Missing $base"
|
echo "Missing $base"
|
||||||
exit 1
|
exit 1
|
||||||
|
|
|
@ -5,9 +5,8 @@ set -e
|
||||||
PS1="$"
|
PS1="$"
|
||||||
basedir="$(cd "$1" && pwd -P)"
|
basedir="$(cd "$1" && pwd -P)"
|
||||||
workdir="$basedir/work"
|
workdir="$basedir/work"
|
||||||
revision="$(cat "$basedir"/revision.txt | tr -d '\n')"
|
|
||||||
minecraftversion=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
|
minecraftversion=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
|
||||||
spigotdecompiledir="$workdir/Minecraft/$minecraftversion-$revision/spigot"
|
spigotdecompiledir="$workdir/Minecraft/$minecraftversion/spigot"
|
||||||
nms="$spigotdecompiledir"
|
nms="$spigotdecompiledir"
|
||||||
cb="src/main/java"
|
cb="src/main/java"
|
||||||
gitcmd="git -c commit.gpgsign=false"
|
gitcmd="git -c commit.gpgsign=false"
|
||||||
|
|
|
@ -7,9 +7,8 @@ PS1="$"
|
||||||
basedir="$(cd "$1" && pwd -P)"
|
basedir="$(cd "$1" && pwd -P)"
|
||||||
cd "$basedir"
|
cd "$basedir"
|
||||||
workdir="$basedir/work"
|
workdir="$basedir/work"
|
||||||
revision="$(cat "$basedir"/revision.txt | tr -d '\n')"
|
|
||||||
minecraftversion=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
|
minecraftversion=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
|
||||||
decompiledir="$workdir/Minecraft/$minecraftversion-$revision"
|
decompiledir="$workdir/Minecraft/$minecraftversion"
|
||||||
nms="$decompiledir/spigot/net/minecraft/server"
|
nms="$decompiledir/spigot/net/minecraft/server"
|
||||||
papernms="Paper-Server/src/main/java/net/minecraft/server"
|
papernms="Paper-Server/src/main/java/net/minecraft/server"
|
||||||
mcdevsrc="${decompiledir}/src/net/minecraft/server"
|
mcdevsrc="${decompiledir}/src/net/minecraft/server"
|
||||||
|
|
|
@ -4,10 +4,9 @@
|
||||||
set -e
|
set -e
|
||||||
basedir="$(cd "$1" && pwd -P)"
|
basedir="$(cd "$1" && pwd -P)"
|
||||||
workdir="$basedir/work"
|
workdir="$basedir/work"
|
||||||
revision="$(cat "$basedir"/revision.txt | tr -d '\n')"
|
|
||||||
mcver=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
|
mcver=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
|
||||||
paperjar="$basedir/Paper-Server/target/paper-$mcver.jar"
|
paperjar="$basedir/Paper-Server/target/paper-$mcver.jar"
|
||||||
vanillajar="$workdir/Minecraft/$mcver-$revision/$mcver.jar"
|
vanillajar="$workdir/Minecraft/$mcver/$mcver.jar"
|
||||||
|
|
||||||
(
|
(
|
||||||
cd "$workdir/Paperclip"
|
cd "$workdir/Paperclip"
|
||||||
|
|
|
@ -5,7 +5,6 @@ set -e
|
||||||
PS1="$"
|
PS1="$"
|
||||||
basedir="$(cd "$1" && pwd -P)"
|
basedir="$(cd "$1" && pwd -P)"
|
||||||
workdir="$basedir/work"
|
workdir="$basedir/work"
|
||||||
revision="$(cat "$basedir"/revision.txt | tr -d '\n')"
|
|
||||||
minecraftversion="$(cat "${workdir}/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)"
|
minecraftversion="$(cat "${workdir}/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)"
|
||||||
minecraftserverurl=$(cat "${workdir}/BuildData/info.json" | grep serverUrl | cut -d '"' -f 4)
|
minecraftserverurl=$(cat "${workdir}/BuildData/info.json" | grep serverUrl | cut -d '"' -f 4)
|
||||||
minecrafthash=$(cat "${workdir}/BuildData/info.json" | grep minecraftHash | cut -d '"' -f 4)
|
minecrafthash=$(cat "${workdir}/BuildData/info.json" | grep minecraftHash | cut -d '"' -f 4)
|
||||||
|
@ -13,7 +12,7 @@ accesstransforms="$workdir/BuildData/mappings/"$(cat "${workdir}/BuildData/info.
|
||||||
classmappings="$workdir/BuildData/mappings/"$(cat "${workdir}/BuildData/info.json" | grep classMappings | cut -d '"' -f 4)
|
classmappings="$workdir/BuildData/mappings/"$(cat "${workdir}/BuildData/info.json" | grep classMappings | cut -d '"' -f 4)
|
||||||
membermappings="$workdir/BuildData/mappings/"$(cat "${workdir}/BuildData/info.json" | grep memberMappings | cut -d '"' -f 4)
|
membermappings="$workdir/BuildData/mappings/"$(cat "${workdir}/BuildData/info.json" | grep memberMappings | cut -d '"' -f 4)
|
||||||
packagemappings="$workdir/BuildData/mappings/"$(cat "${workdir}/BuildData/info.json" | grep packageMappings | cut -d '"' -f 4)
|
packagemappings="$workdir/BuildData/mappings/"$(cat "${workdir}/BuildData/info.json" | grep packageMappings | cut -d '"' -f 4)
|
||||||
decompiledir="$workdir/Minecraft/$minecraftversion-$revision"
|
decompiledir="$workdir/Minecraft/$minecraftversion"
|
||||||
jarpath="$decompiledir/$minecraftversion"
|
jarpath="$decompiledir/$minecraftversion"
|
||||||
mkdir -p "$decompiledir"
|
mkdir -p "$decompiledir"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue