Skip to content

Commit f32c3b2

Browse files
committed
remove unnecessary null check
1 parent 4c864e2 commit f32c3b2

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import net.minecraftforge.fluids.capability.IFluidHandler;
3737
import net.minecraftforge.fluids.capability.IFluidTankProperties;
3838
import net.minecraftforge.items.CapabilityItemHandler;
39-
import net.minecraftforge.items.IItemHandler;
4039

4140
import javax.annotation.Nonnull;
4241
import javax.annotation.Nullable;
@@ -88,12 +87,8 @@ public FluidConvertingInventoryAdaptor(ICapabilityProvider facingTE, @Nullable T
8887
this.invItems = facingTE.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing.getOpposite())
8988
? new AdaptorItemHandler(Objects.requireNonNull(facingTE.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing.getOpposite())))
9089
: null;
91-
this.invFluids = facingTE.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, facing.getOpposite())
92-
? Objects.requireNonNull(facingTE.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, facing.getOpposite()))
93-
: null;
94-
this.invGases = ModAndClassUtil.GAS && facingTE.hasCapability(Capabilities.GAS_HANDLER_CAPABILITY, facing.getOpposite())
95-
? Objects.requireNonNull(facingTE.getCapability(Capabilities.GAS_HANDLER_CAPABILITY, facing.getOpposite()))
96-
: null;
90+
this.invFluids = facingTE.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, facing.getOpposite());
91+
this.invGases = ModAndClassUtil.GAS ? facingTE.getCapability(Capabilities.GAS_HANDLER_CAPABILITY, facing.getOpposite()) : null;
9792
this.facingTE = facingTE;
9893
this.posInterface = pos;
9994
this.onmi = isOnmi;

0 commit comments

Comments
 (0)