keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

fixed patch script and added release scripts

This commit is contained in:
Space Toad 2011-07-16 22:32:57 +00:00
parent 1b7e8b6179
commit eba740b4ce
5 changed files with 105 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
forge/build.bat
View File

@ -4,6 +4,7 @@ rmdir /S /Q src
mkdir src
xcopy /Y /E src_work\* src\
xcopy /Y /E forge\forge_client\src\net\* src\minecraft\net
xcopy /Y /E forge\forge_common\net\* src\minecraft\net
xcopy /Y /E forge\forge_common\net\* src\minecraft_server\net

68
forge/minecraft.patch
View File

@ -1,6 +1,26 @@
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/client/Minecraft.java ../src_work/minecraft/net/minecraft/client/Minecraft.java
--- ../src_base/minecraft/net/minecraft/client/Minecraft.java 2011-07-17 00:28:07.253743200 +0200
+++ ../src_work/minecraft/net/minecraft/client/Minecraft.java 2011-07-17 00:28:32.530189000 +0200
@@ -8,6 +8,8 @@
import java.io.File;
import java.io.PrintStream;
import net.minecraft.src.*;
+import net.minecraft.src.forge.MinecraftForgeClient;
+
import org.lwjgl.LWJGLException;
import org.lwjgl.input.*;
import org.lwjgl.opengl.*;
@@ -177,6 +179,7 @@
renderGlobal = new RenderGlobal(this, renderEngine);
GL11.glViewport(0, 0, displayWidth, displayHeight);
effectRenderer = new EffectRenderer(theWorld, renderEngine);
+ MinecraftForgeClient.onGameStart();
try
{
downloadResourcesThread = new ThreadDownloadResources(mcDataDir, this);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java
--- ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-11 21:58:45.029673700 +0200
+++ ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-15 21:55:40.634969900 +0200
--- ../src_base/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-17 00:28:07.334747900 +0200
+++ ../src_work/minecraft/net/minecraft/src/ChunkProviderGenerate.java 2011-07-17 00:28:09.467869900 +0200
@@ -6,6 +6,8 @@
import java.util.Random;
@ -20,8 +40,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ChunkProv
generatedTemperatures = worldObj.getWorldChunkManager().getTemperatures(generatedTemperatures, k + 8, l + 8, 16, 16);
for(int j19 = k + 8; j19 < k + 8 + 16; j19++)
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucket.java ../src_work/minecraft/net/minecraft/src/ItemBucket.java
--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-07-11 21:58:45.174682000 +0200
+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-07-15 23:13:30.143050500 +0200
--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-07-17 00:28:07.460755100 +0200
+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-07-17 00:28:09.470870000 +0200
@@ -6,6 +6,8 @@
import java.util.Random;
@ -46,8 +66,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke
{
world.setBlockWithNotify(i, j, k, 0);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRenderer.java ../src_work/minecraft/net/minecraft/src/ItemRenderer.java
--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-11 21:58:45.189682900 +0200
+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-16 01:00:00.046532100 +0200
--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-17 00:28:07.476756000 +0200
+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-07-17 00:28:09.472870200 +0200
@@ -5,6 +5,8 @@
package net.minecraft.src;
@ -77,8 +97,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende
Tessellator tessellator = Tessellator.instance;
int i = entityliving.getItemIcon(itemstack);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderBlocks.java ../src_work/minecraft/net/minecraft/src/RenderBlocks.java
--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-07-11 21:58:45.359692600 +0200
+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-07-16 00:51:36.820749200 +0200
--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-07-17 00:28:07.646765700 +0200
+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-07-17 00:28:09.476870400 +0200
@@ -5,6 +5,8 @@
package net.minecraft.src;
@ -89,8 +109,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderBlo
// Referenced classes of package net.minecraft.src:
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderItem.java ../src_work/minecraft/net/minecraft/src/RenderItem.java
--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-07-11 21:58:45.370693200 +0200
+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-07-16 01:01:10.494561500 +0200
--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-07-17 00:28:07.657766300 +0200
+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-07-17 00:28:09.478870500 +0200
@@ -5,6 +5,9 @@
package net.minecraft.src;
@ -152,8 +172,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte
int k1 = Item.itemsList[i].getColorFromDamage(j);
float f = (float)(k1 >> 16 & 0xff) / 255F;
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRenderer.java ../src_work/minecraft/net/minecraft/src/WorldRenderer.java
--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-11 21:58:45.464698600 +0200
+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-16 00:27:38.378475000 +0200
--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-17 00:28:07.751771700 +0200
+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-07-17 00:28:09.481870700 +0200
@@ -5,6 +5,9 @@
package net.minecraft.src;
@ -176,21 +196,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend
}
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/client/Minecraft.java ../src_work/minecraft/net/minecraft/client/Minecraft.java
--- ../src_base/minecraft/net/minecraft/client/Minecraft.java 2011-07-11 21:58:45.464698600 +0200
+++ ../src_work/minecraft/net/minecraft/client/Minecraft.java 2011-07-16 00:27:38.378475000 +0200
@@ -177,6 +177,7 @@
renderGlobal = new RenderGlobal(this, renderEngine);
GL11.glViewport(0, 0, displayWidth, displayHeight);
effectRenderer = new EffectRenderer(theWorld, renderEngine);
+ MinecraftForgeClient.onGameStart();
try
{
downloadResourcesThread = new ThreadDownloadResources(mcDataDir, this);
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-11 21:58:45.468698800 +0200
+++ ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java 2011-07-11 22:00:55.619143000 +0200
--- ../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
@ -248,8 +256,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/server
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-11 21:58:45.652709400 +0200
+++ ../src_work/minecraft_server/net/minecraft/src/ChunkProviderGenerate.java 2011-07-15 23:09:16.449540100 +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
@@ -6,6 +6,8 @@
import java.util.Random;
@ -269,8 +277,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch
generatedTemperatures = worldObj.getWorldChunkManager().getTemperatures(generatedTemperatures, k + 8, l + 8, 16, 16);
for(int j19 = k + 8; j19 < k + 8 + 16; j19++)
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-11 21:58:45.765715800 +0200
+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-15 23:15:07.301607700 +0200
--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-17 00:28:08.089791100 +0200
+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-07-17 00:28:09.490871200 +0200
@@ -6,6 +6,8 @@
import java.util.Random;

44
forge/package.sh Executable file
View File

@ -0,0 +1,44 @@
version=$1
dir=`pwd`/../forge-$version
function remove_svn () {
(
cd $1
if [ -d .svn ]; then
rm -rf .svn
fi
for j in `ls`
do
if [ -d $j ]; then
remove_svn $j
fi
done
)
}
function package_all () {
qual=$1
zip -r $dir/minecraftforge$qual-$version.zip \
*.class \
net/minecraft/src/forge
}
cd ../reobf
remove_svn .
rm -rf $dir
mkdir $dir
cd minecraft
package_all "-client"
cd ../minecraft_server
package_all "-server"
cd ../..
#rm -rf reobf

13
forge/release.bat Executable file
View File

@ -0,0 +1,13 @@
cmd /C build.bat
cd ..
cmd /C reobfuscate.bat
set PATH=E:\cygwin\bin;%PATH%
cd forge
sh package.sh 1.0
pause

15
forge/setup.sh
View File

@ -1,7 +1,10 @@
if [ ! -f ../src_base ]; then
cp -r ../src ../src_base
patch -p0 < minecraft.patch
cp -r ../src ../src_work
else
echo "patch already applied - remove src and src_base and decompile again"
if [ ! -d ../src ]; then
move ../src_base src
rm -rf src_work
fi
cp -r ../src ../src_base
cp -r ../src ../src_work
dir=`pwd`
cd ../src_work
patch -u -p2 < $dir/minecraft.patch