From c6963535fdebe9a4a19ff473c62065e6c8baef2f Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sat, 5 Dec 2015 19:23:43 +0100 Subject: [PATCH] Update mappings --- build.properties | 4 ++-- .../mantle/client/model/BlockItemModelWrapper.java | 4 ++-- .../mantle/client/model/TRSRBakedModel.java | 4 ++-- .../mantle/tileentity/TileInventory.java | 13 ++++++++++--- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/build.properties b/build.properties index 997b44b..2138119 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ mod_version=0.5 minecraft_version=1.8.8 -forge_version=11.14.4.1576-1.8.8 -mappings=snapshot_20151122 +forge_version=11.15.0.1609-1.8.8 +mappings=snapshot_20151204 CCLIB_version=1.1.2.133 ccc_version=1.0.5.36 diff --git a/src/main/java/slimeknights/mantle/client/model/BlockItemModelWrapper.java b/src/main/java/slimeknights/mantle/client/model/BlockItemModelWrapper.java index 690ea6f..4c6e691 100644 --- a/src/main/java/slimeknights/mantle/client/model/BlockItemModelWrapper.java +++ b/src/main/java/slimeknights/mantle/client/model/BlockItemModelWrapper.java @@ -76,8 +76,8 @@ public class BlockItemModelWrapper implements IPerspectiveAwareModel, IFlexibleB } @Override - public TextureAtlasSprite getTexture() { - return parent.getTexture(); + public TextureAtlasSprite getParticleTexture() { + return parent.getParticleTexture(); } @Override diff --git a/src/main/java/slimeknights/mantle/client/model/TRSRBakedModel.java b/src/main/java/slimeknights/mantle/client/model/TRSRBakedModel.java index fa9529a..bdeb9f0 100644 --- a/src/main/java/slimeknights/mantle/client/model/TRSRBakedModel.java +++ b/src/main/java/slimeknights/mantle/client/model/TRSRBakedModel.java @@ -103,8 +103,8 @@ public class TRSRBakedModel implements IFlexibleBakedModel { } @Override - public TextureAtlasSprite getTexture() { - return original.getTexture(); + public TextureAtlasSprite getParticleTexture() { + return original.getParticleTexture(); } @Override diff --git a/src/main/java/slimeknights/mantle/tileentity/TileInventory.java b/src/main/java/slimeknights/mantle/tileentity/TileInventory.java index 94ac585..f64df61 100644 --- a/src/main/java/slimeknights/mantle/tileentity/TileInventory.java +++ b/src/main/java/slimeknights/mantle/tileentity/TileInventory.java @@ -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()); }