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

Added new Item.getIconIndex context sensitive version.

This commit is contained in:
LexManos 2012-02-22 16:49:57 -08:00
parent 76830e7fe2
commit a5e209952e
3 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch
View File

@ -142,7 +142,15 @@
if (!worldObj.isRemote)
{
if (isPlayerSleeping() || !isEntityAlive())
@@ -1473,4 +1547,30 @@
@@ -1341,6 +1415,7 @@
return 101;
}
}
+ j = itemstack.getItem().getIconIndex(itemstack, i, this, itemInUse, itemInUseCount);
}
return j;
}
@@ -1473,4 +1548,30 @@
experience = entityplayer.experience;
score = entityplayer.score;
}

27
forge/patches/minecraft/net/minecraft/src/Item.java.patch
View File

@ -27,7 +27,7 @@
Vec3D vec3d1 = vec3d.addVector((double)f7 * d3, (double)f8 * d3, (double)f9 * d3);
MovingObjectPosition movingobjectposition = world.rayTraceBlocks_do_do(vec3d, vec3d1, flag, !flag);
return movingobjectposition;
@@ -469,6 +473,124 @@
@@ -469,6 +473,149 @@
{
return getIconFromDamage(i);
}
@ -148,6 +148,31 @@
+ public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity)
+ {
+ return false;
+ }
+
+ /**
+ * Player, Render pass, and item usage sensitive version of getIconIndex.
+ *
+ * @param stack The item stack to get the icon for. (Usually this, and usingItem will be the same if usingItem is not null)
+ * @param renderPass The pass to get the icon for, 0 is default.
+ * @param player The player holding the item
+ * @param usingItem The item the player is actively using. Can be null if not using anything.
+ * @param useRemaining The ticks remaining for the active item.
+ * @return The icon index
+ */
+ public int getIconIndex(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining)
+ {
+ /*
+ * Here is an example usage for Vanilla bows.
+ if (usingItem != null && usingItem.getItem().shiftedIndex == Item.bow.shiftedIndex)
+ {
+ int k = usingItem.getMaxItemUseDuration() - useRemaining;
+ if (k >= 18) return 133;
+ if (k > 13) return 117;
+ if (k > 0) return 101;
+ }
+ */
+ return getIconIndex(stack);
+ }
static

18
forge/patches/minecraft_server/net/minecraft/src/Item.java.patch
View File

@ -18,7 +18,7 @@
protected Item(int i)
{
maxStackSize = 64;
@@ -389,10 +393,132 @@
@@ -389,10 +393,148 @@
float f8 = f6;
float f9 = f3 * f5;
double d3 = 5D;
@ -147,6 +147,22 @@
+ public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity)
+ {
+ return false;
+ }
+
+ /**
+ * Player, Render pass, and item usage sensitive version of getIconIndex.
+ *
+ * @param stack The item stack to get the icon for. (Usually this, and usingItem will be the same if usingItem is not null)
+ * @param renderPass The pass to get the icon for, 0 is default.
+ * @param player The player holding the item
+ * @param usingItem The item the player is actively using. Can be null if not using anything.
+ * @param useRemaining The ticks remaining for the active item.
+ * @return The icon index
+ */
+ public int getIconIndex(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining)
+ {
+ //This is here server side for compilation compatibility
+ return 0;
+ }
public int getItemEnchantability()