Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed #3249 #3250

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed #3249 #3250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d88e394
Merge remote-tracking branch 'refs/remotes/SleepyTrousers/master'
LemADEC Apr 1, 2016
bc61ad7
Fixed #3249
LemADEC Apr 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/main/java/crazypants/enderio/power/EnergyHandlerPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package crazypants.enderio.power;

import cofh.api.energy.IEnergyHandler;
import cofh.api.energy.IEnergyReceiver;

public class EnergyHandlerPI extends EnergyReceiverPI {

private IEnergyHandler rfPower;

public EnergyHandlerPI(IEnergyHandler powerReceptor) {
public EnergyHandlerPI(IEnergyReceiver powerReceptor) {
super(powerReceptor);
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/crazypants/enderio/power/PowerHandlerUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ public class PowerHandlerUtil {
public static IPowerInterface create(Object o) {
if (o instanceof TileCapBank) {
return new CapBankPI((TileCapBank) o);
} else if (o instanceof IEnergyHandler) {
return new EnergyHandlerPI((IEnergyHandler) o);
} else if (o instanceof IEnergyHandler || (o instanceof IEnergyProvider && o instanceof IEnergyReceiver)) {
return new EnergyHandlerPI((IEnergyReceiver) o);
} else if (o instanceof IEnergyProvider) {
return new EnergyProviderPI((IEnergyProvider) o);
} else if(o instanceof IEnergyReceiver) {
Expand Down