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

Implemented Importing and Exporting Tile Entities; Additional Improvements #41

Merged
SenseiKiwi merged 15 commits from master into master 2013-07-15 22:08:53 +00:00
Conversation 0 Commits 15 Files Changed 21 +22 -16
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 203580bbbf - Show all commits

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

@@ -12,7 +12,9 @@ import java.util.regex.Pattern;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.nbt.CompressedStreamTools;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.WeightedRandom; import net.minecraft.util.WeightedRandom;
import net.minecraft.world.World; import net.minecraft.world.World;
@@ -392,7 +394,7 @@ public class DungeonHelper
xEnd = centerX + MAX_EXPORT_RADIUS; xEnd = centerX + MAX_EXPORT_RADIUS;
zEnd = centerZ + MAX_EXPORT_RADIUS; zEnd = centerZ + MAX_EXPORT_RADIUS;
yEnd = Math.min(centerY - MAX_EXPORT_RADIUS, world.getActualHeight()); yEnd = Math.min(centerY + MAX_EXPORT_RADIUS, world.getActualHeight());
//This could be done more efficiently, but honestly, this is the simplest approach and it //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. //makes it easy for us to verify that the code is correct.
@@ -421,7 +423,7 @@ public class DungeonHelper
short height = (short) (yMax - yMin + 1); short height = (short) (yMax - yMin + 1);
short length = (short) (zMax - zMin + 1); short length = (short) (zMax - zMin + 1);
ArrayList<NBTCompoundTag> tileEntities = new ArrayList<NBTCompoundTag>(); //ArrayList<NBTCompoundTag> tileEntities = new ArrayList<NBTCompoundTag>();
byte[] blocks = new byte[width * height * length]; byte[] blocks = new byte[width * height * length];
byte[] addBlocks = null; byte[] addBlocks = null;
byte[] blockData = new byte[width * height * length]; byte[] blockData = new byte[width * height * length];
@@ -474,10 +476,10 @@ public class DungeonHelper
if (Block.blocksList[blockID] instanceof BlockContainer) if (Block.blocksList[blockID] instanceof BlockContainer)
{ {
//Export container information //Export container information
TileEntity container = world.getBlockTileEntity(x + xMin, y + yMin, z + zMin); /*TileEntity container = world.getBlockTileEntity(x + xMin, y + yMin, z + zMin);
NBTTagCompound entityData = new NBTTagCompound(); NBTTagCompound entityData = new NBTTagCompound();
container.writeToNBT(entityData); container.writeToNBT(entityData);*/
//TODO fix this //TODO fix this
@@ -502,27 +504,31 @@ public class DungeonHelper
} }
} }
HashMap<String, Tag> schematic = new HashMap<String, Tag>(); NBTTagCompound schematicTag = new NBTTagCompound("Schematic");
schematic.put("Blocks", new ByteArrayTag("Blocks", blocks)); schematicTag.setShort("Width", width);
schematic.put("Data", new ByteArrayTag("Data", blockData)); schematicTag.setShort("Length", length);
schematicTag.setShort("Height", height);
schematic.put("Width", new ShortTag("Width", (short) width)); schematicTag.setByteArray("Blocks", blocks);
schematic.put("Length", new ShortTag("Length", (short) length)); schematicTag.setByteArray("Data", blockData);
schematic.put("Height", new ShortTag("Height", (short) height));
schematic.put("TileEntites", new ListTag("TileEntities", CompoundTag.class, tileEntities)); schematicTag.setTag("Entities", new NBTTagList());
schematicTag.setTag("TileEntities", new NBTTagList());
schematicTag.setString("Material", "Alpha");
if (addBlocks != null) if (addBlocks != null)
{ {
schematic.put("AddBlocks", new ByteArrayTag("AddBlocks", addBlocks)); schematicTag.setByteArray("AddBlocks", addBlocks);
} }
CompoundTag schematicTag = new CompoundTag("Schematic", schematic);
try try
{ {
NBTOutputStream stream = new NBTOutputStream(new FileOutputStream(exportPath)); FileOutputStream outputStream = new FileOutputStream(new File(exportPath));
stream.writeTag(schematicTag); CompressedStreamTools.writeCompressed(schematicTag, outputStream);
stream.close(); //writeCompressed() probably closes the stream on its own - call close again just in case.
//Closing twice will not throw an exception.
outputStream.close();
return true; return true;
} }
catch(Exception e) catch(Exception e)