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

Added additional flag for rendering entity item bobbing

This commit is contained in:
newthead 2012-03-17 00:17:57 -07:00
parent 8e92edb4b7
commit 2e24491707
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java
View File

@ -86,13 +86,15 @@ public class MinecraftForgeClient
private static IEntityItemRenderer[] customEntityItemRenderers = new IEntityItemRenderer[Item.itemsList.length]; private static IEntityItemRenderer[] customEntityItemRenderers = new IEntityItemRenderer[Item.itemsList.length];
private static boolean[] applyEntityItemRotation = new boolean[Item.itemsList.length]; private static boolean[] applyEntityItemRotation = new boolean[Item.itemsList.length];
private static boolean[] applyEntityItemBobbing = new boolean[Item.itemsList.length];
/** Register a custom renderer for an item when it is dropped or thrown on the ground. /** Register a custom renderer for an item that is dropped or thrown on the ground.
*/ */
public static void registerEntityItemRenderer(int itemID, IEntityItemRenderer renderer, boolean applyRotationEffect) public static void registerEntityItemRenderer(int itemID, IEntityItemRenderer renderer, boolean applyRotationEffect, boolean applyBobbingEffect)
{ {
customEntityItemRenderers[itemID] = renderer; customEntityItemRenderers[itemID] = renderer;
applyEntityItemRotation[itemID] = applyRotationEffect; applyEntityItemRotation[itemID] = applyRotationEffect;
applyEntityItemBobbing[itemID] = applyBobbingEffect;
} }
public static IEntityItemRenderer getEntityItemRenderer(int itemID) public static IEntityItemRenderer getEntityItemRenderer(int itemID)
@ -104,6 +106,11 @@ public class MinecraftForgeClient
{ {
return applyEntityItemRotation[itemID]; return applyEntityItemRotation[itemID];
} }
public static boolean applyEntityItemBobbingEffect(int itemID)
{
return applyEntityItemBobbing[itemID];
}
private static IEquippedItemRenderer[] customEquippedItemRenderers = new IEquippedItemRenderer[Item.itemsList.length]; private static IEquippedItemRenderer[] customEquippedItemRenderers = new IEquippedItemRenderer[Item.itemsList.length];
private static boolean[] renderEquippedAsBlock = new boolean[Item.itemsList.length]; private static boolean[] renderEquippedAsBlock = new boolean[Item.itemsList.length];

17
forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch
View File

@ -13,17 +13,18 @@
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.GL12;
@@ -55,10 +61,56 @@ @@ -55,10 +61,57 @@
float var18; float var18;
float var23; float var23;
+ IEntityItemRenderer customRenderer = MinecraftForgeClient.getEntityItemRenderer(var10.itemID); + IEntityItemRenderer customRenderer = MinecraftForgeClient.getEntityItemRenderer(var10.itemID);
+ if (customRenderer != null) + if (customRenderer != null)
+ { + {
+ if (MinecraftForgeClient.applyEntityItemRotationEffect(var10.itemID)) { + if (MinecraftForgeClient.applyEntityItemRotationEffect(var10.itemID))
+ {
+ GL11.glRotatef(var12, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(var12, 0.0F, 1.0F, 0.0F);
+ } + }
+ else + if (!MinecraftForgeClient.applyEntityItemBobbingEffect(var10.itemID))
+ { + {
+ GL11.glTranslatef(0.0F, -var11, 0.0F); + GL11.glTranslatef(0.0F, -var11, 0.0F);
+ } + }
@ -71,7 +72,7 @@
float var21 = 0.25F; float var21 = 0.25F;
var15 = Block.blocksList[var10.itemID].getRenderType(); var15 = Block.blocksList[var10.itemID].getRenderType();
@@ -94,7 +146,7 @@ @@ -94,7 +147,7 @@
if (var10.getItem().func_46058_c()) if (var10.getItem().func_46058_c())
{ {
GL11.glScalef(0.5F, 0.5F, 0.5F); GL11.glScalef(0.5F, 0.5F, 0.5F);
@ -80,7 +81,7 @@
for (var14 = 0; var14 <= 1; ++var14) for (var14 = 0; var14 <= 1; ++var14)
{ {
@@ -120,11 +172,11 @@ @@ -120,11 +173,11 @@
if (var10.itemID < 256) if (var10.itemID < 256)
{ {
@ -94,7 +95,7 @@
} }
if (this.field_27004_a) if (this.field_27004_a)
@@ -187,9 +239,65 @@ @@ -187,9 +240,65 @@
float var12; float var12;
float var13; float var13;
@ -162,7 +163,7 @@
Block var15 = Block.blocksList[par3]; Block var15 = Block.blocksList[par3];
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glTranslatef((float)(par6 - 2), (float)(par7 + 3), -3.0F + this.zLevel); GL11.glTranslatef((float)(par6 - 2), (float)(par7 + 3), -3.0F + this.zLevel);
@@ -221,7 +329,7 @@ @@ -221,7 +330,7 @@
if (Item.itemsList[par3].func_46058_c()) if (Item.itemsList[par3].func_46058_c())
{ {
GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_LIGHTING);
@ -171,7 +172,7 @@
for (var8 = 0; var8 <= 1; ++var8) for (var8 = 0; var8 <= 1; ++var8)
{ {
@@ -247,11 +355,11 @@ @@ -247,11 +356,11 @@
if (par3 < 256) if (par3 < 256)
{ {