Revert de5f4e469...c270abe96

7 files changed, 12 insertions, 19 deletions

diff --git a/scripts/applyPatches.sh b/scripts/applyPatches.sh
index 7f9bdb589f..e700fde80b 100755
--- a/scripts/applyPatches.sh
+++ b/scripts/applyPatches.sh
@@ -97,10 +97,9 @@ echo "Importing MC Dev"
     applyPatch "work/Spigot/Spigot-API" Paper-API HEAD &&
     applyPatch "work/Spigot/Spigot-Server" Paper-Server HEAD
     cd "$basedir"
-    revision="$(cat "$basedir"/revision.txt | tr -d '\n')"
 
     # 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"
     fi
 ) || (
diff --git a/scripts/decompile.sh b/scripts/decompile.sh
index d0337c3dbc..d90a6de9da 100755
--- a/scripts/decompile.sh
+++ b/scripts/decompile.sh
@@ -5,10 +5,9 @@ set -e
 PS1="$"
 basedir="$(cd "$1" && pwd -P)"
 workdir="$basedir/work"
-revision="$(cat "$basedir"/revision.txt | tr -d '\n')"
 minecraftversion=$(cat "$workdir/BuildData/info.json"  | grep minecraftVersion | cut -d '"' -f 4)
 windows="$([[ "$OSTYPE" == "cygwin" || "$OSTYPE" == "msys" ]] && echo "true" || echo "false")"
-decompiledir="$workdir/Minecraft/$minecraftversion-$revision"
+decompiledir="$workdir/Minecraft/$minecraftversion"
 spigotdecompiledir="$decompiledir/spigot"
 forgedecompiledir="$decompiledir/forge"
 forgeflowerversion="1.5.380.19"
@@ -21,7 +20,7 @@ forgefloweroptions="-dgs=1 -hdc=0 -asc=1 -udv=1 -jvn=1"
 forgeflowercachefile="$decompiledir/forgeflowercache"
 forgeflowercachevalue="$forgeflowerurl - $forgeflowerversion - $forgefloweroptions";
 classdir="$decompiledir/classes"
-versionjson="$workdir/Minecraft/$minecraftversion-$revision/$minecraftversion.json"
+versionjson="$workdir/Minecraft/$minecraftversion/$minecraftversion.json"
 
 if [[ ! -f "$versionjson" ]]; then
     echo "Downloading $minecraftversion JSON Data"
@@ -139,9 +138,9 @@ fi
 currentlink="$workdir/Minecraft/current"
 if ([ ! -e "$currentlink" ] || [ -L "$currentlink" ]) && [ "$windows" == "false" ]; then
 	set +e
-	echo "Pointing $currentlink to $minecraftversion-$revision"
+	echo "Pointing $currentlink to $minecraftversion"
 	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
 
 )
diff --git a/scripts/importmcdev.sh b/scripts/importmcdev.sh
index 51bc3a24fd..6165a7195b 100755
--- a/scripts/importmcdev.sh
+++ b/scripts/importmcdev.sh
@@ -11,10 +11,9 @@ gitcmd="git -c commit.gpgsign=false"
 
 workdir="$basedir/work"
 minecraftversion=$(cat "$workdir/BuildData/info.json"  | grep minecraftVersion | cut -d '"' -f 4)
-revision="$(cat "$basedir"/revision.txt | tr -d '\n')"
-decompiledir="$workdir/Minecraft/$minecraftversion-$revision/forge"
+decompiledir="$workdir/Minecraft/$minecraftversion/forge"
 # replace for now
-decompiledir="$workdir/Minecraft/$minecraftversion-$revision/spigot"
+decompiledir="$workdir/Minecraft/$minecraftversion/spigot"
 export importedmcdev=""
 function import {
     export importedmcdev="$importedmcdev $1"
@@ -42,7 +41,7 @@ function importLibrary {
         target="$workdir/Spigot/Spigot-Server/src/main/java/${file}"
         targetdir=$(dirname "$target")
         mkdir -p "${targetdir}"
-        base="$workdir/Minecraft/$minecraftversion-$revision/libraries/${group}/${lib}/$file"
+        base="$workdir/Minecraft/$minecraftversion/libraries/${group}/${lib}/$file"
         if [ ! -f "$base" ]; then
             echo "Missing $base"
             exit 1
diff --git a/scripts/init.sh b/scripts/init.sh
index 40ed4a2661..9c51762ae6 100755
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -5,9 +5,8 @@ set -e
 PS1="$"
 basedir="$(cd "$1" && pwd -P)"
 workdir="$basedir/work"
-revision="$(cat "$basedir"/revision.txt | tr -d '\n')"
 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"
 cb="src/main/java"
 gitcmd="git -c commit.gpgsign=false"
diff --git a/scripts/makemcdevsrc.sh b/scripts/makemcdevsrc.sh
index a7186e3092..dd4c4e48aa 100755
--- a/scripts/makemcdevsrc.sh
+++ b/scripts/makemcdevsrc.sh
@@ -7,9 +7,8 @@ PS1="$"
 basedir="$(cd "$1" && pwd -P)"
 cd "$basedir"
 workdir="$basedir/work"
-revision="$(cat "$basedir"/revision.txt | tr -d '\n')"
 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"
 papernms="Paper-Server/src/main/java/net/minecraft/server"
 mcdevsrc="${decompiledir}/src/net/minecraft/server"
diff --git a/scripts/paperclip.sh b/scripts/paperclip.sh
index cdb540de15..2722ca3dda 100755
--- a/scripts/paperclip.sh
+++ b/scripts/paperclip.sh
@@ -4,10 +4,9 @@
 set -e
 basedir="$(cd "$1" && pwd -P)"
 workdir="$basedir/work"
-revision="$(cat "$basedir"/revision.txt | tr -d '\n')"
 mcver=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
 paperjar="$basedir/Paper-Server/target/paper-$mcver.jar"
-vanillajar="$workdir/Minecraft/$mcver-$revision/$mcver.jar"
+vanillajar="$workdir/Minecraft/$mcver/$mcver.jar"
 
 (
     cd "$workdir/Paperclip"
diff --git a/scripts/remap.sh b/scripts/remap.sh
index 8f5746e4a1..7458070127 100755
--- a/scripts/remap.sh
+++ b/scripts/remap.sh
@@ -5,7 +5,6 @@ set -e
 PS1="$"
 basedir="$(cd "$1" && pwd -P)"
 workdir="$basedir/work"
-revision="$(cat "$basedir"/revision.txt | tr -d '\n')"
 minecraftversion="$(cat "${workdir}/BuildData/info.json" | grep minecraftVersion | 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)
@@ -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)
 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)
-decompiledir="$workdir/Minecraft/$minecraftversion-$revision"
+decompiledir="$workdir/Minecraft/$minecraftversion"
 jarpath="$decompiledir/$minecraftversion"
 mkdir -p "$decompiledir"