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

Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development

Browse source
This commit is contained in:
Aidan C. Brady 2014-06-18 21:19:13 +02:00
commit 5852b59b50
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/mekanism/generators/client/render/RenderWindTurbine.java
View file

@ -39,7 +39,7 @@ public class RenderWindTurbine extends TileEntitySpecialRenderer
if(!Mekanism.proxy.isPaused() &&
tileEntity.getWorldObj().canBlockSeeTheSky(tileEntity.xCoord, tileEntity.yCoord+4, tileEntity.zCoord))
{
tileEntity.angle = (tileEntity.angle+((int)tileEntity.getMultiplier())) % 360;
tileEntity.angle = (tileEntity.angle+((int)(tileEntity.getMultiplier() * partialTick))) % 360;
}
model.render(0.0625F, tileEntity.angle);

3
src/main/java/mekanism/tools/item/ItemMekanismArmor.java
View file

@ -41,7 +41,8 @@ public class ItemMekanismArmor extends ItemArmor
@Override
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
{
return "mekanism:armor/" + getArmorMaterial().name().toLowerCase() + "_" + type + ".png";
int layer = (slot == 2) ? 2 : 1;
return "mekanism:armor/" + getArmorMaterial().name().toLowerCase() + "_" + layer + ".png";
}
@Override