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

Merge branch '6.0.x' into 6.1.x

Browse source
This commit is contained in:
SpaceToad 2014-05-17 14:17:50 +02:00
commit 04967c7c00
5 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
buildcraft_resources/assets/buildcraft/lang/en_US.lang
View file

@ -171,6 +171,7 @@ item.PipeFluidsVoid.name=Void Fluid Pipe
item.PipeItemsSandstone.name=Sandstone Transport Pipe
item.PipeFluidsSandstone.name=Sandstone Fluid Pipe
item.Facade.name=Facade
item.FacadePhased.name=Phased Facade
item.PipePlug.name=Pipe Plug
itemGroup.buildcraft.blocks=Buildcraft Blocks

16
common/buildcraft/builders/TileBlueprintLibrary.java
View file

@ -123,7 +123,21 @@ public class TileBlueprintLibrary extends TileBuildCraft implements IInventory {
@Override
public ItemStack decrStackSize(int i, int j) {
return inv.decrStackSize(i, j);
ItemStack result = inv.decrStackSize(i, j);
if (i == 0) {
if (getStackInSlot(0) == null) {
progressIn = 0;
}
}
if (i == 2) {
if (getStackInSlot(2) == null) {
progressOut = 0;
}
}
return result;
}
@Override

2
common/buildcraft/core/blueprints/BptBuilderBlueprint.java
View file

@ -189,7 +189,7 @@ public class BptBuilderBlueprint extends BptBuilderBase {
for (BuildingSlotBlock b : buildList) {
if (b.mode == Mode.ClearIfInvalid) {
context.world.setBlockToAir(b.x, b.y, b.z);
} else {
} else if (!b.schematic.doNotBuild()) {
b.stackConsumed = new LinkedList<ItemStack>();
try {

8
common/buildcraft/energy/TileEnergyConverter.java
View file

@ -21,6 +21,7 @@ import buildcraft.api.core.NetworkData;
import buildcraft.api.mj.IBatteryObject;
import buildcraft.api.mj.MjAPI;
import buildcraft.api.mj.MjBattery;
import buildcraft.api.power.IPowerEmitter;
import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.power.PowerHandler;
import buildcraft.api.tools.IToolWrench;
@ -28,7 +29,7 @@ import buildcraft.core.TileBuffer;
import buildcraft.core.TileBuildCraft;
import buildcraft.core.utils.StringUtils;
public class TileEnergyConverter extends TileBuildCraft implements IPowerReceptor {
public class TileEnergyConverter extends TileBuildCraft implements IPowerReceptor, IPowerEmitter {
private static enum Mode {
FromOldToNew("from_old_to_new"), FromNewToOld("from_new_to_old");
private final String localizeName;
@ -156,4 +157,9 @@ public class TileEnergyConverter extends TileBuildCraft implements IPowerRecepto
@Override
public void doWork(PowerHandler workProvider) {
}
@Override
public boolean canEmitPowerFrom(ForgeDirection side) {
return mode == Mode.FromOldToNew;
}
}

7
common/buildcraft/transport/ItemFacade.java
View file

@ -19,7 +19,6 @@ import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@ -42,6 +41,7 @@ import buildcraft.core.BlockSpring;
import buildcraft.core.CreativeTabBuildCraft;
import buildcraft.core.ItemBuildCraft;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.StringUtils;
public class ItemFacade extends ItemBuildCraft {
@ -66,7 +66,7 @@ public class ItemFacade extends ItemBuildCraft {
String name = super.getItemStackDisplayName(itemstack);
if (getType(itemstack) == TYPE_PHASED) {
name = "Phased " + name;
name = StringUtils.localize("item.FacadePhased.name");
}
Block block = ItemFacade.getBlocks(itemstack)[0];
@ -83,7 +83,7 @@ public class ItemFacade extends ItemBuildCraft {
}
ItemStack stack = new ItemStack(block, 1, meta);
ItemStack stackAlt = new ItemStack(blockAlt, 1, meta);
ItemStack stackAlt = new ItemStack(blockAlt, 1, metaAlt);
if (getType(itemstack) == TYPE_BASIC) {
if (Item.getItemFromBlock(block) != null) {
@ -122,7 +122,6 @@ public class ItemFacade extends ItemBuildCraft {
for (ItemStack stack : allFacades) {
itemList.add(stack.copy());
}
itemList.add(getAdvancedFacade(PipeWire.RED, Blocks.diamond_block, 0, Blocks.emerald_block, 0));
}
@Override