From f5d9bfa6c921af76684a871f693b37e6d2c26cc8 Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Sat, 17 Nov 2012 08:04:57 -0800 Subject: [PATCH] Fixed imports & updated build.xml --- build.xml | 4 ++-- common/buildcraft/core/EntityPassiveItem.java | 1 + common/buildcraft/core/utils/BlockUtil.java | 11 ++++++----- common/buildcraft/factory/TileMiningWell.java | 5 +++-- common/buildcraft/factory/TileQuarry.java | 4 ++-- common/buildcraft/transport/PipeTransportItems.java | 2 +- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/build.xml b/build.xml index 7ec70250..8e25dd94 100644 --- a/build.xml +++ b/build.xml @@ -17,8 +17,8 @@ - - + + diff --git a/common/buildcraft/core/EntityPassiveItem.java b/common/buildcraft/core/EntityPassiveItem.java index 2b361b8c..e425e7ff 100644 --- a/common/buildcraft/core/EntityPassiveItem.java +++ b/common/buildcraft/core/EntityPassiveItem.java @@ -16,6 +16,7 @@ import buildcraft.api.core.Position; import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.transport.IPassiveItemContribution; import buildcraft.api.transport.IPipedItem; +import buildcraft.BuildCraftCore; import buildcraft.core.proxy.CoreProxy; import net.minecraft.src.EntityItem; diff --git a/common/buildcraft/core/utils/BlockUtil.java b/common/buildcraft/core/utils/BlockUtil.java index e1f7b229..95f6eff5 100644 --- a/common/buildcraft/core/utils/BlockUtil.java +++ b/common/buildcraft/core/utils/BlockUtil.java @@ -8,19 +8,20 @@ package buildcraft.core.utils; -import java.util.ArrayList; +import java.util.List; import buildcraft.BuildCraftCore; - import buildcraft.BuildCraftEnergy; import buildcraft.api.core.BuildCraftAPI; + import net.minecraft.src.Block; +import net.minecraft.src.EntityItem; import net.minecraft.src.ItemStack; import net.minecraft.src.World; public class BlockUtil { - public static ArrayList getItemStackFromBlock(World world, int i, int j, int k) { + public static List getItemStackFromBlock(World world, int i, int j, int k) { Block block = Block.blocksList[world.getBlockId(i, j, k)]; if (block == null) @@ -36,14 +37,14 @@ public class BlockUtil { if (blockId != 0 && BuildCraftCore.dropBrokenBlocks && !world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { List items = Block.blocksList[blockId].getBlockDropped(world, x, y, z, world.getBlockMetadata(x, y, z), 0); - + for (ItemStack item : items) { float var = 0.7F; double dx = world.rand.nextFloat() * var + (1.0F - var) * 0.5D; double dy = world.rand.nextFloat() * var + (1.0F - var) * 0.5D; double dz = world.rand.nextFloat() * var + (1.0F - var) * 0.5D; EntityItem entityitem = new EntityItem(world, x + dx, y + dy, z + dz, item); - + entityitem.lifespan = BuildCraftCore.itemLifespan; entityitem.delayBeforeCanPickup = 10; diff --git a/common/buildcraft/factory/TileMiningWell.java b/common/buildcraft/factory/TileMiningWell.java index 8dac4d7f..f22947af 100644 --- a/common/buildcraft/factory/TileMiningWell.java +++ b/common/buildcraft/factory/TileMiningWell.java @@ -9,8 +9,9 @@ package buildcraft.factory; -import java.util.ArrayList; +import java.util.List; +import buildcraft.BuildCraftCore; import buildcraft.BuildCraftFactory; import net.minecraftforge.common.ForgeDirection; import buildcraft.api.power.IPowerProvider; @@ -61,7 +62,7 @@ public class TileMiningWell extends TileMachine implements IMachine, IPowerRecep int blockId = world.getBlockId(xCoord, depth, zCoord); - ArrayList stacks = BlockUtil.getItemStackFromBlock(worldObj, xCoord, depth, zCoord); + List stacks = BlockUtil.getItemStackFromBlock(worldObj, xCoord, depth, zCoord); world.setBlockWithNotify(xCoord, depth, zCoord, BuildCraftFactory.plainPipeBlock.blockID); diff --git a/common/buildcraft/factory/TileQuarry.java b/common/buildcraft/factory/TileQuarry.java index aa7e84cd..75ab5cc7 100644 --- a/common/buildcraft/factory/TileQuarry.java +++ b/common/buildcraft/factory/TileQuarry.java @@ -9,7 +9,6 @@ package buildcraft.factory; -import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -18,6 +17,7 @@ import com.google.common.collect.Sets; import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.network.Player; +import buildcraft.BuildCraftCore; import buildcraft.BuildCraftFactory; import buildcraft.api.core.IAreaProvider; import buildcraft.api.core.LaserKind; @@ -374,7 +374,7 @@ public class TileQuarry extends TileMachine implements IMachine, IPowerReceptor, // Share this with mining well! - ArrayList stacks = BlockUtil.getItemStackFromBlock(worldObj, i, j, k); + List stacks = BlockUtil.getItemStackFromBlock(worldObj, i, j, k); if (stacks != null) { for (ItemStack s : stacks) { diff --git a/common/buildcraft/transport/PipeTransportItems.java b/common/buildcraft/transport/PipeTransportItems.java index d60d6161..8df1c415 100644 --- a/common/buildcraft/transport/PipeTransportItems.java +++ b/common/buildcraft/transport/PipeTransportItems.java @@ -359,7 +359,7 @@ public class PipeTransportItems extends PipeTransport { entity.setContainer(container); - EntityData data = new EntityData(entity, ForgeDirection.values()[dataTag.getInteger("input")]); + EntityData data = new EntityData(entity, ForgeDirection.getOrientation(dataTag.getInteger("input"))); data.output = ForgeDirection.getOrientation(dataTag.getInteger("output")); data.toCenter = dataTag.getBoolean("toCenter");