Rename method to avoid conflicts with IInventory method

refinedmods · Apr 3, 2016 · ebfbd55 · ebfbd55
1 parent a925301
commit ebfbd55
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/src/main/java/refinedstorage/gui/GuiStorage.java b/src/main/java/refinedstorage/gui/GuiStorage.java
@@ -76,7 +76,7 @@ public void drawBackground(int x, int y, int mouseX, int mouseY) {
 
     @Override
     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(97, 42, t("misc.refinedstorage:priority"));
         drawString(7, 117, t("container.inventory"));

diff --git a/src/main/java/refinedstorage/storage/IStorageGui.java b/src/main/java/refinedstorage/storage/IStorageGui.java
@@ -6,7 +6,7 @@
 import refinedstorage.tile.config.IRedstoneModeConfig;
 
 public interface IStorageGui {
-    String getName();
+    String getGuiTitle();
 
     int getPriority();
 

diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java
@@ -143,7 +143,7 @@ public void setToBlacklist() {
     }
 
     @Override
-    public String getName() {
+    public String getGuiTitle() {
         return "block.refinedstorage:disk_drive.name";
     }
 
@@ -299,6 +299,11 @@ public ITextComponent getDisplayName() {
         return inventory.getDisplayName();
     }
 
+    @Override
+    public String getName() {
+        return inventory.getName();
+    }
+
     @Override
     public IInventory getDroppedInventory() {
         return inventory;

diff --git a/src/main/java/refinedstorage/tile/TileExternalStorage.java b/src/main/java/refinedstorage/tile/TileExternalStorage.java
@@ -289,7 +289,7 @@ public void provide(List<IStorage> storages) {
     }
 
     @Override
-    public String getName() {
+    public String getGuiTitle() {
         return "gui.refinedstorage:external_storage";
     }
 

diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java
@@ -179,7 +179,7 @@ public void setToBlacklist() {
     }
 
     @Override
-    public String getName() {
+    public String getGuiTitle() {
         return "block.refinedstorage:storage." + getType().getId() + ".name";
     }