diff --git a/install/install.cmd b/install/install.cmd index 052a72795c..7c4f21541f 100755 --- a/install/install.cmd +++ b/install/install.cmd @@ -15,20 +15,35 @@ cmd /C decompile.bat if exist runtime\bin\fernflower.jar-backup move runtime\bin\fernflower.jar-backup runtime\bin\fernflower.jar pushd src >nul - del minecraft\net\minecraft\src\MLProp.java - copy ..\forge\MLProp.java minecraft\net\minecraft\src\MLProp.java - del minecraft_server\net\minecraft\src\MLProp.java - copy ..\forge\MLProp.java minecraft_server\net\minecraft\src\MLProp.java - ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ../forge/modLoaderMP.patch ../forge/modLoaderMP.patch - ..\runtime\bin\applydiff.exe -uf -p2 -i ../forge/modLoaderMP.patch + if exist ..\jars\bin\minecraft.jar ( + del minecraft\net\minecraft\src\MLProp.java + copy ..\forge\MLProp.java minecraft\net\minecraft\src\MLProp.java + + for /f "delims=" %%a in ('dir /a -d /b /S ..\forge\patches\minecraft') do ( + pushd "%%a" 2>nul + if errorlevel 1 ( + ..\runtime\bin\python\python_mcp ..\forge\lfcr.py "%%a" "%%a" + ..\runtime\bin\applydiff.exe -uf -p2 -i "%%a" + ) else popd + ) + ) + + if exist ..\jars\minecraft_server.jar ( + del minecraft_server\net\minecraft\src\MLProp.java + copy ..\forge\MLProp.java minecraft_server\net\minecraft\src\MLProp.java - for /f "delims=" %%a in ('dir /a -d /b /S ..\forge\patches') do ( - pushd "%%a" 2>nul - if errorlevel 1 ( - ..\runtime\bin\python\python_mcp ..\forge\lfcr.py "%%a" "%%a" - ..\runtime\bin\applydiff.exe -uf -p2 -i "%%a" - ) else popd + ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ../forge/modLoaderMP.patch ../forge/modLoaderMP.patch + ..\runtime\bin\applydiff.exe -uf -p2 -i ../forge/modLoaderMP.patch + + for /f "delims=" %%a in ('dir /a -d /b /S ..\forge\patches\minecraft_server') do ( + pushd "%%a" 2>nul + if errorlevel 1 ( + ..\runtime\bin\python\python_mcp ..\forge\lfcr.py "%%a" "%%a" + ..\runtime\bin\applydiff.exe -uf -p2 -i "%%a" + ) else popd + ) + ) popd >nul diff --git a/install/install.sh b/install/install.sh index 1b9f7fca9a..9b09dde9ba 100644 --- a/install/install.sh +++ b/install/install.sh @@ -25,16 +25,30 @@ fi pushd src > /dev/null find . -name *.java -exec sed -i 's/\r//g' \{\} \; - cp ../forge/MLProp.java minecraft/net/minecraft/src/MLProp.java - cp ../forge/MLProp.java minecraft_server/net/minecraft/src/MLProp.java - find ../forge/ -name *.patch -exec sed -i 's/\r//g' \{\} \; - patch -p2 -i ../forge/modLoaderMP.patch + + if [ -f ../jars/bin/minecraft.jar ]; + then + cp ../forge/MLProp.java minecraft/net/minecraft/src/MLProp.java - for i in `find ../forge/patches/ -type f` - do - patch -p2 -i $i - done + for i in `find ../forge/patches/minecraft/ -type f` + do + patch -p2 -i $i + done + fi + + + if [ -f ../jars/minecraft_server.jar ]; + then + cp ../forge/MLProp.java minecraft_server/net/minecraft/src/MLProp.java + + patch -p2 -i ../forge/modLoaderMP.patch + + for i in `find ../forge/patches/minecraft_server/ -type f` + do + patch -p2 -i $i + done + fi popd > /dev/null cp -r forge/src/* src