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

Fixed bad multithreading in radar and ship scanner

Browse source
This commit is contained in:
Unknown 2019-09-09 23:15:11 +02:00 committed by unknown
parent 423430f230
commit aac40cdd85
2 changed files with 38 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
src/main/java/cr0s/warpdrive/block/building/TileEntityShipScanner.java
View file

@ -45,6 +45,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockPos.MutableBlockPos;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextComponentString;
@ -113,16 +114,22 @@ public class TileEntityShipScanner extends TileEntityAbstractMachine implements
return; return;
} }
// @TODO implement ShipScanner.isEnabled final IBlockState blockState = world.getBlockState(pos);
updateBlockState(blockState, BlockProperties.ACTIVE, enumShipScannerState != EnumShipScannerState.IDLE);
// Trigger deployment by player, provided setup is done // Trigger deployment by player, provided setup is done
if (!isEnabled) {
enumShipScannerState = EnumShipScannerState.IDLE; // disable scanner
return;
}
final boolean isSetupDone = targetX != 0 || targetY != 0 || targetZ != 0; final boolean isSetupDone = targetX != 0 || targetY != 0 || targetZ != 0;
if (isSetupDone) { if (isSetupDone) {
if (enumShipScannerState == EnumShipScannerState.IDLE) { if (enumShipScannerState == EnumShipScannerState.IDLE) {
checkPlayerForShipToken(); checkPlayerForShipToken();
} }
if (enumShipScannerState != EnumShipScannerState.DEPLOYING) { if (enumShipScannerState != EnumShipScannerState.DEPLOYING) {
setState(EnumShipScannerState.IDLE); // disable scanner enumShipScannerState = EnumShipScannerState.IDLE; // disable scanner
return; return;
} }
@ -176,7 +183,7 @@ public class TileEntityShipScanner extends TileEntityAbstractMachine implements
scanTicks++; scanTicks++;
if (scanTicks > 20 * (1 + shipCore.shipMass / WarpDriveConfig.SS_SCAN_BLOCKS_PER_SECOND)) { if (scanTicks > 20 * (1 + shipCore.shipMass / WarpDriveConfig.SS_SCAN_BLOCKS_PER_SECOND)) {
setState(EnumShipScannerState.IDLE); // disable scanner enumShipScannerState = EnumShipScannerState.IDLE; // disable scanner
} }
break; break;
@ -204,36 +211,18 @@ public class TileEntityShipScanner extends TileEntityAbstractMachine implements
// timeout in sequencer? // timeout in sequencer?
WarpDrive.logger.info(this + " Deployment timeout?"); WarpDrive.logger.info(this + " Deployment timeout?");
deployTicks = 0; deployTicks = 0;
setState(EnumShipScannerState.IDLE); // disable scanner enumShipScannerState = EnumShipScannerState.IDLE; // disable scanner
shipToken_nextUpdate_ticks = SHIP_TOKEN_UPDATE_PERIOD_TICKS * 3; shipToken_nextUpdate_ticks = SHIP_TOKEN_UPDATE_PERIOD_TICKS * 3;
} }
break; break;
default: default:
WarpDrive.logger.error("Invalid ship scanner state, forcing to IDLE..."); WarpDrive.logger.error("Invalid ship scanner state, forcing to IDLE...");
setState(EnumShipScannerState.IDLE); enumShipScannerState = EnumShipScannerState.IDLE;
break; break;
} }
} }
private void setState(final EnumShipScannerState newState) {
if (enumShipScannerState == newState) {
return;
}
enumShipScannerState = newState;
if (Commons.isSafeThread()) {
if (blockCamouflage == null) {
updateBlockState(null, BlockProperties.ACTIVE, newState != EnumShipScannerState.IDLE);
} else {
if (getBlockMetadata() != metadataCamouflage) {
world.setBlockState(pos, getBlockType().getStateFromMeta(metadataCamouflage), 2);
}
}
} else {
WarpDrive.logger.error("Bad multithreading!");
}
}
@Override @Override
public void sequencer_finished() { public void sequencer_finished() {
switch (enumShipScannerState) { switch (enumShipScannerState) {
@ -244,7 +233,7 @@ public class TileEntityShipScanner extends TileEntityAbstractMachine implements
// break; // break;
case DEPLOYING:// active and deploying case DEPLOYING:// active and deploying
setState(EnumShipScannerState.IDLE); // disable scanner enumShipScannerState = EnumShipScannerState.IDLE; // disable scanner
if (WarpDriveConfig.LOGGING_BUILDING) { if (WarpDriveConfig.LOGGING_BUILDING) {
WarpDrive.logger.info(this + " Deployment done"); WarpDrive.logger.info(this + " Deployment done");
} }
@ -254,7 +243,7 @@ public class TileEntityShipScanner extends TileEntityAbstractMachine implements
default: default:
WarpDrive.logger.error(String.format("%s Invalid ship scanner state, forcing to IDLE...", WarpDrive.logger.error(String.format("%s Invalid ship scanner state, forcing to IDLE...",
this)); this));
setState(EnumShipScannerState.IDLE); enumShipScannerState = EnumShipScannerState.IDLE;
break; break;
} }
} }
@ -414,7 +403,7 @@ public class TileEntityShipScanner extends TileEntityAbstractMachine implements
// Begins ship scan // Begins ship scan
private boolean scanShip(final WarpDriveText reason) { private boolean scanShip(final WarpDriveText reason) {
// Enable scanner // Enable scanner
setState(EnumShipScannerState.SCANNING); enumShipScannerState = EnumShipScannerState.SCANNING;
final File file = new File(WarpDriveConfig.G_SCHEMATICS_LOCATION); final File file = new File(WarpDriveConfig.G_SCHEMATICS_LOCATION);
if (!file.exists() || !file.isDirectory()) { if (!file.exists() || !file.isDirectory()) {
if (!file.mkdirs()) { if (!file.mkdirs()) {
@ -511,13 +500,19 @@ public class TileEntityShipScanner extends TileEntityAbstractMachine implements
// Check specified area for occupation by blocks // Check specified area for occupation by blocks
// If specified area is occupied, break deployment with error message // If specified area is occupied, break deployment with error message
int occupiedBlockCount = 0; int occupiedBlockCount = 0;
final MutableBlockPos mutableBlockPos = new MutableBlockPos();
for (int x = targetLocationMin.getX(); x <= targetLocationMax.getX(); x++) { for (int x = targetLocationMin.getX(); x <= targetLocationMax.getX(); x++) {
for (int y = targetLocationMin.getY(); y <= targetLocationMax.getY(); y++) { for (int y = targetLocationMin.getY(); y <= targetLocationMax.getY(); y++) {
for (int z = targetLocationMin.getZ(); z <= targetLocationMax.getZ(); z++) { for (int z = targetLocationMin.getZ(); z <= targetLocationMax.getZ(); z++) {
if (!world.isAirBlock(new BlockPos(x, y, z))) { mutableBlockPos.setPos(x, y, z);
if (!world.isAirBlock(mutableBlockPos)) {
occupiedBlockCount++; occupiedBlockCount++;
if (occupiedBlockCount == 1 || (occupiedBlockCount <= 100 && world.rand.nextInt(10) == 0)) { if (occupiedBlockCount == 1 || (occupiedBlockCount <= 100 && world.rand.nextInt(10) == 0)) {
world.newExplosion(null, x, y, z, 1, false, false); PacketHandler.sendSpawnParticlePacket(world, "explosionLarge", (byte) 5,
new Vector3(mutableBlockPos), new Vector3(0, 0, 0),
0.70F + 0.25F * world.rand.nextFloat(), 0.70F + 0.25F * world.rand.nextFloat(), 0.20F + 0.30F * world.rand.nextFloat(),
0.10F + 0.10F * world.rand.nextFloat(), 0.10F + 0.20F * world.rand.nextFloat(), 0.10F + 0.30F * world.rand.nextFloat(),
WarpDriveConfig.SS_MAX_DEPLOY_RADIUS_BLOCKS);
} }
if (WarpDriveConfig.LOGGING_BUILDING) { if (WarpDriveConfig.LOGGING_BUILDING) {
WarpDrive.logger.info(String.format("Deployment collision detected %s", WarpDrive.logger.info(String.format("Deployment collision detected %s",
@ -539,7 +534,7 @@ public class TileEntityShipScanner extends TileEntityAbstractMachine implements
deployTicks = 0; deployTicks = 0;
isShipToken = isForced; isShipToken = isForced;
setState(EnumShipScannerState.DEPLOYING); enumShipScannerState = EnumShipScannerState.DEPLOYING;
reason.append(Commons.getStyleCorrect(), "warpdrive.builder.guide.deploying_ship", reason.append(Commons.getStyleCorrect(), "warpdrive.builder.guide.deploying_ship",
fileName); fileName);
return true; return true;
@ -553,8 +548,11 @@ public class TileEntityShipScanner extends TileEntityAbstractMachine implements
} }
if (!(blockState.getBlock() instanceof BlockShipCore)) { if (!(blockState.getBlock() instanceof BlockShipCore)) {
world.newExplosion(null, blockPos.getX(), blockPos.getY(), blockPos.getZ(), PacketHandler.sendSpawnParticlePacket(world, "explosionLarge", (byte) 5,
1, false, false); new Vector3(blockPos), new Vector3(0, 0, 0),
0.70F + 0.25F * world.rand.nextFloat(), 0.70F + 0.25F * world.rand.nextFloat(), 0.20F + 0.30F * world.rand.nextFloat(),
0.10F + 0.10F * world.rand.nextFloat(), 0.10F + 0.20F * world.rand.nextFloat(), 0.10F + 0.30F * world.rand.nextFloat(),
WarpDriveConfig.SS_MAX_DEPLOY_RADIUS_BLOCKS);
reason.append(Commons.getStyleWarning(), "warpdrive.builder.guide.deployment_area_occupied_by_block", reason.append(Commons.getStyleWarning(), "warpdrive.builder.guide.deployment_area_occupied_by_block",
blockState.getBlock().getLocalizedName(), blockState.getBlock().getLocalizedName(),
blockPos.getX(), blockPos.getY(), blockPos.getZ()); blockPos.getX(), blockPos.getY(), blockPos.getZ());
@ -568,8 +566,11 @@ public class TileEntityShipScanner extends TileEntityAbstractMachine implements
reason.append(Commons.getStyleCommand(), "warpdrive.builder.guide.contact_an_admin", reason.append(Commons.getStyleCommand(), "warpdrive.builder.guide.contact_an_admin",
Commons.format(world, blockPos)); Commons.format(world, blockPos));
WarpDrive.logger.error(reason.toString()); WarpDrive.logger.error(reason.toString());
world.newExplosion(null, blockPos.getX(), blockPos.getY(), blockPos.getZ(), PacketHandler.sendSpawnParticlePacket(world, "explosionLarge", (byte) 5,
1, false, false); new Vector3(blockPos), new Vector3(0, 0, 0),
0.70F + 0.25F * world.rand.nextFloat(), 0.70F + 0.25F * world.rand.nextFloat(), 0.20F + 0.30F * world.rand.nextFloat(),
0.10F + 0.10F * world.rand.nextFloat(), 0.10F + 0.20F * world.rand.nextFloat(), 0.10F + 0.30F * world.rand.nextFloat(),
WarpDriveConfig.SS_MAX_DEPLOY_RADIUS_BLOCKS);
return false; return false;
} }
@ -750,6 +751,10 @@ public class TileEntityShipScanner extends TileEntityAbstractMachine implements
return new Object[] { false, "Invalid argument format, you need <.schematic file name>, <offsetX>, <offsetY>, <offsetZ>, <rotationSteps>!" }; return new Object[] { false, "Invalid argument format, you need <.schematic file name>, <offsetX>, <offsetY>, <offsetZ>, <rotationSteps>!" };
} }
if (enumShipScannerState != EnumShipScannerState.IDLE) {
return new Object[] { false, String.format("Invalid state, expecting IDLE, found %s", enumShipScannerState.toString()) };
}
final WarpDriveText reason = new WarpDriveText(); final WarpDriveText reason = new WarpDriveText();
final boolean isSuccess = deployShip(fileName, x, y, z, rotationSteps, false, reason); final boolean isSuccess = deployShip(fileName, x, y, z, rotationSteps, false, reason);

1
src/main/java/cr0s/warpdrive/block/detection/TileEntityRadar.java
View file

@ -200,7 +200,6 @@ public class TileEntityRadar extends TileEntityAbstractEnergyConsumer {
scanning_radius = radius; scanning_radius = radius;
scanning_countdown_ticks = calculateScanDuration(radius); scanning_countdown_ticks = calculateScanDuration(radius);
isScanning = true; isScanning = true;
updateBlockState(null, BlockRadar.MODE, EnumRadarMode.SCANNING);
if (WarpDriveConfig.LOGGING_RADAR) { if (WarpDriveConfig.LOGGING_RADAR) {
WarpDrive.logger.info(String.format("%s Starting scan over radius %d for %s %s, results expected in %s ticks", WarpDrive.logger.info(String.format("%s Starting scan over radius %d for %s %s, results expected in %s ticks",
this, scanning_radius, this, scanning_radius,