BuildCraft 7.1.4

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.1.3"
+version = "7.1.4"
 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/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.23
+1.7.10:BuildCraft:7.1.4

common/buildcraft/BuildCraftBuilders.java

@@ -35,7 +35,6 @@ import net.minecraft.world.World;
 
 import cpw.mods.fml.client.event.ConfigChangedEvent;
 import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLInterModComms;
@@ -136,7 +135,6 @@ import buildcraft.core.builders.schematics.SchematicRotateMeta;
 import buildcraft.core.builders.schematics.SchematicRotateMetaSupported;
 import buildcraft.core.builders.schematics.SchematicTileCreative;
 import buildcraft.core.config.ConfigManager;
-import buildcraft.core.proxy.CoreProxy;
 
 @Mod(name = "BuildCraft Builders", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Builders", dependencies = DefaultProps.DEPENDENCY_CORE)
 public class BuildCraftBuilders extends BuildCraftMod {

common/buildcraft/BuildCraftEnergy.java

@@ -63,7 +63,6 @@ import buildcraft.core.lib.engines.TileEngineBase;
 import buildcraft.core.lib.engines.TileEngineBase.EnergyStage;
 import buildcraft.core.lib.network.ChannelHandler;
 import buildcraft.core.lib.network.PacketHandler;
-import buildcraft.core.proxy.CoreProxy;
 import buildcraft.energy.BucketHandler;
 import buildcraft.energy.EnergyGuiHandler;
 import buildcraft.energy.EnergyProxy;

common/buildcraft/BuildCraftFactory.java

@@ -44,7 +44,6 @@ import buildcraft.core.builders.schematics.SchematicRotateMeta;
 import buildcraft.core.config.ConfigManager;
 import buildcraft.core.lib.network.ChannelHandler;
 import buildcraft.core.lib.network.PacketHandler;
-import buildcraft.core.proxy.CoreProxy;
 import buildcraft.factory.BlockAutoWorkbench;
 import buildcraft.factory.BlockFloodGate;
 import buildcraft.factory.BlockHopper;

common/buildcraft/BuildCraftRobotics.java

@@ -53,7 +53,6 @@ import buildcraft.core.InterModComms;
 import buildcraft.core.Version;
 import buildcraft.core.config.ConfigManager;
 import buildcraft.core.network.EntityIds;
-import buildcraft.core.proxy.CoreProxy;
 import buildcraft.robotics.BlockRequester;
 import buildcraft.robotics.BlockZonePlan;
 import buildcraft.robotics.BoardProgrammingRecipe;

common/buildcraft/BuildCraftSilicon.java

@@ -40,7 +40,6 @@ import buildcraft.core.config.ConfigManager;
 import buildcraft.core.lib.items.ItemBuildCraft;
 import buildcraft.core.lib.network.ChannelHandler;
 import buildcraft.core.network.EntityIds;
-import buildcraft.core.proxy.CoreProxy;
 import buildcraft.silicon.BlockLaser;
 import buildcraft.silicon.BlockLaserTable;
 import buildcraft.silicon.BlockPackager;

common/buildcraft/BuildCraftTransport.java

@@ -69,7 +69,6 @@ import buildcraft.core.config.ConfigManager;
 import buildcraft.core.lib.items.ItemBuildCraft;
 import buildcraft.core.lib.network.ChannelHandler;
 import buildcraft.core.lib.utils.ColorUtils;
-import buildcraft.core.proxy.CoreProxy;
 import buildcraft.transport.BlockFilteredBuffer;
 import buildcraft.transport.BlockGenericPipe;
 import buildcraft.transport.FacadePluggable;

common/buildcraft/core/BCRegistry.java

@@ -11,7 +11,7 @@ import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 import buildcraft.core.lib.items.ItemBlockBuildCraft;
 
-public class BCRegistry {
+public final class BCRegistry {
 	public static final BCRegistry INSTANCE = new BCRegistry();
 	private Configuration regCfg;
 

common/buildcraft/core/BlockEngine.java

@@ -1,6 +1,5 @@
 package buildcraft.core;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.creativetab.CreativeTabs;

common/buildcraft/core/builders/BuildingItem.java

@@ -15,7 +15,6 @@ import java.util.List;
 import io.netty.buffer.ByteBuf;
 
 import net.minecraft.block.Block;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;

common/buildcraft/core/proxy/CoreProxy.java

@@ -15,8 +15,6 @@ import net.minecraft.block.Block;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.INetHandler;
 import net.minecraft.network.NetHandlerPlayServer;
@@ -26,17 +24,12 @@ import net.minecraft.world.WorldServer;
 
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.registry.GameRegistry;
 import net.minecraftforge.common.util.FakePlayerFactory;
-import net.minecraftforge.oredict.ShapedOreRecipe;
-import net.minecraftforge.oredict.ShapelessOreRecipe;
 
 import buildcraft.BuildCraftCore;
 import buildcraft.api.core.ICoreProxy;
-import buildcraft.core.CompatHooks;
 import buildcraft.core.LaserKind;
 import buildcraft.core.lib.EntityBlock;
-import buildcraft.core.lib.items.ItemBlockBuildCraft;
 
 public class CoreProxy implements ICoreProxy {
 

common/buildcraft/factory/render/RenderTank.java

@@ -17,6 +17,7 @@ import net.minecraftforge.fluids.FluidStack;
 
 import buildcraft.core.lib.render.FluidRenderer;
 import buildcraft.core.lib.render.RenderUtils;
+import buildcraft.core.lib.utils.MathUtils;
 import buildcraft.core.proxy.CoreProxy;
 import buildcraft.factory.TileTank;
 
@@ -52,7 +53,8 @@ public class RenderTank extends TileEntitySpecialRenderer {
 		GL11.glScalef(0.75F, 0.999F, 0.75F);
 		GL11.glTranslatef(0, -0.5F, 0);
 
-		GL11.glCallList(displayList[(int) ((float) liquid.amount / (float) (tank.tank.getCapacity()) * (FluidRenderer.DISPLAY_STAGES - 1))]);
+		int dl = (int) ((float) liquid.amount / (float) (tank.tank.getCapacity()) * (FluidRenderer.DISPLAY_STAGES - 1));
+		GL11.glCallList(displayList[MathUtils.clamp(dl, 0, FluidRenderer.DISPLAY_STAGES - 1)]);
 
 		GL11.glPopAttrib();
 		GL11.glPopMatrix();

common/buildcraft/robotics/map/MapWorld.java

@@ -1,9 +1,7 @@
 package buildcraft.robotics.map;
 
-import java.io.EOFException;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Date;

common/buildcraft/transport/BlockGenericPipe.java

@@ -912,13 +912,15 @@ public class BlockGenericPipe extends BlockBuildCraft implements IColorRemovable
 			return true;
 		}
 
-		Block placedAgainst = world.getBlock(i + side.getOpposite().offsetX, j + side.getOpposite().offsetY, k + side.getOpposite().offsetZ);
-		BlockEvent.PlaceEvent placeEvent = new BlockEvent.PlaceEvent(
-				new BlockSnapshot(world, i, j, k, block, meta), placedAgainst, player
-		);
-		MinecraftForge.EVENT_BUS.post(placeEvent);
-		if (placeEvent.isCanceled()) {
-			return false;
+		if (player != null) {
+			Block placedAgainst = world.getBlock(i + side.getOpposite().offsetX, j + side.getOpposite().offsetY, k + side.getOpposite().offsetZ);
+			BlockEvent.PlaceEvent placeEvent = new BlockEvent.PlaceEvent(
+					new BlockSnapshot(world, i, j, k, block, meta), placedAgainst, player
+			);
+			MinecraftForge.EVENT_BUS.post(placeEvent);
+			if (placeEvent.isCanceled()) {
+				return false;
+			}
 		}
 
 		boolean placed = world.setBlock(i, j, k, block, meta, 3);

common/buildcraft/transport/ItemFacade.java

@@ -50,8 +50,6 @@ import buildcraft.core.lib.items.ItemBuildCraft;
 import buildcraft.core.lib.utils.StringUtils;
 import buildcraft.core.proxy.CoreProxy;
 
-import scala.collection.mutable.Builder$class;
-
 public class ItemFacade extends ItemBuildCraft implements IFacadeItem, IPipePluggableItem {
 	public static class FacadeState {
 		public final Block block;

common/buildcraft/transport/pipes/PipeItemsEmerald.java

@@ -133,11 +133,15 @@ public class PipeItemsEmerald extends PipeItemsWood implements ISerializable, IG
 			if (doRemove) {
 				int maxStackSize = stack.stackSize;
 				int stackSize = Math.min(maxStackSize, battery.getEnergyStored() / 10);
-				speedMultiplier = Math.min(4.0F, battery.getEnergyStored() * 10 / stackSize);
-				int energyUsed = (int) (stackSize * 10 * speedMultiplier);
-				battery.useEnergy(energyUsed, energyUsed, false);
+				if (stackSize > 0) {
+					speedMultiplier = Math.min(4.0F, battery.getEnergyStored() * 10 / stackSize);
+					int energyUsed = (int) (stackSize * 10 * speedMultiplier);
+					battery.useEnergy(energyUsed, energyUsed, false);
 
-				stack = inventory.decrStackSize(k, stackSize);
+					stack = inventory.decrStackSize(k, stackSize);
+				} else {
+					return null;
+				}
 			}
 
 			return new ItemStack[]{stack};