AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-13 09:18:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8

Browse Source 
Conflicts:
	src/main/scala/li/cil/oc/common/item/data/PrintData.scala
This commit is contained in:
Florian Nücke 2015-03-26 16:44:45 +01:00
commit 389e52b6e1
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/scala/li/cil/oc/common/item/data/PrintData.scala
View File

@ -58,25 +58,42 @@ class PrintData extends ItemData {
object PrintData { object PrintData {
def nbtToShape(nbt: NBTTagCompound): Shape = { def nbtToShape(nbt: NBTTagCompound): Shape = {
val aabb =
if (nbt.hasKey("minX")) {
// Compatibility with shapes created with earlier dev-builds.
val minX = nbt.getByte("minX") / 16f val minX = nbt.getByte("minX") / 16f
val minY = nbt.getByte("minY") / 16f val minY = nbt.getByte("minY") / 16f
val minZ = nbt.getByte("minZ") / 16f val minZ = nbt.getByte("minZ") / 16f
val maxX = nbt.getByte("maxX") / 16f val maxX = nbt.getByte("maxX") / 16f
val maxY = nbt.getByte("maxY") / 16f val maxY = nbt.getByte("maxY") / 16f
val maxZ = nbt.getByte("maxZ") / 16f val maxZ = nbt.getByte("maxZ") / 16f
AxisAlignedBB.fromBounds(minX, minY, minZ, maxX, maxY, maxZ)
}
else {
val bounds = nbt.getByteArray("bounds").padTo(6, 0.toByte)
val minX = bounds(0) / 16f
val minY = bounds(1) / 16f
val minZ = bounds(2) / 16f
val maxX = bounds(3) / 16f
val maxY = bounds(4) / 16f
val maxZ = bounds(5) / 16f
AxisAlignedBB.fromBounds(minX, minY, minZ, maxX, maxY, maxZ)
}
val texture = nbt.getString("texture") val texture = nbt.getString("texture")
val tint = if (nbt.hasKey("tint")) Option(nbt.getInteger("tint")) else None val tint = if (nbt.hasKey("tint")) Option(nbt.getInteger("tint")) else None
new Shape(AxisAlignedBB.fromBounds(minX, minY, minZ, maxX, maxY, maxZ), texture, tint) new Shape(aabb, texture, tint)
} }
def shapeToNBT(shape: Shape): NBTTagCompound = { def shapeToNBT(shape: Shape): NBTTagCompound = {
val nbt = new NBTTagCompound() val nbt = new NBTTagCompound()
nbt.setByte("minX", (shape.bounds.minX * 16).round.toByte) nbt.setByteArray("bounds", Array(
nbt.setByte("minY", (shape.bounds.minY * 16).round.toByte) (shape.bounds.minX * 16).round.toByte,
nbt.setByte("minZ", (shape.bounds.minZ * 16).round.toByte) (shape.bounds.minY * 16).round.toByte,
nbt.setByte("maxX", (shape.bounds.maxX * 16).round.toByte) (shape.bounds.minZ * 16).round.toByte,
nbt.setByte("maxY", (shape.bounds.maxY * 16).round.toByte) (shape.bounds.maxX * 16).round.toByte,
nbt.setByte("maxZ", (shape.bounds.maxZ * 16).round.toByte) (shape.bounds.maxY * 16).round.toByte,
(shape.bounds.maxZ * 16).round.toByte
))
nbt.setString("texture", shape.texture) nbt.setString("texture", shape.texture)
shape.tint.foreach(nbt.setInteger("tint", _)) shape.tint.foreach(nbt.setInteger("tint", _))
nbt nbt