Move mc decompile source to its own folder

Makes caching easier, ever so slightly more organized.
This commit is contained in:
Zach Brown 2017-08-12 18:56:59 -05:00
parent cb011c365e
commit 9ff170660b
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
8 changed files with 9 additions and 10 deletions

3
.gitignore vendored
View file

@ -24,6 +24,7 @@ dist/
manifest.mf
work/1.*
work/Minecraft
work/BuildData
work/Bukkit
work/CraftBukkit
@ -52,8 +53,6 @@ run/
Paper-Server
Paper-API
PaperSpigot-Server
PaperSpigot-API
Paperclip.jar
paperclip.jar
paperclip-*.jar

View file

@ -12,4 +12,4 @@ before_install:
cache:
directories:
- '$HOME/.m2/repository'
- 'work'
- 'work/Minecraft'

View file

@ -6,7 +6,7 @@ PS1="$"
basedir="$(cd "$1" && pwd -P)"
workdir="$basedir/work"
minecraftversion=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
decompiledir="$workdir/$minecraftversion"
decompiledir="$workdir/Minecraft/$minecraftversion"
classdir="$decompiledir/classes"
echo "Extracting NMS classes..."

View file

@ -9,7 +9,7 @@ basedir="$(cd "$1" && pwd -P)"
workdir="$basedir/work"
minecraftversion=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
decompiledir="$workdir/$minecraftversion"
decompiledir="$workdir/Minecraft/$minecraftversion"
export importedmcdev=""
function import {

View file

@ -6,7 +6,7 @@ PS1="$"
basedir="$(cd "$1" && pwd -P)"
workdir="$basedir/work"
minecraftversion=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
decompiledir="$workdir/$minecraftversion"
decompiledir="$workdir/Minecraft/$minecraftversion"
nms="$decompiledir/net/minecraft/server"
cb="src/main/java/net/minecraft/server"
gpgsign="$(git config commit.gpgsign || echo "false")"

View file

@ -7,7 +7,7 @@ PS1="$"
basedir="$(cd "$1" && pwd -P)"
workdir="$basedir/work"
minecraftversion=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
decompiledir="$workdir/$minecraftversion"
decompiledir="$workdir/Minecraft/$minecraftversion"
nms="$decompiledir/net/minecraft/server"
papernms="Paper-Server/src/main/java/net/minecraft/server"
mcdevsrc="${decompiledir}/src/net/minecraft/server"

View file

@ -11,11 +11,11 @@ accesstransforms="$workdir/BuildData/mappings/"$(cat "${workdir}/BuildData/info.
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)
packagemappings="$workdir/BuildData/mappings/"$(cat "${workdir}/BuildData/info.json" | grep packageMappings | cut -d '"' -f 4)
jarpath="$workdir/$minecraftversion/$minecraftversion"
jarpath="$workdir/Minecraft/$minecraftversion/$minecraftversion"
echo "Downloading unmapped vanilla jar..."
if [ ! -f "$jarpath.jar" ]; then
mkdir -p "$workdir/$minecraftversion"
mkdir -p "$workdir/Minecraft/$minecraftversion"
curl -s -o "$jarpath.jar" "https://s3.amazonaws.com/Minecraft.Download/versions/$minecraftversion/minecraft_server.$minecraftversion.jar"
if [ "$?" != "0" ]; then
echo "Failed to download the vanilla server jar. Check connectivity or try again later."

View file

@ -5,7 +5,7 @@ PS1="$"
basedir="$(cd "$1" && pwd -P)"
workdir="$basedir/work"
minecraftversion=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
decompiledir="$workdir/$minecraftversion"
decompiledir="$workdir/Minecraft/$minecraftversion"
#