apex/DimDoors
1
1
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Selection of Bounds for Custom Dungeons

Browse Source 
Fixed the selection of boundaries for custom dungeons. The code had a
bug that would clip off a portion of dungeons during exporting. Also,
permafabric is not used to mark the edges of the dungeon anymore. That
means dungeons can contain permafabric now without getting cut off, and
the permafabric shells will be included as part of the export.
This commit is contained in:
SenseiKiwi
2013-07-15 00:47:32 -04:00
parent df452e930f
commit d23198c4fa
1 changed files with 54 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java
View File

@@ -38,6 +38,7 @@ public class DungeonHelper
public static final String SCHEMATIC_FILE_EXTENSION = ".schematic";
private static final int DEFAULT_DUNGEON_WEIGHT = 100;
public static final int MAX_DUNGEON_WEIGHT = 10000; //Used to prevent overflows and math breaking down
private static final int MAX_EXPORT_RADIUS = 50;
private static final String HUB_DUNGEON_TYPE = "Hub";
private static final String TRAP_DUNGEON_TYPE = "Trap";
@@ -375,67 +376,66 @@ public class DungeonHelper
registeredDungeons.addAll(hubs);
}
public boolean exportDungeon(World world, int xI, int yI, int zI, String exportPath)
public boolean exportDungeonX(World world, int centerX, int centerY, int centerZ, String exportPath)
{
int xMin;
int yMin;
int zMin;
int xMin, yMin, zMin;
int xMax, yMax, zMax;
int xStart, yStart, zStart;
int xEnd, yEnd, zEnd;
int xMax;
int yMax;
int zMax;
//Find the smallest bounding box that contains all non-air blocks within a max radius around the player.
xMax = yMax = zMax = Integer.MIN_VALUE;
xMin = yMin = zMin = Integer.MAX_VALUE;
xMin=xMax=xI;
yMin=yMax=yI;
zMin=zMax=zI;
xStart = centerX - MAX_EXPORT_RADIUS;
zStart = centerZ - MAX_EXPORT_RADIUS;
yStart = Math.max(centerY - MAX_EXPORT_RADIUS, 0);
for (int count = 0; count < 50; count++)
xEnd = centerX + MAX_EXPORT_RADIUS;
zEnd = centerZ + MAX_EXPORT_RADIUS;
yEnd = Math.min(centerY - MAX_EXPORT_RADIUS, world.getActualHeight());
//This could be done more efficiently, but honestly, this is the simplest approach and it
//makes it easy for us to verify that the code is correct.
for (int x = xStart; x <= xEnd; x++)
{
if(world.getBlockId(xMin, yI, zI)!=properties.PermaFabricBlockID)
for (int z = zStart; z <= zEnd; z++)
{
xMin--;
for (int y = yStart; y <= yEnd; y++)
{
if (!world.isAirBlock(x, y, z))
{
xMax = x > xMax ? x : xMax;
zMax = z > zMax ? z : zMax;
yMax = y > yMax ? y : yMax;
xMin = x < xMin ? x : xMin;
zMin = z < zMin ? z : zMin;
yMin = y < yMin ? y : yMin;
}
if(world.getBlockId(xI, yMin, zI)!=properties.PermaFabricBlockID)
{
yMin--;
}
if(world.getBlockId(xI, yI, zMin)!=properties.PermaFabricBlockID)
{
zMin--;
}
if(world.getBlockId(xMax, yI, zI)!=properties.PermaFabricBlockID)
{
xMax++;
}
if(world.getBlockId(xI, yMax, zI)!=properties.PermaFabricBlockID)
{
yMax++;
}
if(world.getBlockId(xI, yI, zMax)!=properties.PermaFabricBlockID)
{
zMax++;
}
}
short width =(short) (xMax-xMin);
short height= (short) (yMax-yMin);
short length= (short) (zMax-zMin);
//Export all the blocks within our selected bounding box
short width = (short) (xMax - xMin + 1);
short height = (short) (yMax - yMin + 1);
short length = (short) (zMax - zMin + 1);
//ArrayList<NBTTagCompound> tileEntities = new ArrayList<NBTTagCompound>();
ArrayList<Tag> tileEntites = new ArrayList<Tag>();
ArrayList<CompoundTag> tileEntities = new ArrayList<CompoundTag>();
byte[] blocks = new byte[width * height * length];
byte[] addBlocks = null;
byte[] blockData = new byte[width * height * length];
for (int x = 0; x < width; ++x)
for (int x = 0; x < width; x++)
{
for (int y = 0; y < height; ++y)
for (int z = 0; z < length; z++)
{
for (int z = 0; z < length; ++z)
for (int y = 0; y < height; y++)
{
int index = y * width * length + z * width + x;
int blockID = world.getBlockId(x + xMin, y + yMin, z + zMin);
int meta= world.getBlockMetadata(x+xMin, y+yMin, z+zMin);
int metadata = world.getBlockMetadata(x + xMin, y + yMin, z + zMin);
if (blockID == properties.DimensionalDoorID)
{
@@ -461,7 +461,7 @@ public class DungeonHelper
}
blocks[index] = (byte) blockID;
blockData[index] = (byte) meta;
blockData[index] = (byte) metadata;
if (Block.blocksList[blockID] instanceof BlockContainer)
{
@@ -486,15 +486,6 @@ public class DungeonHelper
}
}
}
/**
*
* nbtdata.setShort("Width", width);
nbtdata.setShort("Height", height);
nbtdata.setShort("Length", length);
nbtdata.setByteArray("Blocks", blocks);
nbtdata.setByteArray("Data", blockData);
*/
HashMap<String, Tag> schematic = new HashMap<String, Tag>();
@@ -504,7 +495,7 @@ public class DungeonHelper
schematic.put("Width", new ShortTag("Width", (short) width));
schematic.put("Length", new ShortTag("Length", (short) length));
schematic.put("Height", new ShortTag("Height", (short) height));
schematic.put("TileEntites", new ListTag("TileEntities", CompoundTag.class,tileEntites));
schematic.put("TileEntites", new ListTag("TileEntities", CompoundTag.class, tileEntities));
if (addBlocks != null)
{