Merge remote-tracking branch 'Zoko/master'

This commit is contained in:
DreamMasterXXL committed 2020-04-18 23:40:09 +02:00
commit 36eaeeb615
2 files changed
+5 -11

No files matched your search

@@ -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) {
@@ -48,7 +48,6 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid
private final SetMultimap<ChannelType, Channel> sendChannels = MultimapBuilder.enumKeys(ChannelType.class).hashSetValues().build();
private final SetMultimap<ChannelType, Channel> 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<ChannelType, Channel> channels, String key) {
channels.clear();
if(!nbtRoot.hasKey(key)) {
return;
}