Skip to content

Commit

Permalink
fix passthrough blocks
Browse files Browse the repository at this point in the history
  • Loading branch information
@Pulverizer
Pulverizer committed Nov 25, 2020
1 parent cd65255 commit 293af89
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 48 deletions.
16 changes: 9 additions & 7 deletions src/main/java/io/github/pulverizer/movecraft/async/TranslationTask.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,9 @@ protected void execute() throws InterruptedException {
}

// Check if Craft is obstructed
if (craftObstructed())
if (craftObstructed()) {
return;
}

// Call the Craft Translate Event
CraftTranslateEvent event = new CraftTranslateEvent(craft, oldHitBox, newHitBox);
Expand All @@ -105,18 +106,19 @@ protected void execute() throws InterruptedException {
}

// Clean up torpedoes after explosion
// TODO - Move to correct location
// What is the correct location?
if (!collisionBox.isEmpty() && craft.getType().getCruiseOnPilot()) {
if (!collisionBox.isEmpty() && craft.getType().getCruiseOnPilot() && craft.getType().getCollisionExplosion() > 0) {
craft.release(null);

for (Vector3i location : oldHitBox) {
updates.add(new BlockCreateCommand(craft.getWorld(), location, BlockTypes.AIR));
}

newHitBox = new HashHitBox();
}

// Add Craft Translation Map Update to list of updates
updates.add(new CraftTranslateCommand(craft, displacement, newHitBox));
} else {
// Add Craft Translation Map Update to list of updates
updates.add(new CraftTranslateCommand(craft, displacement, newHitBox));
}

// Move Entities
moveEntities();
Expand Down
15 changes: 6 additions & 9 deletions src/main/java/io/github/pulverizer/movecraft/map_updater/update/CraftRotateCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public void doUpdate() {
validExterior.addAll(CollectionUtils.filter(hitBox, newHitBox).asSet());
}
//Check to see which locations in the from set are actually outside of the craft
for (Vector3i location :validExterior ) {
for (Vector3i location : validExterior ) {
if (newHitBox.contains(location) || exterior.contains(location)) {
continue;
}
Expand Down Expand Up @@ -137,19 +137,16 @@ public void doUpdate() {
}

//place confirmed blocks if they have been un-phased
craft.getPhasedBlocks().forEach(block -> {
if (exterior.contains(block.getPosition())) {
final HashSet<BlockSnapshot> phasedBlocks = new HashSet<>(craft.getPhasedBlocks());
for (BlockSnapshot block : phasedBlocks) {

craft.getWorld().restoreSnapshot(block, true, BlockChangeFlags.NONE);
craft.getPhasedBlocks().remove(block);
}

if (originalLocations.contains(block.getPosition()) && !craft.getHitBox().inBounds(block.getPosition())) {
if (exterior.contains(block.getPosition())
|| (originalLocations.contains(block.getPosition()) && !newHitBox.contains(block.getPosition()))) {

craft.getWorld().restoreSnapshot(block, true, BlockChangeFlags.NONE);
craft.getPhasedBlocks().remove(block);
}
});
}

for (Vector3i location : interior) {
final BlockSnapshot material = craft.getWorld().createSnapshot(location);
Expand Down
63 changes: 31 additions & 32 deletions src/main/java/io/github/pulverizer/movecraft/map_updater/update/CraftTranslateCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.flowpowered.math.vector.Vector3i;
import io.github.pulverizer.movecraft.Movecraft;
import io.github.pulverizer.movecraft.world.ChunkDataManager;
import io.github.pulverizer.movecraft.config.Settings;
import io.github.pulverizer.movecraft.craft.Craft;
import io.github.pulverizer.movecraft.event.SignTranslateEvent;
Expand All @@ -11,6 +10,7 @@
import io.github.pulverizer.movecraft.utils.HitBox;
import io.github.pulverizer.movecraft.utils.MutableHitBox;
import io.github.pulverizer.movecraft.utils.SolidHitBox;
import io.github.pulverizer.movecraft.world.ChunkDataManager;
import org.slf4j.Logger;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.block.BlockSnapshot;
Expand All @@ -27,13 +27,14 @@
import java.util.Set;

public class CraftTranslateCommand extends UpdateCommand {

private final Craft craft;
private final Vector3i displacement;
private final HashHitBox newHitBox;
private final World world;


public CraftTranslateCommand(Craft craft, Vector3i displacement, HashHitBox newHitBox){
public CraftTranslateCommand(Craft craft, Vector3i displacement, HashHitBox newHitBox) {
this.craft = craft;
this.displacement = displacement;
this.newHitBox = newHitBox;
Expand All @@ -47,14 +48,14 @@ public void doUpdate() {
long time = System.currentTimeMillis();

final Logger logger = Movecraft.getInstance().getLogger();
if(craft.getHitBox().isEmpty()){
if (craft.getHitBox().isEmpty()) {
logger.warn("Attempted to move craft with empty HashHitBox!");
craft.release(null);
return;
}

final Set<BlockType> passthroughBlocks = new HashSet<>(craft.getType().getPassthroughBlocks());
if(craft.isSinking()){
if (craft.isSinking()) {
passthroughBlocks.add(BlockTypes.WATER);
passthroughBlocks.add(BlockTypes.FLOWING_WATER);
passthroughBlocks.add(BlockTypes.LEAVES);
Expand All @@ -64,7 +65,7 @@ public void doUpdate() {
passthroughBlocks.add(BlockTypes.DOUBLE_PLANT);
}

if(passthroughBlocks.isEmpty()){
if (passthroughBlocks.isEmpty()) {

//add the craft
translateCraft();
Expand All @@ -83,12 +84,9 @@ public void doUpdate() {

} else {

MutableHitBox originalLocations = new HashHitBox();
for (Vector3i vector3i : craft.getHitBox()) {
originalLocations.add((vector3i).sub(displacement));
}
MutableHitBox originalLocations = new HashHitBox(craft.getHitBox());

final HitBox to = CollectionUtils.filter(craft.getHitBox(), originalLocations);
final HitBox to = CollectionUtils.filter(newHitBox, originalLocations);
for (Vector3i location : to) {
BlockSnapshot material = craft.getWorld().createSnapshot(location);
if (passthroughBlocks.contains(material.getState().getType())) {
Expand All @@ -98,19 +96,19 @@ public void doUpdate() {

//place phased blocks
//The subtraction of the set of coordinates in the HitBox cube and the HitBox itself
final HitBox invertedHitBox = CollectionUtils.filter(craft.getHitBox().boundingHitBox(), craft.getHitBox());
final HitBox invertedHitBox = CollectionUtils.filter(newHitBox.boundingHitBox(), newHitBox);

//A set of locations that are confirmed to be "exterior" locations
final MutableHitBox exterior = new HashHitBox();
final MutableHitBox interior = new HashHitBox();

//place phased blocks
final int minX = craft.getHitBox().getMinX();
final int maxX = craft.getHitBox().getMaxX();
final int minY = craft.getHitBox().getMinY();
final int maxY = craft.getHitBox().getMaxY();
final int minZ = craft.getHitBox().getMinZ();
final int maxZ = craft.getHitBox().getMaxZ();
final int minX = newHitBox.getMinX();
final int maxX = newHitBox.getMaxX();
final int minY = newHitBox.getMinY();
final int maxY = newHitBox.getMaxY();
final int minZ = newHitBox.getMinZ();
final int maxZ = newHitBox.getMaxZ();
final HitBox[] surfaces = {
new SolidHitBox(new Vector3i(minX, minY, minZ), new Vector3i(minX, maxY, maxZ)),
new SolidHitBox(new Vector3i(minX, minY, minZ), new Vector3i(maxX, minY, maxZ)),
Expand All @@ -122,12 +120,12 @@ public void doUpdate() {
//Valid exterior starts as the 6 surface planes of the HitBox with the locations that lie in the HitBox removed
final Set<Vector3i> validExterior = new HashSet<>();
for (HitBox hitBox : surfaces) {
validExterior.addAll(CollectionUtils.filter(hitBox, craft.getHitBox()).asSet());
validExterior.addAll(CollectionUtils.filter(hitBox, newHitBox).asSet());
}

//Check to see which locations in the from set are actually outside of the craft
for (Vector3i location :validExterior ) {
if (craft.getHitBox().contains(location) || exterior.contains(location)) {
for (Vector3i location : validExterior) {
if (newHitBox.contains(location) || exterior.contains(location)) {
continue;
}
//use a modified BFS for multiple origin elements
Expand Down Expand Up @@ -173,15 +171,11 @@ public void doUpdate() {
}

//place confirmed blocks if they have been un-phased
for (BlockSnapshot block : craft.getPhasedBlocks()) {

if (exterior.contains(new Vector3i(block.getPosition().getX(), block.getPosition().getY(), block.getPosition().getZ()))) {
final HashSet<BlockSnapshot> phasedBlocks = new HashSet<>(craft.getPhasedBlocks());
for (BlockSnapshot block : phasedBlocks) {

craft.getWorld().restoreSnapshot(block, true, BlockChangeFlags.NONE);
craft.getPhasedBlocks().remove(block);
}

if (originalLocations.contains(new Vector3i(block.getPosition().getX(), block.getPosition().getY(), block.getPosition().getZ())) && !craft.getHitBox().inBounds(new Vector3i(block.getPosition().getX(), block.getPosition().getY(), block.getPosition().getZ()))) {
if (exterior.contains(block.getPosition())
|| (originalLocations.contains(block.getPosition()) && !newHitBox.contains(block.getPosition()))) {

craft.getWorld().restoreSnapshot(block, true, BlockChangeFlags.NONE);
craft.getPhasedBlocks().remove(block);
Expand All @@ -192,7 +186,9 @@ public void doUpdate() {
final BlockSnapshot material = craft.getWorld().createSnapshot(location);
if (passthroughBlocks.contains(material.getState().getType())) {
craft.getPhasedBlocks().add(material);
craft.getWorld().restoreSnapshot(location, BlockTypes.AIR.getDefaultState().snapshotFor(new Location<>(craft.getWorld(), location)), true, BlockChangeFlags.NONE);
craft.getWorld()
.restoreSnapshot(location, BlockTypes.AIR.getDefaultState().snapshotFor(new Location<>(craft.getWorld(), location)), true,
BlockChangeFlags.NONE);

}
}
Expand All @@ -203,7 +199,10 @@ public void doUpdate() {
craft.updateLastMoveTick();
craft.setProcessing(false);

if(Settings.Debug) logger.info("Total time: " + time + " ms. Moving with cooldown of " + craft.getTickCooldown() + ". Speed of: " + String.format("%.2f", craft.getActualSpeed()));
if (Settings.Debug) {
logger.info("Total time: " + time + " ms. Moving with cooldown of " + craft.getTickCooldown() + ". Speed of: " + String
.format("%.2f", craft.getActualSpeed()));
}
}

private void translateCraft() {
Expand All @@ -228,13 +227,13 @@ private void translateCraft() {
chunkDataManager.processFireSpread();
}

public Craft getCraft(){
public Craft getCraft() {
return craft;
}

@Override
public boolean equals(Object obj) {
if(!(obj instanceof CraftTranslateCommand)){
if (!(obj instanceof CraftTranslateCommand)) {
return false;
}
CraftTranslateCommand other = (CraftTranslateCommand) obj;
Expand Down

0 comments on commit 293af89

Please sign in to comment.