BuildCraft 7.0.18

build.gradle

@@ -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.17"
+version = "7.0.18"
 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]
 

buildcraft_resources/changelog/7.0.18

@@ -11,6 +11,7 @@ Bugs fixed:
 * [#2921] Architect Table's defined area box not visible >64 blocks (ganymedes01)
 * [#2914] Advanced Crafting Table excess tick times in certain circumstances (asie)
 * [#2898] Robot crash on chunk unload/reload (hea3ven)
+* [#2862] Pipe name not displaying in WAILA (asie)
 * Fluid tanks rendering incorrectly in Builder (asie)
 * Knight/Butcher not emitting Forge attack events (asie)
 * Restoring robot block breaking state could fail (hea3ven)

buildcraft_resources/versions.txt

@@ -1,3 +1,3 @@
 1.6.4:BuildCraft:4.2.2
 1.7.2:BuildCraft:6.0.16
-1.7.10:BuildCraft:7.0.17
+1.7.10:BuildCraft:7.0.18

common/buildcraft/core/builders/BuildingSlotMapIterator.java

@@ -14,14 +14,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.WorldSettings;
-import net.minecraftforge.fluids.FluidStack;
 import buildcraft.core.lib.fluids.Tank;
-import buildcraft.core.lib.utils.FluidUtils;
 
 public class BuildingSlotMapIterator {
 	private static final int MAX_PER_ITEM = 80;

common/buildcraft/core/proxy/CoreProxy.java

@@ -167,4 +167,8 @@ public class CoreProxy implements ICoreProxy {
 			return null;
 		}
 	}
+
+	public EntityPlayer getClientPlayer() {
+		return null;
+	}
 }

common/buildcraft/core/proxy/CoreProxyClient.java

@@ -139,4 +139,9 @@ public class CoreProxyClient extends CoreProxy {
 			return Minecraft.getMinecraft().thePlayer;
 		}
 	}
+
+	@Override
+	public EntityPlayer getClientPlayer() {
+		return Minecraft.getMinecraft().thePlayer;
+	}
 }

common/buildcraft/robotics/EntityRobot.java

@@ -23,9 +23,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.IEntityMultiPart;
-import net.minecraft.entity.SharedMonsterAttributes;
-import net.minecraft.entity.boss.EntityDragonPart;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemArmor;
@@ -34,10 +31,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.nbt.NBTUtil;
-import net.minecraft.potion.Potion;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.stats.AchievementList;
-import net.minecraft.stats.StatList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.DamageSource;
@@ -1006,12 +1000,12 @@ public class EntityRobot extends EntityRobotBase implements
 		}
 		if (par1Entity.canAttackWithItem()) {
 			if (!par1Entity.hitByEntity(this)) {
-				float attackDamage = (float)this.getEntityAttribute(SharedMonsterAttributes.attackDamage).getAttributeValue();
+				float attackDamage = 2.0F;
 				int knockback = 0;
 
 				if (par1Entity instanceof EntityLivingBase) {
 					attackDamage += EnchantmentHelper.getEnchantmentModifierLiving(this, (EntityLivingBase) par1Entity);
-					knockback += EnchantmentHelper.getKnockbackModifier(this, (EntityLivingBase)par1Entity);
+					knockback += EnchantmentHelper.getKnockbackModifier(this, (EntityLivingBase) par1Entity);
 				}
 
 				if (attackDamage > 0.0F) {

common/buildcraft/transport/BlockGenericPipe.java

@@ -62,6 +62,7 @@ import buildcraft.core.lib.TileBuffer;
 import buildcraft.core.lib.block.BlockBuildCraft;
 import buildcraft.core.lib.utils.MatrixTranformations;
 import buildcraft.core.lib.utils.Utils;
+import buildcraft.core.proxy.CoreProxy;
 import buildcraft.transport.gates.GatePluggable;
 import buildcraft.transport.render.PipeRendererWorld;
 
@@ -485,6 +486,17 @@ public class BlockGenericPipe extends BlockBuildCraft implements IColorRemovable
 		return null;
 	}
 
+	@Override
+	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) {
+		// HACK: WAILA compatibility
+		EntityPlayer clientPlayer = CoreProxy.proxy.getClientPlayer();
+		if (clientPlayer != null) {
+			return getPickBlock(target, world, x, y, z, clientPlayer);
+		} else {
+			return new ItemStack(getPipe(world, x, y, z).item, 1, getPipe(world, x, y, z).container.getItemMetadata());
+		}
+	}
+
 	@Override
 	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) {
 		RaytraceResult rayTraceResult = doRayTrace(world, x, y, z, player);

common/buildcraft/transport/gates/GateExpansionPulsar.java

@@ -16,7 +16,6 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import cofh.api.energy.IEnergyHandler;
 import buildcraft.BuildCraftTransport;
-import buildcraft.api.core.BCLog;
 import buildcraft.api.gates.GateExpansionController;
 import buildcraft.api.gates.IGate;
 import buildcraft.api.gates.IGateExpansion;

common/buildcraft/transport/stripes/StripesHandlerPlaceBlock.java

@@ -14,7 +14,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import buildcraft.api.core.Position;
 import buildcraft.api.transport.IStripesActivator;
 import buildcraft.api.transport.IStripesHandler;