From a82498a083a2d9110a52d2e567302995271c4332 Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Mon, 2 Jul 2012 20:05:42 -0700
Subject: [PATCH] Updated some remaining scripts to call there python versions.

---
 forge/build.bat | 38 +-------------------------
 forge/build.sh  | 23 +---------------
 forge/setup.sh  | 72 +------------------------------------------------
 3 files changed, 3 insertions(+), 130 deletions(-)

diff --git a/forge/build.bat b/forge/build.bat
index f54d086b9..8792694de 100755
--- a/forge/build.bat
+++ b/forge/build.bat
@@ -1,38 +1,2 @@
 @echo off
-echo =================================== Build Start =================================
-cd ..
-
-rmdir /S /Q src
-mkdir src
-
-echo src_work -^> src
-xcopy /Q /Y /E src_work\* src\
-echo.
-
-echo forge_client -^> minecraft
-xcopy /Y /E forge\forge_client\src\net\* src\minecraft\net
-echo.
-
-echo forge_server -^> minecraft_server
-xcopy /Y /E forge\forge_server\src\net\* src\minecraft_server\net
-echo.
-
-echo forge_common -^> minecraft
-xcopy /Y /E forge\forge_common\net\* src\minecraft\net
-echo.
-
-echo forge_common -^> minecraft_server
-xcopy /Y /E forge\forge_common\net\* src\minecraft_server\net
-echo.
-
-cd forge
-cmd /C inject_version.bat ../src/minecraft/net/minecraft/src/forge/ForgeHooks.java
-cmd /C inject_version.bat ../src/minecraft_server/net/minecraft/src/forge/ForgeHooks.java
-cd ..
-
-runtime\bin\python\python_mcp runtime\recompile.py
-
-set ret=%ERRORLEVEL%
-cd forge
-echo =================================== Build Finished %ret% =================================
-if %ret% NEQ 0 exit /b %ret%
+..\runtime\bin\python\python_mcp build.py %*
diff --git a/forge/build.sh b/forge/build.sh
index 466b57d29..d57ac6949 100755
--- a/forge/build.sh
+++ b/forge/build.sh
@@ -1,23 +1,2 @@
 #!/bin/bash
-
-cd ..
-
-rm -rf src bin src_forge
-
-cp -a src_work src_forge
-
-cp -a forge/forge_client/src/net/* src_forge/minecraft/net/
-cp -a forge/forge_server/src/net/* src_forge/minecraft_server/net/
-cp -a forge/forge_common/net/* src_forge/minecraft/net/
-cp -a forge/forge_common/net/* src_forge/minecraft_server/net/
-
-pushd forge > /dev/null
-./inject_version.sh $OLDPWD/src_forge/minecraft/net/minecraft/src/forge/ForgeHooks.java
-./inject_version.sh $OLDPWD/src_forge/minecraft_server/net/minecraft/src/forge/ForgeHooks.java
-popd > /dev/null
-
-cp -a src_forge src
-
-./recompile.sh
-
-
+python build.py "$@"
diff --git a/forge/setup.sh b/forge/setup.sh
index 3429a5882..8c02e4c2f 100755
--- a/forge/setup.sh
+++ b/forge/setup.sh
@@ -1,72 +1,2 @@
 #!/bin/bash
-
-echo "MinecraftForge Linux Setup Program"
-echo 
-
-pushd .. > /dev/null
-
-if [ -d src ] ; then
-	echo "!!! WARNING !!!"
-	echo
-	echo "This setup will erase your src directory.  Make sure to back up"
-	echo "any changes before continuing."
-	echo
-
-	read -p "Continue (y/n)? " var
-
-	if [ "$var" != "y" ]; then exit ; fi
-fi
-
-if [ ! -f ./runtime/bin/fernflower.jar ]
-then
-    pushd forge
-        python download_fernflower.py
-    popd
-fi
-
-if [ ! -f ./runtime/bin/fernflower.jar ]
-then
-    echo "Failed to download fernflower, install it manually and re-run setup."
-    exit 1
-fi
-
-rm -rf src src_work src_forge
-
-if [ ! -d src_base ] ; then
-	./decompile.sh
-	mv src src_base
-fi
-
-cp -a src_base src_work
-pushd src_work > /dev/null
-	for i in `find ../forge/patches/ -type f -name \*.patch`
-	do
-        patch -p2 -i $i
-	done
-popd > /dev/null
-
-echo "!!! WARNING !!!"
-echo
-echo "This is an extra step for Eloraam, only say yes if you are her"
-echo
-
-read -p "Continue (y/n)? " var
-
-if [ "$var" != "y" ]; then exit ; fi
-
-cp -a src_work src_forge
-
-cp -a forge/forge_client/src/net/* src_forge/minecraft/net/
-cp -a forge/forge_common/net/* src_forge/minecraft/net/
-cp -a forge/forge_common/net/* src_forge/minecraft_server/net/
-cp -a forge/forge_server/src/net/* src_forge/minecraft_server/net/
-
-pushd forge > /dev/null
-./inject_version.sh $OLDPWD/src_forge/minecraft/net/minecraft/src/forge/ForgeHooks.java
-./inject_version.sh $OLDPWD/src_forge/minecraft_server/net/minecraft/src/forge/ForgeHooks.java
-popd > /dev/null
-
-cp -a src_forge src
-
-./updatemd5.sh
-
+python setup.py "$@"
\ No newline at end of file