Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added accelerator cool-down when its capacitors aren't loaded

Browse source
This commit is contained in:
Unknown 2019-10-20 10:31:44 +02:00 committed by unknown
parent 03216f4166
commit d9685a636c
3 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/cr0s/warpdrive/block/TileEntityAbstractBase.java
View file

@ -90,6 +90,12 @@ public abstract class TileEntityAbstractBase extends TileEntity implements IBloc
isConstructed = true;
}
public void finishConstruction() {
if (!isConstructed) {
onConstructed();
}
}
protected void onFirstUpdateTick() {
// No operation
assert isConstructed;

5
src/main/java/cr0s/warpdrive/block/atomic/TileEntityAcceleratorCore.java
View file

@ -192,6 +192,11 @@ public class TileEntityAcceleratorCore extends TileEntityAbstractEnergyCoreOrCon
final int energyPotential = acceleratorSetup.energy_getPotentialOutput();
isPowered = energyRequired > 0 && energyPotential >= energyRequired;
if (!acceleratorSetup.isLoaded()) {
cooldownTicks = ACCELERATOR_COOLDOWN_TICKS;
return;
}
final boolean isEnabledAndValid = isEnabled && isAssemblyValid;
final boolean isOn = isEnabledAndValid && cooldownTicks <= 0 && isPowered;
updateBlockState(null, BlockProperties.ACTIVE, isOn);

23
src/main/java/cr0s/warpdrive/data/AcceleratorSetup.java
View file

@ -82,6 +82,7 @@ public class AcceleratorSetup extends GlobalPosition {
protected boolean isAssemblyValid = true;
protected WarpDriveText textValidityIssues = new WarpDriveText(Commons.getStyleWarning(), "-undefined accelerator setup-");
private boolean isLoaded = true;
public AcceleratorSetup(final int dimensionId, @Nonnull final BlockPos blockPos) {
super(dimensionId, blockPos.getX(), blockPos.getY(), blockPos.getZ());
@ -556,6 +557,11 @@ public class AcceleratorSetup extends GlobalPosition {
return isAssemblyValid;
}
@Override
public boolean isLoaded() {
return super.isLoaded() && isLoaded;
}
// Pseudo-API for energy
@Nonnull
private HashSet<TileEntityCapacitor> getCapacitors() {
@ -567,31 +573,42 @@ public class AcceleratorSetup extends GlobalPosition {
if (Commons.throttleMe("AcceleratorSetup.getCapacitors")) {
new RuntimeException().printStackTrace(WarpDrive.printStreamWarn);
}
isLoaded = false;
return setTileEntityCapacitors;
}
for (final BlockPos blockPosCapacitor : setCapacitors) {
final TileEntity tileEntity = world.getTileEntity(blockPosCapacitor);
if (tileEntity instanceof TileEntityCapacitor) {
final TileEntityCapacitor tileEntityCapacitor = (TileEntityCapacitor) tileEntity;
tileEntityCapacitor.finishConstruction();
setTileEntityCapacitors.add(tileEntityCapacitor);
} else {
isDirty = true;
}
}
isLoaded = true;
return setTileEntityCapacitors;
}
public long energy_getEnergyStored() {
final HashSet<TileEntityCapacitor> capacitors = getCapacitors();
if (!isLoaded()) {
return Integer.MAX_VALUE;
}
long energyStored = 0;
for (final TileEntityCapacitor tileEntityCapacitor : getCapacitors()) {
for (final TileEntityCapacitor tileEntityCapacitor : capacitors) {
energyStored += tileEntityCapacitor.energy_getEnergyStored();
}
return energyStored;
}
public int energy_getPotentialOutput() {
final HashSet<TileEntityCapacitor> capacitors = getCapacitors();
if (!isLoaded()) {
return Integer.MAX_VALUE;
}
long potentialOutput = 0;
for (final TileEntityCapacitor tileEntityCapacitor : getCapacitors()) {
for (final TileEntityCapacitor tileEntityCapacitor : capacitors) {
potentialOutput = Math.min(potentialOutput + tileEntityCapacitor.energy_getPotentialOutput(), Integer.MAX_VALUE);
}
return (int) potentialOutput;
@ -602,6 +619,8 @@ public class AcceleratorSetup extends GlobalPosition {
}
public void energy_consume(final int amount_internal) {
assert isLoaded;
// first, draw average from all
final int energyMean = amount_internal / setCapacitors.size();
int energyConsumed = 0;