Fix Merges

This commit is contained in:
Stuart Pomeroy 2016-03-27 20:14:13 +01:00
commit dfb7d0afd4
26 changed files with 176 additions and 90 deletions

View file

@ -13,6 +13,8 @@ import reborncore.common.util.Inventory;
import reborncore.common.util.ItemUtils;
import techreborn.init.ModBlocks;
import techreborn.init.ModItems;
import ic2.api.tile.IWrenchable;
import techreborn.items.ItemParts;
public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchable, IInventory
{
@ -302,6 +304,11 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab
{
// int value = getValue(Recipes.matterAmplifier.getOutputFor(itemStack,
// false));
if(itemStack.getItem() == ModItems.parts && itemStack.getItemDamage() == ItemParts.getPartByName("scrap").getItemDamage()){
return 5000;
} else if (itemStack.getItem() == ModItems.scrapBox){
return 45000;
}
return 0;
}

View file

@ -81,7 +81,7 @@ public class TileQuantumTank extends TileMachineBase
FluidUtils.fillContainers(this, inventory, 0, 1, tank.getFluidType());
if (tank.getFluidType() != null && getStackInSlot(2) == null)
{
inventory.setInventorySlotContents(2, new ItemStack(tank.getFluidType().getBlock()));
// inventory.setInventorySlotContents(2, new ItemStack(tank.getFluidType().getBlock()));
} else if (tank.getFluidType() == null && getStackInSlot(2) != null)
{
setInventorySlotContents(2, null);

View file

@ -158,9 +158,9 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab
public void updateEntity()
{
super.updateEntity();
FluidUtils.drainContainers(this, inventory, 0, 1);
if (!worldObj.isRemote)
{
FluidUtils.drainContainers(this, inventory, 0, 1);
for (EnumFacing direction : EnumFacing.values())
{
if (worldObj.getBlockState(new BlockPos(getPos().getX() + direction.getFrontOffsetX(),