From 7c66376a3bf6aeec93afb48aaaf0611bca6b96e1 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Tue, 21 Feb 2012 03:53:33 -0500 Subject: [PATCH] Fixed linux scripts, fixed TE bug. --- forge/build.sh | 8 +++---- forge/inject_version.sh | 0 .../net/minecraft/src/Chunk.java.patch | 2 +- .../net/minecraft/src/Chunk.java.patch | 2 +- forge/setup.sh | 6 +++++ forge/update_patches.sh | 23 ++++++++++++------- 6 files changed, 27 insertions(+), 14 deletions(-) mode change 100644 => 100755 forge/inject_version.sh mode change 100644 => 100755 forge/update_patches.sh diff --git a/forge/build.sh b/forge/build.sh index 111a63bbe..466b57d29 100755 --- a/forge/build.sh +++ b/forge/build.sh @@ -11,10 +11,10 @@ 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/ -cd forge -./inject_version.sh ../src_forge/minecraft/net/minecraft/src/forge/ForgeHooks.java -./inject_version.sh ../src_forge/minecraft_server/net/minecraft/src/forge/ForgeHooks.java -cd .. +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 diff --git a/forge/inject_version.sh b/forge/inject_version.sh old mode 100644 new mode 100755 diff --git a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch index c562aae35..3e4aff738 100644 --- a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch @@ -5,7 +5,7 @@ Block.blocksList[l1].onBlockRemoval(worldObj, i2, j, j2); } - else if ((Block.blocksList[l1] instanceof BlockContainer) && l1 != l) -+ else if (Block.blocksList[l1] != null && Block.blocksList[l1].hasTileEntity(getBlockMetadata(i, j, k)) && l1 != l) ++ else if (Block.blocksList[l1] != null && Block.blocksList[l1].hasTileEntity(getBlockMetadata(i, j, k))) { worldObj.removeBlockTileEntity(i2, j, j2); } diff --git a/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch index e80998261..976d11567 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch @@ -5,7 +5,7 @@ Block.blocksList[l1].onBlockRemoval(worldObj, i2, j, j2); } - else if ((Block.blocksList[l1] instanceof BlockContainer) && l1 != l) -+ else if (Block.blocksList[l1] != null && Block.blocksList[l1].hasTileEntity(getBlockMetadata(i, j, k)) && l1 != l) ++ else if (Block.blocksList[l1] != null && Block.blocksList[l1].hasTileEntity(getBlockMetadata(i, j, k))) { worldObj.removeBlockTileEntity(i2, j, j2); } diff --git a/forge/setup.sh b/forge/setup.sh index fde826c7a..d37ac03d9 100755 --- a/forge/setup.sh +++ b/forge/setup.sh @@ -46,6 +46,12 @@ 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 diff --git a/forge/update_patches.sh b/forge/update_patches.sh old mode 100644 new mode 100755 index bf65d9154..a22ba77c6 --- a/forge/update_patches.sh +++ b/forge/update_patches.sh @@ -1,34 +1,41 @@ echo Creating directories -for i in `find ../src_work -type d` +fdir=$PWD +cd .. + +for i in `find src_work -type d` do - mkdir --parents "./patches${i:11}" + mkdir --parents "$fdir/patches${i##src_work}" done echo Creating patches +cd src_work for i in `find ../src_work -type f` do - diff -u ../src_base${i:11} $i -r --strip-trailing-cr --new-file | sed -e "1,2s/[0-9-]* [0-9:\.]* [+-][0-9]*\b/0000-00-00 00:00:00.000000000 -0000/" | tr -d '\r' > ./patches${i:11}.patch + ibase=${i##../src_work} + diff -u ../src_base$ibase $i -r --strip-trailing-cr --new-file | sed -e "1,2s/[0-9-]* [0-9:\.]* [+-][0-9]*\b/0000-00-00 00:00:00.000000000 -0000/" | tr -d '\r' > $fdir/patches$ibase.patch done +cd .. echo Removing empty patches -find patches -size 0 -type f -name \*.patch -delete -for i in `find patches -depth -empty -type d | grep -a -v "svn"` +find $fdir/patches -size 0 -type f -name \*.patch -delete +for i in `find $fdir/patches -depth -empty -type d | grep -a -v "svn"` do rmdir "$i" done echo Grabbing copy of conf folder -for i in `find conf -type f | grep -a -v "svn"` +for i in `find $fdir/conf -type f | grep -a -v "svn"` do rm $i done -for i in `find conf -depth -empty -type d | grep -a -v "svn"` +for i in `find $fdir/conf -depth -empty -type d | grep -a -v "svn"` do rmdir "$i" done -cp -r ../conf/* conf +mkdir -p $fdir/conf +cp -r conf/* $fdir/conf echo Finished