Merge branch '6.0.x' of github.com:BuildCraft/BuildCraft into 6.0.x
This commit is contained in:
commit
7e2365de26
1 changed files with 7 additions and 1 deletions
|
@ -21,6 +21,7 @@ import buildcraft.api.core.NetworkData;
|
||||||
import buildcraft.api.mj.IBatteryObject;
|
import buildcraft.api.mj.IBatteryObject;
|
||||||
import buildcraft.api.mj.MjAPI;
|
import buildcraft.api.mj.MjAPI;
|
||||||
import buildcraft.api.mj.MjBattery;
|
import buildcraft.api.mj.MjBattery;
|
||||||
|
import buildcraft.api.power.IPowerEmitter;
|
||||||
import buildcraft.api.power.IPowerReceptor;
|
import buildcraft.api.power.IPowerReceptor;
|
||||||
import buildcraft.api.power.PowerHandler;
|
import buildcraft.api.power.PowerHandler;
|
||||||
import buildcraft.api.tools.IToolWrench;
|
import buildcraft.api.tools.IToolWrench;
|
||||||
|
@ -28,7 +29,7 @@ import buildcraft.core.TileBuffer;
|
||||||
import buildcraft.core.TileBuildCraft;
|
import buildcraft.core.TileBuildCraft;
|
||||||
import buildcraft.core.utils.StringUtils;
|
import buildcraft.core.utils.StringUtils;
|
||||||
|
|
||||||
public class TileEnergyConverter extends TileBuildCraft implements IPowerReceptor {
|
public class TileEnergyConverter extends TileBuildCraft implements IPowerReceptor, IPowerEmitter {
|
||||||
private static enum Mode {
|
private static enum Mode {
|
||||||
FromOldToNew("from_old_to_new"), FromNewToOld("from_new_to_old");
|
FromOldToNew("from_old_to_new"), FromNewToOld("from_new_to_old");
|
||||||
private final String localizeName;
|
private final String localizeName;
|
||||||
|
@ -156,4 +157,9 @@ public class TileEnergyConverter extends TileBuildCraft implements IPowerRecepto
|
||||||
@Override
|
@Override
|
||||||
public void doWork(PowerHandler workProvider) {
|
public void doWork(PowerHandler workProvider) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean canEmitPowerFrom(ForgeDirection side) {
|
||||||
|
return mode == Mode.FromOldToNew;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue