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

Some work on rendering, fixed sound error

Browse source
This commit is contained in:
Aidan C. Brady 2013-11-13 14:59:11 -05:00
parent f24c12044d
commit c9b5c7b51f
2 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
common/mekanism/client/render/item/ItemRenderingHandler.java
View file

@ -1,7 +1,6 @@
package mekanism.client.render.item;
import mekanism.api.EnumColor;
import mekanism.api.Object3D;
import mekanism.api.energy.IEnergizedItem;
import mekanism.client.ClientProxy;
import mekanism.client.MekanismClient;
@ -36,6 +35,7 @@ import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.ForgeHooksClient;
import net.minecraftforge.client.IItemRenderer;
@ -155,25 +155,35 @@ public class ItemRenderingHandler implements IItemRenderer
{
GL11.glPushMatrix();
if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON)
if(!(itemStack.getItem() instanceof ItemBlock) || Block.blocksList[itemStack.itemID].getRenderType() != 0)
{
GL11.glTranslated(-0.2, 0, -0.4);
GL11.glRotatef(180, 0, 0, 1);
GL11.glTranslatef(-1.02F, -0.2F, 0);
if(type == ItemRenderType.INVENTORY)
{
GL11.glTranslatef(-0.45F, -0.4F, 0.0F);
}
}
if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON || type == ItemRenderType.ENTITY)
{
GL11.glTranslatef(-0.22F, -0.2F, -0.22F);
}
//TODO
GL11.glTranslated(0.73, 0.53, -0.01);
GL11.glTranslated(0.73, 0.08, 0.44);
GL11.glRotatef(90, 0, 1, 0);
float scale = 0.03125F;
float scaler = 0.9F;
GL11.glScalef(scale*scaler, scale*scaler, 0);
GL11.glRotatef(180, 0, 0, 1);
TextureManager renderEngine = Minecraft.getMinecraft().renderEngine;
GL11.glDisable(2896);
GL11.glEnable(GL11.GL_CULL_FACE);
if(!ForgeHooksClient.renderInventoryItem(renderBlocks, renderEngine, itemStack, true, 0.0F, 0.0F, 0.0F))
{
renderItem.renderItemIntoGUI(binRenderer.getFontRenderer(), renderEngine, itemStack, 0, 0);
@ -197,12 +207,11 @@ public class ItemRenderingHandler implements IItemRenderer
float displayHeight = 1 - (2 / 16);
GL11.glTranslatef(0, -0.31F, 0);
if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON)
if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON || type == ItemRenderType.ENTITY)
{
GL11.glTranslated(-0.4, 0, -0.4);
GL11.glTranslated(-0.5, -0.4, -0.5);
}
//TODO
GL11.glTranslatef(0, 0.9F, 1);
GL11.glRotatef(90, 0, 1, 0);
GL11.glRotatef(90, 1, 0, 0);

8
common/mekanism/client/sound/SoundHandler.java
View file

@ -52,9 +52,9 @@ public class SoundHandler
public void preloadSounds()
{
URL url = getClass().getClassLoader().getResource("assets/mekanism/sound");
File dir = new File(url.getFile());
File dir = new File(url.getFile().replace("%20", " "));
if(dir != null)
if(dir != null && dir.exists())
{
for(File file : dir.listFiles())
{
@ -66,9 +66,9 @@ public class SoundHandler
}
url = getClass().getClassLoader().getResource("assets/mekanism/sound/etc");
dir = new File(url.getFile());
dir = new File(url.getFile().replace("%20", " "));
if(dir != null)
if(dir != null && dir.exists())
{
for(File file : dir.listFiles())
{