diff --git a/src/main/java/appeng/integration/modules/IC2.java b/src/main/java/appeng/integration/modules/IC2.java index e79ffb59..cc25123b 100644 --- a/src/main/java/appeng/integration/modules/IC2.java +++ b/src/main/java/appeng/integration/modules/IC2.java @@ -19,7 +19,9 @@ package appeng.integration.modules; -import java.util.function.Function; +import java.util.function.BiFunction; + +import net.minecraft.tileentity.TileEntity; import appeng.helpers.Reflected; import appeng.integration.IIntegrationModule; @@ -35,7 +37,7 @@ public class IC2 implements IIntegrationModule @Reflected public static IC2 instance; - private Function powerSinkFactory = ( sink -> IC2PowerSinkStub.INSTANCE ); + private BiFunction powerSinkFactory = ( ( te, sink ) -> IC2PowerSinkStub.INSTANCE ); @Override public void init() throws Throwable @@ -51,8 +53,8 @@ public class IC2 implements IIntegrationModule /** * Create an IC2 power sink for the given external sink. */ - public static IC2PowerSink createPowerSink( IExternalPowerSink externalSink ) + public static IC2PowerSink createPowerSink( TileEntity tileEntity, IExternalPowerSink externalSink ) { - return instance.powerSinkFactory.apply( externalSink ); + return instance.powerSinkFactory.apply( tileEntity, externalSink ); } } diff --git a/src/main/java/appeng/integration/modules/ic2/IC2PowerSinkAdapter.java b/src/main/java/appeng/integration/modules/ic2/IC2PowerSinkAdapter.java index e914c23a..2f22b369 100644 --- a/src/main/java/appeng/integration/modules/ic2/IC2PowerSinkAdapter.java +++ b/src/main/java/appeng/integration/modules/ic2/IC2PowerSinkAdapter.java @@ -42,9 +42,9 @@ public class IC2PowerSinkAdapter extends BasicSink implements IC2PowerSink private final Set validFaces = EnumSet.allOf( EnumFacing.class ); - public IC2PowerSinkAdapter( IExternalPowerSink powerSink ) + public IC2PowerSinkAdapter( TileEntity tileEntity, IExternalPowerSink powerSink ) { - super( (TileEntity) powerSink, 0, Integer.MAX_VALUE ); + super( tileEntity, 0, Integer.MAX_VALUE ); this.powerSink = powerSink; } diff --git a/src/main/java/appeng/tile/powersink/AERootPoweredTile.java b/src/main/java/appeng/tile/powersink/AERootPoweredTile.java index a535d049..533c5238 100644 --- a/src/main/java/appeng/tile/powersink/AERootPoweredTile.java +++ b/src/main/java/appeng/tile/powersink/AERootPoweredTile.java @@ -64,10 +64,11 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe public AERootPoweredTile() { forgeEnergyAdapter = new ForgeEnergyAdapter( this ); - if ( teslaConsumerCapability != null ) { + if( teslaConsumerCapability != null ) + { teslaEnergyAdapter = new TeslaEnergyAdapter( this ); } - ic2Sink = IC2.createPowerSink(this); + ic2Sink = IC2.createPowerSink( this, this ); ic2Sink.setValidFaces( internalPowerSides ); }