Fixed bad merge by @fnuecke.

Vexatos · Vexatos · commit cfe67bdf4828 · 2016-07-18T20:28:16.000+02:00
Does not fix @fnuecke being bad at merging.
diff --git a/src/main/scala/li/cil/oc/integration/jei/ModPluginOpenComputers.scala b/src/main/scala/li/cil/oc/integration/jei/ModPluginOpenComputers.scala
@@ -35,6 +35,33 @@ class ModPluginOpenComputers extends IModPlugin {
     registry.addRecipeHandlers(CallbackDocHandler.CallbackDocRecipeHandler)
     registry.addRecipes(CallbackDocHandler.getRecipes(registry))
 
+    def useNBT(names: String*) = names.map(name => {
+      val info = Items.get(name)
+      Option(info.item).getOrElse(Item.getItemFromBlock(info.block))
+    }).filter(_ != null).distinct.foreach(registry.getJeiHelpers.getSubtypeRegistry.useNbtForSubtypes(_))
+
+    // Only the preconfigured blocks and items have to be here.
+    useNBT(
+      Constants.BlockName.Microcontroller,
+      Constants.BlockName.Robot,
+
+      Constants.ItemName.Drone,
+      Constants.ItemName.Tablet
+    )
+
+    registry.getJeiHelpers.getSubtypeRegistry.registerNbtInterpreter(Items.get(Constants.ItemName.Floppy).item(), new ISubtypeInterpreter {
+      override def getSubtypeInfo(stack: ItemStack): String = {
+        if (!stack.hasTagCompound) return null
+        val compound: NBTTagCompound = stack.getTagCompound
+        val data = new NBTTagCompound
+        // Separate loot disks from normal floppies
+        if (compound.hasKey(Settings.namespace + "lootFactory")) {
+          data.setTag(Settings.namespace + "lootFactory", compound.getTag(Settings.namespace + "lootFactory"))
+        }
+        if (data.hasNoTags) null else data.toString
+      }
+    })
+
     registry.addAdvancedGuiHandlers(RelayGuiHandler)
   }
 
