Rename method to avoid conflicts with IInventory method

This commit is contained in:
Raoul Van den Berge
2016-04-03 14:24:02 +02:00
parent a9253018a5
commit ebfbd55199
5 changed files with 10 additions and 5 deletions

View File

@@ -76,7 +76,7 @@ public class GuiStorage extends GuiBase {
@Override @Override
public void drawForeground(int mouseX, int mouseY) { public void drawForeground(int mouseX, int mouseY) {
drawString(7, 7, t(gui.getName())); drawString(7, 7, t(gui.getGuiTitle()));
drawString(7, 42, gui.getCapacity() == -1 ? t("misc.refinedstorage:storage.stored_minimal", gui.getStored()) : t("misc.refinedstorage:storage.stored_capacity_minimal", gui.getStored(), gui.getCapacity())); drawString(7, 42, gui.getCapacity() == -1 ? t("misc.refinedstorage:storage.stored_minimal", gui.getStored()) : t("misc.refinedstorage:storage.stored_capacity_minimal", gui.getStored(), gui.getCapacity()));
drawString(97, 42, t("misc.refinedstorage:priority")); drawString(97, 42, t("misc.refinedstorage:priority"));
drawString(7, 117, t("container.inventory")); drawString(7, 117, t("container.inventory"));

View File

@@ -6,7 +6,7 @@ import refinedstorage.tile.config.IModeConfig;
import refinedstorage.tile.config.IRedstoneModeConfig; import refinedstorage.tile.config.IRedstoneModeConfig;
public interface IStorageGui { public interface IStorageGui {
String getName(); String getGuiTitle();
int getPriority(); int getPriority();

View File

@@ -143,7 +143,7 @@ public class TileDiskDrive extends TileMachine implements IStorageProvider, ISto
} }
@Override @Override
public String getName() { public String getGuiTitle() {
return "block.refinedstorage:disk_drive.name"; return "block.refinedstorage:disk_drive.name";
} }
@@ -299,6 +299,11 @@ public class TileDiskDrive extends TileMachine implements IStorageProvider, ISto
return inventory.getDisplayName(); return inventory.getDisplayName();
} }
@Override
public String getName() {
return inventory.getName();
}
@Override @Override
public IInventory getDroppedInventory() { public IInventory getDroppedInventory() {
return inventory; return inventory;

View File

@@ -289,7 +289,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider
} }
@Override @Override
public String getName() { public String getGuiTitle() {
return "gui.refinedstorage:external_storage"; return "gui.refinedstorage:external_storage";
} }

View File

@@ -179,7 +179,7 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
} }
@Override @Override
public String getName() { public String getGuiTitle() {
return "block.refinedstorage:storage." + getType().getId() + ".name"; return "block.refinedstorage:storage." + getType().getId() + ".name";
} }