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

Fixed imports & updated build.xml

Browse source
This commit is contained in:
CovertJaguar 2012-11-17 08:04:57 -08:00
parent b1b950cc3e
commit f5d9bfa6c9
6 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.xml
View file

@ -17,8 +17,8 @@
<property name="mcpsrc.dir" value="${mcp.dir}/src/minecraft"/>
<property name="mcp.version" value="719"/>
<property name="forge.version" value="6.0.1.337"/>
<property name="mcp.version" value="722"/>
<property name="forge.version" value="6.4.0.381"/>
<property name="bc.version" value="3.1.8"/>
<available property="forge-exists" file="${download.dir}/minecraftforge-src-${forge.version}.zip"/>

1
common/buildcraft/core/EntityPassiveItem.java
View file

@ -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;

7
common/buildcraft/core/utils/BlockUtil.java
View file

@ -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<ItemStack> getItemStackFromBlock(World world, int i, int j, int k) {
public static List<ItemStack> getItemStackFromBlock(World world, int i, int j, int k) {
Block block = Block.blocksList[world.getBlockId(i, j, k)];
if (block == null)

5
common/buildcraft/factory/TileMiningWell.java
View file

@ -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<ItemStack> stacks = BlockUtil.getItemStackFromBlock(worldObj, xCoord, depth, zCoord);
List<ItemStack> stacks = BlockUtil.getItemStackFromBlock(worldObj, xCoord, depth, zCoord);
world.setBlockWithNotify(xCoord, depth, zCoord, BuildCraftFactory.plainPipeBlock.blockID);

4
common/buildcraft/factory/TileQuarry.java
View file

@ -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<ItemStack> stacks = BlockUtil.getItemStackFromBlock(worldObj, i, j, k);
List<ItemStack> stacks = BlockUtil.getItemStackFromBlock(worldObj, i, j, k);
if (stacks != null) {
for (ItemStack s : stacks) {

2
common/buildcraft/transport/PipeTransportItems.java
View file

@ -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");