Fix Issue #140: Custom items not properly having texture applied for partical effects.
This commit is contained in:
parent
e50050a175
commit
1a2ce02a7f
2 changed files with 23 additions and 7 deletions
|
@ -1,6 +1,6 @@
|
|||
--- ../src_base/common/net/minecraft/src/Item.java
|
||||
+++ ../src_work/common/net/minecraft/src/Item.java
|
||||
@@ -196,13 +196,16 @@
|
||||
@@ -196,16 +196,24 @@
|
||||
/** full name of item from language file */
|
||||
private String itemName;
|
||||
|
||||
|
@ -18,7 +18,15 @@
|
|||
}
|
||||
|
||||
itemsList[256 + par1] = this;
|
||||
@@ -589,6 +592,10 @@
|
||||
+
|
||||
+ if (!(this instanceof ItemBlock))
|
||||
+ {
|
||||
+ isDefaultTexture = "/gui/items.png".equals(getTextureFile());
|
||||
+ }
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -589,6 +597,10 @@
|
||||
float var18 = var15 * var16;
|
||||
float var20 = var14 * var16;
|
||||
double var21 = 5.0D;
|
||||
|
@ -29,7 +37,7 @@
|
|||
Vec3 var23 = var13.addVector((double)var18 * var21, (double)var17 * var21, (double)var20 * var21);
|
||||
return par1World.rayTraceBlocks_do_do(var13, var23, par3, !par3);
|
||||
}
|
||||
@@ -650,4 +657,199 @@
|
||||
@@ -650,4 +662,199 @@
|
||||
{
|
||||
StatList.initStats();
|
||||
}
|
||||
|
|
|
@ -1,6 +1,14 @@
|
|||
--- ../src_base/common/net/minecraft/src/ItemBlock.java
|
||||
+++ ../src_work/common/net/minecraft/src/ItemBlock.java
|
||||
@@ -32,7 +32,8 @@
|
||||
@@ -14,6 +14,7 @@
|
||||
super(par1);
|
||||
this.blockID = par1 + 256;
|
||||
this.setIconIndex(Block.blocksList[par1 + 256].getBlockTextureFromSide(2));
|
||||
+ isDefaultTexture = Block.blocksList[par1 + 256].isDefaultTexture;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -32,7 +33,8 @@
|
||||
{
|
||||
par7 = 1;
|
||||
}
|
||||
|
@ -10,7 +18,7 @@
|
|||
{
|
||||
if (par7 == 0)
|
||||
{
|
||||
@@ -81,14 +82,8 @@
|
||||
@@ -81,14 +83,8 @@
|
||||
{
|
||||
Block var12 = Block.blocksList[this.blockID];
|
||||
|
||||
|
@ -27,7 +35,7 @@
|
|||
par3World.playSoundEffect((double)((float)par4 + 0.5F), (double)((float)par5 + 0.5F), (double)((float)par6 + 0.5F), var12.stepSound.getStepSound(), (var12.stepSound.getVolume() + 1.0F) / 2.0F, var12.stepSound.getPitch() * 0.8F);
|
||||
--par1ItemStack.stackSize;
|
||||
}
|
||||
@@ -114,7 +109,8 @@
|
||||
@@ -114,7 +110,8 @@
|
||||
{
|
||||
par5 = 1;
|
||||
}
|
||||
|
@ -37,7 +45,7 @@
|
|||
{
|
||||
if (par5 == 0)
|
||||
{
|
||||
@@ -179,4 +175,28 @@
|
||||
@@ -179,4 +176,28 @@
|
||||
{
|
||||
Block.blocksList[this.blockID].getSubBlocks(par1, par2CreativeTabs, par3List);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue