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

Fix placing schematics at positions not multiples of 16, and fix null pointer with warp door

Browse source
This commit is contained in:
Runemoro 2018-01-22 01:00:53 -05:00
parent 0e41140216
commit ad9a779a18
3 changed files with 33 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/main/java/org/dimdev/ddutils/schem/Schematic.java
View file

@ -415,23 +415,29 @@ public class Schematic {
if (cubicChunks && world instanceof ICubicWorld) {
DimDoors.log.info("Setting cube blockstates");
ICubicWorld cubicWorld = (ICubicWorld) world;
for (int cubeX = 0; cubeX < (schematic.width - 1 >> 4) + 1; cubeX++) {
for (int cubeY = 0; cubeY < (schematic.length - 1 >> 4) + 1; cubeY++) {
for (int cubeZ = 0; cubeZ < (schematic.height - 1 >> 4) + 1; cubeZ++) {
for (int cubeX = 0; cubeX <= (schematic.width >> 4) + 1; cubeX++) {
for (int cubeY = 0; cubeY <= (schematic.length >> 4) + 1; cubeY++) {
for (int cubeZ = 0; cubeZ <= (schematic.height >> 4) + 1; cubeZ++) {
long setStart = System.nanoTime();
// Get the cube only once for efficiency
Cube cube = cubicWorld.getCubeFromCubeCoords((xBase << 4) + cubeX, (yBase << 4) + cubeY, (zBase << 4) + cubeZ);
ExtendedBlockStorage storage = cube.getStorage();
boolean setAir = storage != null;
for (int x = 0; x < 16; x++) {
for (int y = 0; y < 16; y++) {
for (int z = 0; z < 16; z++) {
if ((cubeX << 4) + x < schematic.width && (cubeY << 4) + y < schematic.height && (cubeZ << 4) + z < schematic.length) {
IBlockState state = schematic.palette.get(schematic.blockData[(cubeX << 4) + x][(cubeY << 4) + y][(cubeZ << 4) + z]);
int sx = (cubeX << 4) + x - (xBase & 0xFF);
int sy = (cubeY << 4) + y - (yBase & 0xFF);
int sz = (cubeZ << 4) + z - (zBase & 0xFF);
if (sx >= 0 && sy >= 0 && sz >= 0 && sx < schematic.width && sy < schematic.height && sz < schematic.length) {
IBlockState state = schematic.palette.get(schematic.blockData[sx][sy][sz]);
if (!state.getBlock().equals(Blocks.AIR)) {
if (storage == null) {
cube.setStorage(storage = new ExtendedBlockStorage(cube.getY() << 4, world.provider.hasSkyLight()));
}
storage.set(x, y, z, state);
} else if (setAir) {
storage.set(x, y, z, state);
}
}
}
@ -439,8 +445,8 @@ public class Schematic {
}
setTime += System.nanoTime() - setStart;
long relightStart = System.nanoTime();
// TODO: It's possible to relight a whole region at once, and immediately (this might not even work
// TODO: if the cube is already loaded) using this, according to Foghrye4: https://hastebin.com/hociqufabe.java
// TODO: It's possible to relight a whole region at once, and immediately using this, according
// TODO: to Foghrye4: https://hastebin.com/hociqufabe.java
cube.setInitialLightingDone(false);
relightTime += System.nanoTime() - relightStart;
cube.markDirty();
@ -449,25 +455,31 @@ public class Schematic {
}
} else {
DimDoors.log.info("Setting chunk blockstates");
for (int chunkX = 0; chunkX < (schematic.width - 1 >> 4) + 1; chunkX++) {
for (int chunkZ = 0; chunkZ < (schematic.length - 1 >> 4) + 1; chunkZ++) {
for (int chunkX = 0; chunkX <= (schematic.width >> 4) + 1; chunkX++) {
for (int chunkZ = 0; chunkZ <= (schematic.length >> 4) + 1; chunkZ++) {
long setStart = System.nanoTime();
// Get the chunk only once for efficiency
Chunk chunk = world.getChunkFromChunkCoords((xBase >> 4) + chunkX, (zBase >> 4) + chunkZ);
ExtendedBlockStorage[] storageArray = chunk.getBlockStorageArray();
for (int storageY = 0; storageY < (schematic.height - 1 >> 4) + 1; storageY++) {
for (int storageY = 0; storageY <= (schematic.height >> 4) + 1; storageY++) {
// Get the storage only once for eficiency
ExtendedBlockStorage storage = storageArray[(yBase >> 4) + storageY];
boolean setAir = storage != null;
for (int x = 0; x < 16; x++) {
for (int y = 0; y < 16; y++) {
for (int z = 0; z < 16; z++) {
if ((chunkX << 4) + x < schematic.width && (storageY << 4) + y < schematic.height && (chunkZ << 4) + z < schematic.length) {
IBlockState state = schematic.palette.get(schematic.blockData[(chunkX << 4) + x][(storageY << 4) + y][(chunkZ << 4) + z]);
int sx = (chunkX << 4) + x - (xBase & 0xFF);
int sy = (storageY << 4) + y - (yBase & 0xFF);
int sz = (chunkZ << 4) + z - (zBase & 0xFF);
if (sx >= 0 && sy >= 0 && sz >= 0 && sx < schematic.width && sy < schematic.height && sz < schematic.length) {
IBlockState state = schematic.palette.get(schematic.blockData[sx][sy][sz]);
if (!state.getBlock().equals(Blocks.AIR)) {
if (storage == null) {
storageArray[storageY] = storage = new ExtendedBlockStorage(storageY << 4, world.provider.hasSkyLight());
}
storage.set(x, y, z, state);
} else if (setAir) {
storage.set(x, y, z, state);
}
}
}

5
src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDimensionalDoor.java
View file

@ -135,7 +135,10 @@ public abstract class BlockDimensionalDoor extends BlockDoor implements IRiftPro
DimDoors.log.error("Rift tile entity was null when breaking block at " + new Location(world, pos) + ", please report this error.");
}
if (rift.isPlaceRiftOnBreak() || rift.isRegistered() && RiftRegistry.instance().getSources(new Location(rift.getWorld(), rift.getPos())).size() > 0 && !rift.isAlwaysDelete()) {
world.setBlockState(rift.getPos(), ModBlocks.RIFT.getDefaultState());
IBlockState oldState = world.getBlockState(rift.getPos());
world.setBlockState(rift.getPos(), ModBlocks.RIFT.getDefaultState(), 2);
//world.notifyBlockUpdate(rift.getPos(), oldState, ModBlocks.RIFT.getDefaultState(), 3);
world.markBlockRangeForRenderUpdate(rift.getPos(), rift.getPos());
TileEntityFloatingRift newRift = (TileEntityFloatingRift) world.getTileEntity(pos);
newRift.copyFrom(rift);
newRift.updateType();

8
src/main/java/org/dimdev/dimdoors/shared/rifts/destinations/AvailableLinkDestination.java
View file

@ -170,10 +170,12 @@ import java.util.Set;
TileEntityRift tileEntityFrom = (TileEntityRift) from.getTileEntity();
TileEntityRift tileEntityTo = (TileEntityRift) to.getTileEntity();
tileEntityFrom.setDestination(new GlobalDestination(to)); // TODO: local if possible
tileEntityTo.getProperties().linksRemaining--;
tileEntityTo.updateProperties();
tileEntityFrom.markDirty();
tileEntityTo.markDirty();
if (tileEntityTo.getProperties() != null) {
tileEntityTo.getProperties().linksRemaining--;
tileEntityTo.updateProperties();
tileEntityTo.markDirty();
}
}
private double sq(double a) { return a * a; }