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 2015-03-16 11:43:41 -04:00
commit 9db789674a
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.properties
View file

@ -1,5 +1,5 @@
minecraft_version=1.7.10 minecraft_version=1.7.10
forge_version=10.13.2.1277 forge_version=10.13.2.1291
FMP_version=1.1.1.320 FMP_version=1.1.1.320
CCLIB_version=1.1.1.110 CCLIB_version=1.1.1.110
NEI_version=1.0.4.83 NEI_version=1.0.4.83

5
src/main/java/mekanism/client/render/item/ItemRenderingHandler.java
View file

@ -67,6 +67,7 @@ import net.minecraftforge.fluids.Fluid;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
@ -491,11 +492,11 @@ public class ItemRenderingHandler implements IItemRenderer
else { else {
if(item.getItem() instanceof ItemBlockMachine) if(item.getItem() instanceof ItemBlockMachine)
{ {
FMLRenderAccessLibrary.renderInventoryBlock((RenderBlocks)data[0], Block.getBlockFromItem(item.getItem()), item.getItemDamage(), ClientProxy.MACHINE_RENDER_ID); RenderingRegistry.instance().renderInventoryBlock((RenderBlocks)data[0], Block.getBlockFromItem(item.getItem()), item.getItemDamage(), ClientProxy.MACHINE_RENDER_ID);
} }
else if(item.getItem() instanceof ItemBlockBasic) else if(item.getItem() instanceof ItemBlockBasic)
{ {
FMLRenderAccessLibrary.renderInventoryBlock((RenderBlocks)data[0], Block.getBlockFromItem(item.getItem()), item.getItemDamage(), ClientProxy.BASIC_RENDER_ID); RenderingRegistry.instance().renderInventoryBlock((RenderBlocks)data[0], Block.getBlockFromItem(item.getItem()), item.getItemDamage(), ClientProxy.BASIC_RENDER_ID);
} }
} }
} }