Anvilcraft/buildcraft
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

BuildCraft 7.0.14

Browse source
This commit is contained in:
Adrian 2015-07-11 14:31:19 +02:00
parent 915d900a40
commit 45384e0a53
6 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -22,7 +22,7 @@ apply plugin: 'forge' // adds the forge dependency
apply plugin: 'maven' // for uploading to a maven repo
apply plugin: 'checkstyle'
version = "7.0.13"
version = "7.0.14"
group= "com.mod-buildcraft"
archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension]

4
buildcraft_resources/changelog/7.0.14
View file

@ -1,3 +1,7 @@
Improvements:
* Quarries now dig through light fluids and stop on dense fluids. Behaviour might change later, so watch out! (asie)
Bugs fixed:
* [#2880] Try to fix fluid pipe bug (asie)

2
buildcraft_resources/versions.txt
View file

@ -1,3 +1,3 @@
1.6.4:BuildCraft:4.2.2
1.7.2:BuildCraft:6.0.16
1.7.10:BuildCraft:7.0.13
1.7.10:BuildCraft:7.0.14

1
common/buildcraft/builders/TilePathMarker.java
View file

@ -11,7 +11,6 @@ package buildcraft.builders;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import io.netty.buffer.ByteBuf;

7
common/buildcraft/builders/TileQuarry.java
View file

@ -17,6 +17,7 @@ import com.google.common.collect.Sets;
import io.netty.buffer.ByteBuf;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLiquid;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ISidedInventory;
@ -31,6 +32,7 @@ import net.minecraftforge.common.ForgeChunkManager.Ticket;
import net.minecraftforge.common.ForgeChunkManager.Type;
import net.minecraftforge.common.util.FakePlayer;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.IFluidBlock;
import buildcraft.BuildCraftBuilders;
import buildcraft.BuildCraftCore;
@ -374,7 +376,7 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI
if (!BlockUtils.canChangeBlock(block, worldObj, bx, by, bz)) {
blockedColumns[searchX][searchZ] = true;
} else if (!BuildCraftAPI.isSoftBlock(worldObj, bx, by, bz)) {
} else if (!BuildCraftAPI.isSoftBlock(worldObj, bx, by, bz) && !(block instanceof BlockLiquid) && !(block instanceof IFluidBlock)) {
visitList.add(new int[]{bx, by, bz});
}
@ -470,7 +472,8 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI
private boolean isQuarriableBlock(int bx, int by, int bz) {
Block block = worldObj.getBlock(bx, by, bz);
return BlockUtils.canChangeBlock(block, worldObj, bx, by, bz)
&& !BuildCraftAPI.isSoftBlock(worldObj, bx, by, bz);
&& !BuildCraftAPI.isSoftBlock(worldObj, bx, by, bz)
&& !(block instanceof BlockLiquid) && !(block instanceof IFluidBlock);
}
@Override

2
common/buildcraft/core/lib/block/BlockBuildCraftFluid.java
View file

@ -186,7 +186,7 @@ public class BlockBuildCraftFluid extends BlockFluidClassic {
}
@Override
public boolean canDropFromExplosion(Explosion p_149659_1_) {
public boolean canDropFromExplosion(Explosion explosion) {
return false;
}
}