Update mappings

This commit is contained in:
Bernhard Bonigl committed 2015-12-05 19:23:43 +01:00
1 parent 2889c24f65
commit c6963535fd
4 files changed
+16 -9

No files matched your search

@@ -76,8 +76,8 @@ public class BlockItemModelWrapper implements IPerspectiveAwareModel, IFlexibleB
}
@Override
public TextureAtlasSprite getTexture() {
return parent.getTexture();
public TextureAtlasSprite getParticleTexture() {
return parent.getParticleTexture();
}
@Override
@@ -103,8 +103,8 @@ public class TRSRBakedModel implements IFlexibleBakedModel {
}
@Override
public TextureAtlasSprite getTexture() {
return original.getTexture();
public TextureAtlasSprite getParticleTexture() {
return original.getParticleTexture();
}
@Override
@@ -105,6 +105,13 @@ public class TileInventory extends TileEntity implements IInventory {
return itemStack;
}
@Override
public ItemStack removeStackFromSlot(int slot) {
ItemStack itemStack = getStackInSlot(slot);
setInventorySlotContents(slot, null);
return itemStack;
}
@Override
public boolean isItemValidForSlot(int slot, ItemStack itemstack) {
if(slot < getSizeInventory()) {
@@ -123,7 +130,7 @@ public class TileInventory extends TileEntity implements IInventory {
}
@Override
public String getCommandSenderName() {
public String getName() {
return this.inventoryTitle;
}
@@ -140,10 +147,10 @@ public class TileInventory extends TileEntity implements IInventory {
@Override
public IChatComponent getDisplayName() {
if(hasCustomName()) {
return new ChatComponentText(getCommandSenderName());
return new ChatComponentText(getName());
}
return new ChatComponentTranslation(getCommandSenderName());
return new ChatComponentTranslation(getName());
}