tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

v4.2.2 Beta #2

Browse source 
*Fixed BuildCraft energy injection.
*Removed unneeded import.
*Removed unused textureIndex field in BlockMachine.
This commit is contained in:
Aidan Brady 2012-10-09 18:35:19 -04:00
parent e12825cccc
commit b8781cc3e4
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/common/net/uberkat/obsidian/common/BlockMachine.java
View file

@ -3,7 +3,6 @@ package net.uberkat.obsidian.common;
import java.util.List;
import java.util.Random;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.Side;
import cpw.mods.fml.common.asm.SideOnly;
import net.minecraft.src.*;
@ -23,8 +22,6 @@ public class BlockMachine extends BlockContainer
{
public Random machineRand = new Random();
public int textureIndex = 32;
public BlockMachine(int id)
{
super(id, Material.iron);

2
src/common/net/uberkat/obsidian/common/TileEntityPowerUnit.java
View file

@ -121,7 +121,7 @@ public class TileEntityPowerUnit extends TileEntityDisableable implements IInven
if(powerProvider != null)
{
int received = (int)(powerProvider.useEnergy(25, 25, true)*100);
int received = (int)(powerProvider.useEnergy(25, 25, true)*10);
setEnergy(energyStored + received);
}