diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java index 07eccfa0..6531e3ae 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java @@ -19,10 +19,10 @@ import crazypants.enderio.power.PowerHandlerUtil; public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity implements IInternalPoweredTile { // Power - private Capacitors capacitorType; - private ICapacitor capacitor; + private Capacitors capacitorType = Capacitors.BASIC_CAPACITOR; + private ICapacitor capacitor = Capacitors.BASIC_CAPACITOR.capacitor; - private int storedEnergyRF; + private int storedEnergyRF = 0; protected float lastSyncPowerStored = -1; protected AbstractPoweredMachineEntity(SlotDefinition slotDefinition) { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java index 37ef6cba..b6b8f5dd 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java @@ -48,7 +48,6 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid private final SetMultimap sendChannels = MultimapBuilder.enumKeys(ChannelType.class).hashSetValues().build(); private final SetMultimap recieveChannels = MultimapBuilder.enumKeys(ChannelType.class).hashSetValues().build(); - private ICapacitor capacitor = new BasicCapacitor(Config.transceiverMaxIoRF * 2, 500000, Config.transceiverMaxIoRF); private boolean sendChannelsDirty = false; private boolean recieveChannelsDirty = false; private boolean registered = false; @@ -69,12 +68,12 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid public TileTransceiver() { super(new SlotDefinition(8, 8, 0)); - currentTask = new ContinuousTask(Config.transceiverUpkeepCostRF); railController = new EnderRailController(this); sendItemFilter = new ItemFilter(true); recieveItemFilter = new ItemFilter(true); + setCapacitor(new BasicCapacitor(0,Config.transceiverMaxIoRF * 2, 500000, Config.transceiverMaxIoRF)); } public EnderRailController getRailController() { @@ -161,11 +160,6 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid return hasPower(); } - @Override - public ICapacitor getCapacitor() { - return capacitor; - } - @Override public int getPowerUsePerTick() { return Config.transceiverUpkeepCostRF; @@ -260,7 +254,7 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid static void readChannels(NBTTagCompound nbtRoot, SetMultimap channels, String key) { channels.clear(); - + if(!nbtRoot.hasKey(key)) { return; }