From 11c81cc91f3a87f2b29b4f635fbdd4cac852f29f Mon Sep 17 00:00:00 2001
From: Space Toad <spacetoadcraft@gmail.com>
Date: Sun, 17 Jul 2011 12:16:26 +0000
Subject: [PATCH] fixed setup script for windows and patch

---
 forge/minecraft.patch   | 59 -----------------------------------------
 forge/modLoaderMP.patch | 59 +++++++++++++++++++++++++++++++++++++++++
 forge/setup.bat         | 24 +++++++++++++++++
 3 files changed, 83 insertions(+), 59 deletions(-)
 create mode 100755 forge/modLoaderMP.patch
 create mode 100755 forge/setup.bat

diff --git a/forge/minecraft.patch b/forge/minecraft.patch
index 8121b72221..28fb877595 100644
--- a/forge/minecraft.patch
+++ b/forge/minecraft.patch
@@ -196,65 +196,6 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend
                          }
                      }
  
-diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java
---- ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java	2011-07-17 00:28:07.755771900 +0200
-+++ ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java	2011-07-17 00:28:09.485870900 +0200
-@@ -333,41 +333,22 @@
-             }
-             finally
-             {
--                System.exit(0);
-+                    try
-+                    {
-+                            stopServer();
-+                            serverStopped = true;
-+                    }
-+                    catch(Throwable throwable2)
-+                    {
-+                            throwable2.printStackTrace();
-+                    }
-+                    finally
-+                    {
-+                            System.exit(0);
-+                    }
-             }
--            break MISSING_BLOCK_LABEL_350;
--        }
--        try
--        {
--            stopServer();
--            serverStopped = true;
--        }
--        catch(Throwable throwable)
--        {
--            throwable.printStackTrace();
--        }
--        finally
--        {
--            System.exit(0);
--        }
--        break MISSING_BLOCK_LABEL_350;
--        Exception exception2;
--        exception2;
--        try
--        {
--            stopServer();
--            serverStopped = true;
--        }
--        catch(Throwable throwable3)
--        {
--            throwable3.printStackTrace();
--        }
--        finally
--        {
--            System.exit(0);
--        }
--        throw exception2;
-     }
-+}
- 
-     private void doTick()
-     {
 diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java
 --- ../src_base/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java	2011-07-17 00:28:07.853777600 +0200
 +++ ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java	2011-07-17 00:28:09.488871100 +0200
diff --git a/forge/modLoaderMP.patch b/forge/modLoaderMP.patch
new file mode 100755
index 0000000000..babf5b9a11
--- /dev/null
+++ b/forge/modLoaderMP.patch
@@ -0,0 +1,59 @@
+diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java
+--- ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java	2011-07-17 00:28:07.755771900 +0200
++++ ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java	2011-07-17 00:28:09.485870900 +0200
+@@ -333,41 +333,22 @@
+             }
+             finally
+             {
+-                System.exit(0);
++                    try
++                    {
++                            stopServer();
++                            serverStopped = true;
++                    }
++                    catch(Throwable throwable2)
++                    {
++                            throwable2.printStackTrace();
++                    }
++                    finally
++                    {
++                            System.exit(0);
++                    }
+             }
+-            break MISSING_BLOCK_LABEL_350;
+-        }
+-        try
+-        {
+-            stopServer();
+-            serverStopped = true;
+-        }
+-        catch(Throwable throwable)
+-        {
+-            throwable.printStackTrace();
+-        }
+-        finally
+-        {
+-            System.exit(0);
+-        }
+-        break MISSING_BLOCK_LABEL_350;
+-        Exception exception2;
+-        exception2;
+-        try
+-        {
+-            stopServer();
+-            serverStopped = true;
+-        }
+-        catch(Throwable throwable3)
+-        {
+-            throwable3.printStackTrace();
+-        }
+-        finally
+-        {
+-            System.exit(0);
+-        }
+-        throw exception2;
+     }
++}
+ 
+     private void doTick()
+     {
diff --git a/forge/setup.bat b/forge/setup.bat
new file mode 100755
index 0000000000..540d01547e
--- /dev/null
+++ b/forge/setup.bat
@@ -0,0 +1,24 @@
+set CYWIN=E:\cygwin\bin
+
+cd ..
+
+rmdir /S /Q src
+
+IF EXIST src_base (
+move src_base src;
+rmdir /S /Q src_work
+) ELSE (
+cmd /C decompile.bat
+cd src
+%CYGWIN%\patch -u -p2 < ..\forge\modLoaderMP.patch
+cd ..
+cmd /C recompile.bat
+cmd /C updatemd5.bat
+)
+
+mkdir src_base
+mkdir src_work
+xcopy  /Y /E src\* src_base
+xcopy  /Y /E src\* src_work
+cd src_work
+%CYGWIN%\patch -u -p2 < ..\forge\minecraft.patch