fixed setup script for windows and patch
This commit is contained in:
Space Toad
parent
5477f767b3
commit
11c81cc91f
3 changed files with 83 additions and 59 deletions
|
|
@ -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
|
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_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
|
+++ ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-17 00:28:09.488871100 +0200
|
||||||
|
|
|
||||||
59
forge/modLoaderMP.patch
Executable file
59
forge/modLoaderMP.patch
Executable file
|
|
@ -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()
|
||||||
|
{
|
||||||
24
forge/setup.bat
Executable file
24
forge/setup.bat
Executable file
|
|
@ -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
|
||||||
Loading…
Reference in a new issue