fix itemstack sizes
This commit is contained in:
parent
4e94a660ff
commit
c376d92790
111 changed files with 983 additions and 1353 deletions
|
@ -1477,7 +1477,7 @@ public class Client implements IThreadListener {
|
|||
|
||||
if (this.world.getState(blockpos).getBlock() != Blocks.air)
|
||||
{
|
||||
int i = itemstack != null ? itemstack.size : 0;
|
||||
int i = itemstack != null ? itemstack.getSize() : 0;
|
||||
|
||||
if (this.controller.clickRight(this.player, this.world, itemstack, blockpos, this.pointed.side, this.pointed.vec))
|
||||
{
|
||||
|
@ -1490,13 +1490,13 @@ public class Client implements IThreadListener {
|
|||
return;
|
||||
}
|
||||
|
||||
if (itemstack.size == 0)
|
||||
if (itemstack.isEmpty())
|
||||
{
|
||||
this.player.inventory.mainInventory[this.player.inventory.currentItem] = null;
|
||||
}
|
||||
else if (itemstack.size != i) // || this.controller.isCreative())
|
||||
else if (itemstack.getSize() != i) // || this.controller.isCreative())
|
||||
{
|
||||
this.entityRenderer.itemRenderer.resetEquippedProgress();
|
||||
this.entityRenderer.itemRenderer.resetProgress();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1508,7 +1508,7 @@ public class Client implements IThreadListener {
|
|||
|
||||
if (itemstack1 != null && this.controller.sendUseItem(this.player, this.world, itemstack1))
|
||||
{
|
||||
this.entityRenderer.itemRenderer.resetEquippedProgress2();
|
||||
this.entityRenderer.itemRenderer.resetProgress();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1980,7 +1980,7 @@ public class Client implements IThreadListener {
|
|||
(((EntityLiving)entity).deathTime != 0 ? "Tod: " + ((EntityLiving)entity).deathTime + "t, " : "") + "Rüstung: " + ((EntityLiving)entity).getTotalArmorValue() + ", Pfeile: " + ((EntityLiving)entity).getArrowCountInEntity()
|
||||
: "Rüstung: n/a, Pfeile: n/a") + "\n" +
|
||||
(held != null ?
|
||||
"Gegens.: " + ItemRegistry.getName(held.getItem()) + " x" + held.size : "Gegens.: n/a") + "\n" +
|
||||
"Gegens.: " + ItemRegistry.getName(held.getItem()) + " x" + held.getSize() : "Gegens.: n/a") + "\n" +
|
||||
"Eigens.: " + (entity.dead ? "D" : "") + (entity.noClip ? "N" : "") + (entity.onGround ? "G" : "")
|
||||
+ (entity.canBeCollidedWith() ? "C" : "") + (entity.canBePushed() ? "P" : "")
|
||||
+ (entity.isBurning() ? "B" : "") + (entity.isPlayer() ? "S" : "")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue