From 39114ec4291c258c2b1b4bfa908eb192a6448416 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 30 Jun 2016 16:26:36 -0700 Subject: [PATCH] Tidy up capabilities --- .../java/forestry/core/tiles/TileAnalyzer.java | 16 ++++++---------- .../java/forestry/core/tiles/TileForestry.java | 7 ++++--- .../forestry/energy/tiles/TileEngineBiogas.java | 17 +++++++---------- .../forestry/energy/tiles/TileEuGenerator.java | 6 ++++-- .../forestry/factory/tiles/TileBottler.java | 16 ++++++---------- .../forestry/factory/tiles/TileCarpenter.java | 15 +++++---------- .../forestry/factory/tiles/TileFabricator.java | 16 ++++++---------- .../forestry/factory/tiles/TileFermenter.java | 16 ++++++---------- .../forestry/factory/tiles/TileMoistener.java | 16 ++++++---------- .../forestry/factory/tiles/TileRaintank.java | 16 ++++++---------- .../forestry/factory/tiles/TileSqueezer.java | 16 ++++++---------- .../java/forestry/factory/tiles/TileStill.java | 16 ++++++---------- 12 files changed, 68 insertions(+), 105 deletions(-) diff --git a/src/main/java/forestry/core/tiles/TileAnalyzer.java b/src/main/java/forestry/core/tiles/TileAnalyzer.java index e93b6e9d4..d336dbe8c 100644 --- a/src/main/java/forestry/core/tiles/TileAnalyzer.java +++ b/src/main/java/forestry/core/tiles/TileAnalyzer.java @@ -11,6 +11,7 @@ package forestry.core.tiles; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; @@ -251,22 +252,17 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) { - if (super.hasCapability(capability, facing)) { - return true; - } - return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY; + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { + return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, facing); } + @Nonnull @Override - public T getCapability(Capability capability, EnumFacing facing) { - if (super.hasCapability(capability, facing)) { - return super.getCapability(capability, facing); - } + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tankManager); } - return null; + return super.getCapability(capability, facing); } @Override diff --git a/src/main/java/forestry/core/tiles/TileForestry.java b/src/main/java/forestry/core/tiles/TileForestry.java index 9b446edc0..09a5fe461 100644 --- a/src/main/java/forestry/core/tiles/TileForestry.java +++ b/src/main/java/forestry/core/tiles/TileForestry.java @@ -352,8 +352,9 @@ public abstract class TileForestry extends TileEntity implements IStreamable, IE public void clear() { } + @Nonnull @Override - public T getCapability(Capability capability, EnumFacing facing) { + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && inventory != null){ SidedInvWrapper sidedInvWrapper = new SidedInvWrapper(inventory, facing); return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(sidedInvWrapper); @@ -362,8 +363,8 @@ public abstract class TileForestry extends TileEntity implements IStreamable, IE } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) { - if(capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && inventory != null){ + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { + if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && inventory != null){ return true; } return super.hasCapability(capability, facing); diff --git a/src/main/java/forestry/energy/tiles/TileEngineBiogas.java b/src/main/java/forestry/energy/tiles/TileEngineBiogas.java index f94913255..8dda93677 100644 --- a/src/main/java/forestry/energy/tiles/TileEngineBiogas.java +++ b/src/main/java/forestry/energy/tiles/TileEngineBiogas.java @@ -11,8 +11,10 @@ package forestry.energy.tiles; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.io.IOException; +import forestry.energy.EnergyManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IContainerListener; @@ -293,22 +295,17 @@ public class TileEngineBiogas extends TileEngine implements ISidedInventory, ILi } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) { - if (super.hasCapability(capability, facing)) { - return true; - } - return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY; + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { + return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, facing); } + @Nonnull @Override - public T getCapability(Capability capability, EnumFacing facing) { - if (super.hasCapability(capability, facing)) { - return super.getCapability(capability, facing); - } + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tankManager); } - return null; + return super.getCapability(capability, facing); } @Override diff --git a/src/main/java/forestry/energy/tiles/TileEuGenerator.java b/src/main/java/forestry/energy/tiles/TileEuGenerator.java index d83781c29..b0891b48d 100644 --- a/src/main/java/forestry/energy/tiles/TileEuGenerator.java +++ b/src/main/java/forestry/energy/tiles/TileEuGenerator.java @@ -11,6 +11,7 @@ package forestry.energy.tiles; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; @@ -215,15 +216,16 @@ public class TileEuGenerator extends TileBase implements ISidedInventory, ILiqui } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) { + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (super.hasCapability(capability, facing)) { return true; } return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY; } + @Nonnull @Override - public T getCapability(Capability capability, EnumFacing facing) { + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (super.hasCapability(capability, facing)) { return super.getCapability(capability, facing); } diff --git a/src/main/java/forestry/factory/tiles/TileBottler.java b/src/main/java/forestry/factory/tiles/TileBottler.java index 139485d6c..4666fab98 100644 --- a/src/main/java/forestry/factory/tiles/TileBottler.java +++ b/src/main/java/forestry/factory/tiles/TileBottler.java @@ -11,6 +11,7 @@ package forestry.factory.tiles; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; @@ -167,22 +168,17 @@ public class TileBottler extends TilePowered implements ISidedInventory, ILiquid } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) { - if (super.hasCapability(capability, facing)) { - return true; - } - return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY; + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { + return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, facing); } + @Nonnull @Override - public T getCapability(Capability capability, EnumFacing facing) { - if (super.hasCapability(capability, facing)) { - return super.getCapability(capability, facing); - } + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tankManager); } - return null; + return super.getCapability(capability, facing); } /* ITRIGGERPROVIDER */ diff --git a/src/main/java/forestry/factory/tiles/TileCarpenter.java b/src/main/java/forestry/factory/tiles/TileCarpenter.java index bf5139cf2..94fc19c97 100644 --- a/src/main/java/forestry/factory/tiles/TileCarpenter.java +++ b/src/main/java/forestry/factory/tiles/TileCarpenter.java @@ -250,22 +250,17 @@ public class TileCarpenter extends TilePowered implements ISidedInventory, ILiqu } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) { - if (super.hasCapability(capability, facing)) { - return true; - } - return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY; + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { + return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, facing); } + @Nonnull @Override - public T getCapability(Capability capability, EnumFacing facing) { - if (super.hasCapability(capability, facing)) { - return super.getCapability(capability, facing); - } + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tankManager); } - return null; + return super.getCapability(capability, facing); } @Override diff --git a/src/main/java/forestry/factory/tiles/TileFabricator.java b/src/main/java/forestry/factory/tiles/TileFabricator.java index d5ed112ff..fdf21351f 100644 --- a/src/main/java/forestry/factory/tiles/TileFabricator.java +++ b/src/main/java/forestry/factory/tiles/TileFabricator.java @@ -11,6 +11,7 @@ package forestry.factory.tiles; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; @@ -320,22 +321,17 @@ public class TileFabricator extends TilePowered implements ISlotPickupWatcher, I } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) { - if (super.hasCapability(capability, facing)) { - return true; - } - return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY; + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { + return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, facing); } + @Nonnull @Override - public T getCapability(Capability capability, EnumFacing facing) { - if (super.hasCapability(capability, facing)) { - return super.getCapability(capability, facing); - } + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tankManager); } - return null; + return super.getCapability(capability, facing); } @Override diff --git a/src/main/java/forestry/factory/tiles/TileFermenter.java b/src/main/java/forestry/factory/tiles/TileFermenter.java index 48681baff..84a2057e1 100644 --- a/src/main/java/forestry/factory/tiles/TileFermenter.java +++ b/src/main/java/forestry/factory/tiles/TileFermenter.java @@ -11,6 +11,7 @@ package forestry.factory.tiles; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; @@ -324,21 +325,16 @@ public class TileFermenter extends TilePowered implements ISidedInventory, ILiqu } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) { - if (super.hasCapability(capability, facing)) { - return true; - } - return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY; + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { + return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, facing); } + @Nonnull @Override - public T getCapability(Capability capability, EnumFacing facing) { - if (super.hasCapability(capability, facing)) { - return super.getCapability(capability, facing); - } + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tankManager); } - return null; + return super.getCapability(capability, facing); } } diff --git a/src/main/java/forestry/factory/tiles/TileMoistener.java b/src/main/java/forestry/factory/tiles/TileMoistener.java index 227ae518f..162150eec 100644 --- a/src/main/java/forestry/factory/tiles/TileMoistener.java +++ b/src/main/java/forestry/factory/tiles/TileMoistener.java @@ -11,6 +11,7 @@ package forestry.factory.tiles; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.io.IOException; import java.util.ArrayList; @@ -520,21 +521,16 @@ public class TileMoistener extends TileBase implements ISidedInventory, ILiquidT } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) { - if (super.hasCapability(capability, facing)) { - return true; - } - return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY; + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { + return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, facing); } + @Nonnull @Override - public T getCapability(Capability capability, EnumFacing facing) { - if (super.hasCapability(capability, facing)) { - return super.getCapability(capability, facing); - } + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tankManager); } - return null; + return super.getCapability(capability, facing); } } diff --git a/src/main/java/forestry/factory/tiles/TileRaintank.java b/src/main/java/forestry/factory/tiles/TileRaintank.java index 730e02692..684349820 100644 --- a/src/main/java/forestry/factory/tiles/TileRaintank.java +++ b/src/main/java/forestry/factory/tiles/TileRaintank.java @@ -11,6 +11,7 @@ package forestry.factory.tiles; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; @@ -161,22 +162,17 @@ public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTa } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) { - if (super.hasCapability(capability, facing)) { - return true; - } - return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY; + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { + return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, facing); } + @Nonnull @Override - public T getCapability(Capability capability, EnumFacing facing) { - if (super.hasCapability(capability, facing)) { - return super.getCapability(capability, facing); - } + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tankManager); } - return null; + return super.getCapability(capability, facing); } @Override diff --git a/src/main/java/forestry/factory/tiles/TileSqueezer.java b/src/main/java/forestry/factory/tiles/TileSqueezer.java index 360f5fc99..14175ded3 100644 --- a/src/main/java/forestry/factory/tiles/TileSqueezer.java +++ b/src/main/java/forestry/factory/tiles/TileSqueezer.java @@ -11,6 +11,7 @@ package forestry.factory.tiles; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; @@ -257,22 +258,17 @@ public class TileSqueezer extends TilePowered implements ISocketable, ISidedInve } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) { - if (super.hasCapability(capability, facing)) { - return true; - } - return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY; + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { + return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, facing); } + @Nonnull @Override - public T getCapability(Capability capability, EnumFacing facing) { - if (super.hasCapability(capability, facing)) { - return super.getCapability(capability, facing); - } + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tankManager); } - return null; + return super.getCapability(capability, facing); } @Override diff --git a/src/main/java/forestry/factory/tiles/TileStill.java b/src/main/java/forestry/factory/tiles/TileStill.java index 78aa46826..cceaedd37 100644 --- a/src/main/java/forestry/factory/tiles/TileStill.java +++ b/src/main/java/forestry/factory/tiles/TileStill.java @@ -11,6 +11,7 @@ package forestry.factory.tiles; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; @@ -187,22 +188,17 @@ public class TileStill extends TilePowered implements ISidedInventory, ILiquidTa } @Override - public boolean hasCapability(Capability capability, EnumFacing facing) { - if (super.hasCapability(capability, facing)) { - return true; - } - return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY; + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { + return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, facing); } + @Nonnull @Override - public T getCapability(Capability capability, EnumFacing facing) { - if (super.hasCapability(capability, facing)) { - return super.getCapability(capability, facing); - } + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tankManager); } - return null; + return super.getCapability(capability, facing); } @Override