AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 03:05:30 -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/integration/vanilla/ConverterItemStack.scala
This commit is contained in:
Florian Nücke 2015-04-01 00:26:04 +02:00
commit d503fc7ac4
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/scala/li/cil/oc/integration/vanilla/ConverterItemStack.scala
View File

@ -4,9 +4,12 @@ import java.util
import li.cil.oc.Settings import li.cil.oc.Settings
import li.cil.oc.api import li.cil.oc.api
import li.cil.oc.util.ExtendedNBT._
import li.cil.oc.util.ItemUtils import li.cil.oc.util.ItemUtils
import net.minecraft.item import net.minecraft.item
import net.minecraft.item.Item import net.minecraft.item.Item
import net.minecraft.nbt.NBTTagString
import net.minecraftforge.common.util.Constants.NBT
import scala.collection.convert.WrapAsScala._ import scala.collection.convert.WrapAsScala._
@ -24,6 +27,14 @@ object ConverterItemStack extends api.driver.Converter {
output += "hasTag" -> Boolean.box(stack.hasTagCompound) output += "hasTag" -> Boolean.box(stack.hasTagCompound)
output += "name" -> Item.itemRegistry.getNameForObject(stack.getItem) output += "name" -> Item.itemRegistry.getNameForObject(stack.getItem)
output += "label" -> stack.getDisplayName output += "label" -> stack.getDisplayName
if (stack.hasTagCompound &&
stack.getTagCompound.hasKey("display", NBT.TAG_COMPOUND) &&
stack.getTagCompound.getCompoundTag("display").hasKey("Lore", NBT.TAG_LIST)) {
output += "lore" -> stack.getTagCompound.
getCompoundTag("display").
getTagList("Lore", NBT.TAG_STRING).map((tag: NBTTagString) => tag.func_150285_a_()).
mkString("\n")
}
if (stack.hasTagCompound && Settings.get.allowItemStackNBTTags) { if (stack.hasTagCompound && Settings.get.allowItemStackNBTTags) {
output += "tag" -> ItemUtils.saveTag(stack.getTagCompound) output += "tag" -> ItemUtils.saveTag(stack.getTagCompound)