Merge pull request #1592 from covers1624/master

Enhancement #1516: Glass panes lay down on the casting table.
This commit is contained in:
boni committed 2015-05-02 10:56:39 +02:00
commit b5ffc4229e
2 files changed
+10 -1

No files matched your search

@@ -5,8 +5,11 @@ import net.minecraft.client.renderer.entity.*;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.item.*;
import net.minecraft.tileentity.TileEntity;
import org.lwjgl.opengl.GL11;
import tconstruct.library.ItemBlocklike;
import tconstruct.smeltery.TinkerSmeltery;
import tconstruct.smeltery.logic.CastingTableLogic;
import tconstruct.tools.entity.FancyEntityItem;
@@ -61,6 +64,13 @@ public class CastingTableSpecialRenderer extends TileEntitySpecialRenderer
GL11.glTranslatef(0F, -0.1F, 0.2275F);
}
if (stack.isItemEqual(new ItemStack(TinkerSmeltery.glassPane)))
{
GL11.glRotatef(90F, 1F, 0F, 0F);
GL11.glTranslatef(0F, -0.194F, -0.1F);
GL11.glScalef(0.85F, 0.85F, 0.85F);
}
RenderItem.renderInFrame = true;
RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
RenderItem.renderInFrame = false;
@@ -46,7 +46,6 @@ public class ArmourGuiSyncPacket extends AbstractPacket
@Override
public void handleClientSide (EntityPlayer player)
{
TConstruct.logger.info("Packet Arrived!");
TPlayerStats stats = new TPlayerStats(player);
stats.loadNBTData(playerStats);
TinkerArmor.proxy.updatePlayerStats(stats);