keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

MinecraftForge/FML@787c0c4a6a Don't spit error on LWJGL not supporting 4.3 just warning.

Browse source 
Make custom item renderers attempt to use EQUIPPED type when running first person. For backwards compatiblity, will be removed in 1.6.
And a small change to make the 1.6 check not print it's stack trace.
This commit is contained in:
LexManos 2013-05-11 10:59:03 -07:00
parent 348af15cb5
commit 7ea4508933
3 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fml

@ -1 +1 @@
Subproject commit 49111e9c5cffab49ec35f965801c3f0496f6def6
Subproject commit 787c0c4a6af3af60928b3a90f383a305a17a4347

13
patches/minecraft/net/minecraft/client/gui/RunnableTitleScreen.java.patch Normal file
View file

@ -0,0 +1,13 @@
--- ../src_base/minecraft/net/minecraft/client/gui/RunnableTitleScreen.java
+++ ../src_work/minecraft/net/minecraft/client/gui/RunnableTitleScreen.java
@@ -40,6 +40,10 @@
}
}
}
+ catch (java.io.FileNotFoundException e)
+ {
+ //NomNomNom, Don't print the error when the flag isn't found.
+ }
catch (Throwable throwable)
{
throwable.printStackTrace();

15
patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch
View file

@ -23,7 +23,7 @@
@SideOnly(Side.CLIENT)
public class ItemRenderer
{
@@ -46,15 +55,33 @@
@@ -46,15 +55,40 @@
this.mc = par1Minecraft;
this.mapItemRenderer = new MapItemRenderer(par1Minecraft.fontRenderer, par1Minecraft.gameSettings, par1Minecraft.renderEngine);
}
@ -49,6 +49,13 @@
+ }
+
+ IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(par2ItemStack, type);
+ //Backwards compatibility, Remove in 1.6, For 1.5 if they implement EQUIPPED then
+ //they must handle it how it was when 1.5 began.
+ if (customRenderer == null && type == ItemRenderType.EQUIPPED_FIRST_PERSON)
+ {
+ type = ItemRenderType.EQUIPPED;
+ customRenderer = MinecraftForgeClient.getItemRenderer(par2ItemStack, type);
+ }
+
+ if (customRenderer != null)
+ {
@ -59,7 +66,7 @@
{
this.mc.renderEngine.bindTexture("/terrain.png");
this.renderBlocksInstance.renderBlockAsItem(Block.blocksList[par2ItemStack.itemID], par2ItemStack.getItemDamage(), 1.0F);
@@ -272,7 +299,7 @@
@@ -272,7 +306,7 @@
Render render;
RenderPlayer renderplayer;
@ -68,7 +75,7 @@
{
GL11.glPushMatrix();
f4 = 0.8F;
@@ -340,11 +367,20 @@
@@ -340,11 +374,20 @@
tessellator.addVertexWithUV((double)(128 + b0), (double)(0 - b0), 0.0D, 1.0D, 0.0D);
tessellator.addVertexWithUV((double)(0 - b0), (double)(0 - b0), 0.0D, 0.0D, 0.0D);
tessellator.draw();
@ -94,7 +101,7 @@
}
GL11.glPopMatrix();
@@ -446,17 +482,20 @@
@@ -446,17 +489,20 @@
if (itemstack.getItem().requiresMultipleRenderPasses())
{