Merge pull request #4443 from AppliedEnergistics/cable-bus-redstone-connections
Refactored CableBus to pass the direction directly.
This commit is contained in:
@@ -623,14 +623,9 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canConnectRedstone(final EnumSet<Direction> enumSet) {
|
||||
for (final Direction dir : enumSet) {
|
||||
final IPart part = this.getPart(dir);
|
||||
if (part != null && part.canConnectRedstone()) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
public boolean canConnectRedstone(final Direction opposite) {
|
||||
final IPart part = this.getPart(opposite);
|
||||
return part != null && part.canConnectRedstone();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
|
||||
package appeng.parts;
|
||||
|
||||
import java.util.EnumSet;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -43,7 +42,7 @@ public interface ICableBusContainer {
|
||||
|
||||
int isProvidingWeakPower(Direction opposite);
|
||||
|
||||
boolean canConnectRedstone(EnumSet<Direction> of);
|
||||
boolean canConnectRedstone(Direction opposite);
|
||||
|
||||
void onEntityCollision(Entity e);
|
||||
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
|
||||
package appeng.parts;
|
||||
|
||||
import java.util.EnumSet;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -48,7 +47,7 @@ public class NullCableBusContainer implements ICableBusContainer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canConnectRedstone(final EnumSet<Direction> of) {
|
||||
public boolean canConnectRedstone(final Direction opposite) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user