GT5.08.29

This commit is contained in:
Blood-Asp 2015-09-05 23:18:46 +02:00
parent fbf9df8b2e
commit 1f3bb4317f
47 changed files with 9 additions and 11 deletions

View file

@ -552,7 +552,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
mFacing = (byte)(aValue& 7);
mActive = ((aValue& 8) != 0);
mRedstone = ((aValue&16) != 0);
mLockUpgrade = ((aValue&32) != 0);
//mLockUpgrade = ((aValue&32) != 0);
break;
case 1:
if (hasValidMetaTileEntity()) mMetaTileEntity.onValueUpdate((byte)aValue);

View file

@ -325,7 +325,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
stopMachine();
return false;
}
if (mRuntime++>10) {
if (mRuntime++>1000) {
mRuntime = 0;
if (getBaseMetaTileEntity().getRandomNumber(6000) == 0) {
switch (getBaseMetaTileEntity().getRandomNumber(6)) {

View file

@ -296,10 +296,14 @@ public class GT_Block_Machines
public float getPlayerRelativeBlockHardness(EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ)
{
// System.out.println("player hardness");
TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
if (((tTileEntity instanceof BaseMetaTileEntity)) && (((BaseMetaTileEntity)tTileEntity).privateAccess()) && (!((BaseMetaTileEntity)tTileEntity).playerOwnsThis(aPlayer, false))) {
return -1.0F;
if (((tTileEntity instanceof BaseMetaTileEntity)) && (((BaseMetaTileEntity)tTileEntity).privateAccess()) && (!((BaseMetaTileEntity)tTileEntity).playerOwnsThis(aPlayer, true))) {
// System.out.println("locked");
return -1.0F;
}
// System.out.println("unlocked");
// System.out.println("hardness: "+super.getPlayerRelativeBlockHardness(aPlayer, aWorld, aX, aY, aZ));
return super.getPlayerRelativeBlockHardness(aPlayer, aWorld, aX, aY, aZ);
}

View file

@ -141,10 +141,4 @@ public class GT_Tool_Wrench
{
return new ChatComponentText(EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + " threw a Monkey Wrench into the Plans of " + EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE);
}
}
/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar
* Qualified Name: gregtech.common.tools.GT_Tool_Wrench
* JD-Core Version: 0.7.0.1
*/
}