Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

More work on UE integration

Browse source
This commit is contained in:
Calclavia 2013-08-07 00:38:51 -04:00
parent a93571ad33
commit c099462b3f
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/resonantinduction/contractor/TileEntityEMContractor.java
View file

@ -157,7 +157,7 @@ public class TileEntityEMContractor extends TileEntityAdvanced implements IPacke
if (TileEntityEMContractor.canBePath(this.worldObj, result))
{
// TODO: RENDER BEAMS ONLY ON CHANGE. SAVE CALCULATIONS!
if (i - 1 >= 0)
{
Vector3 prevResult = this.pathfinder.results.get(i - 1).clone();

4
src/resonantinduction/render/RenderMultimeter.java
View file

@ -11,6 +11,8 @@ import org.lwjgl.opengl.GL11;
import resonantinduction.ResonantInduction;
import resonantinduction.model.ModelMultimeter;
import resonantinduction.multimeter.TileEntityMultimeter;
import universalelectricity.core.electricity.ElectricityDisplay;
import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -121,7 +123,7 @@ public class RenderMultimeter extends TileEntitySpecialRenderer
FontRenderer fontRenderer = this.getFontRenderer();
String joules = Math.round(tileEntity.getDetectedEnergy()) + " J";
String joules = ElectricityDisplay.getDisplayShort(tileEntity.getDetectedEnergy(), ElectricUnit.JOULES);
int stringWidth = Math.max(fontRenderer.getStringWidth(joules), 0);
// maxWidth += 8;

13
src/resonantinduction/tesla/TileEntityTesla.java
View file

@ -6,6 +6,7 @@ package resonantinduction.tesla;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@ -224,7 +225,7 @@ public class TileEntityTesla extends TileEntityUniversalElectrical implements IT
* @author Calclavia
*/
TileEntity tileEntity = this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord - 1, this.zCoord);
if (tileEntity instanceof TileEntityFurnace && this.getRequest(ForgeDirection.DOWN) > 0)
{
TileEntityFurnace furnaceTile = (TileEntityFurnace) tileEntity;
@ -573,14 +574,20 @@ public class TileEntityTesla extends TileEntityUniversalElectrical implements IT
{
return this.getEnergyStored();
}
return 0;
}
@Override
public float getMaxEnergyStored()
{
return 20;
return TRANSFER_CAP;
}
@Override
public EnumSet<ForgeDirection> getOutputDirections()
{
return EnumSet.allOf(ForgeDirection.class);
}
}