From 3bdbf1699adc4b38d20abc0876c27633eec04ca0 Mon Sep 17 00:00:00 2001 From: TeamSpen210 Date: Tue, 6 Aug 2019 08:54:19 +1000 Subject: [PATCH] Make MultiModuleScreen generic over its container This allows getContainer() to have the return type expected by IHasContainer, allowing the screen to be registered. --- .../mantle/client/screen/MultiModuleScreen.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/slimeknights/mantle/client/screen/MultiModuleScreen.java b/src/main/java/slimeknights/mantle/client/screen/MultiModuleScreen.java index c3839c7..88ebb3d 100644 --- a/src/main/java/slimeknights/mantle/client/screen/MultiModuleScreen.java +++ b/src/main/java/slimeknights/mantle/client/screen/MultiModuleScreen.java @@ -17,7 +17,7 @@ import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; -public class MultiModuleScreen extends ContainerScreen { +public class MultiModuleScreen extends ContainerScreen { protected List modules = Lists.newArrayList(); @@ -26,7 +26,7 @@ public class MultiModuleScreen extends ContainerScreen { public int realWidth; public int realHeight; - public MultiModuleScreen(MultiModuleContainer container, PlayerInventory playerInventory, ITextComponent title) { + public MultiModuleScreen(T container, PlayerInventory playerInventory, ITextComponent title) { super(container, playerInventory, title); this.realWidth = -1; @@ -98,7 +98,6 @@ public class MultiModuleScreen extends ContainerScreen { } protected void drawContainerName() { - MultiModuleContainer multiContainer = (MultiModuleContainer) this.container; String localizedName = this.getTitle().getFormattedText();//multiContainer.getInventoryDisplayName(); if (localizedName != null) { this.font.drawString(localizedName, 8, 6, 0x404040); @@ -280,9 +279,10 @@ public class MultiModuleScreen extends ContainerScreen { return null; } + @Nonnull @Override - public MultiModuleContainer getContainer() { - return (MultiModuleContainer) this.container; + public T getContainer() { + return this.container; } }