From b75837d6b281ce66bfeca0bdfb5c6eb08d3cc751 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 10 May 2016 20:49:17 +0200 Subject: [PATCH] Changed some stuff around in Drill's container to match TileInventoryBase's sorting --- .../mod/inventory/ContainerDrill.java | 57 ++++++++++--------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java index a34c2e0a6..2f6e4a002 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java @@ -14,6 +14,7 @@ import cofh.api.energy.IEnergyContainerItem; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotImmovable; import de.ellpeck.actuallyadditions.mod.items.ItemDrill; import de.ellpeck.actuallyadditions.mod.items.ItemDrillUpgrade; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -23,6 +24,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentString; @InventoryContainer public class ContainerDrill extends Container{ @@ -153,16 +155,6 @@ public class ContainerDrill extends Container{ return "drill"; } - @Override - public boolean hasCustomName(){ - return false; - } - - @Override - public ITextComponent getDisplayName(){ - return null; - } - @Override public int getInventoryStackLimit(){ return 64; @@ -174,7 +166,22 @@ public class ContainerDrill extends Container{ } @Override - public boolean isItemValidForSlot(int slot, ItemStack stack){ + public boolean isUseableByPlayer(EntityPlayer player){ + return true; + } + + @Override + public void openInventory(EntityPlayer player){ + + } + + @Override + public void closeInventory(EntityPlayer player){ + + } + + @Override + public boolean isItemValidForSlot(int index, ItemStack stack){ return true; } @@ -195,22 +202,8 @@ public class ContainerDrill extends Container{ @Override public void clear(){ - this.slots = new ItemStack[this.slots.length]; - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player){ - return true; - } - - @Override - public void openInventory(EntityPlayer player){ - - } - - @Override - public void closeInventory(EntityPlayer player){ - + int length = this.slots.length; + this.slots = new ItemStack[length]; } @Override @@ -260,5 +253,15 @@ public class ContainerDrill extends Container{ this.slots[index] = null; return stack; } + + @Override + public boolean hasCustomName(){ + return false; + } + + @Override + public ITextComponent getDisplayName(){ + return new TextComponentString(StringUtil.localize(this.getName())); + } } } \ No newline at end of file