From bbd51d55d08dfd97cc2383da08c3b98d7968251b Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 4 Dec 2016 03:24:32 +0100 Subject: [PATCH] Use capability casts instead of casting manually --- .../refinedstorage/item/ItemNetworkItem.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java index a86765b27..de45a7bdd 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java @@ -224,11 +224,17 @@ public abstract class ItemNetworkItem extends ItemBase implements INetworkItemPr @Override public T getCapability(Capability capability, @Nullable EnumFacing facing) { if (capability == CapabilityEnergy.ENERGY) { - return (T) new NetworkItemEnergyForge(stack, 3200); + return CapabilityEnergy.ENERGY.cast(new NetworkItemEnergyForge(stack, 3200)); } - if (IntegrationTesla.isLoaded() && (capability == TeslaCapabilities.CAPABILITY_HOLDER || capability == TeslaCapabilities.CAPABILITY_CONSUMER)) { - return (T) new NetworkItemEnergyTesla(stack); + if (IntegrationTesla.isLoaded()) { + if (capability == TeslaCapabilities.CAPABILITY_HOLDER) { + return TeslaCapabilities.CAPABILITY_HOLDER.cast(new NetworkItemEnergyTesla(stack)); + } + + if (capability == TeslaCapabilities.CAPABILITY_CONSUMER) { + return TeslaCapabilities.CAPABILITY_CONSUMER.cast(new NetworkItemEnergyTesla(stack)); + } } return null;